/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

Commit messages never contain config options

Show diffs side-by-side

added added

removed removed

Lines of Context:
ui.py
19
19
"""GTK UI
20
20
"""
21
21
 
22
 
import gtk
 
22
from gi.repository import Gtk
23
23
 
24
24
from bzrlib.ui import UIFactory
25
25
 
26
26
 
27
 
class PromptDialog(gtk.Dialog):
 
27
def main_iteration(function):
 
28
    def with_main_iteration(self, *args, **kwargs):
 
29
        result = function(self, *args, **kwargs)
 
30
        while Gtk.events_pending():
 
31
            Gtk.main_iteration_do(False)
 
32
        return result
 
33
    return with_main_iteration
 
34
 
 
35
 
 
36
class PromptDialog(Gtk.MessageDialog):
28
37
    """Prompt the user for a yes/no answer."""
29
38
 
30
 
    def __init__(self, prompt):
31
 
        gtk.Dialog.__init__(self)
32
 
 
33
 
        label = gtk.Label(prompt)
34
 
        self.vbox.pack_start(label, padding=10)
35
 
        self.vbox.show_all()
36
 
 
37
 
        self.add_buttons(gtk.STOCK_YES, gtk.RESPONSE_YES, gtk.STOCK_NO,
38
 
                         gtk.RESPONSE_NO)
39
 
 
40
 
 
41
 
class GtkProgressBar(gtk.ProgressBar):
 
39
    def __init__(self, prompt, parent=None):
 
40
        super(PromptDialog, self).__init__(
 
41
            parent, Gtk.DialogFlags.DESTROY_WITH_PARENT,
 
42
            Gtk.MessageType.QUESTION, Gtk.ButtonsType.YES_NO, prompt)
 
43
 
 
44
 
 
45
class InfoDialog(Gtk.MessageDialog):
 
46
    """Show the user an informational message."""
 
47
 
 
48
    MESSAGE_TYPE = Gtk.MessageType.INFO
 
49
 
 
50
    def __init__(self, prompt, parent=None):
 
51
        super(InfoDialog, self).__init__(
 
52
            parent, Gtk.DialogFlags.DESTROY_WITH_PARENT,
 
53
            self.MESSAGE_TYPE, Gtk.ButtonsType.CLOSE, prompt)
 
54
 
 
55
 
 
56
class WarningDialog(InfoDialog):
 
57
    """Show the user a warning message."""
 
58
 
 
59
    MESSAGE_TYPE = Gtk.MessageType.WARNING
 
60
 
 
61
 
 
62
class ErrorDialog(InfoDialog):
 
63
    """Show the user a warning message."""
 
64
 
 
65
    MESSAGE_TYPE = Gtk.MessageType.ERROR
 
66
 
 
67
 
 
68
class GtkProgressBar(Gtk.ProgressBar):
42
69
 
43
70
    def __init__(self):
44
 
        gtk.ProgressBar.__init__(self)
 
71
        super(GtkProgressBar, self).__init__()
45
72
        self.set_fraction(0.0)
46
73
        self.current = None
47
74
        self.total = None
48
75
 
 
76
    @main_iteration
49
77
    def tick(self):
50
78
        self.show()
51
79
        self.pulse()
52
80
 
 
81
    @main_iteration
53
82
    def update(self, msg=None, current_cnt=None, total_cnt=None):
54
83
        self.show()
55
84
        if current_cnt is not None:
59
88
        if msg is not None:
60
89
            self.set_text(msg)
61
90
        if None not in (self.current, self.total):
62
 
            self.fraction = float(self.current) / self.total
63
 
            if self.fraction < 0.0 or self.fraction > 1.0:
64
 
                raise AssertionError
65
 
            self.set_fraction(self.fraction)
66
 
        while gtk.events_pending():
67
 
            gtk.main_iteration()
68
 
 
69
 
    def finished(self):
70
 
        self.hide()
71
 
 
72
 
    def clear(self):
73
 
        self.hide()
74
 
 
75
 
 
76
 
class ProgressBarWindow(gtk.Window):
 
91
            fraction = float(self.current) / self.total
 
92
            if fraction < 0.0 or fraction > 1.0:
 
93
                raise ValueError
 
94
            self.set_fraction(fraction)
 
