/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-03-28 19:26:53 UTC
  • mto: (450.1.13 trunk)
  • mto: This revision was merged to the branch mainline in revision 458.
  • Revision ID: jelmer@samba.org-20080328192653-trzptkwahx1tulz9
Add module for preferences code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branchview/treeview.py
3
3
 
4
4
"""
5
5
 
6
 
__copyright__ = "Copyright © 2005 Canonical Ltd."
 
6
__copyright__ = "Copyright � 2005 Canonical Ltd."
7
7
__author__    = "Daniel Schierbeck <daniel.schierbeck@gmail.com>"
8
8
 
9
 
from gi.repository import Gtk
10
 
from gi.repository import GObject
11
 
from gi.repository import Pango
 
9
import sys
 
10
import string
 
11
import gtk
 
12
import gobject
 
13
import pango
 
14
import re
 
15
import treemodel
12
16
 
13
 
from bzrlib import ui
 
17
from linegraph import linegraph, same_branch
 
18
from graphcell import CellRendererGraph
 
19
from treemodel import TreeModel
14
20
from bzrlib.revision import NULL_REVISION
15
21
 
16
 
from bzrlib.plugins.gtk import lock
17
 
from bzrlib.plugins.gtk.ui import ProgressPanel
18
 
from bzrlib.plugins.gtk.branchview import treemodel
19
 
from bzrlib.plugins.gtk.branchview.linegraph import linegraph, same_branch
20
 
from bzrlib.plugins.gtk.branchview.graphcell import CellRendererGraph
21
 
 
22
 
 
23
 
class TreeView(Gtk.VBox):
 
22
class TreeView(gtk.VBox):
24
23
 
25
24
    __gproperties__ = {
26
 
        'branch': (GObject.TYPE_PYOBJECT,
 
25
        'branch': (gobject.TYPE_PYOBJECT,
27
26
                   'Branch',
28
27
                   'The Bazaar branch being visualized',
29
 
                   GObject.PARAM_CONSTRUCT_ONLY | GObject.PARAM_WRITABLE),
 
28
                   gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE),
30
29
 
31
 
        'revision': (GObject.TYPE_PYOBJECT,
 
30
        'revision': (gobject.TYPE_PYOBJECT,
32
31
                     'Revision',
33
32
                     'The currently selected revision',
34
 
                     GObject.PARAM_READWRITE),
 
33
                     gobject.PARAM_READWRITE),
35
34
 
36
 
        'revision-number': (GObject.TYPE_STRING,
 
35
        'revision-number': (gobject.TYPE_STRING,
37
36
                            'Revision number',
38
37
                            'The number of the selected revision',
39
38
                            '',
40
 
                            GObject.PARAM_READABLE),
 
39
                            gobject.PARAM_READABLE),
41
40
 
42
 
        'children': (GObject.TYPE_PYOBJECT,
 
41
        'children': (gobject.TYPE_PYOBJECT,
43
42
                     'Child revisions',
44
43
                     'Children of the currently selected revision',
45
 
                     GObject.PARAM_READABLE),
 
44
                     gobject.PARAM_READABLE),
46
45
 
47
 
        'parents': (GObject.TYPE_PYOBJECT,
 
46
        'parents': (gobject.TYPE_PYOBJECT,
48
47
                    'Parent revisions',
49
48
                    'Parents to the currently selected revision',
50
 
                    GObject.PARAM_READABLE),
 
49
                    gobject.PARAM_READABLE),
51
50
 
52
 
        'revno-column-visible': (GObject.TYPE_BOOLEAN,
 
51
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
53
52
                                 'Revision number column',
54
53
                                 'Show revision number column',
55
54
                                 True,
56
 
                                 GObject.PARAM_READWRITE),
 
55
                                 gobject.PARAM_READWRITE),
57
56
 
58
 
        'graph-column-visible': (GObject.TYPE_BOOLEAN,
 
57
        'graph-column-visible': (gobject.TYPE_BOOLEAN,
59
58
                                 'Graph column',
60
59
                                 'Show graph column',
61
60
                                 True,
62
 
                                 GObject.PARAM_READWRITE),
 
61
                                 gobject.PARAM_READWRITE),
63
62
 
64
 
        'date-column-visible': (GObject.TYPE_BOOLEAN,
 
63
        'date-column-visible': (gobject.TYPE_BOOLEAN,
65
64
                                 'Date',
66
65
                                 'Show date column',
67
66
                                 False,
68
 
                                 GObject.PARAM_READWRITE),
 
67
                                 gobject.PARAM_READWRITE),
69
68
 
70
 
        'compact': (GObject.TYPE_BOOLEAN,
 
69
        'compact': (gobject.TYPE_BOOLEAN,
71
70
                    'Compact view',
72
71
                    'Break ancestry lines to save space',
73
72
                    True,
74
 
                    GObject.PARAM_CONSTRUCT | GObject.PARAM_READWRITE),
 
73
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
75
74
 
76
 
        'mainline-only': (GObject.TYPE_BOOLEAN,
 
75
        'mainline-only': (gobject.TYPE_BOOLEAN,
77
76
                    'Mainline only',
78
77
                    'Only show the mainline history.',
79
78
                    False,
80
 
                    GObject.PARAM_CONSTRUCT | GObject.PARAM_READWRITE),
 
79
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
81
80
 
82
81
    }
83
82
 
84
83
    __gsignals__ = {
85
 
        'revision-selected': (GObject.SignalFlags.RUN_FIRST,
86
 
                              None,
 
84
        'revisions-loaded': (gobject.SIGNAL_RUN_FIRST, 
 
85
                             gobject.TYPE_NONE,
 
86
                             ()),
 
87
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
 
88
                              gobject.TYPE_NONE,
87
89
                              ()),
88
 
        'revision-activated': (GObject.SignalFlags.RUN_FIRST,
89
 
                              None,
90
 
                              (GObject.TYPE_PYOBJECT, GObject.TYPE_PYOBJECT)),
91
 
        'tag-added': (GObject.SignalFlags.RUN_FIRST,
92
 
                              None,
93
 
                              (GObject.TYPE_STRING, GObject.TYPE_STRING)),
94
 
        'refreshed': (GObject.SignalFlags.RUN_FIRST, None,
95
 
                              ())
 
90
        'revision-activated': (gobject.SIGNAL_RUN_FIRST,
 
91
                              gobject.TYPE_NONE,
 
92
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
 
93
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
 
94
                              gobject.TYPE_NONE,
 
95
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
96
96
    }
97
97
 
98
98
    def __init__(self, branch, start, maxnum, compact=True):
105
105
        :param broken_line_length: After how much lines to break 
106
106
                                   branches.
107
107
        """
