/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-06-29 16:20:15 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629162015-amhe7xj4cdmup4id
Rename GtkProgressBarStack to GtkWindowProgressBarStack

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
20
19
from linegraph import linegraph, same_branch
21
20
from graphcell import CellRendererGraph
22
21
from treemodel import TreeModel
23
22
from bzrlib.revision import NULL_REVISION
24
23
 
25
 
 
26
24
class TreeView(gtk.VBox):
27
25
 
28
26
    __gproperties__ = {
93
91
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
94
92
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
95
93
                              gobject.TYPE_NONE,
96
 
                              (gobject.TYPE_STRING, gobject.TYPE_STRING)),
97
 
        'refreshed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
98
 
                              ())
 
94
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
99
95
    }
100
96
 
101
97
    def __init__(self, branch, start, maxnum, compact=True):
110
106
        """
111
107
        gtk.VBox.__init__(self, spacing=0)
112
108
 
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)
118
 
 
119
109
        self.scrolled_window = gtk.ScrolledWindow()
120
110
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
121
111
                                        gtk.POLICY_AUTOMATIC)
125
115
 
126
116
        self.scrolled_window.add(self.construct_treeview())
127
117
 
128
 
        self.path = None
 
118
        self.iter = None
129
119
        self.branch = branch
130
120
        self.revision = None
131
 
        self.index = {}
132
121
 
133
122
        self.start = start
134
123
        self.maxnum = maxnum
136
125
 
137
126
        gobject.idle_add(self.populate)
138
127
 
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)
 
128
        self.connect("destroy", lambda x: self.branch.unlock())
146
129
 
147
130
    def do_get_property(self, property):
148
131
        if property.name == 'revno-column-visible':
158
141
        elif property.name == 'branch':
159
142
            return self.branch
160
143
        elif property.name == 'revision':
161
 
            return self.model.get_value(self.model.get_iter(self.path),
162
 
                                        treemodel.REVISION)
 
144
            return self.model.get_value(self.iter, treemodel.REVISION)
163
145
        elif property.name == 'revision-number':
164
 
            return self.model.get_value(self.model.get_iter(self.path),
165
 
                                        treemodel.REVNO)
 
146
            return self.model.get_value(self.iter, treemodel.REVNO)
166
147
        elif property.name == 'children':
167
 
            return self.model.get_value(self.model.get_iter(self.path),
168
 
                                        treemodel.CHILDREN)
 
148
            return self.model.get_value(self.iter, treemodel.CHILDREN)
169
149
        elif property.name == 'parents':
170
 
            return self.model.get_value(self.model.get_iter(self.path),
171
 
                                        treemodel.PARENTS)
 
150
            return self.model.get_value(self.iter, treemodel.PARENTS)
172
151
        else:
173
152
            raise AttributeError, 'unknown property %s' % property.name
174
153
 
194
173
        """Return revision id of currently selected revision, or None."""
195
174
        return self.get_property('revision')
196
175
 
197
 
    def has_revision_id(self, revision_id):
198
 
        return (revision_id in self.index)
199
 
 
200
176
    def set_revision(self, revision):
201
177
        self.set_property('revision', revision)
202
178
 
293
269
                       should be broken.
294
270
        """
295
271
 
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
 
        self.progress_bar = ui.ui_factory.nested_progress_bar()
300
 
        self.progress_bar.update("Loading ancestry graph", 0, 5)
 
272
        loading_progress = ui.ui_factory.nested_progress_bar()
 
273
        loading_progress.update(msg="Loading ancestry graph", total=5)
301
274
 
302
275
        try:
303
276
            if self.compact:
314
287
                                                            broken_line_length,
315
288
                                                            show_graph,
316
289
                                                            self.mainline_only,
317
 
                                                            self.progress_bar)
 
290
                                                            loading_progress)
318
291
 
319
292
            self.model = TreeModel(self.branch, linegraphdata)
320
293
            self.graph_cell.columns_len = columns_len
331
304
            else:
332
305
                self.set_revision(revision)
333
306
 
334
 
            self.emit('refreshed')
 
307
            self.emit('revisions-loaded')
 
308
 
335
309
            return False
336
310
        finally:
337
 
            self.progress_bar.finished()
 
311
            loading_progress.finished()
338
312
 
339
313
    def construct_treeview(self):
340
314
        self.treeview = gtk.TreeView()
347
321
        if set_tooltip is not None:
348
322
            set_tooltip(treemodel.MESSAGE)
349
323
 
350
 
        self._prev_cursor_path = None
351
324
        self.treeview.connect("cursor-changed",
352
325
                self._on_selection_changed)
353
326
 
419
392
        self.treeview.append_column(self.date_column)
420
393
        
421
394
        return self.treeview
422
 
    
 
395
 
423
396
    def _on_selection_changed(self, treeview):
424
397
        """callback for when the treeview changes."""
425
398
        (path, focus) = treeview.get_cursor()
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
 
399
        if path is not None:
 
400
            self.iter = self.model.get_iter(path)
429
401
            self.emit('revision-selected')
430
402
 
431
403
    def _on_revision_selected(self, widget, event):
432
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
 
404
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
433
405
        if event.button == 3:
434
 
            menu = RevisionMenu(self.branch.repository, 
 
406
            menu = RevisionPopupMenu(self.branch.repository, 
435
407
                [self.get_revision().revision_id],
436
408
                self.branch)
437
409
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))