/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
110
110
        """
111
111
        gtk.VBox.__init__(self, spacing=0)
112
112
 
113
 
        loading_msg_widget = ProgressPanel()
114
 
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
115
 
            # We'are using our own ui, let's tell it to use our widget.
116
 
            ui.ui_factory.set_progress_bar_widget(loading_msg_widget)
117
 
        self.pack_start(loading_msg_widget, expand=False, fill=True)
 
113
        self.progress_widget = ProgressPanel()
 
114
        self.pack_start(self.progress_widget, expand=False, fill=True)
118
115
 
119
116
        self.scrolled_window = gtk.ScrolledWindow()
120
117
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
125
122
 
126
123
        self.scrolled_window.add(self.construct_treeview())
127
124
 
128
 
        self.iter = None
 
125
        self.path = None
129
126
        self.branch = branch
130
127
        self.revision = None
131
128
        self.index = {}
152
149
        elif property.name == 'branch':
153
150
            return self.branch
154
151
        elif property.name == 'revision':
155
 
            return self.model.get_value(self.iter, treemodel.REVISION)
 
152
            return self.model.get_value(self.model.get_iter(self.path),
 
153
                                        treemodel.REVISION)
156
154
        elif property.name == 'revision-number':
157
 
            return self.model.get_value(self.iter, treemodel.REVNO)
 
155
            return self.model.get_value(self.model.get_iter(self.path),
 
156
                                        treemodel.REVNO)
158
157
        elif property.name == 'children':
159
 
            return self.model.get_value(self.iter, treemodel.CHILDREN)
 
158
            return self.model.get_value(self.model.get_iter(self.path),
 
159
                                        treemodel.CHILDREN)
160
160
        elif property.name == 'parents':
161
 
            return self.model.get_value(self.iter, treemodel.PARENTS)
 
161
            return self.model.get_value(self.model.get_iter(self.path),
 
162
                                        treemodel.PARENTS)
162
163
        else:
163
164
            raise AttributeError, 'unknown property %s' % property.name
164
165
 
283
284
                       should be broken.
284
285
        """
285
286
 
 
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)
286
290
        self.progress_bar = ui.ui_factory.nested_progress_bar()
287
291
        self.progress_bar.update("Loading ancestry graph", 0, 5)
288
292
 
412
416
        (path, focus) = treeview.get_cursor()
413
417
        if (path is not None) and (path != self._prev_cursor_path):
414
418
            self._prev_cursor_path = path # avoid emitting twice per click
415
 
            self.iter = self.model.get_iter(path)
 
419
            self.path = path
416
420
            self.emit('revision-selected')
417
421
 
418
422
    def _on_revision_selected(self, widget, event):