/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-06-10 16:38:37 UTC
  • mto: This revision was merged to the branch mainline in revision 648.
  • Revision ID: v.ladeuil+lp@free.fr-20090610163837-8n8122j38ozwd5ef
Fix #385191 by using the new progress reporting API.

* ui.py:
(GtkProgressBar): Simplified, we don't need to inherit from
_BaseProgressBar.
(GtkProgressBar.update): Show the widget.
(ProgressBarWindow.__init__): Simplified. Don't show
unconditionally.
(ProgressBarWindow.update): Show the widget.
(ProgressPanel.update): Show the widget.
(GtkUIFactory.__init__): Simplified.
(GtkUIFactory._progress_all_finished): 

* branchview/treeview.py:
(TreeView.__init__): Set the progress reporting widget.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ui.py
30
30
    """ Prompt the user for a yes/no answer. """
31
31
    def __init__(self, prompt):
32
32
        gtk.Dialog.__init__(self)
33
 
        
 
33
 
34
34
        label = gtk.Label(prompt)
35
35
        self.vbox.pack_start(label, padding=10)
36
 
        
37
36
        self.vbox.show_all()
38
37
 
39
 
        self.add_buttons(gtk.STOCK_YES, gtk.RESPONSE_YES, gtk.STOCK_NO, 
 
38
        self.add_buttons(gtk.STOCK_YES, gtk.RESPONSE_YES, gtk.STOCK_NO,
40
39
                         gtk.RESPONSE_NO)
41
40
 
42
41
 
43
 
class GtkProgressBar(gtk.ProgressBar,progress._BaseProgressBar):
44
 
    def __init__(self, _stack=None):
 
42
class GtkProgressBar(gtk.ProgressBar):
 
43
 
 
44
    def __init__(self):
45
45
        gtk.ProgressBar.__init__(self)
46
46
        self.set_fraction(0.0)
47
 
        progress._BaseProgressBar.__init__(self, _stack=_stack)
48
47
        self.current = None
49
48
        self.total = None
50
49
 
51
 
    def clear(self):
52
 
        self.hide()
53
 
 
54
50
    def tick(self):
55
51
        self.pulse()
56
52
 
57
 
    def child_update(self, message, current, total):
58
 
        pass
59
 
 
60
53
    def update(self, msg=None, current_cnt=None, total_cnt=None):
 
54
        self.show()
61
55
        if current_cnt is not None:
62
56
            self.current = current_cnt
63
57
        if total_cnt is not None:
72
66
        while gtk.events_pending():
73
67
            gtk.main_iteration()
74
68
 
 
69
    def finished(self):
 
70
        self.hide()
 
71
 
 
72
    def clear(self):
 
73
        self.hide()
 
74
 
75
75
 
76
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):
 
77
 
 
78
    def __init__(self):
79
79
        super(ProgressBarWindow, self).__init__(type=gtk.WINDOW_TOPLEVEL)
80
 
        self._stack = _stack
81
80
        self.set_border_width(0)
82
81
        self.set_title("Progress")
83
82
        self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
84
 
        self.pb = GtkProgressBar(self)
 
83
        self.pb = GtkProgressBar()
85
84
        self.add(self.pb)
86
85
        self.resize(250, 15)
87
86
        self.set_resizable(False)
 
87
 
 
88
    def tick(self, *args, **kwargs):
 
89
        self.pb.tick(*args, **kwargs)
 
90
 
 
91
    def update(self, *args, **kwargs):
88
92
        self.show_all()
89
 
 
90
 
    def return_pb(self, pb):
91
 
        self._stack.return_pb(self)
92
 
    
93
 
    def update(self, *args, **kwargs):
94
93
        self.pb.update(*args, **kwargs)
95
94
 
96
 
    def tick(self, *args, **kwargs):
97
 
        self.pb.tick(*args, **kwargs)
98
 
 
99
95
    def finished(self):
100
 
        self.pb.finished()
101
96
        self.hide_all()
102
 
 
 
97
 
103
98
    def clear(self):
104
99
        self.pb.clear()
 
100
        # FIXME: destroy() ? Really ? -- vila 20090610
105
101
        self.destroy()
106
102
 
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
103
 
118
104
class ProgressPanel(gtk.HBox):
 
105
 
119
106
    def __init__(self):
120
107
        super(ProgressPanel, self).__init__()
121
108
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
122
109
                                                 gtk.ICON_SIZE_BUTTON)
123
110
        image_loading.show()
