/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: Andrew Starr-Bochicchio
  • Date: 2011-02-15 00:15:40 UTC
  • mfrom: (709 bzr-gtk)
  • mto: This revision was merged to the branch mainline in revision 711.
  • Revision ID: a.starr.b@gmail.com-20110215001540-ivb00xv8s8ma1vn1
Re-merge on trunk, resolving one conflict.

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
 
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
42
class GtkProgressBar(gtk.ProgressBar):
44
 
    def __init__(self, stack):
45
 
        super(GtkProgressBar, self).__init__()
 
43
 
 
44
    def __init__(self):
 
45
        gtk.ProgressBar.__init__(self)
46
46
        self.set_fraction(0.0)
47
 
        self._stack = stack
48
 
 
49
 
    def finished(self):
50
 
        self._stack.remove(self)
51
 
 
52
 
    def clear(self):
53
 
        pass
 
47
        self.current = None
 
48
        self.total = None
54
49
 
55
50
    def tick(self):
 
51
        self.show()
56
52
        self.pulse()
57
53
 
58
 
    def update(self, msg=None, current=None, total=None):
 
54
    def update(self, msg=None, current_cnt=None, total_cnt=None):
 
55
        self.show()
 
56
        if current_cnt is not None:
 
57
            self.current = current_cnt
 
58
        if total_cnt is not None:
 
59
            self.total = total_cnt
59
60
        if msg is not None:
60
61
            self.set_text(msg)
61
 
        if None not in (current, total) and total > 0:
62
 
            self.set_fraction(1.0 * current / total)
 
62
        if None not in (self.current, self.total):
 
63
            self.fraction = float(self.current) / self.total
 
64
            if self.fraction < 0.0 or self.fraction > 1.0:
 
65
                raise AssertionError
 
66
            self.set_fraction(self.fraction)
63
67
        while gtk.events_pending():
64
68
            gtk.main_iteration()
65
69
 
66
 
 
67
 
class GtkProgressBarStack(gtk.Window):
 
70
    def finished(self):
 
71
        self.hide()
 
72
 
 
73
    def clear(self):
 
74
        self.hide()
 
75
 
 
76
 
 
77
class ProgressBarWindow(gtk.Window):
 
78
 
68
79
    def __init__(self):
69
 
        super(GtkProgressBarStack, self).__init__(type=gtk.WINDOW_TOPLEVEL)
 
80
        super(ProgressBarWindow, self).__init__(type=gtk.WINDOW_TOPLEVEL)
70
81
        self.set_border_width(0)
71
82
        self.set_title("Progress")
72
83
        self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
73
 
        self.vbox = gtk.VBox()
74
 
        self.add(self.vbox)
 
84
        self.pb = GtkProgressBar()
 
85
        self.add(self.pb)
 
86
        self.resize(250, 15)
75
87
        self.set_resizable(False)
76
88
 
77
 
    def _adapt_size(self):
78
 
        self.resize(250, 15 * len(self.vbox.get_children()))
79
 
 
80
 
    def get_nested(self):
81
 
        nested = GtkProgressBar(self)
82
 
        self.vbox.pack_start(nested)
83
 
        self._adapt_size()
84
 
        self.show_all()
85
 
        return nested
86
 
 
87
 
    def remove(self, pb):
88
 
        self.vbox.remove(pb)
89
 
        if len(self.vbox.get_children()) == 0: # If there is nothing to show, don't leave a ghost window here
90
 
             self.destroy()
 
89
    def tick(self, *args, **kwargs):
 
90
        self.show_all()
 
91
        self.pb.tick(*args, **kwargs)
 
92
 
 
93
    def update(self, *args, **kwargs):
 
94
        self.show_all()
 
95
        self.pb.update(*args, **kwargs)
 
96
 
 
97
    def finished(self):
 
98
        self.pb.finished()
 
99
        self.hide_all()
 
100
        self.destroy()
 
101
 
 
102
    def clear(self):
 
103
        self.pb.clear()
 
