/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: Vincent Ladeuil
  • Date: 2009-05-06 11:51:38 UTC
  • mfrom: (628.1.2 gtk)
  • Revision ID: v.ladeuil+lp@free.fr-20090506115138-7abxvg2qz4gzraup
Upgrade COMPATIBLE_BZR_VERSIONS

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 is not None:
 
62
            self.current = current_cnt
 
63
        if total_cnt is not None:
 
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
            if self.fraction < 0.0 or self.fraction > 1.0:
 
70
                raise AssertionError
 
71
            self.set_fraction(self.fraction)
69
72
        while gtk.events_pending():
70
73
            gtk.main_iteration()
71
74
 
72
75
 
73
 
class GtkWindowProgressBarStack(gtk.Window):
74
 
    def __init__(self):
75
 
        super(GtkWindowProgressBarStack, self).__init__(type=gtk.WINDOW_TOPLEVEL)
 
76
class ProgressBarWindow(gtk.Window):
 
77
    def __init__(self, to_file=None, show_pct=None, show_spinner=None, show_eta=None, 
 
78
                 show_bar=None, show_count=None, to_messages_file=None, _stack=None):
 
79
        super(ProgressBarWindow, self).__init__(type=gtk.WINDOW_TOPLEVEL)
 
80
        self._stack = _stack
76
81
        self.set_border_width(0)
77
82
        self.set_title("Progress")
78
83
        self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
79
 
        self.vbox = gtk.VBox()
80
 
        self.add(self.vbox)
 
84
        self.pb = GtkProgressBar(self)
 
85
        self.add(self.pb)
 
86
        self.resize(250, 15)
81
87
        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()
 
88
        self.show_all()
 
89
 
 
90
    def return_pb(self, pb):
 
91
        self._stack.return_pb(self)
 
92
    
 
93
    def update(self, *args, **kwargs):
 
94
        self.pb.update(*args, **kwargs)
 
95
 
 
96
    def tick(self, *args, **kwargs):
 
97
        self.pb.tick(*args, **kwargs)
 
98
 
 
99
    def finished(self):
 
100
        self.pb.finished()
 
101
        self.hide_all()
 
102
 
 
103
    def clear(self):
 
104
        self.pb.clear()
 
105
        self.destroy()
 
106
 
 
107
    def child_progress(self, *args, **kwargs):
 
108
        return self.pb.child_progress(*args, **kwargs)
 
109
 
 
110
    def child_update(self, *args, **kwargs):
 
111
        return self.pb.child_update(*args, **kwargs)
 
112
 
 
113
    def get_progress_bar(self):
 
114
        self.show_all()
 
115
        return self
 
116
 
 
117
 
 
118
class ProgressPanel(gtk.HBox):
 
119
    def __init__(self):
 
120
        super(ProgressPanel, self).__init__()
 
121
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
 
122
                                                 gtk.ICON_SIZE_BUTTON)
 
123
        image_loading.show()
 
124
        
 
125
        self.pb = GtkProgressBar(self)
 
126
        self.set_spacing(5)
 
127
        self.set_border_width(5)        
 
128
        self.pack_start(image_loading, False, False)
 
129
        self.pack_start(self.pb, True, True)
 
130
 
 
131
    def return_pb(self, pb):
 
132
        self._stack.return_pb(self)
 
133
 
 
134
    def get_progress_bar(self, to_file=None, show_pct=None, show_spinner=None, show_eta=None, 
 
135
                         show_bar=None, show_count=None, to_messages_file=None, 
 
136
                         _stack=None):
 
137
        self._stack = _stack
 
138
        self.show_all()
 
139
        return self
 
140
 
 
141
    def tick(self, *args, **kwargs):
 
142
        self.pb.tick(*args, **kwargs)
 
143
    
 
144
    def update(self, *args, **kwargs):
 
145
        self.pb.update(*args, **kwargs)
 
146
 
 
147
    def finished(self):
 
148
        self.pb.finished()
 
149
        self.hide_all()
 
150
 
 
151
    def clear(self):
 
152
        self.pb.clear()
 
153
        self.hide_all()
 
154
 
 
155
    def child_progress(self, *args, **kwargs):
 
156
        return self.pb.child_progress(*args, **kwargs)
 
157
 
 
158
    def child_update(self, *args, **kwargs):
 
159
        return self.pb.child_update(*args, **kwargs)
 
160
 
97
161
 
98
162
 
99
163
class PasswordDialog(gtk.Dialog):
128
192
 
129
193
        """
130
194
        super(GtkUIFactory, self).__init__()
131
 
        self._progress_bar_stack = None
 
195
        self.set_nested_progress_bar_widget(ProgressBarWindow)
132
196
 
133
197
    def get_boolean(self, prompt):
134
198
        """GtkDialog with yes/no answers"""
156
220
        else:
157
221
            return None
158
222
 
 
223
    def set_nested_progress_bar_widget(self, widget):
 
224
        self._progress_bar_stack = progress.ProgressBarStack(klass=widget)
 
225
 
159
226
    def nested_progress_bar(self):
160
227
        """Return a nested progress bar.
161
228
        """
162
 
        if self._progress_bar_stack is None:
163
 
            self._progress_bar_stack = GtkWindowProgressBarStack()
164
229
        return self._progress_bar_stack.get_nested()
165
230
 
166
231
    def set_progress_bar_vbox(self, vbox):