/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: Szilveszter Farkas (Phanatic)
  • Date: 2006-09-30 11:01:59 UTC
  • mto: (0.14.3 main)
  • mto: This revision was merged to the branch mainline in revision 86.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060930110159-d1d716766985f3dd
Fix Move, Rename and glade file.

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