/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: Adrian Wilkins
  • Date: 2008-04-24 15:26:14 UTC
  • mto: This revision was merged to the branch mainline in revision 470.
  • Revision ID: adrian.wilkins@gmail.com-20080424152614-2rnnljbro6vzqvf7
Detect the reserved null: revision in appropriate places. 

This removes a huge shower of stack traces that get dumped to console when 
you look at the bottom of a log.

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