/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to viz/branchwin.py

  • Committer: Aaron Bentley
  • Date: 2008-03-11 13:18:28 UTC
  • Revision ID: aaron@aaronbentley.com-20080311131828-ypof288xwih1r3x2
Update to use new Tree.iter_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
14
14
import pango
15
15
 
16
16
from bzrlib.plugins.gtk.window import Window
17
 
from bzrlib.plugins.gtk import icon_path
18
17
from bzrlib.plugins.gtk.tags import AddTagDialog
19
18
from bzrlib.plugins.gtk.preferences import PreferencesWindow
20
19
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
21
 
 
22
 
from bzrlib.config import BranchConfig, GlobalConfig
23
20
from bzrlib.revision import Revision, NULL_REVISION
24
 
from bzrlib.trace import mutter
 
21
from bzrlib.config import BranchConfig
 
22
from bzrlib.config import GlobalConfig
25
23
 
26
24
class BranchWindow(Window):
27
25
    """Branch window.
30
28
    for a particular branch.
31
29
    """
32
30
 
33
 
    def __init__(self, branch, start_revs, maxnum, parent=None):
 
31
    def __init__(self, branch, start, maxnum, parent=None):
34
32
        """Create a new BranchWindow.
35
33
 
36
34
        :param branch: Branch object for branch to show.
37
 
        :param start_revs: Revision ids of top revisions.
 
35
        :param start: Revision id of top revision.
38
36
        :param maxnum: Maximum number of revisions to display, 
39
37
                       None for no limit.
40
38
        """
43
41
        self.set_border_width(0)
44
42
 
45
43
        self.branch      = branch
46
 
        self.start_revs  = start_revs
 
44
        self.start       = start
47
45
        self.maxnum      = maxnum
48
46
        self.config      = GlobalConfig()
49
47
 
67
65
 
68
66
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
69
67
        gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
70
 
        gtk.accel_map_add_entry("<viz>/View/Refresh", gtk.keysyms.F5, 0)
71
68
 
72
69
        self.accel_group = gtk.AccelGroup()
73
70
        self.add_accel_group(self.accel_group)
86
83
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
87
84
        self.next_rev_action.connect_accelerator()
88
85
 
89
 
        self.refresh_action = gtk.Action("refresh", "_Refresh", "Refresh view", gtk.STOCK_REFRESH)
90
 
        self.refresh_action.set_accel_path("<viz>/View/Refresh")
91
 
        self.refresh_action.set_accel_group(self.accel_group)
92
 
        self.refresh_action.connect("activate", self._refresh_clicked)
93
 
        self.refresh_action.connect_accelerator()
94
 
 
95
86
        self.construct()
96
87
 
97
88
    def set_revision(self, revid):
152
143
        view_menuitem = gtk.MenuItem("_View")
153
144
        view_menuitem.set_submenu(view_menu)
154
145
 
155
 
        view_menu_refresh = self.refresh_action.create_menu_item()
156
 
        view_menu_refresh.connect('activate', self._refresh_clicked)
157
 
 
158
 
        view_menu.add(view_menu_refresh)
159
 
        view_menu.add(gtk.SeparatorMenuItem())
160
 
 
161
146
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
162
147
        view_menu_toolbar.set_active(True)
163
148
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
170
155
        view_menu.add(view_menu_compact)
171
156
        view_menu.add(gtk.SeparatorMenuItem())
172
157
 
173
 
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
174
 
        self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
175
 
 
176
 
        # Revision numbers are pointless if there are multiple branches
177
 
        if len(self.start_revs) > 1:
178
 
            self.mnu_show_revno_column.set_sensitive(False)
179
 
            self.treeview.set_property('revno-column-visible', False)
180
 
 
181
 
        for (col, name) in [(self.mnu_show_revno_column, "revno"), 
182
 
                            (self.mnu_show_date_column, "date")]:
 
158
        for (label, name) in [("Revision _Number", "revno"), ("_Date", "date")]:
 
159
            col = gtk.CheckMenuItem("Show " + label + " Column")
183
160
            col.set_active(self.treeview.get_property(name + "-column-visible"))
184
161
            col.connect('toggled', self._col_visibility_changed, name)
185
162
            view_menu.add(col)
192
169
        go_menu_next = self.next_rev_action.create_menu_item()
193
170
        go_menu_prev = self.prev_rev_action.create_menu_item()
194
171
 
195
 
        tag_image = gtk.Image()
196
 
        tag_image.set_from_file(icon_path("tag-16.png"))
197
 
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
198
 
        self.go_menu_tags.set_image(tag_image)
 
172
        self.go_menu_tags = gtk.MenuItem("_Tags")
199
173
        self._update_tags()
200
174
 
201
175
        go_menu.add(go_menu_next)
209
183
 
210
184
        revision_menu_diff = gtk.MenuItem("View Changes")
211
185
        revision_menu_diff.connect('activate', 
212
 
                self._menu_diff_cb)
213
 
        
214
 
        revision_menu_compare = gtk.MenuItem("Compare with...")
215
 
        revision_menu_compare.connect('activate',
216
 
                self._compare_with_cb)
 
186
                lambda w: self.treeview.show_diff())
217
187
 
218
188
        revision_menu_tag = gtk.MenuItem("Tag Revision")
219
189
        revision_menu_tag.connect('activate', self._tag_revision_cb)
220
190
 
221
191
        revision_menu.add(revision_menu_tag)
222
192
        revision_menu.add(revision_menu_diff)
223
 
        revision_menu.add(revision_menu_compare)
224
193
 
