/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

Fix regressions in plugins tab.

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