/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: Vincent Ladeuil
  • Date: 2009-06-15 06:53:53 UTC
  • mto: This revision was merged to the branch mainline in revision 649.
  • Revision ID: v.ladeuil+lp@free.fr-20090615065353-nxyyk6lj8te4ciiw
Fix refresh warnings and progress widget usage.

* branchview/treeview.py:
(TreeView.__init__): Make the proress widget an attribute. Don't
keep an GtkIter, they are not persistent, keep the path instead.
(TreeView.do_get_property): Convert path to iter when needed.
(TreeView._on_selection_changed): Memorize path, not iter.
(TreeView.populate): Use our own widget if we can.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branchview/treeview.py
16
16
from bzrlib import ui
17
17
 
18
18
from bzrlib.plugins.gtk import _i18n
 
19
from bzrlib.plugins.gtk.ui import GtkProgressBar, ProgressPanel
19
20
from linegraph import linegraph, same_branch
20
21
from graphcell import CellRendererGraph
21
22
from treemodel import TreeModel
22
23
from bzrlib.revision import NULL_REVISION
23
24
 
 
25
 
24
26
class TreeView(gtk.VBox):
25
27
 
26
28
    __gproperties__ = {
91
93
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
92
94
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
93
95
                              gobject.TYPE_NONE,
94
 
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
 
96
                              (gobject.TYPE_STRING, gobject.TYPE_STRING)),
 
97
        'refreshed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
 
98
                              ())
95
99
    }
96
100
 
97
101
    def __init__(self, branch, start, maxnum, compact=True):
106
110
        """
107
111
        gtk.VBox.__init__(self, spacing=0)
108
112
 
 
113
        self.progress_widget = ProgressPanel()
 
114
        self.pack_start(self.progress_widget, expand=False, fill=True)
 
115
 
109
116
        self.scrolled_window = gtk.ScrolledWindow()
110
117
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
111
118
                                        gtk.POLICY_AUTOMATIC)
115
122
 
116
123
        self.scrolled_window.add(self.construct_treeview())
117
124
 
118
 
        self.iter = None
 
125
        self.path = None
119
126
        self.branch = branch
120
127
        self.revision = None
 
128
        self.index = {}
121
129
 
122
130
        self.start = start
123
131
        self.maxnum = maxnum
141
149
        elif property.name == 'branch':
142
150
            return self.branch
143
151
        elif property.name == 'revision':
144
 
            return self.model.get_value(self.iter, treemodel.REVISION)
 
152
            return self.model.get_value(self.model.get_iter(self.path),
 
153
                                        treemodel.REVISION)
145
154
        elif property.name == 'revision-number':
146
 
            return self.model.get_value(self.iter, treemodel.REVNO)
 
155
            return self.model.get_value(self.model.get_iter(self.path),
 
156
                                        treemodel.REVNO)
147
157
        elif property.name == 'children':
148
 
            return self.model.get_value(self.iter, treemodel.CHILDREN)
 
158
            return self.model.get_value(self.model.get_iter(self.path),
 
159
                                        treemodel.CHILDREN)
149
160
        elif property.name == 'parents':
150
 
            return self.model.get_value(self.iter, treemodel.PARENTS)
 
161
            return self.model.get_value(self.model.get_iter(self.path),
 
162
                                        treemodel.PARENTS)
151
163
        else:
152
164
            raise AttributeError, 'unknown property %s' % property.name
153
165
 
173
185
        """Return revision id of currently selected revision, or None."""
174
186
        return self.get_property('revision')
175
187
 
 
188
    def has_revision_id(self, revision_id):
 
189
        return (revision_id in self.index)
 
190
 
176
191
    def set_revision(self, revision):
177
192
        self.set_property('revision', revision)
178
193
 
269
284
                       should be broken.
270
285
        """
271
286
 
272
 
        loading_progress = ui.ui_factory.nested_progress_bar()
273
 
        loading_progress.update(msg="Loading ancestry graph", total=5)
 
287
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
 
288
            # We'are using our own ui, let's tell it to use our widget.
 
289
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
 
290
        self.progress_bar = ui.ui_factory.nested_progress_bar()
 
291
        self.progress_bar.update("Loading ancestry graph", 0, 5)
274
292
 
275
293
        try:
276
294
            if self.compact:
287
305
                                                            broken_line_length,
288
306
                                                            show_graph,
289
307
                                                            self.mainline_only,
290
 
                                                            loading_progress)
 
308
                                                            self.progress_bar)
291
309
 
292
310
            self.model = TreeModel(self.branch, linegraphdata)
293
311
            self.graph_cell.columns_len = columns_len
304
322
            else:
305
323
                self.set_revision(revision)
306
324
 
 
325
            self.emit('refreshed')
307
326
            return False
308
327
        finally:
309
 
            loading_progress.finished()
 
328
            self.progress_bar.finished()
310
329
 
311
330
    def construct_treeview(self):
312
331
        self.treeview = gtk.TreeView()
319
338
        if set_tooltip is not None:
320
339
            set_tooltip(treemodel.MESSAGE)
321
340
 
 
341
        self._prev_cursor_path = None
322
342
        self.treeview.connect("cursor-changed",
323
343
                self._on_selection_changed)
324
344
 
390
410
        self.treeview.append_column(self.date_column)
391
411
        
392
412
        return self.treeview
393
 
 
 
413
    
394
414
    def _on_selection_changed(self, treeview):
395
415
        """callback for when the treeview changes."""
396
416
        (path, focus) = treeview.get_cursor()
397
 
        if path is not None:
398
 
            self.iter = self.model.get_iter(path)
 
417
        if (path is not None) and (path != self._prev_cursor_path):
 
418
            self._prev_cursor_path = path # avoid emitting twice per click
 
419
            self.path = path
399
420
            self.emit('revision-selected')
400
421
 
401
422
    def _on_revision_selected(self, widget, event):
402
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
 
423
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
403
424
        if event.button == 3:
404
 
            menu = RevisionPopupMenu(self.branch.repository, 
 
425
            menu = RevisionMenu(self.branch.repository, 
405
426
                [self.get_revision().revision_id],
406
427
                self.branch)
407
428
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))