108
 
        super(TreeView, self).__init__(homogeneous=False, spacing=0)
109
 
 
110
 
        self.progress_widget = ProgressPanel()
111
 
        self.pack_start(self.progress_widget, False, True, 0)
112
 
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
113
 
            # We'are using our own ui, let's tell it to use our widget.
114
 
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
115
 
 
116
 
        self.scrolled_window = Gtk.ScrolledWindow()
117
 
        self.scrolled_window.set_policy(Gtk.PolicyType.AUTOMATIC,
118
 
                                        Gtk.PolicyType.AUTOMATIC)
119
 
        self.scrolled_window.set_shadow_type(Gtk.ShadowType.IN)
 
108
        gtk.VBox.__init__(self, spacing=0)
 
109
 
 
110
        self.pack_start(self.construct_loading_msg(), expand=False, fill=True)
 
111
        self.connect('revisions-loaded', 
 
112
                lambda x: self.loading_msg_box.hide())
 
113
 
 
114
        self.scrolled_window = gtk.ScrolledWindow()
 
115
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
 
116
                                        gtk.POLICY_AUTOMATIC)
 
117
        self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
120
118
        self.scrolled_window.show()
121
 
        self.pack_start(self.scrolled_window, True, True, 0)
 
119
        self.pack_start(self.scrolled_window, expand=True, fill=True)