95
 
 
96
    @main_iteration
 
97
    def finished(self):
 
98
        self.set_fraction(0.0)
 
99
        self.current = None
 
100
        self.total = None
 
101
        self.hide()
 
102
 
 
103
    def clear(self):
 
104
        self.finished()
 
105
 
 
106
 
 
107
class ProgressContainerMixin:
 
108
    """Expose GtkProgressBar methods to a container class."""
 
109
 
 
110
    def tick(self, *args, **kwargs):
 
111
        self.show_all()
 
112
        self.pb.tick(*args, **kwargs)
 
113
 
 
114
    def update(self, *args, **kwargs):
 
115
        self.show_all()
 
116
        self.pb.update(*args, **kwargs)
 
117
 
 
118
    def finished(self):
 
119
        self.hide()
 
120
        self.pb.finished()
 
121
 
 
122
    def clear(self):
 
123
        self.hide()
 
124
        self.pb.clear()
 
125
 
 
126
 
 
127
class ProgressBarWindow(ProgressContainerMixin, Gtk.Window):
77
128
 
78
129
    def __init__(self):
79
 
        super(ProgressBarWindow, self).__init__(type=gtk.WINDOW_TOPLEVEL)
 
130
        super(ProgressBarWindow, self).__init__(type=Gtk.WindowType.TOPLEVEL)
80
131
        self.set_border_width(0)
81
132
        self.set_title("Progress")
82
 
        self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
 
133
        self.set_position(Gtk.WindowPosition.CENTER_ALWAYS)
83
134
        self.pb = GtkProgressBar()
84
135
        self.add(self.pb)
85
136
        self.resize(250, 15)
86
137
        self.set_resizable(False)
87
138
 
88
 
    def tick(self, *args, **kwargs):
89
 
        self.show_all()
90
 
        self.pb.tick(*args, **kwargs)
91
 
 
92
 
    def update(self, *args, **kwargs):
93
 
        self.show_all()
94
 
        self.pb.update(*args, **kwargs)
95
 
 
96
 
    def finished(self):
97
 
        self.pb.finished()
98
 
        self.hide_all()
99
 
        self.destroy()
100
 
 
101
 
    def clear(self):
102
 
        self.pb.clear()
103
 
        self.hide_all()
104
 
 
105
 
 
106
 
class ProgressPanel(gtk.HBox):
 
139
 
 
140
class ProgressPanel(ProgressContainerMixin, Gtk.Box):
107
141
 
108
142
    def __init__(self):
109
 
        super(ProgressPanel, self).__init__()
110
 
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
111
 
                                                 gtk.ICON_SIZE_BUTTON)
 
143
        super(ProgressPanel, self).__init__(Gtk.Orientation.HORIZONTAL, 5)
 
144
        image_loading = Gtk.Image.new_from_stock(Gtk.STOCK_REFRESH,
 
145
                                                 Gtk.IconSize.BUTTON)
112
146
        image_loading.show()
113
147
 
114
148
        self.pb = GtkProgressBar()
115
 
        self.set_spacing(5)
116
149
        self.set_border_width(5)
117
 
        self.pack_start(image_loading, False, False)
118
 
        self.pack_start(self.pb, True, True)
119
 
 
120
 
    def tick(self, *args, **kwargs):
121
 
        self.show_all()
122
 
        self.pb.tick(*args, **kwargs)
123
 
 
124
 
    def update(self, *args, **kwargs):
125
 
        self.show_all()
126
 
        self.pb.update(*args, **kwargs)
127
 
 
128
 
    def finished(self):
129
 
        self.pb.finished()
130
 
        self.hide_all()
131
 
 
132
 
    def clear(self):
133
 
        self.pb.clear()
134
 
        self.hide_all()
135
 
 
136
 
 
137
 
class PasswordDialog(gtk.Dialog):
 
150
        self.pack_start(image_loading, False, False, 0)
 
151
        self.pack_start(self.pb, True, True, 0)
 
152
 
 
153
 
 
154
class PasswordDialog(Gtk.Dialog):
138
155
    """ Prompt the user for a password. """
139
156
 
140
157
    def __init__(self, prompt):
141
 
        gtk.Dialog.__init__(self)
142
 
 
143
 
        label = gtk.Label(prompt)
