/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 18:12:29 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629181229-1l2m4cf7vvbyh8qg
Simplify progress bar code, use embedded progress bar inside viz window.

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