122
120
 
123
121
        self.scrolled_window.add(self.construct_treeview())
 
122
        
124
123
 
125
 
        self.path = None
 
124
        self.iter = None
126
125
        self.branch = branch
127
126
        self.revision = None
128
 
        self.index = {}
129
127
 
130
128
        self.start = start
131
129
        self.maxnum = maxnum
132
130
        self.compact = compact
133
131
 
134
 
        self.model = treemodel.BranchTreeModel(self.branch, [])
135
 
        GObject.idle_add(self.populate)
136
 
 
137
 
        self.connect("destroy", self._on_destroy)
138
 
 
139
 
    def _on_destroy(self, *ignored):
140
 
        self.branch.unlock()
141
 
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
142
 
            # We'are using our own ui, let's tell it to stop using our widget.
143
 
            ui.ui_factory.set_progress_bar_widget(None)
 
132
        gobject.idle_add(self.populate)
 
133
 
 
134
        self.connect("destroy", lambda x: self.branch.unlock())
144
135
 
145
136
    def do_get_property(self, property):
146
137
        if property.name == 'revno-column-visible':
156
147
        elif property.name == 'branch':
157
148
            return self.branch
158
149
        elif property.name == 'revision':
159
 
            if self.path is None:
160
 
                return None
161
 
            return self.model.get_value(self.model.get_iter(self.path),
162
 
                                        treemodel.REVISION)
 
150
            return self.model.get_value(self.iter, treemodel.REVISION)
163
151
        elif property.name == 'revision-number':
164
 
            if self.path is None:
165
 
                return None
166
 
            return self.model.get_value(self.model.get_iter(self.path),
167
 
                                        treemodel.REVNO)
 
152
            return self.model.get_value(self.iter, treemodel.REVNO)
168
153
        elif property.name == 'children':
169
 
            if self.path is None:
170
 
                return None
171
 
            return self.model.get_value(self.model.get_iter(self.path),
172
 
                                        treemodel.CHILDREN)
 
154
            return self.model.get_value(self.iter, treemodel.CHILDREN)
173
155
        elif property.name == 'parents':
174
 
            if self.path is None:
175
 
                return None
176
 
            return self.model.get_value(self.model.get_iter(self.path),
177
 
                                        treemodel.PARENTS)
 
156
            return self.model.get_value(self.iter, treemodel.PARENTS)
178
157
        else:
179
158
            raise AttributeError, 'unknown property %s' % property.name
180
159
 
200
179
        """Return revision id of currently selected revision, or None."""
201
180
        return self.get_property('revision')
202
181
 
203
 
    def has_revision_id(self, revision_id):
204
 
        return (revision_id in self.index)
205
 
 
206
182
    def set_revision(self, revision):
207
183
        self.set_property('revision', revision)
208
184
 
211
187
 
212
188
        :param revid: Revision id of revision to display.
213
189
        """
214
 
        self.treeview.set_cursor(
215
 
            Gtk.TreePath(path=self.index[revid]), None, False)
 
190
        self.treeview.set_cursor(self.index[revid])
216
191
        self.treeview.grab_focus()
217
192
 
218
193
    def get_children(self):
232
207
    def add_tag(self, tag, revid=None):
233
208
        if revid is None: revid = self.revision.revision_id
234
209
 
235
 
        if lock.release(self.branch):
 
210
        try:
 
211
            self.branch.unlock()
 
212
 
236
213
            try:
237
 
                lock.acquire(self.branch, lock.WRITE)
 
214
                self.branch.lock_write()
238
215
                self.model.add_tag(tag, revid)
239
216
            finally:
240
 
                lock.release(self.branch)
241
 
 
242
 
            lock.acquire(self.branch, lock.READ)
243
 
 
244
 
            self.emit('tag-added', tag, revid)
245
 
 
 
217
                self.branch.unlock()
 
218
 
 
219
        finally:
 
220
            self.branch.lock_read()
 
221
 
 
222
        self.emit('tag-added', tag, revid)
 
223
        
246
224
    def refresh(self):
247
 
        GObject.idle_add(self.populate, self.get_revision())
 
225
        self.loading_msg_box.show()
 
226
        gobject.idle_add(self.populate, self.get_revision())
248
227
 
249
228
    def update(self):
250
229
        try:
260
239
    def back(self):
261
240
        """Signal handler for the Back button."""
262
241
        parents = self.get_parents()
263
 
        if not parents:
 
242
        if not len(parents):
264
243
            return
265
244
 
266
245
        for parent_id in parents:
275
254
    def forward(self):
276
255
        """Signal handler for the Forward button."""
277
256
        children = self.get_children()
278
 
        if not children:
 
257
        if not len(children):
279
258
            return
280
259
 
281
260
        for child_id in children:
297
276
                       should be broken.
298
277
        """
