/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-06 00:22:31 UTC
  • mto: (0.8.83 merge)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060906002231-c94c6bd9d195713f
Fix a few more bits that I broke earlier.

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