/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-10-01 01:56:17 UTC
  • mfrom: (0.8.98 merge)
  • Revision ID: jelmer@samba.org-20061001015617-9827cc403415cbf0
[merge] more changes from Szilveszter

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