144
 
        self.vbox.pack_start(label, padding=10)
145
 
 
146
 
        self.entry = gtk.Entry()
 
158
        super(PasswordDialog, self).__init__()
 
159
 
 
160
        label = Gtk.Label(label=prompt)
 
161
        self.get_content_area().pack_start(label, True, True, 10)
 
162
 
 
163
        self.entry = Gtk.Entry()
147
164
        self.entry.set_visibility(False)
148
 
        self.vbox.pack_end(self.entry, padding=10)
149
 
 
150
 
        self.vbox.show_all()
151
 
 
152
 
        self.add_buttons(gtk.STOCK_OK, gtk.RESPONSE_OK,
153
 
                         gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
 
165
        self.get_content_area().pack_end(self.entry, False, False, 10)
 
166
 
 
167
        self.get_content_area().show_all()
 
168
 
 
169
        self.add_buttons(Gtk.STOCK_OK, Gtk.ResponseType.OK,
 
170
                         Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL)
154
171
 
155
172
    def _get_passwd(self):
156
173
        return self.entry.get_text()
174
191
        dialog = PromptDialog(prompt)
175
192
        response = dialog.run()
176
193
        dialog.destroy()
177
 
        return (response == gtk.RESPONSE_YES)
 
194
        return (response == Gtk.ResponseType.YES)
 
195
 
 
196
    def show_message(self, msg):
 
197
        """See UIFactory.show_message."""
 
198
        dialog = InfoDialog(msg)
 
199
        dialog.run()
 
200
        dialog.destroy()
 
201
 
 
202
    def show_warning(self, msg):
 
203
        """See UIFactory.show_warning."""
 
204
        dialog = WarningDialog(msg)
 
205
        dialog.run()
 
206
        dialog.destroy()
 
207
 
 
208
    def show_error(self, msg):
 
209
        """See UIFactory.show_error."""
 
210
        dialog = ErrorDialog(msg)
 
211
        dialog.run()
 
212
        dialog.destroy()
 
213
 
 
214
    def show_user_warning(self, warning_id, **message_args):
 
215
        """See UIFactory.show_user_warning."""
 
216
        if warning_id not in self.suppressed_warnings:
 
217
            message = self.format_user_warning(warning_id, message_args)
 
218
            self.show_warning(message)
178
219
 
179
220
    def get_password(self, prompt='', **kwargs):
180
221
        """Prompt the user for a password.
183
224
        :param kwargs: Arguments which will be expanded into the prompt.
184
225
                       This lets front ends display different things if
185
226
                       they so choose.
186
 
        :return: The password string, return None if the user 
 
227
        :return: The password string, return None if the user
187
228
                 canceled the request.
188
229
        """
189
230
        dialog = PasswordDialog(prompt % kwargs)
190
231
        response = dialog.run()
191
232
        passwd = dialog.passwd
192
233
        dialog.destroy()
193
 
        if response == gtk.RESPONSE_OK:
 
234
        if response == Gtk.ResponseType.OK:
194
235
            return passwd
195
236
        else:
196
237
            return None
197
238
 
198
239
    def _progress_all_finished(self):
199
 
        """See UIFactory._progress_all_finished"""
 
240
        """See UIFactory._progress_all_finished."""
200
241
        pbw = self._progress_bar_widget
201
242
        if pbw:
202
243
            pbw.finished()
203
244
 
204
 
    def _progress_updated(self, task):
205
 
        """See UIFactory._progress_updated"""
 
245
    def _ensure_progress_widget(self):
206
246
        if self._progress_bar_widget is None:
207
 
            # Default to a window since nobody gave us a better mean to report
 
247
            # Default to a window since nobody gave us a better means to report
208
248
            # progress.
209
249
            self.set_progress_bar_widget(ProgressBarWindow())
 
250
 
 
251
    def _progress_updated(self, task):
 
252
        """See UIFactory._progress_updated."""
 
253
        self._ensure_progress_widget()
210
254
        self._progress_bar_widget.update(task.msg,
211
255
                                         task.current_cnt, task.total_cnt)
212
256
 
 
257
    def report_transport_activity(self, transport, byte_count, direction):
 
258
        """See UIFactory.report_transport_activity."""
 
259
        self._ensure_progress_widget()
 
260
        self._progress_bar_widget.tick()