/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: 2006-09-27 20:30:59 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927203059-85792ae0a81db524
Bunch of small fixes, cleanups and simplifications.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/rename.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
 
18
import sys
18
19
 
19
20
try:
20
21
    import pygtk
26
27
import gtk.glade
27
28
 
28
29
import bzrlib.errors as errors
29
 
from bzrlib.workingtree import WorkingTree
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
 
 
36
30
 
37
31
class OliveRename:
38
32
    """ Display the Rename dialog and perform the needed actions. """
39
 
    def __init__(self, wt, wtpath, selected=[]):
 
33
    def __init__(self, comm):
40
34
        """ Initialize the Rename dialog. """
41
 
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_rename')
 
35
        self.glade = gtk.glade.XML(gladefile, 'window_rename')
 
36
        
 
37
        # Communication object
 
38
        self.comm = comm
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,
50
46
        # Connect the signals to the handlers
51
47
        self.glade.signal_autoconnect(dic)
52
48
        
53
 
        self.wt = wt
54
 
        self.wtpath = wtpath
55
 
        self.selected = selected
56
 
        
57
49
    def display(self):
58
50
        """ Display the Rename dialog. """
59
 
        if self.selected is not None:
60
 
            self.entry.set_text(self.selected)
61
 
        
62
51
        self.window.show_all()
63
52
 
64
 
    @show_bzr_error
65
53
    def rename(self, widget):
66
54
        # Get entry
67
 
        old_filename = self.selected
68
 
        new_filename = self.entry.get_text()
 
55
        entry = self.glade.get_widget('entry_rename')
 
56
        
 
57
        old_filename = self.comm.get_selected_right()
 
58
        new_filename = entry.get_text()
69
59
            
70
60
        if old_filename is None:
71
 
            error_dialog(_i18n('No file was selected'),
72
 
                         _i18n('Please select a file from the list to proceed.'))
 
61
            error_dialog(_('No file was selected'),
 
62
                                     _('Please select a file from the list to proceed.'))
73
63
            return
74
64
        
75
65
        if new_filename == "":
76
 
            error_dialog(_i18n('Filename not given'),
77
 
                         _i18n('Please specify a new name for the file.'))
 
66
            error_dialog(_('Filename not given'),
 
67
                                     _('Please specify a new name for the file.'))
78
68
            return
79
69
        
80
 
        source = os.path.join(self.wtpath, old_filename)
81
 
        destination = os.path.join(self.wtpath, new_filename)
 
70
        source = self.comm.get_path() + '/' + old_filename
 
71
        destination = self.comm.get_path() + '/' + new_filename
82
72
        
83
73
        # Rename the file
84
 
        wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
85
 
        wt2, path2 = WorkingTree.open_containing(self.wt.abspath(source))
 
74
        try:
 
75
            wt1, path1 = WorkingTree.open_containing(source)
 
76
            wt2, path2 = WorkingTree.open_containing(source)
86
77
 
87
 
        if wt1.basedir != wt2.basedir:
88
 
            error_dialog(_i18n('Not the same branch'),
89
 
                         _i18n('The destination is not in the same branch.'))
 
78
            if wt1.base != wt2.base:
 
79
                error_dialog(_('Not the same branch'),
 
80
                                         _('The destination is not in the same branch.'))
 
81
                return
 
82
            wt1.rename_one(source, destination)
 
83
        except errors.NotBranchError:
 
84
            error_dialog(_('File is not in a branch'),
 
85
                                     _('The selected file is not in a branch.'))
90
86
            return
91
 
        wt1.rename_one(source, destination)
 
87
 
92
88
        self.close()
 
89
        self.comm.refresh_right()
93
90
    
94
91
    def close(self, widget=None):
95
92
        self.window.destroy()