299
278
 
300
 
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
301
 
            # We'are using our own ui, let's tell it to use our widget.
302
 
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
303
 
        self.progress_bar = ui.ui_factory.nested_progress_bar()
304
 
        self.progress_bar.update("Loading ancestry graph", 0, 5)
305
 
 
306
 
        try:
307
 
            if self.compact:
308
 
                broken_line_length = 32
309
 
            else:
310
 
                broken_line_length = None
311
 
 
312
 
            show_graph = self.graph_column.get_visible()
313
 
 
314
 
            self.branch.lock_read()
315
 
            (linegraphdata, index, columns_len) = linegraph(
316
 
                self.branch.repository.get_graph(),
317
 
                self.start,
318
 
                self.maxnum, 
319
 
                broken_line_length,
320
 
                show_graph,
321
 
                self.mainline_only,
322
 
                self.progress_bar)
323
 
 
324
 
            self.model.set_line_graph_data(linegraphdata)
325
 
            self.graph_cell.columns_len = columns_len
326
 
            width = self.graph_cell.get_preferred_width(self.treeview)[1]
327
 
            if width > 500:
328
 
                width = 500
329
 
            elif width == 0:
330
 
                # The get_preferred_width() call got an insane value.
331
 
                width = 200
332
 
            self.graph_column.set_fixed_width(width)
333
 
            self.graph_column.set_max_width(width)
334
 
            self.index = index
335
 
            self.treeview.set_model(self.model)
336
 
 
337
 
            if not revision or revision == NULL_REVISION:
338
 
                self.treeview.set_cursor(Gtk.TreePath(path=0), None, False)
339
 
            else:
340
 
                self.set_revision(revision)
341
 
 
342
 
            self.emit('refreshed')
343
 
            return False
344
 
        finally:
345
 
            self.progress_bar.finished()
 
279
        if self.compact:
 
280
            broken_line_length = 32
 
281
        else:
 
282
            broken_line_length = None
 
283
        
 
284
        show_graph = self.graph_column.get_visible()
 
285
 
 
286
        self.branch.lock_read()
 
287
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
 
288
                                                        self.start,
 
289
                                                        self.maxnum, 
 
290
                                                        broken_line_length,
 
291
                                                        show_graph,
 
292
                                                        self.mainline_only)
 
293
 
 
294
        self.model = TreeModel(self.branch, linegraphdata)
 
295
        self.graph_cell.columns_len = columns_len
 
296
        width = self.graph_cell.get_size(self.treeview)[2]
 
297
        if width > 500:
 
298
            width = 500
 
299
        self.graph_column.set_fixed_width(width)
 
300
        self.graph_column.set_max_width(width)
 
301
        self.index = index
 
302
        self.treeview.set_model(self.model)
 
303
 
 
304
        if revision is None:
 
305
            self.treeview.set_cursor(0)
 
306
        else:
 
307
            self.set_revision(revision)
 
308
 
 
309
        self.emit('revisions-loaded')
 
310
 
 
311
        return False
346
312
 
347
313
    def construct_treeview(self):
348
 
        self.treeview = Gtk.TreeView()
 
