/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-16 10:08:18 UTC
  • mfrom: (645.1.5 gtk)
  • Revision ID: v.ladeuil+lp@free.fr-20090616100818-tclct827olglm0ou
https://launchpad.net/bugs/385191
(vila) Fix #385191 by using the new progress reporting API

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()
 
113
        self.progress_widget = ProgressPanel()
 
114
        self.pack_start(self.progress_widget, expand=False, fill=True)
114
115
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
115
116
            # 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)
 
117
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
118
118
 
119
119
        self.scrolled_window = gtk.ScrolledWindow()
120
120
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
125
125
 
126
126
        self.scrolled_window.add(self.construct_treeview())
127
127
 
128
 
        self.iter = None
 
128
        self.path = None
129
129
        self.branch = branch
130
130
        self.revision = None
131
131
        self.index = {}
136
136
 
137
137
        gobject.idle_add(self.populate)
138
138
 
139
 
        self.connect("destroy", lambda x: self.branch.unlock())
 
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)
140
146
 
141
147
    def do_get_property(self, property):
142
148
        if property.name == 'revno-column-visible':
152
158
        elif property.name == 'branch':
153
159
            return self.branch
154
160
        elif property.name == 'revision':
155
 
            return self.model.get_value(self.iter, treemodel.REVISION)
 
161
            return self.model.get_value(self.model.get_iter(self.path),
 
162
                                        treemodel.REVISION)
156
163
        elif property.name == 'revision-number':
157
 
            return self.model.get_value(self.iter, treemodel.REVNO)
 
164
            return self.model.get_value(self.model.get_iter(self.path),
 
165
                                        treemodel.REVNO)
158
166
        elif property.name == 'children':
159
 
            return self.model.get_value(self.iter, treemodel.CHILDREN)
 
167
            return self.model.get_value(self.model.get_iter(self.path),
 
168
                                        treemodel.CHILDREN)
160
169
        elif property.name == 'parents':
161
 
            return self.model.get_value(self.iter, treemodel.PARENTS)
 
170
            return self.model.get_value(self.model.get_iter(self.path),
 
171
                                        treemodel.PARENTS)
162
172
        else:
163
173
            raise AttributeError, 'unknown property %s' % property.name
164
174
 
283
293
                       should be broken.
284
294
        """
285
295
 
 
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)
286
299
        self.progress_bar = ui.ui_factory.nested_progress_bar()
287
300
        self.progress_bar.update("Loading ancestry graph", 0, 5)
288
301
 
412
425
        (path, focus) = treeview.get_cursor()
413
426
        if (path is not None) and (path != self._prev_cursor_path):
414
427
            self._prev_cursor_path = path # avoid emitting twice per click
415
 
            self.iter = self.model.get_iter(path)
 
428
            self.path = path
416
429
            self.emit('revision-selected')
417
430
 
418
431
    def _on_revision_selected(self, widget, event):