/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to ui.py

  • Committer: Jelmer Vernooij
  • Date: 2008-06-29 18:12:29 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629181229-1l2m4cf7vvbyh8qg
Simplify progress bar code, use embedded progress bar inside viz window.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ui.py
22
22
import gtk
23
23
import sys
24
24
 
25
 
import bzrlib.progress
 
25
from bzrlib import progress
26
26
from bzrlib.ui import UIFactory
27
27
 
28
28
 
40
40
                         gtk.RESPONSE_NO)
41
41
 
42
42
 
43
 
class GtkProgressBar(gtk.ProgressBar):
44
 
    def __init__(self, stack):
45
 
        super(GtkProgressBar, self).__init__()
 
43
class GtkProgressBar(gtk.ProgressBar,progress._BaseProgressBar):
 
44
    def __init__(self, _stack=None):
 
45
        gtk.ProgressBar.__init__(self)
46
46
        self.set_fraction(0.0)
47
 
        self._stack = stack
 
47
        progress._BaseProgressBar.__init__(self, _stack=_stack)
48
48
        self.current = None
49
49
        self.total = None
50
50
 
51
 
    def finished(self):
52
 
        self._stack.remove(self)
53
 
 
54
51
    def clear(self):
55
 
        pass
 
52
        self.hide()
56
53
 
57
54
    def tick(self):
58
55
        self.pulse()
59
56
 
60
 
    def update(self, msg=None, current=None, total=None):
61
 
        if current:
62
 
            self.current = current
63
 
        if total:
64
 
            self.total = total
 
57
    def child_update(self, message, current, total):
 
58
        pass
 
59
 
 
60
    def update(self, msg=None, current_cnt=None, total_cnt=None):
 
61
        if current_cnt:
 
62
            self.current = current_cnt
 
63
        if total_cnt:
 
64
            self.total = total_cnt
65
65
        if msg is not None:
66
66
            self.set_text(msg)
67
67
        if None not in (self.current, self.total):
68
 
            self.set_fraction(1.0 * self.current / self.total)
 
68
            self.fraction = float(self.current) / self.total
 
69
            self.set_fraction(self.fraction)
69
70
        while gtk.events_pending():
70
71
            gtk.main_iteration()
71
72
 
72
73
 
73
 
class GtkWindowProgressBarStack(gtk.Window):
 
74
class ProgressBarWindow(gtk.Window):
74
75
    def __init__(self):
75
 
        super(GtkWindowProgressBarStack, self).__init__(type=gtk.WINDOW_TOPLEVEL)
 
76
        super(ProgressBarWindow, self).__init__(type=gtk.WINDOW_TOPLEVEL)
76
77
        self.set_border_width(0)
77
78
        self.set_title("Progress")
78
79
        self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
79
 
        self.vbox = gtk.VBox()
80
 
        self.add(self.vbox)
 
80
        self.pb = GtkProgressBar(self)
 
81
        self.add(self.pb)
 
82
        self.resize(250, 15)
81
83
        self.set_resizable(False)
82
 
 
83
 
    def _adapt_size(self):
84
 
        self.resize(250, 15 * len(self.vbox.get_children()))
85
 
 
86
 
    def get_nested(self):
87
 
        nested = GtkProgressBar(self)
88
 
        self.vbox.pack_start(nested)
89
 
        self._adapt_size()
90
 
        self.show_all()
91
 
        return nested
92
 
 
93
 
    def remove(self, pb):
94
 
        self.vbox.remove(pb)
95
 
        if len(self.vbox.get_children()) == 0: # If there is nothing to show, don't leave a ghost window here
96
 
             self.destroy()
 
84
        self.show_all()
 
85
 
 
86
    def clear(self):
 
87
        self.pb.clear()
 
88
        self.destroy()
 
89
 
 
90
 
 
91
class ProgressPanel(gtk.HBox):
 
92
    def __init__(self):
 
93
        super(ProgressPanel, self).__init__()
 
94
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
 
95
                                                 gtk.ICON_SIZE_BUTTON)
 
96
        image_loading.show()
 
97
        
 
98
        self.pb = GtkProgressBar(self)
 
99
        self.set_spacing(5)
 
100
        self.set_border_width(5)        
 
101
        self.pack_start(image_loading, False, False)
 
102
        self.pack_start(self.pb, True, True)
 
103
 
 
104
    def return_pb(self, pb):
 
105
        self._stack.return_pb(self)
 
106
 
 
107
    def get_progress_bar(self, to_file=None, show_pct=None, show_spinner=None, show_eta=None, 
 
108
                         show_bar=None, show_count=None, to_messages_file=None, 
 
109
                         _stack=None):
 
110
        self._stack = _stack
 
111
        self.show_all()
 
112
        return self
 
113
    
 
114
    def update(self, *args, **kwargs):
 
115
        self.pb.update(*args, **kwargs)
 
116
 
 
117
    def finished(self):
 
118
        self.pb.finished()
 
119
        self.hide_all()
 
120
 
 
121
    def clear(self):
 
122
        self.pb.clear()
 
123
        self.hide_all()
 
124
 
 
125
    def child_progress(self, *args, **kwargs):
 
126
        return self.pb.child_progress(*args, **kwargs)
 
127
 
 
128
    def child_update(self, *args, **kwargs):
 
129
        return self.pb.child_update(*args, **kwargs)
 
130
 
97
131
 
98
132
 
99
133
class PasswordDialog(gtk.Dialog):
128
162
 
129
163
        """
130
164
        super(GtkUIFactory, self).__init__()
131
 
        self._progress_bar_stack = None
 
165
        self.set_nested_progress_bar_widget(ProgressBarWindow)
132
166
 
133
167
    def get_boolean(self, prompt):
134
168
        """GtkDialog with yes/no answers"""
156
190
        else:
157
191
            return None
158
192
 
 
193
    def set_nested_progress_bar_widget(self, widget):
 
194
        self._progress_bar_stack = progress.ProgressBarStack(klass=widget)
 
195
 
159
196
    def nested_progress_bar(self):
160
197
        """Return a nested progress bar.
161
198
        """
162
 
        if self._progress_bar_stack is None:
163
 
            self._progress_bar_stack = GtkWindowProgressBarStack()
164
199
        return self._progress_bar_stack.get_nested()
165
200
 
166
201
    def set_progress_bar_vbox(self, vbox):