/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: Jelmer Vernooij
  • Date: 2008-04-25 19:41:23 UTC
  • mfrom: (463.2.4 bug.78765)
  • Revision ID: jelmer@samba.org-20080425194123-pwb3nn0n89sgoio2
Merge Compare With option from Javier.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
66
66
 
67
67
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
68
68
        gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
69
 
        gtk.accel_map_add_entry("<viz>/View/Refresh", gtk.keysyms.F5, 0)
70
69
 
71
70
        self.accel_group = gtk.AccelGroup()
72
71
        self.add_accel_group(self.accel_group)
85
84
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
86
85
        self.next_rev_action.connect_accelerator()
87
86
 
88
 
        self.refresh_action = gtk.Action("refresh", "_Refresh", "Refresh view", gtk.STOCK_REFRESH)
89
 
        self.refresh_action.set_accel_path("<viz>/View/Refresh")
90
 
        self.refresh_action.set_accel_group(self.accel_group)
91
 
        self.refresh_action.connect("activate", self._refresh_clicked)
92
 
        self.refresh_action.connect_accelerator()
93
 
 
94
87
        self.construct()
95
88
 
96
89
    def set_revision(self, revid):
151
144
        view_menuitem = gtk.MenuItem("_View")
152
145
        view_menuitem.set_submenu(view_menu)
153
146
 
154
 
        view_menu_refresh = self.refresh_action.create_menu_item()
155
 
        view_menu_refresh.connect('activate', self._refresh_clicked)
156
 
 
157
 
        view_menu.add(view_menu_refresh)
158
 
        view_menu.add(gtk.SeparatorMenuItem())
159
 
 
160
147
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
161
148
        view_menu_toolbar.set_active(True)
162
149
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
208
195
 
209
196
        revision_menu_diff = gtk.MenuItem("View Changes")
210
197
        revision_menu_diff.connect('activate', 
211
 
                self._menu_diff_cb)
 
198
                lambda w: self.treeview.show_diff())
212
199
        
213
200
        revision_menu_compare = gtk.MenuItem("Compare with...")
214
201
        revision_menu_compare.connect('activate',
215
202
                self._compare_with_cb)
216
 
 
 
203
        
217
204
        revision_menu_tag = gtk.MenuItem("Tag Revision")
218
205
        revision_menu_tag.connect('activate', self._tag_revision_cb)
219
206
 
319
306
        parents  = self.treeview.get_parents()
320
307
        children = self.treeview.get_children()
321
308
 
322
 
        if revision and revision != NULL_REVISION:
 
309
        if revision is not None:
323
310
            prev_menu = gtk.Menu()
324
311
            if len(parents) > 0:
325
312
                self.prev_rev_action.set_sensitive(True)
326
313
                for parent_id in parents:
327
 
                    if parent_id and parent_id != NULL_REVISION:
328
 
                        parent = self.branch.repository.get_revision(parent_id)
329
 
                        try:
330
 
                            str = ' (' + parent.properties['branch-nick'] + ')'
331
 
                        except KeyError:
332
 
                            str = ""
 
314
                    parent = self.branch.repository.get_revision(parent_id)
 
315
                    try:
 
316
                        str = ' (' + parent.properties['branch-nick'] + ')'
 
317
                    except KeyError:
 
318
                        str = ""
333
319
 
334
 
                        item = gtk.MenuItem(parent.message.split("\n")[0] + str)
335
 
                        item.connect('activate', self._set_revision_cb, parent_id)
336
 
                        prev_menu.add(item)
 
320
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
 
321
                    item.connect('activate', self._set_revision_cb, parent_id)
 
322
                    prev_menu.add(item)
337
323
                prev_menu.show_all()
338
324
            else:
339
325
                self.prev_rev_action.set_sensitive(False)
377
363
 
378
364
        self.show_diff(revision.revision_id, parent_id)
379
365
        self.treeview.grab_focus()
380
 
        
381
 
    def _menu_diff_cb(self,w):
382
 
        (path, focus) = self.treeview.treeview.get_cursor()
383
 
        revid = self.treeview.model[path][treemodel.REVID]
384
 
        
385
 
        parentids = self.branch.repository.revision_parents(revid)
386
 
 
387
 
        if len(parentids) == 0:
388
 
            parentid = NULL_REVISION
389
 
        else:
390
 
            parentid = parentids[0]
391
 
        
392
 
        self.show_diff(revid,parentid)    
 
366
    
393
367
 
394
368
    def _back_clicked_cb(self, *args):
395
369
        """Callback for when the back button is clicked."""