27
29
import bzrlib.errors as errors
28
30
from bzrlib.workingtree import WorkingTree
30
from bzrlib.plugins.gtk import _i18n
31
from bzrlib.plugins.gtk.dialog import error_dialog
32
from bzrlib.plugins.gtk.errors import show_bzr_error
35
class MoveDialog(gtk.Dialog):
32
from dialog import error_dialog
33
from guifiles import GLADEFILENAME
36
37
""" Display the Move dialog and perform the needed actions. """
38
def __init__(self, wt, wtpath, selected, parent=None):
38
def __init__(self, wt, wtpath, selected=[]):
39
39
""" Initialize the Move dialog. """
40
gtk.Dialog.__init__(self, title="Olive - Move",
43
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
40
self.glade = gtk.glade.XML(GLADEFILENAME, 'window_move', 'olive-gtk')
42
self.window = self.glade.get_widget('window_move')
44
# Dictionary for signal_autoconnect
45
dic = { "on_button_move_move_clicked": self.move,
46
"on_button_move_cancel_clicked": self.close }
48
# Connect the signals to the handlers
49
self.glade.signal_autoconnect(dic)
47
52
self.wtpath = wtpath
48
53
self.selected = selected
53
58
if self.wtpath == "":
54
directory = os.path.dirname(self.wt.abspath(self.selected))
59
directory = dirname(self.wt.abspath(self.selected))
56
directory = os.path.dirname(self.wt.abspath(self.wtpath + os.sep + self.selected))
59
self._hbox = gtk.HBox()
60
self._label_move_to = gtk.Label(_i18n("Move to"))
61
self._filechooser_dialog = gtk.FileChooserDialog(title="Please select a folder",
63
action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
64
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
65
gtk.STOCK_OPEN, gtk.RESPONSE_OK))
66
self._filechooser_dialog.set_default_response(gtk.RESPONSE_OK)
67
self.filechooser = gtk.FileChooserButton(self._filechooser_dialog)
68
self._button_move = gtk.Button(_i18n("_Move"))
69
self._button_move_icon = gtk.Image()
70
self._button_move_icon.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_BUTTON)
71
self._button_move.set_image(self._button_move_icon)
73
self._button_move.connect('clicked', self._on_move_clicked)
76
self._filechooser_dialog.set_current_folder(directory)
78
# Add widgets to dialog
79
self.vbox.add(self._hbox)
80
self._hbox.add(self._label_move_to)
81
self._hbox.add(self.filechooser)
82
self._hbox.set_spacing(5)
83
self.action_area.pack_end(self._button_move)
88
def _on_move_clicked(self, widget):
61
directory = dirname(self.wt.abspath(self.wtpath + os.sep + self.selected))
63
# Set FileChooser directory
64
self.filechooser = self.glade.get_widget('filechooserbutton_move')
65
self.filechooser.set_filename(directory)
68
""" Display the Move dialog. """
69
self.window.show_all()
71
def move(self, widget):
89
72
destination = self.filechooser.get_filename()
91
if destination == None:
92
error_dialog(_i18n('No folder was selected'),
93
_i18n('Please select a folder to move the selected file to'))
96
74
filename = self.selected
98
76
if filename is None:
99
error_dialog(_i18n('No file was selected'),
100
_i18n('Please select a file from the list to proceed.'))
77
error_dialog(_('No file was selected'),
78
_('Please select a file from the list to proceed.'))
103
81
source = os.path.join(self.wtpath, filename)
105
83
# Move the file to a directory
106
wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
107
wt2, path2 = WorkingTree.open_containing(destination)
108
if wt1.basedir != wt2.basedir:
109
error_dialog(_i18n('Not the same branch'),
110
_i18n('The destination is not in the same branch.'))
85
wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
86
wt2, path2 = WorkingTree.open_containing(destination)
87
if wt1.basedir != wt2.basedir:
88
error_dialog(_('Not the same branch'),
89
_('The destination is not in the same branch.'))
92
wt1.move([source], wt1.relpath(destination))
93
except errors.NotBranchError:
94
error_dialog(_('File is not in a branch'),
95
_('The selected file is not in a branch.'))
113
wt1.move([source], wt1.relpath(destination))
115
self.response(gtk.RESPONSE_OK)
100
def close(self, widget=None):
101
self.window.destroy()
added
removed
olive/move.py
