/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-07-31 01:55:07 UTC
  • mto: (580.2.1 gtk.gloom)
  • mto: This revision was merged to the branch mainline in revision 581.
  • Revision ID: jelmer@samba.org-20080731015507-tarukc7r26ud7twu
Avoid making assumptions about a branch being a loom until we've checked.

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
        if getattr(ui.ui_factory, "set_nested_progress_bar_widget", None) is not None:
 
113
            ui.ui_factory.set_nested_progress_bar_widget(loading_msg_widget.get_progress_bar)
 
114
        self.pack_start(loading_msg_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.path = None
 
125
        self.iter = None
129
126
        self.branch = branch
130
127
        self.revision = None
131
 
        self.index = {}
132
128
 
133
129
        self.start = start
134
130
        self.maxnum = maxnum
136
132
 
137
133
        gobject.idle_add(self.populate)
138
134
 
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)
 
135
        self.connect("destroy", lambda x: self.branch.unlock())
146
136
 
147
137
    def do_get_property(self, property):
148
138
        if property.name == 'revno-column-visible':
158
148
        elif property.name == 'branch':
159
149
            return self.branch
160
150
        elif property.name == 'revision':
161
 
            return self.model.get_value(self.model.get_iter(self.path),
162
 
                                        treemodel.REVISION)
 
151
            return self.model.get_value(self.iter, treemodel.REVISION)
163
152
        elif property.name == 'revision-number':
164
 
            return self.model.get_value(self.model.get_iter(self.path),
165
 
                                        treemodel.REVNO)
 
153
            return self.model.get_value(self.iter, treemodel.REVNO)
166
154
        elif property.name == 'children':
167
 
            return self.model.get_value(self.model.get_iter(self.path),
168
 
                                        treemodel.CHILDREN)
 
155
            return self.model.get_value(self.iter, treemodel.CHILDREN)
169
156
        elif property.name == 'parents':
170
 
            return self.model.get_value(self.model.get_iter(self.path),
171
 
                                        treemodel.PARENTS)
 
157
            return self.model.get_value(self.iter, treemodel.PARENTS)
172
158
        else:
173
159
            raise AttributeError, 'unknown property %s' % property.name
174
160
 
194
180
        """Return revision id of currently selected revision, or None."""
195
181
        return self.get_property('revision')
196
182
 
197
 
    def has_revision_id(self, revision_id):
198
 
        return (revision_id in self.index)
199
 
 
200
183
    def set_revision(self, revision):
201
184
        self.set_property('revision', revision)
202
185
 
293
276
                       should be broken.
294
277
        """
295
278
 
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
279
        self.progress_bar = ui.ui_factory.nested_progress_bar()
300
280
        self.progress_bar.update("Loading ancestry graph", 0, 5)
301
281
 
331
311
            else:
332
312
                self.set_revision(revision)
333
313
 
334
 
            self.emit('refreshed')
335
314
            return False
336
315
        finally:
337
316
            self.progress_bar.finished()
425
404
        (path, focus) = treeview.get_cursor()
426
405
        if (path is not None) and (path != self._prev_cursor_path):
427
406
            self._prev_cursor_path = path # avoid emitting twice per click
428
 
            self.path = path
 
407
            self.iter = self.model.get_iter(path)
429
408
            self.emit('revision-selected')
430
409
 
431
410
    def _on_revision_selected(self, widget, event):