314
        self.treeview = gtk.TreeView()
349
315
 
350
316
        self.treeview.set_rules_hint(True)
351
 
        # combined revno/summary interactive search
352
 
        #
353
 
        # the row in a treemodel is considered "matched" if a REVNO *starts*
354
 
        # from the key (that is the key is found in a REVNO at the offset 0)
355
 
        # or if a MESSAGE *contains* the key anywhere (that is, the key is
356
 
        # found case insensitively in a MESSAGE at any offset)
357
 
        def search_equal_func(model, column, key, iter):
358
 
            return (model.get_value(iter, treemodel.REVNO).find(key) != 0
359
 
                and model.get_value(iter, treemodel.MESSAGE).lower().find(key.lower()) == -1)
360
 
 
361
 
        self.treeview.set_search_equal_func(search_equal_func, None)
362
 
        self.treeview.set_enable_search(True)
363
 
 
364
 
        self.treeview.set_tooltip_column(treemodel.MESSAGE)
365
 
        self.treeview.set_headers_visible(True)
366
 
 
367
 
        self._prev_cursor_path = None
 
317
        self.treeview.set_search_column(treemodel.REVNO)
 
318
        
 
319
        # Fix old PyGTK bug - by JAM
 
320
        set_tooltip = getattr(self.treeview, 'set_tooltip_column', None)
 
321
        if set_tooltip is not None:
 
322
            set_tooltip(treemodel.MESSAGE)
 
323
 
368
324
        self.treeview.connect("cursor-changed",
369
325
                self._on_selection_changed)
370
326
 
378
334
 
379
335
        self.treeview.show()
380
336
 
381
 
        cell = Gtk.CellRendererText()
 
337
        cell = gtk.CellRendererText()
382
338
        cell.set_property("width-chars", 15)
383
 
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
384
 
        self.revno_column = Gtk.TreeViewColumn("Revision No")
 
339
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
340
        self.revno_column = gtk.TreeViewColumn("Revision No")
385
341
        self.revno_column.set_resizable(True)
386
 
        self.revno_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
387
 
        self.revno_column.set_fixed_width(
388
 
            cell.get_preferred_width(self.treeview)[1])
389
 
        self.revno_column.pack_start(cell, True)
 
342
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
343
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
344
        self.revno_column.pack_start(cell, expand=True)
390
345
        self.revno_column.add_attribute(cell, "text", treemodel.REVNO)
391
346
        self.treeview.append_column(self.revno_column)
392
347
 
393
348
        self.graph_cell = CellRendererGraph()
394
 
        self.graph_column = Gtk.TreeViewColumn()
 
349
        self.graph_column = gtk.TreeViewColumn()
395
350
        self.graph_column.set_resizable(True)
396
 
        self.graph_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
397
 
        self.graph_column.pack_start(self.graph_cell, True)
398
 
        self.graph_column.add_attribute(
399
 
            self.graph_cell, "node", treemodel.NODE)
400
 
        self.graph_column.add_attribute(
401
 
            self.graph_cell, "tags", treemodel.TAGS)
402
 
        self.graph_column.add_attribute(
403
 
            self.graph_cell, "in-lines", treemodel.LAST_LINES)
404
 
        self.graph_column.add_attribute(
405
 
            self.graph_cell, "out-lines", treemodel.LINES)
 
351
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
352
        self.graph_column.pack_start(self.graph_cell, expand=False)
 
353
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
 
354
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
 
355
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
 
356
        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
406
357
        self.treeview.append_column(self.graph_column)
407
358
 
408
 
        cell = Gtk.CellRendererText()
 
359
        cell = gtk.CellRendererText()
409
360
        cell.set_property("width-chars", 65)
410
 
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
411
 
        self.summary_column = Gtk.TreeViewColumn("Summary")
 
361
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
362
        self.summary_column = gtk.TreeViewColumn("Summary")
412
363
        self.summary_column.set_resizable(True)
413
 
        self.summary_column.set_expand(True)
414
 
        self.summary_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
