/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
196
196
        revision_menu_diff = gtk.MenuItem("View Changes")
197
197
        revision_menu_diff.connect('activate', 
198
198
                lambda w: self.treeview.show_diff())
199
 
 
 
199
        
 
200
        revision_menu_compare = gtk.MenuItem("Compare with...")
 
201
        revision_menu_compare.connect('activate',
 
202
                self._compare_with_cb)
 
203
        
200
204
        revision_menu_tag = gtk.MenuItem("Tag Revision")
201
205
        revision_menu_tag.connect('activate', self._tag_revision_cb)
202
206
 
203
207
        revision_menu.add(revision_menu_tag)
204
208
        revision_menu.add(revision_menu_diff)
 
209
        revision_menu.add(revision_menu_compare)
205
210
 
206
211
        branch_menu = gtk.Menu()
207
212
        branch_menuitem = gtk.MenuItem("_Branch")
378
383
        self.show_diff(revid, parentid)
379
384
        self.treeview.grab_focus()
380
385
 
 
386
    def _compare_with_cb(self,w):
 
387
        """Callback for revision 'compare with' menu. Will show a small
 
388
            dialog with branch revisions to compare with selected revision in TreeView"""
 
389
        
 
390
        from bzrlib.plugins.gtk.revbrowser import RevisionBrowser
 
391
        
 
392
        rb = RevisionBrowser(self.branch,self)
 
393
        ret = rb.run()
 
394
        
 
395
        if ret == gtk.RESPONSE_OK:          
 
396
            (path, focus) = self.treeview.treeview.get_cursor()
 
397
            revid = self.treeview.model[path][treemodel.REVID]
 
398
            self.show_diff(revid, rb.selected_revid)
 
399
            
 
400
        rb.destroy()
 
401
            
381
402
    def _set_revision_cb(self, w, revision_id):
382
403
        self.treeview.set_revision_id(revision_id)
383
404