/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-07-18 12:29:56 UTC
  • mfrom: (531.7.14 vis-enhancements)
  • Revision ID: jelmer@samba.org-20080718122956-27468cxu2b613ib8
Merge diff widget in viz.

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
 
40
40
                         gtk.RESPONSE_NO)
41
41
 
42
42
 
43
 
class GtkProgressBar(gtk.ProgressBar):
44
 
    def __init__(self, stack):
45
 
        super(GtkProgressBar, self).__init__()
 
43
class GtkProgressBar(gtk.ProgressBar,progress._BaseProgressBar):
 
44
    def __init__(self, _stack=None):
 
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)
 
47
        progress._BaseProgressBar.__init__(self, _stack=_stack)
 
48
        self.current = None
 
49
        self.total = None
51
50
 
52
51
    def clear(self):
53
 
        pass
 
52
        self.hide()
54
53
 
55
54
    def tick(self):
56
55
        self.pulse()
57
56
 
58
 
    def update(self, msg=None, current=None, total=None):
 
57
    def child_update(self, message, current, total):
 
58
        pass
 
59
 
 
60
    def update(self, msg=None, current_cnt=None, total_cnt=None):
 
61
        if current_cnt:
 
62
            self.current = current_cnt
 
63
        if total_cnt:
 
64
            self.total = total_cnt
59
65
        if msg is not None:
60
66
            self.set_text(msg)
61
 
        if None not in (current, total) and total > 0:
62
 
            self.set_fraction(1.0 * current / total)
 
67
        if None not in (self.current, self.total):
 
68
            self.fraction = float(self.current) / self.total
 
69
            self.set_fraction(self.fraction)
63
70
        while gtk.events_pending():
64
71
            gtk.main_iteration()
65
72
 
66
73
 
67
 
class GtkProgressBarStack(gtk.Window):
68
 
    def __init__(self):
69
 
        super(GtkProgressBarStack, self).__init__(type=gtk.WINDOW_TOPLEVEL)
 
74
class ProgressBarWindow(gtk.Window):
 
75
    def __init__(self, to_file=None, show_pct=None, show_spinner=None, show_eta=None, 
 
76
                 show_bar=None, show_count=None, to_messages_file=None, _stack=None):
 
77
        super(ProgressBarWindow, self).__init__(type=gtk.WINDOW_TOPLEVEL)
 
78
        self._stack = _stack
70
79
        self.set_border_width(0)
71
80
        self.set_title("Progress")
72
81
        self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
73
 
        self.vbox = gtk.VBox()
74
 
        self.add(self.vbox)
 
82
        self.pb = GtkProgressBar(self)
 
83
        self.add(self.pb)
 
84
        self.resize(250, 15)
75
85
        self.set_resizable(False)
76
 
 
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()
 
86
        self.show_all()
 
87
 
 
88
    def return_pb(self, pb):
 
89
        self._stack.return_pb(self)
 
90
    
 
91
    def update(self, *args, **kwargs):
 
92
        self.pb.update(*args, **kwargs)
 
93
 
 
94
    def finished(self):
 
95
        self.pb.finished()
 
96
        self.hide_all()
 
97
 
 
98
    def clear(self):
 
99
        self.pb.clear()
 
100
        self.destroy()
 
101
 
 
102
    def child_progress(self, *args, **kwargs):
 
103
        return self.pb.child_progress(*args, **kwargs)
 
104
 
 
105
    def child_update(self, *args, **kwargs):
 
106
        return self.pb.child_update(*args, **kwargs)
 
107
 
 
108
    def get_progress_bar(self):
 
109
        self.show_all()
 
110
        return self
 
111
 
 
112
 
 
113
class ProgressPanel(gtk.HBox):
 
114
    def __init__(self):
 
115
        super(ProgressPanel, self).__init__()
 
116
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
 
117
                                                 gtk.ICON_SIZE_BUTTON)
 
118
        image_loading.show()
 
119
        
 
120
        self.pb = GtkProgressBar(self)
 
121
        self.set_spacing(5)
 
122
        self.set_border_width(5)        
 
123
        self.pack_start(image_loading, False, False)
 
124
        self.pack_start(self.pb, True, True)
 
125
 
 
126
    def return_pb(self, pb):
 
127
        self._stack.return_pb(self)
 
128
 
 
129
    def get_progress_bar(self, to_file=None, show_pct=None, show_spinner=None, show_eta=None, 
 
130
                         show_bar=None, show_count=None, to_messages_file=None, 
 
131
                         _stack=None):
 
132
        self._stack = _stack
 
133
        self.show_all()
 
134
        return self
 
135
    
 
136
    def update(self, *args, **kwargs):
 
137
        self.pb.update(*args, **kwargs)
 
138
 
 
139
    def finished(self):
 
140
        self.pb.finished()
 
141
        self.hide_all()
 
142
 
 
143
    def clear(self):
 
144
        self.pb.clear()
 
145
        self.hide_all()
 
146
 
 
147
    def child_progress(self, *args, **kwargs):
 
148
        return self.pb.child_progress(*args, **kwargs)
 
149
 
 
150
    def child_update(self, *args, **kwargs):
 
151
        return self.pb.child_update(*args, **kwargs)
 
152
 
91
153
 
92
154
 
93
155
class PasswordDialog(gtk.Dialog):
122
184
 
123
185
        """
124
186
        super(GtkUIFactory, self).__init__()
125
 
        self._progress_bar_stack = None
 
187
        self.set_nested_progress_bar_widget(ProgressBarWindow)
126
188
 
127
189
    def get_boolean(self, prompt):
128
190
        """GtkDialog with yes/no answers"""
150
212
        else:
151
213
            return None
152
214
 
 
215
    def set_nested_progress_bar_widget(self, widget):
 
216
        self._progress_bar_stack = progress.ProgressBarStack(klass=widget)
 
217
 
153
218
    def nested_progress_bar(self):
154
219
        """Return a nested progress bar.
155
220
        """
156
 
        if self._progress_bar_stack is None:
157
 
            self._progress_bar_stack = GtkProgressBarStack()
158
221
        return self._progress_bar_stack.get_nested()
159
222
 
160
223
    def set_progress_bar_vbox(self, vbox):