124
 
        
125
 
        self.pb = GtkProgressBar(self)
 
111
 
 
112
        self.pb = GtkProgressBar()
126
113
        self.set_spacing(5)
127
 
        self.set_border_width(5)        
 
114
        self.set_border_width(5)
128
115
        self.pack_start(image_loading, False, False)
129
116
        self.pack_start(self.pb, True, True)
130
117
 
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
118
    def tick(self, *args, **kwargs):
142
119
        self.pb.tick(*args, **kwargs)
143
 
    
 
120
 
144
121
    def update(self, *args, **kwargs):
 
122
        self.show_all()
145
123
        self.pb.update(*args, **kwargs)
146
124
 
147
125
    def finished(self):
152
130
        self.pb.clear()
153
131
        self.hide_all()
154
132
 
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
 
 
161
 
 
162
133
 
163
134
class PasswordDialog(gtk.Dialog):
164
135
    """ Prompt the user for a password. """
165
136
    def __init__(self, prompt):
166
137
        gtk.Dialog.__init__(self)
167
 
        
 
138
 
168
139
        label = gtk.Label(prompt)
169
140
        self.vbox.pack_start(label, padding=10)
170
 
        
 
141
 
171
142
        self.entry = gtk.Entry()
172
143
        self.entry.set_visibility(False)
173
144
        self.vbox.pack_end(self.entry, padding=10)
174
 
        
 
145
 
175
146
        self.vbox.show_all()
176
 
        
177
 
        self.add_buttons(gtk.STOCK_OK, gtk.RESPONSE_OK, gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
178
 
    
 
147
 
 
148
        self.add_buttons(gtk.STOCK_OK, gtk.RESPONSE_OK,
 
149
                         gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
 
150
 
179
151
    def _get_passwd(self):
180
152
        return self.entry.get_text()
181
153
 
185
157
class GtkUIFactory(UIFactory):
186
158
    """A UI factory for GTK user interfaces."""
187
159
 
188
 
    def __init__(self,
189
 
                 stdout=None,
190
 
                 stderr=None):
191
 
        """Create a GtkUIFactory.
192
 
 
193
 
        """
 
160
    def __init__(self):
 
161
        """Create a GtkUIFactory"""
194
162
        super(GtkUIFactory, self).__init__()
195
 
        self.set_nested_progress_bar_widget(ProgressBarWindow)
 
163
        # FIXME: The following seems to be there to provide a default for cases
 
164
        # where set_progress_bar_widget() is not called explicitely. It will be
 
165
        # better to call it explicitely and get rid of that default. (I'm not
 
166
        # even sure it really needed now :-/ -- vila 20090610.
 
167
        self.set_progress_bar_widget(ProgressBarWindow())
196
168
 
197
169
    def get_boolean(self, prompt):
198
170
        """GtkDialog with yes/no answers"""
200
172
        response = dialog.run()
201
173
        dialog.destroy()
202
174
        return (response == gtk.RESPONSE_YES)
203
 
        
 
175
 
204
176
    def get_password(self, prompt='', **kwargs):
205
177
        """Prompt the user for a password.
206
178
 
220
192
        else:
221
193
            return None
222
194
 
223
 
    def set_nested_progress_bar_widget(self, widget):
224
 
        self._progress_bar_stack = progress.ProgressBarStack(klass=widget)
225
 
 
226
 
    def nested_progress_bar(self):
227
 
        """Return a nested progress bar.
228
 
        """
229
 
        return self._progress_bar_stack.get_nested()
230
 
 
231
 
    def set_progress_bar_vbox(self, vbox):
232
 
        """Change the vbox to put progress bars in.
233
 
        """
234
 
        self._progress_bar_stack = vbox
235
 
 
236
 
    def clear_term(self):
237
 
        """Prepare the terminal for output.
238
 
 
239
 
        It has no sense when talking about GTK."""
240
 
        pass
 
195
    def _progress_all_finished(self):
 
196
        """See UIFactory._progress_all_finished"""
 
197
        pbw = self._progress_bar_widget
 
198
        if pbw:
 
199
            pbw.finished()
 
200
 
 
201
    def _progress_updated(self, task):
 
202
        """See UIFactory._progress_updated"""
 
203
        pbw = self._progress_bar_widget
 
204
        if pbw:
 
205
            pbw.update(task.msg, task.current_cnt, task.total_cnt)
 
206
 
 
207
    def set_progress_bar_widget(self, widget):
 
208
        self._progress_bar_widget = widget
 
209