/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: 2010-06-17 20:25:04 UTC
  • mfrom: (690 realtrunk)
  • mto: This revision was merged to the branch mainline in revision 691.
  • Revision ID: jelmer@samba.org-20100617202504-7yln6khkqftlun6i
Merge trunk

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