225
194
        branch_menu = gtk.Menu()
226
195
        branch_menuitem = gtk.MenuItem("_Branch")
229
198
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
230
199
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
231
200
 
232
 
        try:
233
 
            from bzrlib.plugins import search
234
 
        except ImportError:
235
 
            mutter("Didn't find search plugin")
236
 
        else:
237
 
            branch_index_menuitem = gtk.MenuItem("_Index")
238
 
            branch_index_menuitem.connect('activate', self._branch_index_cb)
239
 
            branch_menu.add(branch_index_menuitem)
240
 
 
241
201
        help_menu = gtk.Menu()
242
202
        help_menuitem = gtk.MenuItem("_Help")
243
203
        help_menuitem.set_submenu(help_menu)
262
222
        """Construct the top-half of the window."""
263
223
        # FIXME: Make broken_line_length configurable
264
224
 
265
 
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
 
225
        self.treeview = TreeView(self.branch, self.start, self.maxnum, self.compact_view)
266
226
 
267
227
        self.treeview.connect('revision-selected',
268
228
                self._treeselection_changed_cb)
275
235
            option = self.config.get_user_option(col + '-column-visible')
276
236
            if option is not None:
277
237
                self.treeview.set_property(col + '-column-visible', option == 'True')
278
 
            else:
279
 
                self.treeview.set_property(col + '-column-visible', False)
280
238
 
281
239
        self.treeview.show()
282
240
 
329
287
        parents  = self.treeview.get_parents()
330
288
        children = self.treeview.get_children()
331
289
 
332
 
        if revision and revision != NULL_REVISION:
 
290
        if revision is not None:
333
291
            prev_menu = gtk.Menu()
334
292
            if len(parents) > 0:
335
293
                self.prev_rev_action.set_sensitive(True)
336
294
                for parent_id in parents:
337
 
                    if parent_id and parent_id != NULL_REVISION:
338
 
                        parent = self.branch.repository.get_revision(parent_id)
339
 
                        try:
340
 
                            str = ' (' + parent.properties['branch-nick'] + ')'
341
 
                        except KeyError:
342
 
                            str = ""
 
295
                    parent = self.branch.repository.get_revision(parent_id)
 
296
                    try:
 
297
                        str = ' (' + parent.properties['branch-nick'] + ')'
 
298
                    except KeyError:
 
299
                        str = ""
343
300
 
344
 
                        item = gtk.MenuItem(parent.message.split("\n")[0] + str)
345
 
                        item.connect('activate', self._set_revision_cb, parent_id)
346
 
                        prev_menu.add(item)
 
301
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
 
302
                    item.connect('activate', self._set_revision_cb, parent_id)
 
303
                    prev_menu.add(item)
347
304
                prev_menu.show_all()
348
305
            else:
349
306
                self.prev_rev_action.set_sensitive(False)
387
344
 
388
345
        self.show_diff(revision.revision_id, parent_id)
389
346
        self.treeview.grab_focus()
390
 
        
391
 
    def _menu_diff_cb(self,w):
392
 
        (path, focus) = self.treeview.treeview.get_cursor()
393
 
        revid = self.treeview.model[path][treemodel.REVID]
394
 
        
395
 
        parentids = self.branch.repository.revision_parents(revid)
396
 
 
397
 
        if len(parentids) == 0:
398
 
            parentid = NULL_REVISION
399
 
        else:
400
 
            parentid = parentids[0]
401
 
        
402
 
        self.show_diff(revid,parentid)    
 
347
    
403
348
 
404
349
    def _back_clicked_cb(self, *args):
405
350
        """Callback for when the back button is clicked."""
419
364
        self.show_diff(revid, parentid)
420
365
        self.treeview.grab_focus()
421
366
 
422
 
    def _compare_with_cb(self,w):
423
 
        """Callback for revision 'compare with' menu. Will show a small
424
 
            dialog with branch revisions to compare with selected revision in TreeView"""
425
 
        
426
 
        from bzrlib.plugins.gtk.revbrowser import RevisionBrowser
427
 
        
428
 
        rb = RevisionBrowser(self.branch,self)
429
 
        ret = rb.run()
430
 
        
431
 
        if ret == gtk.RESPONSE_OK:          
432
 
            (path, focus) = self.treeview.treeview.get_cursor()
433
 
            revid = self.treeview.model[path][treemodel.REVID]
434
 
            self.show_diff(revid, rb.selected_revid)
435
 
            
436
 
        rb.destroy()
437
 
            
438
367
    def _set_revision_cb(self, w, revision_id):
439
368
        self.treeview.set_revision_id(revision_id)
440
369
 
466
395
        finally:
467
396
            self.treeview.set_sensitive(True)
468
397
 
469
 
    def _branch_index_cb(self, w):
470
 
        from bzrlib.plugins.search import index as _mod_index
471
 
        _mod_index.index_url(self.branch.base)
472
 
 
473
398
    def _about_dialog_cb(self, w):
474
399
        from bzrlib.plugins.gtk.about import AboutDialog
475
400
 
501
426
            tags.sort()
502
427
            tags.reverse()
503
428
            for tag, revid in tags:
504
 
                tag_image = gtk.Image()
505
 
                tag_image.set_from_file(icon_path('tag-16.png'))
506
 
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
507
 
                tag_item.set_image(tag_image)
 
429
                tag_item = gtk.MenuItem(tag)
508
430
                tag_item.connect('activate', self._tag_selected_cb, revid)
509
431
                menu.add(tag_item)
510
432
            self.go_menu_tags.set_submenu(menu)