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