/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-06-29 18:31:29 UTC
  • mto: This revision was merged to the branch mainline in revision 518.
  • Revision ID: jelmer@samba.org-20080629183129-syqvz3xm5gqagzsx
https://launchpad.net/bugs/244025
Fix use of smart_add.

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)
69
70
 
70
71
        self.accel_group = gtk.AccelGroup()
71
72
        self.add_accel_group(self.accel_group)
84
85
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
85
86
        self.next_rev_action.connect_accelerator()
86
87
 
 
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
 
87
94
        self.construct()
88
95
 
89
96
    def set_revision(self, revid):
144
151
        view_menuitem = gtk.MenuItem("_View")
145
152
        view_menuitem.set_submenu(view_menu)
146
153
 
 
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
 
147
160
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
148
161
        view_menu_toolbar.set_active(True)
149
162
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
195
208
 
196
209
        revision_menu_diff = gtk.MenuItem("View Changes")
197
210
        revision_menu_diff.connect('activate', 
198
 
                lambda w: self.treeview.show_diff())
 
211
                self._menu_diff_cb)
199
212
        
200
213
        revision_menu_compare = gtk.MenuItem("Compare with...")
201
214
        revision_menu_compare.connect('activate',
202
215
                self._compare_with_cb)
203
 
        
 
216
 
204
217
        revision_menu_tag = gtk.MenuItem("Tag Revision")
205
218
        revision_menu_tag.connect('activate', self._tag_revision_cb)
206
219
 
306
319
        parents  = self.treeview.get_parents()
307
320
        children = self.treeview.get_children()
308
321
 
309
 
        if revision is not None:
 
322
        if revision and revision != NULL_REVISION:
310
323
            prev_menu = gtk.Menu()
311
324
            if len(parents) > 0:
312
325
                self.prev_rev_action.set_sensitive(True)
313
326
                for parent_id in parents:
314
 
                    parent = self.branch.repository.get_revision(parent_id)
315
 
                    try:
316
 
                        str = ' (' + parent.properties['branch-nick'] + ')'
317
 
                    except KeyError:
318
 
                        str = ""
 
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 = ""
319
333
 
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)
 
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)
323
337
                prev_menu.show_all()
324
338
            else:
325
339
                self.prev_rev_action.set_sensitive(False)
363
377
 
364
378
        self.show_diff(revision.revision_id, parent_id)
365
379
        self.treeview.grab_focus()
366
 
    
 
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)    
367
393
 
368
394
    def _back_clicked_cb(self, *args):
369
395
        """Callback for when the back button is clicked."""