/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 branchview/treeview.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:
branchview/treeview.py
93
93
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
94
94
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
95
95
                              gobject.TYPE_NONE,
96
 
                              (gobject.TYPE_STRING, gobject.TYPE_STRING)),
97
 
        'refreshed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
98
 
                              ())
 
96
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
99
97
    }
100
98
 
101
99
    def __init__(self, branch, start, maxnum, compact=True):
110
108
        """
111
109
        gtk.VBox.__init__(self, spacing=0)
112
110
 
113
 
        self.progress_widget = ProgressPanel()
114
 
        self.pack_start(self.progress_widget, expand=False, fill=True)
115
 
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
116
 
            # We'are using our own ui, let's tell it to use our widget.
117
 
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
 
111
        loading_msg_widget = ProgressPanel()
 
112
        ui.ui_factory.set_nested_progress_bar_widget(loading_msg_widget.get_progress_bar)
 
113
        self.pack_start(loading_msg_widget, expand=False, fill=True)
118
114
 
119
115
        self.scrolled_window = gtk.ScrolledWindow()
120
116
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
125
121
 
126
122
        self.scrolled_window.add(self.construct_treeview())
127
123
 
128
 
        self.path = None
 
124
        self.iter = None
129
125
        self.branch = branch
130
126
        self.revision = None
131
 
        self.index = {}
132
127
 
133
128
        self.start = start
134
129
        self.maxnum = maxnum
136
131
 
137
132
        gobject.idle_add(self.populate)
138
133
 
139
 
        self.connect("destroy", self._on_destroy)
140
 
 
141
 
    def _on_destroy(self, *ignored):
142
 
        self.branch.unlock()
143
 
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
144
 
            # We'are using our own ui, let's tell it to stop using our widget.
145
 
            ui.ui_factory.set_progress_bar_widget(None)
 
134
        self.connect("destroy", lambda x: self.branch.unlock())
146
135
 
147
136
    def do_get_property(self, property):
148
137
        if property.name == 'revno-column-visible':
158
147
        elif property.name == 'branch':
159
148
            return self.branch
160
149
        elif property.name == 'revision':
161
 
            return self.model.get_value(self.model.get_iter(self.path),
162
 
                                        treemodel.REVISION)
 
150
            return self.model.get_value(self.iter, treemodel.REVISION)
163
151
        elif property.name == 'revision-number':
164
 
            return self.model.get_value(self.model.get_iter(self.path),
165
 
                                        treemodel.REVNO)
 
152
            return self.model.get_value(self.iter, treemodel.REVNO)
166
153
        elif property.name == 'children':
167
 
            return self.model.get_value(self.model.get_iter(self.path),
168
 
                                        treemodel.CHILDREN)
 
154
            return self.model.get_value(self.iter, treemodel.CHILDREN)
169
155
        elif property.name == 'parents':
170
 
            return self.model.get_value(self.model.get_iter(self.path),
171
 
                                        treemodel.PARENTS)
 
156
            return self.model.get_value(self.iter, treemodel.PARENTS)
172
157
        else:
173
158
            raise AttributeError, 'unknown property %s' % property.name
174
159
 
194
179
        """Return revision id of currently selected revision, or None."""
195
180
        return self.get_property('revision')
196
181
 
197
 
    def has_revision_id(self, revision_id):
198
 
        return (revision_id in self.index)
199
 
 
200
182
    def set_revision(self, revision):
201
183
        self.set_property('revision', revision)
202
184
 
293
275
                       should be broken.
294
276
        """
295
277
 
296
 
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
297
 
            # We'are using our own ui, let's tell it to use our widget.
298
 
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
299
278
        self.progress_bar = ui.ui_factory.nested_progress_bar()
300
 
        self.progress_bar.update("Loading ancestry graph", 0, 5)
 
279
        self.progress_bar.update(msg="Loading ancestry graph", total_cnt=5)
301
280
 
302
281
        try:
303
282
            if self.compact:
331
310
            else:
332
311
                self.set_revision(revision)
333
312
 
334
 
            self.emit('refreshed')
335
313
            return False
336
314
        finally:
337
315
            self.progress_bar.finished()
347
325
        if set_tooltip is not None:
348
326
            set_tooltip(treemodel.MESSAGE)
349
327
 
350
 
        self._prev_cursor_path = None
351
328
        self.treeview.connect("cursor-changed",
352
329
                self._on_selection_changed)
353
330
 
423
400
    def _on_selection_changed(self, treeview):
424
401
        """callback for when the treeview changes."""
425
402
        (path, focus) = treeview.get_cursor()
426
 
        if (path is not None) and (path != self._prev_cursor_path):
427
 
            self._prev_cursor_path = path # avoid emitting twice per click
428
 
            self.path = path
 
403
        if path is not None:
 
404
            self.iter = self.model.get_iter(path)
429
405
            self.emit('revision-selected')
430
406
 
431
407
    def _on_revision_selected(self, widget, event):
432
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
 
408
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
433
409
        if event.button == 3:
434
 
            menu = RevisionMenu(self.branch.repository, 
 
410
            menu = RevisionPopupMenu(self.branch.repository, 
435
411
                [self.get_revision().revision_id],
436
412
                self.branch)
437
413
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))