104
        self.hide_all()
 
105
 
 
106
 
 
107
class ProgressPanel(gtk.HBox):
 
108
 
 
109
    def __init__(self):
 
110
        super(ProgressPanel, self).__init__()
 
111
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
 
112
                                                 gtk.ICON_SIZE_BUTTON)
 
113
        image_loading.show()
 
114
 
 
115
        self.pb = GtkProgressBar()
 
116
        self.set_spacing(5)
 
117
        self.set_border_width(5)
 
118
        self.pack_start(image_loading, False, False)
 
119
        self.pack_start(self.pb, True, True)
 
120
 
 
121
    def tick(self, *args, **kwargs):
 
122
        self.show_all()
 
123
        self.pb.tick(*args, **kwargs)
 
124
 
 
125
    def update(self, *args, **kwargs):
 
126
        self.show_all()
 
127
        self.pb.update(*args, **kwargs)
 
128
 
 
129
    def finished(self):
 
130
        self.pb.finished()
 
131
        self.hide_all()
 
132
 
 
133
    def clear(self):
 
134
        self.pb.clear()
 
135
        self.hide_all()
91
136
 
92
137
 
93
138
class PasswordDialog(gtk.Dialog):
94
139
    """ Prompt the user for a password. """
 
140
 
95
141
    def __init__(self, prompt):
96
142
        gtk.Dialog.__init__(self)
97
 
        
 
143
 
98
144
        label = gtk.Label(prompt)
99
145
        self.vbox.pack_start(label, padding=10)
100
 
        
 
146
 
101
147
        self.entry = gtk.Entry()
102
148
        self.entry.set_visibility(False)
103
149
        self.vbox.pack_end(self.entry, padding=10)
104
 
        
 
150
 
105
151
        self.vbox.show_all()
106
 
        
107
 
        self.add_buttons(gtk.STOCK_OK, gtk.RESPONSE_OK, gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
108
 
    
 
152
 
 
153
        self.add_buttons(gtk.STOCK_OK, gtk.RESPONSE_OK,
 
154
                         gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
 
155
 
109
156
    def _get_passwd(self):
110
157
        return self.entry.get_text()
111
158
 
115
162
class GtkUIFactory(UIFactory):
116
163
    """A UI factory for GTK user interfaces."""
117
164
 
118
 
    def __init__(self,
119
 
                 stdout=None,
120
 
                 stderr=None):
121
 
        """Create a GtkUIFactory.
122
 
 
123
 
        """
 
165
    def __init__(self):
 
166
        """Create a GtkUIFactory"""
124
167
        super(GtkUIFactory, self).__init__()
125
 
        self._progress_bar_stack = None
 
168
        self.set_progress_bar_widget(None)
 
169
 
 
170
    def set_progress_bar_widget(self, widget):
 
171
        self._progress_bar_widget = widget
126
172
 
127
173
    def get_boolean(self, prompt):
128
174
        """GtkDialog with yes/no answers"""
130
176
        response = dialog.run()
131
177
        dialog.destroy()
132
178
        return (response == gtk.RESPONSE_YES)
133
 
        
 
179
 
134
180
    def get_password(self, prompt='', **kwargs):
135
181
        """Prompt the user for a password.
136
182
 
150
196
        else:
151
197
            return None
152
198
 
153
 
    def nested_progress_bar(self):
154
 
        """Return a nested progress bar.
155
 
        """
156
 
        if self._progress_bar_stack is None:
157
 
            self._progress_bar_stack = GtkProgressBarStack()
158
 
        return self._progress_bar_stack.get_nested()
159
 
 
160
 
    def set_progress_bar_vbox(self, vbox):
161
 
        """Change the vbox to put progress bars in.
162
 
        """
163
 
        self._progress_bar_stack = vbox
164
 
 
165
 
    def clear_term(self):
166
 
        """Prepare the terminal for output.
167
 
 
168
 
        It has no sense when talking about GTK."""
169
 
        pass
 
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