/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 19:52:46 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927195246-9354d7ccf56127f5
Don't pass around gladefile all the time. 
Fix bug in status information when files have been removed.

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