/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/move.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:
olive/move.py
29
29
import bzrlib.errors as errors
30
30
from bzrlib.workingtree import WorkingTree
31
31
 
32
 
from dialog import error_dialog
 
32
from bzrlib.plugins.gtk import _i18n
 
33
from bzrlib.plugins.gtk.dialog import error_dialog
 
34
from errors import show_bzr_error
33
35
from guifiles import GLADEFILENAME
34
36
 
35
37
 
68
70
        """ Display the Move dialog. """
69
71
        self.window.show_all()
70
72
 
 
73
    @show_bzr_error
71
74
    def move(self, widget):
72
75
        destination = self.filechooser.get_filename()
73
76
 
74
77
        filename = self.selected
75
78
            
76
79
        if filename is None:
77
 
            error_dialog(_('No file was selected'),
78
 
                         _('Please select a file from the list to proceed.'))
 
80
            error_dialog(_i18n('No file was selected'),
 
81
                         _i18n('Please select a file from the list to proceed.'))
79
82
            return
80
83
        
81
84
        source = os.path.join(self.wtpath, filename)
82
85
        
83
86
        # Move the file to a directory
84
 
        try:
85
 
            wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
86
 
            wt2, path2 = WorkingTree.open_containing(destination)
87
 
            if wt1.basedir != wt2.basedir:
88
 
                error_dialog(_('Not the same branch'),
89
 
                             _('The destination is not in the same branch.'))
90
 
                return
91
 
 
92
 
            wt1.move([source], wt1.relpath(destination))
93
 
        except errors.NotBranchError:
94
 
            error_dialog(_('File is not in a branch'),
95
 
                         _('The selected file is not in a branch.'))
 
87
        wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
 
88
        wt2, path2 = WorkingTree.open_containing(destination)
 
89
        if wt1.basedir != wt2.basedir:
 
90
            error_dialog(_i18n('Not the same branch'),
 
91
                         _i18n('The destination is not in the same branch.'))
96
92
            return
97
93
 
 
94
        wt1.move([source], wt1.relpath(destination))
98
95
        self.close()
99
96
    
100
97
    def close(self, widget=None):