Jasper
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [EMAIL PROTECTED] # target_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # testament_sha1: a82f313c268e1db287ce90a1435e214e62acc45d # timestamp: 2008-07-17 23:26:32 +0200 # source_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # base_revision_id: [EMAIL PROTECTED] # # Begin patch === modified file 'olive/__init__.py' --- olive/__init__.py 2008-07-01 21:56:25 +0000 +++ olive/__init__.py 2008-07-17 21:24:16 +0000 @@ -737,8 +737,8 @@ def on_menuitem_remove_file_activate(self, widget): """ Remove (unversion) selected file. """ - from remove import OliveRemoveDialog - remove = OliveRemoveDialog(self.wt, self.wtpath, + from bzrlib.plugins.gtk.olive.remove import RemoveDialog + remove = RemoveDialog(self.wt, self.wtpath, selected=self.get_selected_right(), parent=self.window) response = remove.run()
=== modified file 'olive/remove.py'
--- olive/remove.py 2008-05-05 18:16:46 +0000
+++ olive/remove.py 2008-07-17 21:24:16 +0000
@@ -23,76 +23,20 @@
pass
import gtk
-import gtk.glade
import bzrlib.errors as errors
from bzrlib.plugins.gtk import _i18n
from bzrlib.plugins.gtk.dialog import error_dialog, warning_dialog
-from guifiles import GLADEFILENAME
-
-
-class OliveRemove:
- """ Display the Remove file(s) dialog and perform the needed actions. """
- def __init__(self, wt, wtpath, selected=[]):
- """ Initialize the Remove file(s) dialog. """
- self.glade = gtk.glade.XML(GLADEFILENAME, 'window_remove')
-
- self.window = self.glade.get_widget('window_remove')
-
- # Dictionary for signal_autoconnect
- dic = { "on_button_remove_remove_clicked": self.remove,
- "on_button_remove_cancel_clicked": self.close }
-
- # Connect the signals to the handlers
- self.glade.signal_autoconnect(dic)
-
- self.wt = wt
- self.wtpath = wtpath
- self.selected = selected
-
- def display(self):
- """ Display the Remove file(s) dialog. """
- self.window.show_all()
-
- @show_bzr_error
- def remove(self, widget):
- radio_selected = self.glade.get_widget('radiobutton_remove_selected')
- radio_new = self.glade.get_widget('radiobutton_remove_new')
-
- if radio_selected.get_active():
- # Remove only the selected file
- filename = self.selected
-
- if filename is None:
- error_dialog(_i18n('No file was selected'),
- _i18n('Please select a file from the list,\nor choose the other option.'))
- return
-
- fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
-
- self.wt.remove(fullpath)
- elif radio_new.get_active():
- # Remove added files recursively
- added = self.wt.changes_from(self.wt.basis_tree()).added
- file_list = sorted([f[0] for f in added], reverse=True)
- if len(file_list) == 0:
- warning_dialog(_i18n('No matching files'),
- _i18n('No added files were found in the working tree.'))
- return
- self.wt.remove(file_list)
-
- self.close()
-
- def close(self, widget=None):
- self.window.destroy()
-
-class OliveRemoveDialog(gtk.Dialog):
+from bzrlib.plugins.gtk.errors import show_bzr_error
+
+
+class RemoveDialog(gtk.Dialog):
""" This class wraps the old Remove window into a gtk.Dialog. """
- def __init__(self, wt, wtpath, selected=[], parent=None):
+ def __init__(self, wt, wtpath, selected='', parent=None):
""" Initialize the Remove file(s) dialog. """
- gtk.Dialog.__init__(self, title="Remove files - Olive",
+ gtk.Dialog.__init__(self, title="Olive - Remove files",
parent=parent,
flags=0,
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
@@ -104,19 +48,18 @@
# Create widgets
self._label = gtk.Label(_i18n("Which file(s) do you want to remove?"))
- self._radio_selected = gtk.RadioButton(None, _i18n("Selected only"), False)
+ self._radio_selected = gtk.RadioButton(None, _i18n("Selected: %s"%self.selected), False)
self._radio_added = gtk.RadioButton(self._radio_selected, _i18n("All files with status 'added'"), False)
- self._button_remove = gtk.Button(_i18n("_Remove"), use_underline=True)
+ self._button_remove = gtk.Button(stock=gtk.STOCK_REMOVE)
self._button_remove.connect('clicked', self._on_remove_clicked)
- self.vbox.pack_start(self._label)
- self.vbox.pack_end(self._radio_added)
- self.vbox.pack_end(self._radio_selected)
-
+ self.vbox.add(self._label)
+ self.vbox.add(self._radio_selected)
+ self.vbox.add(self._radio_added)
+ self.vbox.set_spacing(3)
self.action_area.pack_end(self._button_remove)
- self.vbox.set_spacing(3)
self.vbox.show_all()
@show_bzr_error
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUyfN60AAohfgEQQU+///1+b
nQC////wUAW7Q8oZLO4BKug6rhJJU0/RTZMmo8UyepiPKMgAPUAaDTEBKKHoIJ6mkPUG1DQaAADQ
NAABKaKaJiZNNU80mmRqabUeUaNGgDTT1PU9QA5oyYmACYjAjTAgxGCZMAjBJImmg0TCJjQjEp7U
bUyaR6ZR6mhoDxSBjjmvv6bWuc1D18MNYlS6+SK6mqaGTYlqibHNIbFjmBHtBoJfU9b4kZ7RERhD
D6Sp7rkzGEVBVVRHd7Nko5TuixElesl73pXzioqVCnKROJJntPpo5u/qu5b5p8XEzfeGWj+xiFTZ
IkosqgatzHAzhnu4dmHMYxGEYECVplAim+DcmG2ZPw8b9GxTOuBzNE2n3YSqXaqJybjZumsm1a5k
+TrLDqSVBQag2WhaBO2ujSOBtydkii5Hsn2bT1sQTf2HAn3MMNTSwtCzbs854hM2BpigwYgyT8Xc
ARymImtbu2o3wuKxOIqaAmYRMw0OZilooJyg36zeaGtuZsqKliVaVJDOPOLRTYDXYPAi17Z6Sc8j
MM4xUR9qoaIExImwqHpDjxlQcL3YE5NYpzECR/xeYp7g6IPtmSBhD5pFEw4CJGR4PJXGmKKWKCsH
wPZlQ+q7nScjUqiuoq13WlJNOUBB9JA0vIuH6mROWHzIAOYp3EsTKgWkBiFc1E8hYtMSiVlDJsNo
Gvgi+gYhCVopYm+kZxWsdMBGnEVCOYNEZnYhni1kkvHmPUE5Etee3xlfEopTkLoYcIdmUjg6QxIM
5oPYpqQrBykY3jjHqOIGi0t1KrOKJE1zXAOJFdMGVZPlOrwkKPlqECegWBl08dzZBxeVFJxl00kX
Xpk2UIwbGxJbDo7hJm9qLmr13UCIyuZIfMQw6Jdmf5t6NsUOYk8V1hpYLSTJC9e/bykzi/k/6zEe
e7b0a9L9iC286qRysuQa5oUat9D4YKmoud2B96pbQ6JDIiExs+lRHcwcwgQFZz4nv87kHI6zMr4X
tvinneWj0P8OaBkv9gHQs8fG1B62fwnnl3SK13Ad4x+RebR5UGBAgUjy3SdX2C5Bu8TIgeAlWeZS
eR9TgBAsQZAMZx5+e7XyAnHOs/ftMQYvqRrAY2JlGsMRwOfWk1pYiP3cXkOpPD9Vfh8jYqtg5b8z
mZVsExbkbzIoXYcJ5956ETtsavJehm2fBi9E5BHdaZ7CkYuOsoRXnbQyl10dhB9ctK+jJL3CB3DM
yYGw2uUkwuqvTm0hX8e+IZ/wK4qNVaDZykie3IiErCgxkRhOA2TIplnMxKpC+5YCnU/R2zwjKkGy
MSpUzmYk0t5xu9r5UfJl4ljHZBTsgoEQfRY8Cs0+ouNY/KKVJBaN6TzFfVFr7KEdJp3z0VhggvQa
JUR8de4KAam1i6qOnhnIkm5VQjdJa8rgJEEofTkUZcJckFQWsSQzCXzMD7E6bARvnByXq3xw7eUi
Uo4OkBUcGbdkc5kjgESGyjidaLFTsUDKj2Q9TuUGRpQMPEzCZdPycG0DXiV4JZIOsrgPoiMA3ucY
CeicJJ+pTK7OJauwJh9vG4MstYRIqeoLR5LdTSNoPgtqqpFvMTEsy2zOLto5GnoQcVQh3SBRN4NZ
04t97UGjnsJ2T7AzVZ7iZYe9xPkGg7yooTDMMqpqfeHM70DphmpIniHcuuZWGrHwOdCVrg8bZJp2
6QJtzBBaC1Xdru0qqRuslnNp6G08M85rrQxrCzW75IwxCmk2ZiYoaSUn0JkSXYXHpidFKB/O1lcj
4d3PI8Xkt8DJp6AtzMJITJAlcpcytBwXoTHRHzHTz9JsA8yzSzUhHkgZGqqoTnNimWFPnVJ/i7ki
nChIJk+b1oA=
signature.asc
Description: OpenPGP digital signature
-- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
