/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/rename.py

  • Committer: Jelmer Vernooij
  • Date: 2008-06-29 16:11:12 UTC
  • mfrom: (475.2.2 gtk)
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629161112-3j4zp0r0e7cv6cds
Merge Chad's progress bar in viz patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/rename.py
28
28
import bzrlib.errors as errors
29
29
from bzrlib.workingtree import WorkingTree
30
30
 
31
 
from dialog import error_dialog
 
31
from errors import show_bzr_error
 
32
from bzrlib.plugins.gtk.dialog import error_dialog
32
33
from guifiles import GLADEFILENAME
 
34
from bzrlib.plugins.gtk import _i18n
33
35
 
34
36
 
35
37
class OliveRename:
39
41
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_rename')
40
42
        
41
43
        self.window = self.glade.get_widget('window_rename')
 
44
        self.entry = self.glade.get_widget('entry_rename')
42
45
        
43
46
        # Dictionary for signal_autoconnect
44
47
        dic = { "on_button_rename_rename_clicked": self.rename,
53
56
        
54
57
    def display(self):
55
58
        """ Display the Rename dialog. """
 
59
        if self.selected is not None:
 
60
            self.entry.set_text(self.selected)
 
61
        
56
62
        self.window.show_all()
57
63
 
 
64
    @show_bzr_error
58
65
    def rename(self, widget):
59
66
        # Get entry
60
 
        entry = self.glade.get_widget('entry_rename')
61
 
        
62
67
        old_filename = self.selected
63
 
        new_filename = entry.get_text()
 
68
        new_filename = self.entry.get_text()
64
69
            
65
70
        if old_filename is None:
66
 
            error_dialog(_('No file was selected'),
67
 
                         _('Please select a file from the list to proceed.'))
 
71
            error_dialog(_i18n('No file was selected'),
 
72
                         _i18n('Please select a file from the list to proceed.'))
68
73
            return
69
74
        
70
75
        if new_filename == "":
71
 
            error_dialog(_('Filename not given'),
72
 
                         _('Please specify a new name for the file.'))
 
76
            error_dialog(_i18n('Filename not given'),
 
77
                         _i18n('Please specify a new name for the file.'))
73
78
            return
74
79
        
75
80
        source = os.path.join(self.wtpath, old_filename)
76
81
        destination = os.path.join(self.wtpath, new_filename)
77
82
        
78
83
        # Rename the file
79
 
        try:
80
 
            wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
81
 
            wt2, path2 = WorkingTree.open_containing(self.wt.abspath(source))
 
84
        wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
 
85
        wt2, path2 = WorkingTree.open_containing(self.wt.abspath(source))
82
86
 
83
 
            if wt1.basedir != wt2.basedir:
84
 
                error_dialog(_('Not the same branch'),
85
 
                             _('The destination is not in the same branch.'))
86
 
                return
87
 
            wt1.rename_one(source, destination)
88
 
        except errors.NotBranchError:
89
 
            error_dialog(_('File is not in a branch'),
90
 
                         _('The selected file is not in a branch.'))
 
87
        if wt1.basedir != wt2.basedir:
 
88
            error_dialog(_i18n('Not the same branch'),
 
89
                         _i18n('The destination is not in the same branch.'))
91
90
            return
92
 
        except errors.BzrError, msg:
93
 
            error_dialog(_('Unknown bzr error'), str(msg))
94
 
 
 
91
        wt1.rename_one(source, destination)
95
92
        self.close()
96
93
    
97
94
    def close(self, widget=None):