/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 olive/__init__.py

  • Committer: Jasper Groenewegen
  • Date: 2008-07-17 21:00:10 UTC
  • mto: (533.2.1 mergedialog)
  • mto: This revision was merged to the branch mainline in revision 534.
  • Revision ID: colbrac@xs4all.nl-20080717210010-31seo8vr1g0tyrzg
Replace MergeDialog with glade-less version. 
Move merge.py to olive/merge.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
537
537
    
538
538
    def on_menuitem_branch_merge_activate(self, widget):
539
539
        """ Branch/Merge... menu handler. """
540
 
        from bzrlib.plugins.gtk.merge import MergeDialog
 
540
        from bzrlib.plugins.gtk.olive.merge import MergeDialog
541
541
        
542
542
        if self.check_for_changes():
543
543
            error_dialog(_i18n('There are local changes in the branch'),
544
544
                         _i18n('Please commit or revert the changes before merging.'))
545
545
        else:
546
 
            parent_branch_path = self.wt.branch.get_parent()
547
 
            merge = MergeDialog(self.wt, self.wtpath,default_branch_path=parent_branch_path )
548
 
            merge.display()
 
546
            merge = MergeDialog(self.wt, self.wtpath, parent_branch_path, self.window)
 
547
            response = merge.run()
 
548
            merge.destroy()
 
549
            if response == gtk.RESPONSE_OK:
 
550
                self.refresh_right()
549
551
 
550
552
    @show_bzr_error
551
553
    def on_menuitem_branch_missing_revisions_activate(self, widget):