415
 
        self.summary_column.set_fixed_width(
416
 
            cell.get_preferred_width(self.treeview)[1])
417
 
        self.summary_column.pack_start(cell, True)
 
364
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
365
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
366
        self.summary_column.pack_start(cell, expand=True)
418
367
        self.summary_column.add_attribute(cell, "markup", treemodel.SUMMARY)
419
368
        self.treeview.append_column(self.summary_column)
420
369
 
421
 
        cell = Gtk.CellRendererText()
 
370
        cell = gtk.CellRendererText()
422
371
        cell.set_property("width-chars", 15)
423
 
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
424
 
        self.authors_column = Gtk.TreeViewColumn("Author(s)")
425
 
        self.authors_column.set_resizable(False)
426
 
        self.authors_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
427
 
        self.authors_column.set_fixed_width(200)
428
 
        self.authors_column.pack_start(cell, True)
429
 
        self.authors_column.add_attribute(cell, "text", treemodel.AUTHORS)
430
 
        self.treeview.append_column(self.authors_column)
 
372
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
373
        self.committer_column = gtk.TreeViewColumn("Committer")
 
374
        self.committer_column.set_resizable(True)
 
375
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
376
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
377
        self.committer_column.pack_start(cell, expand=True)
 
378
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
 
379
        self.treeview.append_column(self.committer_column)
431
380
 
432
 
        cell = Gtk.CellRendererText()
 
381
        cell = gtk.CellRendererText()
433
382
        cell.set_property("width-chars", 20)
434
 
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
435
 
        self.date_column = Gtk.TreeViewColumn("Date")
 
383
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
384
        self.date_column = gtk.TreeViewColumn("Date")
436
385
        self.date_column.set_visible(False)
437
386
        self.date_column.set_resizable(True)
438
 
        self.date_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
439
 
        self.date_column.set_fixed_width(130)
440
 
        self.date_column.pack_start(cell, True)
 
387
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
388
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
389
        self.date_column.pack_start(cell, expand=True)
441
390
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
442
391
        self.treeview.append_column(self.date_column)
443
 
 
 
392
        
444
393
        return self.treeview
 
394
    
 
395
    def construct_loading_msg(self):
 
396
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
 
397
                                                 gtk.ICON_SIZE_BUTTON)
 
398
        image_loading.show()
 
399
        
 
400
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
 
401
        label_loading.set_alignment(0.0, 0.5)
 
402
        label_loading.show()
 
403
        
 
404
        self.loading_msg_box = gtk.HBox()
 
405
        self.loading_msg_box.set_spacing(5)
 
406
        self.loading_msg_box.set_border_width(5)        
 
407
        self.loading_msg_box.pack_start(image_loading, False, False)
 
408
        self.loading_msg_box.pack_start(label_loading, True, True)
 
409
        self.loading_msg_box.show()
 
410
        
 
411
        return self.loading_msg_box
445
412
 
446
413
    def _on_selection_changed(self, treeview):
447
414
        """callback for when the treeview changes."""
448
415
        (path, focus) = treeview.get_cursor()
449
 
        if (path is not None) and (path != self._prev_cursor_path):
450
 
            self._prev_cursor_path = path # avoid emitting twice per click
451
 
            self.path = path
 
416
        if path is not None:
 
417
            self.iter = self.model.get_iter(path)
452
418
            self.emit('revision-selected')
453
419
 
454
420
    def _on_revision_selected(self, widget, event):
455
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
 
421
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
456
422
        if event.button == 3:
457
 
            menu = RevisionMenu(self.branch.repository, 
 
423
            menu = RevisionPopupMenu(self.branch.repository, 
458
424
                [self.get_revision().revision_id],
459
425
                self.branch)
460
426
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
461
 
            menu.popup(None, None, None, None, event.button, event.get_time())
 
427
            menu.popup(None, None, None, event.button, event.get_time())
462
428
 
463
429
    def _on_revision_activated(self, widget, path, col):
464
430
        self.emit('revision-activated', path, col)