[Pkg-bazaar-commits] ./bzr-gtk/unstable r529: Merge fix for regression in progress windows.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 529
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Tue 2008-07-01 23:52:37 +0200
message:
  Merge fix for regression in progress windows.
modified:
  ui.py
    ------------------------------------------------------------
    revno: 523.2.1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Mon 2008-06-30 22:32:25 +0200
    message:
      Fix Window-based progress indication.
    modified:
      ui.py
-------------- next part --------------
=== modified file 'ui.py'
--- a/ui.py	2008-06-29 18:12:29 +0000
+++ b/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):