/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 19:18:34 UTC
  • mto: This revision was merged to the branch mainline in revision 515.
  • Revision ID: jelmer@samba.org-20080629191834-ha2ecpv5szt96nge
Make sure signed testament matches repository data.

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)
 
212
        
 
213
        revision_menu_compare = gtk.MenuItem("Compare with...")
 
214
        revision_menu_compare.connect('activate',
 
215
                self._compare_with_cb)
199
216
 
200
217
        revision_menu_tag = gtk.MenuItem("Tag Revision")
201
218
        revision_menu_tag.connect('activate', self._tag_revision_cb)
202
219
 
203
220
        revision_menu.add(revision_menu_tag)
204
221
        revision_menu.add(revision_menu_diff)
 
222
        revision_menu.add(revision_menu_compare)
205
223
 
206
224
        branch_menu = gtk.Menu()
207
225
        branch_menuitem = gtk.MenuItem("_Branch")
247
265
            option = self.config.get_user_option(col + '-column-visible')
248
266
            if option is not None:
249
267
                self.treeview.set_property(col + '-column-visible', option == 'True')
 
268
            else:
 
269
                self.treeview.set_property(col + '-column-visible', False)
250
270
 
251
 
        self.treeview.set_property(col + '-column-visible', False)
252
271
        self.treeview.show()
253
272
 
254
273
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
300
319
        parents  = self.treeview.get_parents()
301
320
        children = self.treeview.get_children()
302
321
 
303
 
        if revision is not None:
 
322
        if revision and revision != NULL_REVISION:
304
323
            prev_menu = gtk.Menu()
305
324
            if len(parents) > 0:
306
325
                self.prev_rev_action.set_sensitive(True)
307
326
                for parent_id in parents:
308
 
                    parent = self.branch.repository.get_revision(parent_id)
309
 
                    try:
310
 
                        str = ' (' + parent.properties['branch-nick'] + ')'
311
 
                    except KeyError:
312
 
                        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 = ""
313
333
 
314
 
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
315
 
                    item.connect('activate', self._set_revision_cb, parent_id)
316
 
                    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)
317
337
                prev_menu.show_all()
318
338
            else:
319
339
                self.prev_rev_action.set_sensitive(False)
357
377
 
358
378
        self.show_diff(revision.revision_id, parent_id)
359
379
        self.treeview.grab_focus()
360
 
    
 
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)    
361
393
 
362
394
    def _back_clicked_cb(self, *args):
363
395
        """Callback for when the back button is clicked."""
377
409
        self.show_diff(revid, parentid)
378
410
        self.treeview.grab_focus()
379
411
 
 
412
    def _compare_with_cb(self,w):
 
413
        """Callback for revision 'compare with' menu. Will show a small
 
414
            dialog with branch revisions to compare with selected revision in TreeView"""
 
415
        
 
416
        from bzrlib.plugins.gtk.revbrowser import RevisionBrowser
 
417
        
 
418
        rb = RevisionBrowser(self.branch,self)
 
419
        ret = rb.run()
 
420
        
 
421
        if ret == gtk.RESPONSE_OK:          
 
422
            (path, focus) = self.treeview.treeview.get_cursor()
 
423
            revid = self.treeview.model[path][treemodel.REVID]
 
424
            self.show_diff(revid, rb.selected_revid)
 
425
            
 
426
        rb.destroy()
 
427
            
380
428
    def _set_revision_cb(self, w, revision_id):
381
429
        self.treeview.set_revision_id(revision_id)
382
430