/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/move.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/move.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
18
 
from os.path import dirname
 
18
import sys
19
19
 
20
20
try:
21
21
    import pygtk
22
22
    pygtk.require("2.0")
23
23
except:
24
24
    pass
25
 
 
26
25
import gtk
27
26
import gtk.glade
28
27
 
29
28
import bzrlib.errors as errors
30
 
from bzrlib.workingtree import WorkingTree
31
 
 
32
 
from bzrlib.plugins.gtk import _i18n
33
 
from bzrlib.plugins.gtk.dialog import error_dialog
34
 
from errors import show_bzr_error
35
 
from guifiles import GLADEFILENAME
36
 
 
 
29
 
 
30
from olive import gladefile
37
31
 
38
32
class OliveMove:
39
33
    """ Display the Move dialog and perform the needed actions. """
40
 
    def __init__(self, wt, wtpath, selected=[]):
 
34
    def __init__(self, comm):
41
35
        """ Initialize the Move dialog. """
42
 
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_move', 'olive-gtk')
 
36
        self.glade = gtk.glade.XML(gladefile, 'window_move', 'olive-gtk')
 
37
        
 
38
        # Communication object
 
39
        self.comm = comm
43
40
        
44
41
        self.window = self.glade.get_widget('window_move')
45
42
        
50
47
        # Connect the signals to the handlers
51
48
        self.glade.signal_autoconnect(dic)
52
49
        
53
 
        self.wt = wt
54
 
        self.wtpath = wtpath
55
 
        self.selected = selected
56
 
        
57
 
        if self.selected is None:
58
 
            self.selected = ""
59
 
        
60
 
        if self.wtpath == "":
61
 
            directory = dirname(self.wt.abspath(self.selected))
62
 
        else:
63
 
            directory = dirname(self.wt.abspath(self.wtpath + os.sep + self.selected))
64
 
        
65
50
        # Set FileChooser directory
66
51
        self.filechooser = self.glade.get_widget('filechooserbutton_move')
67
 
        self.filechooser.set_filename(directory)
 
52
        self.filechooser.set_filename(self.comm.get_path())
68
53
 
69
54
    def display(self):
70
55
        """ Display the Move dialog. """
71
56
        self.window.show_all()
72
57
 
73
 
    @show_bzr_error
74
58
    def move(self, widget):
75
59
        destination = self.filechooser.get_filename()
76
60
 
77
 
        filename = self.selected
 
61
        filename = self.comm.get_selected_right()
78
62
            
79
63
        if filename is None:
80
 
            error_dialog(_i18n('No file was selected'),
81
 
                         _i18n('Please select a file from the list to proceed.'))
 
64
            error_dialog(_('No file was selected'),
 
65
                                     _('Please select a file from the list to proceed.'))
82
66
            return
83
67
        
84
 
        source = os.path.join(self.wtpath, filename)
 
68
        source = self.comm.get_path() + '/' + filename
85
69
        
86
70
        # Move the file to a directory
87
 
        wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
88
 
        wt2, path2 = WorkingTree.open_containing(destination)
89
 
        if wt1.basedir != wt2.basedir:
90
 
            error_dialog(_i18n('Not the same branch'),
91
 
                         _i18n('The destination is not in the same branch.'))
 
71
        try:
 
72
            wt1, path1 = WorkingTree.open_containing(source)
 
73
            wt2, path2 = WorkingTree.open_containing(destination)
 
74
            if wt1.base != wt2.base:
 
75
                error_dialog(_('Not the same branch'),
 
76
                                         _('The destination is not in the same branch.'))
 
77
                return
 
78
 
 
79
            wt1.move([source], destination)
 
80
        except errors.NotBranchError:
 
81
            error_dialog(_('File is not in a branch'),
 
82
                                     _('The selected file is not in a branch.'))
92
83
            return
93
84
 
94
 
        wt1.move([source], wt1.relpath(destination))
95
85
        self.close()
 
86
        self.comm.refresh_right()
96
87
    
97
88
    def close(self, widget=None):
98
89
        self.window.destroy()