/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 23:15:43 UTC
  • mto: This revision was merged to the branch mainline in revision 534.
  • Revision ID: colbrac@xs4all.nl-20080717231543-0hbkqs4emdi88bj1
Move merge.py back to main directory

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
442
442
            # History Mode deactivated
443
443
            self.entry_history.set_sensitive(False)
444
444
            self.button_history.set_sensitive(False)
 
445
            
 
446
            # Return right window to normal view by acting like we jump to it
 
447
            self.on_button_location_jump_clicked(widget)
445
448
    
446
449
    @show_bzr_error
447
450
    def on_entry_history_revno_key_press_event(self, widget, event):
534
537
    
535
538
    def on_menuitem_branch_merge_activate(self, widget):
536
539
        """ Branch/Merge... menu handler. """
537
 
        from bzrlib.plugins.gtk.merge import MergeDialog
 
540
        from bzrlib.plugins.gtk.olive.merge import MergeDialog
538
541
        
539
542
        if self.check_for_changes():
540
543
            error_dialog(_i18n('There are local changes in the branch'),
541
544
                         _i18n('Please commit or revert the changes before merging.'))
542
545
        else:
543
 
            parent_branch_path = self.wt.branch.get_parent()
544
 
            merge = MergeDialog(self.wt, self.wtpath,default_branch_path=parent_branch_path )
545
 
            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()
546
551
 
547
552
    @show_bzr_error
548
553
    def on_menuitem_branch_missing_revisions_activate(self, widget):
773
778
        else:
774
779
            branch = self.remote_branch
775
780
 
776
 
        window = branchwin.BranchWindow(branch, branch.last_revision(), None, parent=self.window)
 
781
        window = branchwin.BranchWindow(branch, [branch.last_revision()], None, 
 
782
                                        parent=self.window)
777
783
        window.show()
778
784
    
779
785
    def on_menuitem_view_refresh_activate(self, widget):
1485
1491
        
1486
1492
        driveletters = []
1487
1493
        for drive in string.ascii_uppercase:
1488
 
            if win32file.GetDriveType(drive+':') == win32file.DRIVE_FIXED:
 
1494
            if win32file.GetDriveType(drive+':') == win32file.DRIVE_FIXED or\
 
1495
                win32file.GetDriveType(drive+':') == win32file.DRIVE_REMOTE:
1489
1496
                driveletters.append(drive+':')
1490
1497
        return driveletters
1491
1498