This fixes the Window-based progress indication that I broke when I added support for progress bars in "bzr viz". "bzr pull" in olive-gtk now works again.
Cheers, Jelmer --
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: lp:bzr-gtk
# testament_sha1: ebf141ebe45d3b7491e3c1be0daac2bbb5736420
# timestamp: 2008-06-30 22:33:24 +0200
# base_revision_id: [EMAIL PROTECTED]
#
# Begin patch
=== modified file 'branchview/linegraph.py'
--- branchview/linegraph.py 2008-06-29 18:12:29 +0000
+++ branchview/linegraph.py 2008-06-30 12:39:07 +0000
@@ -47,7 +47,7 @@
def update_root_progress(step_number):
"""IFF our container received a root progress bar, then update it."""
if root_progress is not None:
- root_progress.update(current_cnt=step_number)
+ root_progress.update(None, current_cnt=step_number)
graph_parents = {}
ghosts = set()
=== modified file 'ui.py'
--- ui.py 2008-06-29 18:12:29 +0000
+++ ui.py 2008-06-30 20:32:25 +0000
@@ -72,8 +72,10 @@
class ProgressBarWindow(gtk.Window):
- def __init__(self):
+ def __init__(self, to_file=None, show_pct=None, show_spinner=None, show_eta=None,
+ show_bar=None, show_count=None, to_messages_file=None, _stack=None):
super(ProgressBarWindow, self).__init__(type=gtk.WINDOW_TOPLEVEL)
+ self._stack = _stack
self.set_border_width(0)
self.set_title("Progress")
self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
@@ -83,10 +85,30 @@
self.set_resizable(False)
self.show_all()
+ def return_pb(self, pb):
+ self._stack.return_pb(self)
+
+ def update(self, *args, **kwargs):
+ self.pb.update(*args, **kwargs)
+
+ def finished(self):
+ self.pb.finished()
+ self.hide_all()
+
def clear(self):
self.pb.clear()
self.destroy()
+ def child_progress(self, *args, **kwargs):
+ return self.pb.child_progress(*args, **kwargs)
+
+ def child_update(self, *args, **kwargs):
+ return self.pb.child_update(*args, **kwargs)
+
+ def get_progress_bar(self):
+ self.show_all()
+ return self
+
class ProgressPanel(gtk.HBox):
def __init__(self):
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWY8H0rcAAznfgERSUXf//1MR
AYC////wYAZXzyAAFUAAABjmATACYAATAAEwABpEnono0TTQGanpDQMgAA000DmATACYAATAAEwA
BKnqZU2hT1PUeKeKBoABo0AeoDQOYBMAJgABMAATAAEkgQaATI0VP00yAmmkeVPyapjRqe1RAIDa
6UUV48oDy+SX+yVnCAxb4VIkjQ2FB4xzEdUAJwMKgYpfVRfEkIOJKyl0CmDUSHlNSQS1ckgckHsV
QQbQ/cwGBmZg+PcVn4iUkC295DpF7uYrMgsVCORsfg1b/Tdl9OXD+w1GB+jZTuOIqU9U0nEIKYZg
iAhrMLuPQWjY1pRaxWSfCLU33wE+G0cPEH9HI1NNblD+ob4xIfy9fXcxfRREok5qhUJl5ilEUU4Z
gZnHPebg/WAI2p3ebxa/gccEG9zrOu82JvwJDBT2sMcXxo0Dqqy0c53sIq6ygC9mYWA2RmPHIF+2
YKBQOFEzJCedQ4gVJikEaoKgehHdVEcKt44iZl5pwXBVeuIr2xZWsQGMDGD8GO4cqhkErccGcbym
pi8+4Pu4hMwSzKyYQLC/7WHtuOyLWBmaE5ZaYaESSBXipNmAyKtgnGROgeg2EZGpaLaRLzUV8S0s
mlpAveXncXlFNDCDAoGFq4eSHCzJFZlQ9BxQMWJqI3PH7BgLCsx0mRMBVzC0pP8Kyw0HFlON+WoU
iwNtBgqzg4noWFRw0LbiJaQMQ3ECZAYcRIBhbYKosuVJmOMy4jYECxhA422kCorCkxrRgYFpcWD5
aOe1yDOgyYjGgkSkPzKhiRIdkZY3CYq2XVjdBcFYbM8b0ImYvK4PbB2hmRxI4khUzKgrMhXmlFTl
BTQMU6DWP20XFthqvyL5UT0SxoZXmbCYLhPxC5KP7heegdgwQ8BBbqNe+cIxguUibjKHQhIYVNzT
ClDiMg7jyHkRwVjDh5QJDrkwMzDf27Aiei/hkZL0rjRpqTojpZ6yCkoQe9yW0SGJ+Zi0RNrYinNB
BFAGp2nE5HWdYOJlnTm4yYzVZkHFJvt46jxI3BSSFzzGmkXC9Bbo+aPJBvRd5VJbDI3FIkZHnUaE
PMcVIOxfJ3pH3vLsTkWXkD6jhjPi8+ZHMpOol20sz+KgMboDbHZhqbNpQdUA9SaJCYmg9AmiRreR
/6lOmgG6IPpWc3oggeZkO+UzIeWr2HR6/biZFRyPEvOwMCwLt5kMdUSKUzyzO47fpAmRgVC5DUl2
0VSA/J4CRQbxZOEZOM55wJxEiv9HEDrDSYpJO7XoRCoUTdogYA4F5vGOs/Y3m88SoccApBi0Pg7T
E7zwbmLe5GR0NokeC+DMFLH37/AVIL/RtDkrReo/oBexk8PMeJ2iB65+Ap97bTVB5SDxkGRAOQEQ
3fCTfOd8ien36yJSZk2EqRYGAA3ic/0SLuw6f2cTrY5jgZww5N0FvNUHLcMMmTYDtUvog9xXr4MR
eqyBWoCs8RYeIdxEBeJM8j/F4IoEihgaIC2nYbLg6jUpN4VKMCtMhMMdAkoIHpDZNyGVB3jtqCoh
wzAiyRc4XNB0ml2FThhWkyspQHyg/4UFAilL6iRWjo8UyvyxFkWi2mWhqamotpDALkD9yKgvA1W7
0FslWUhaWgxggtF9hVFdRgWDIZkkWpdy9VC01ckPF/5WYYHmOMRhPJiRShWTei1DzPYL9ScBGISY
JDhYheC9CD4jgYcznI+RInb6AZJwy3ouDgZ/MgeAQJitQdY/3vSHAx/s0vNNfkeI4O3uLmNtf0Bt
wqBJ47EyCso5A8KGJJVC70DfkZEmFYWIeEcD7c22lOU1SXb9rNfH8mxGnmZb1aLyzAOiD+B16Xue
wnFR9lEWwuKhOJoHjhQLIKkmOkkfxdyRThQkI8H0rcA=
signature.asc
Description: Digital signature
-- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
