[Pkg-bazaar-commits] ./bzr-gtk/unstable r271: Add common widget for selecting branches.
Jelmer Vernooij
jelmer at samba.org
Fri Apr 10 07:45:27 UTC 2009
------------------------------------------------------------
revno: 271
tags: bzr-gtk-0.90.0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2007-08-27 14:38:18 +0200
message:
Add common widget for selecting branches.
added:
branchbox.py
modified:
NEWS
__init__.py
branch.py
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2007-08-27 12:06:37 +0000
+++ b/NEWS 2007-08-27 12:38:18 +0000
@@ -24,6 +24,8 @@
* Updated pot generator script and regenerated the translation template.
(Szilveszter)
+
+ * Add helper widget for selecting branches (Jelmer)
BUG FIXES
=== modified file '__init__.py'
--- a/__init__.py 2007-08-23 10:17:40 +0000
+++ b/__init__.py 2007-08-27 12:38:18 +0000
@@ -57,7 +57,7 @@
from warnings import warn as warning
if bzrlib_version < desired:
from bzrlib.errors import BzrError
- warning('Installed bzr version %s is too old to be used with bzr-gtk'
+ warning('Installed Bazaar version %s is too old to be used with bzr-gtk'
' %s.' % (bzrlib.__version__, __version__))
raise BzrError('Version mismatch: %r' % (version_info,) )
else:
=== modified file 'branch.py'
--- a/branch.py 2007-07-07 22:02:45 +0000
+++ b/branch.py 2007-08-27 12:38:18 +0000
@@ -27,13 +27,11 @@
from errors import show_bzr_error
from bzrlib.branch import Branch
-from bzrlib.config import GlobalConfig
import bzrlib.errors as errors
from dialog import error_dialog, info_dialog
-from history import UrlHistory
-from olive import Preferences
+from branchbox import BranchSelectionBox
class BranchDialog(gtk.Dialog):
""" New implementation of the Branch dialog. """
@@ -50,14 +48,15 @@
# Create the widgets
self._button_branch = gtk.Button(_("_Branch"), use_underline=True)
+ self._remote_branch = BranchSelectionBox()
self._button_revision = gtk.Button('')
- self._image_browse = gtk.Image()
- self._filechooser = gtk.FileChooserButton(_("Please select a folder"))
- self._combo = gtk.ComboBoxEntry()
self._label_location = gtk.Label(_("Branch location:"))
+ self._label_location.set_alignment(0, 0.5)
self._label_destination = gtk.Label(_("Destination:"))
self._label_nick = gtk.Label(_("Branck nick:"))
self._label_revision = gtk.Label(_("Revision:"))
+ self._filechooser = gtk.FileChooserButton(_("Please select a folder"))
+ self._filechooser.set_action(gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
self._hbox_revision = gtk.HBox()
self._entry_revision = gtk.Entry()
self._entry_nick = gtk.Entry()
@@ -65,35 +64,34 @@
# Set callbacks
self._button_branch.connect('clicked', self._on_branch_clicked)
self._button_revision.connect('clicked', self._on_revision_clicked)
- self._combo.child.connect('focus-out-event', self._on_combo_changed)
-
+ self._remote_branch.connect('branch-changed', self._on_branch_changed)
+
# Create the table and pack the widgets into it
self._table = gtk.Table(rows=3, columns=2)
self._table.attach(self._label_location, 0, 1, 0, 1)
+ self._table.attach(self._remote_branch, 1, 2, 0, 1)
self._table.attach(self._label_destination, 0, 1, 1, 2)
self._table.attach(self._label_nick, 0, 1, 2, 3)
self._table.attach(self._label_revision, 0, 1, 3, 4)
- self._table.attach(self._combo, 1, 2, 0, 1)
self._table.attach(self._filechooser, 1, 2, 1, 2)
self._table.attach(self._entry_nick, 1, 2, 2, 3)
self._table.attach(self._hbox_revision, 1, 2, 3, 4)
# Set properties
+ self._image_browse = gtk.Image()
self._image_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
self._button_revision.set_image(self._image_browse)
self._button_revision.set_sensitive(False)
- self._filechooser.set_action(gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
- self._label_location.set_alignment(0, 0.5)
self._label_destination.set_alignment(0, 0.5)
self._label_nick.set_alignment(0, 0.5)
self._label_revision.set_alignment(0, 0.5)
self._table.set_row_spacings(3)
self._table.set_col_spacings(3)
self.vbox.set_spacing(3)
+ if remote_path is not None:
+ self._remote_branch.set_url(remote_path)
if self.path is not None:
self._filechooser.set_filename(self.path)
- if remote_path is not None:
- self._combo.child.set_text(remote_path)
# Pack some widgets
self._hbox_revision.pack_start(self._entry_revision, True, True)
@@ -103,61 +101,39 @@
# Show the dialog
self.vbox.show_all()
-
- # Build branch history
- self._history = UrlHistory(GlobalConfig(), 'branch_history')
- self._build_history()
-
- def _build_history(self):
- """ Build up the branch history. """
- self._combo_model = gtk.ListStore(str)
-
- for item in self._history.get_entries():
- self._combo_model.append([ item ])
-
- pref = Preferences()
- for item in pref.get_bookmarks():
- self._combo_model.append([ item ])
-
- self._combo.set_model(self._combo_model)
- self._combo.set_text_column(0)
def _get_last_revno(self):
""" Get the revno of the last revision (if any). """
- location = self._combo.get_child().get_text()
try:
- br = Branch.open(location)
- except:
- return None
- else:
+ br = self._remote_branch.get_branch()
return br.revno()
+ except:
+ pass
def _on_revision_clicked(self, button):
""" Browse for revision button clicked handler. """
from revbrowser import RevisionBrowser
- location = self._combo.get_child().get_text()
try:
- br = Branch.open(location)
+ br = self._remote_branch.get_branch()
except:
return
- else:
- revb = RevisionBrowser(br, self)
- response = revb.run()
- if response != gtk.RESPONSE_NONE:
- revb.hide()
+ revb = RevisionBrowser(br, self)
+ response = revb.run()
+ if response != gtk.RESPONSE_NONE:
+ revb.hide()
+
+ if response == gtk.RESPONSE_OK:
+ if revb.selected_revno is not None:
+ self._entry_revision.set_text(revb.selected_revno)
- if response == gtk.RESPONSE_OK:
- if revb.selected_revno is not None:
- self._entry_revision.set_text(revb.selected_revno)
-
- revb.destroy()
+ revb.destroy()
@show_bzr_error
def _on_branch_clicked(self, button):
""" Branch button clicked handler. """
- location = self._combo.get_child().get_text()
+ location = self._remote_branch.get_url()
if location is '':
error_dialog(_('Missing branch location'),
_('You must specify a branch location.'))
@@ -207,7 +183,7 @@
self.response(gtk.RESPONSE_OK)
- def _on_combo_changed(self, widget, event):
+ def _on_branch_changed(self, widget, event):
""" We try to get the last revision if focus lost. """
rev = self._get_last_revno()
if rev is None:
@@ -217,4 +193,4 @@
self._entry_revision.set_text(str(rev))
self._button_revision.set_sensitive(True)
if self._entry_nick.get_text() == '':
- self._entry_nick.set_text(os.path.basename(self._combo.get_child().get_text().rstrip("/\\")))
+ self._entry_nick.set_text(os.path.basename(self._remote_branch.get_url().rstrip("/\\")))
=== added file 'branchbox.py'
--- a/branchbox.py 1970-01-01 00:00:00 +0000
+++ b/branchbox.py 2007-08-27 12:38:18 +0000
@@ -0,0 +1,71 @@
+# Copyright (C) 2007 by Jelmer Vernooij <jelmer at samba.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+try:
+ import pygtk
+ pygtk.require("2.0")
+except:
+ pass
+
+from bzrlib.branch import Branch
+from bzrlib.config import GlobalConfig
+import gtk
+from history import UrlHistory
+from olive import Preferences
+import gobject
+
+class BranchSelectionBox(gtk.HBox):
+ def __init__(self, path=None):
+ super(BranchSelectionBox, self).__init__()
+ self._combo = gtk.ComboBoxEntry()
+ self._combo.child.connect('focus-out-event', self._on_combo_changed)
+
+ # Build branch history
+ self._history = UrlHistory(GlobalConfig(), 'branch_history')
+ self._build_history()
+
+ self.add(self._combo)
+
+ gobject.signal_new('branch-changed', BranchSelectionBox,
+ gobject.SIGNAL_RUN_LAST,
+ gobject.TYPE_NONE, (gobject.TYPE_OBJECT,))
+
+ def set_url(self, url):
+ self._combo.get_child().set_text(url)
+
+ def get_url(self):
+ return self._combo.get_child().get_text()
+
+ def get_branch(self):
+ return Branch.open(self.get_url())
+
+ def _build_history(self):
+ """ Build up the branch history. """
+ self._combo_model = gtk.ListStore(str)
+
+ for item in self._history.get_entries():
+ self._combo_model.append([ item ])
+
+ pref = Preferences()
+ for item in pref.get_bookmarks():
+ self._combo_model.append([ item ])
+
+ self._combo.set_model(self._combo_model)
+ self._combo.set_text_column(0)
+
+ def _on_combo_changed(self, widget, event):
+ self.emit('branch-changed', widget)
+
More information about the Pkg-bazaar-commits
mailing list