/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: 2008-11-06 15:45:24 UTC
  • mto: This revision was merged to the branch mainline in revision 625.
  • Revision ID: v.ladeuil+lp@free.fr-20081106154524-n9al5n1pome2xo0u
Fix bug #289220 by using the right parameter order.

* status.py:
(StatusWindow.row_diff): One can argue that the parameters are in
the wrong order or just respect their meaning :) Thanks to Anne
Mohsen for noticing and proposing the fix.

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
        
36
37
        self.vbox.show_all()
37
38
 
38
 
        self.add_buttons(gtk.STOCK_YES, gtk.RESPONSE_YES, gtk.STOCK_NO,
 
39
        self.add_buttons(gtk.STOCK_YES, gtk.RESPONSE_YES, gtk.STOCK_NO, 
39
40
                         gtk.RESPONSE_NO)
40
41
 
41
42
 
42
 
class GtkProgressBar(gtk.ProgressBar):
43
 
 
44
 
    def __init__(self):
 
43
class GtkProgressBar(gtk.ProgressBar,progress._BaseProgressBar):
 
44
    def __init__(self, _stack=None):
45
45
        gtk.ProgressBar.__init__(self)
46
46
        self.set_fraction(0.0)
 
47
        progress._BaseProgressBar.__init__(self, _stack=_stack)
47
48
        self.current = None
48
49
        self.total = None
49
50
 
 
51
    def clear(self):
 
52
        self.hide()
 
53
 
50
54
    def tick(self):
51
 
        self.show()
52
55
        self.pulse()
53
56
 
 
57
    def child_update(self, message, current, total):
 
58
        pass
 
59
 
54
60
    def update(self, msg=None, current_cnt=None, total_cnt=None):
55
 
        self.show()
56
61
        if current_cnt is not None:
57
62
            self.current = current_cnt
58
63
        if total_cnt is not None:
67
72
        while gtk.events_pending():
68
73
            gtk.main_iteration()
69
74
 
70
 
    def finished(self):
71
 
        self.hide()
72
 
 
73
 
    def clear(self):
74
 
        self.hide()
75
 
 
76
75
 
77
76
class ProgressBarWindow(gtk.Window):
78
 
 
79
 
    def __init__(self):
 
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):
80
79
        super(ProgressBarWindow, self).__init__(type=gtk.WINDOW_TOPLEVEL)
 
80
        self._stack = _stack
81
81
        self.set_border_width(0)
82
82
        self.set_title("Progress")
83
83
        self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
84
 
        self.pb = GtkProgressBar()
 
84
        self.pb = GtkProgressBar(self)
85
85
        self.add(self.pb)
86
86
        self.resize(250, 15)
87
87
        self.set_resizable(False)
 
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)
88
95
 
89
96
    def tick(self, *args, **kwargs):
90
 
        self.show_all()
91
97
        self.pb.tick(*args, **kwargs)
92
98
 
93
 
    def update(self, *args, **kwargs):
94
 
        self.show_all()
95
 
        self.pb.update(*args, **kwargs)
96
 
 
97
99
    def finished(self):
98
100
        self.pb.finished()
99
101
        self.hide_all()
 
102
 
 
103
    def clear(self):
 
104
        self.pb.clear()
100
105
        self.destroy()
101
106
 
102
 
    def clear(self):
103
 
        self.pb.clear()
104
 
        self.hide_all()
 
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
105
116
 
106
117
 
107
118
class ProgressPanel(gtk.HBox):
108
 
 
109
119
    def __init__(self):
110
120
        super(ProgressPanel, self).__init__()
111
121
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
112
122
                                                 gtk.ICON_SIZE_BUTTON)
113
123
        image_loading.show()
114
 
 
115
 
        self.pb = GtkProgressBar()
 
124
        
 
125
        self.pb = GtkProgressBar(self)
116
126
        self.set_spacing(5)
117
 
        self.set_border_width(5)
 
127
        self.set_border_width(5)        
118
128
        self.pack_start(image_loading, False, False)
119
129
        self.pack_start(self.pb, True, True)
120
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
 
121
141
    def tick(self, *args, **kwargs):
122
 
        self.show_all()
123
142
        self.pb.tick(*args, **kwargs)
124
 
 
 
143
    
125
144
    def update(self, *args, **kwargs):
126
 
        self.show_all()
127
145
        self.pb.update(*args, **kwargs)
128
146
 
129
147
    def finished(self):
134
152
        self.pb.clear()
135
153
        self.hide_all()
136
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
 
 
161
 
137
162
 
138
163
class PasswordDialog(gtk.Dialog):
139
164
    """ Prompt the user for a password. """
140
 
 
141
165
    def __init__(self, prompt):
142
166
        gtk.Dialog.__init__(self)
143
 
 
 
167
        
144
168
        label = gtk.Label(prompt)
145
169
        self.vbox.pack_start(label, padding=10)
146
 
 
 
170
        
147
171
        self.entry = gtk.Entry()
148
172
        self.entry.set_visibility(False)
149
173
        self.vbox.pack_end(self.entry, padding=10)
150
 
 
 
174
        
151
175
        self.vbox.show_all()
152
 
 
153
 
        self.add_buttons(gtk.STOCK_OK, gtk.RESPONSE_OK,
154
 
                         gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
155
 
 
 
176
        
 
177
        self.add_buttons(gtk.STOCK_OK, gtk.RESPONSE_OK, gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
 
178
    
156
179
    def _get_passwd(self):
157
180
        return self.entry.get_text()
158
181
 
162
185
class GtkUIFactory(UIFactory):
163
186
    """A UI factory for GTK user interfaces."""
164
187
 
165
 
    def __init__(self):
166
 
        """Create a GtkUIFactory"""
 
188
    def __init__(self,
 
189
                 stdout=None,
 
190
                 stderr=None):
 
191
        """Create a GtkUIFactory.
 
192
 
 
193
        """
167
194
        super(GtkUIFactory, self).__init__()
168
 
        self.set_progress_bar_widget(None)
169
 
 
170
 
    def set_progress_bar_widget(self, widget):
171
 
        self._progress_bar_widget = widget
 
195
        self.set_nested_progress_bar_widget(ProgressBarWindow)
172
196
 
173
197
    def get_boolean(self, prompt):
174
198
        """GtkDialog with yes/no answers"""
176
200
        response = dialog.run()
177
201
        dialog.destroy()
178
202
        return (response == gtk.RESPONSE_YES)
179
 
 
 
203
        
180
204
    def get_password(self, prompt='', **kwargs):
181
205
        """Prompt the user for a password.
182
206
 
196
220
        else:
197
221
            return None
198
222
 
199
 
    def _progress_all_finished(self):
200
 
        """See UIFactory._progress_all_finished"""
201
 
        pbw = self._progress_bar_widget
202
 
        if pbw:
203
 
            pbw.finished()
204
 
 
205
 
    def _progress_updated(self, task):
206
 
        """See UIFactory._progress_updated"""
207
 
        if self._progress_bar_widget is None:
208
 
            # Default to a window since nobody gave us a better mean to report
209
 
            # progress.
210
 
            self.set_progress_bar_widget(ProgressBarWindow())
211
 
        self._progress_bar_widget.update(task.msg,
212
 
                                         task.current_cnt, task.total_cnt)
213
 
 
 
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