/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: 2011-04-06 14:50:40 UTC
  • Revision ID: jelmer@samba.org-20110406145040-7u37k9hxkhleiqx2
Cleanups, fix compatibility with older versions of pygtk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branchview/treeview.py
6
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 gtk
 
10
import gobject
 
11
import pango
12
12
 
13
13
from bzrlib import ui
14
14
from bzrlib.revision import NULL_REVISION
20
20
from bzrlib.plugins.gtk.branchview.graphcell import CellRendererGraph
21
21
 
22
22
 
23
 
class TreeView(Gtk.VBox):
 
23
class TreeView(gtk.VBox):
24
24
 
25
25
    __gproperties__ = {
26
 
        'branch': (GObject.TYPE_PYOBJECT,
 
26
        'branch': (gobject.TYPE_PYOBJECT,
27
27
                   'Branch',
28
28
                   'The Bazaar branch being visualized',
29
 
                   GObject.PARAM_CONSTRUCT_ONLY | GObject.PARAM_WRITABLE),
 
29
                   gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE),
30
30
 
31
 
        'revision': (GObject.TYPE_PYOBJECT,
 
31
        'revision': (gobject.TYPE_PYOBJECT,
32
32
                     'Revision',
33
33
                     'The currently selected revision',
34
 
                     GObject.PARAM_READWRITE),
 
34
                     gobject.PARAM_READWRITE),
35
35
 
36
 
        'revision-number': (GObject.TYPE_STRING,
 
36
        'revision-number': (gobject.TYPE_STRING,
37
37
                            'Revision number',
38
38
                            'The number of the selected revision',
39
39
                            '',
40
 
                            GObject.PARAM_READABLE),
 
40
                            gobject.PARAM_READABLE),
41
41
 
42
 
        'children': (GObject.TYPE_PYOBJECT,
 
42
        'children': (gobject.TYPE_PYOBJECT,
43
43
                     'Child revisions',
44
44
                     'Children of the currently selected revision',
45
 
                     GObject.PARAM_READABLE),
 
45
                     gobject.PARAM_READABLE),
46
46
 
47
 
        'parents': (GObject.TYPE_PYOBJECT,
 
47
        'parents': (gobject.TYPE_PYOBJECT,
48
48
                    'Parent revisions',
49
49
                    'Parents to the currently selected revision',
50
 
                    GObject.PARAM_READABLE),
 
50
                    gobject.PARAM_READABLE),
51
51
 
52
 
        'revno-column-visible': (GObject.TYPE_BOOLEAN,
 
52
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
53
53
                                 'Revision number column',
54
54
                                 'Show revision number column',
55
55
                                 True,
56
 
                                 GObject.PARAM_READWRITE),
 
56
                                 gobject.PARAM_READWRITE),
57
57
 
58
 
        'graph-column-visible': (GObject.TYPE_BOOLEAN,
 
58
        'graph-column-visible': (gobject.TYPE_BOOLEAN,
59
59
                                 'Graph column',
60
60
                                 'Show graph column',
61
61
                                 True,
62
 
                                 GObject.PARAM_READWRITE),
 
62
                                 gobject.PARAM_READWRITE),
63
63
 
64
 
        'date-column-visible': (GObject.TYPE_BOOLEAN,
 
64
        'date-column-visible': (gobject.TYPE_BOOLEAN,
65
65
                                 'Date',
66
66
                                 'Show date column',
67
67
                                 False,
68
 
                                 GObject.PARAM_READWRITE),
 
68
                                 gobject.PARAM_READWRITE),
69
69
 
70
 
        'compact': (GObject.TYPE_BOOLEAN,
 
70
        'compact': (gobject.TYPE_BOOLEAN,
71
71
                    'Compact view',
72
72
                    'Break ancestry lines to save space',
73
73
                    True,
74
 
                    GObject.PARAM_CONSTRUCT | GObject.PARAM_READWRITE),
 
74
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
75
75
 
76
 
        'mainline-only': (GObject.TYPE_BOOLEAN,
 
76
        'mainline-only': (gobject.TYPE_BOOLEAN,
77
77
                    'Mainline only',
78
78
                    'Only show the mainline history.',
79
79
                    False,
80
 
                    GObject.PARAM_CONSTRUCT | GObject.PARAM_READWRITE),
 
80
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
81
81
 
82
82
    }
83
83
 
84
84
    __gsignals__ = {
85
 
        'revision-selected': (GObject.SignalFlags.RUN_FIRST,
86
 
                              None,
 
85
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
 
86
                              gobject.TYPE_NONE,
87
87
                              ()),
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,
 
88
        'revision-activated': (gobject.SIGNAL_RUN_FIRST,
 
89
                              gobject.TYPE_NONE,
 
90
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
 
91
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
 
92
                              gobject.TYPE_NONE,
 
93
                              (gobject.TYPE_STRING, gobject.TYPE_STRING)),
 
94
        'refreshed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
95
95
                              ())
96
96
    }
97
97
 
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)
 
108
        gtk.VBox.__init__(self, spacing=0)
109
109
 
110
110
        self.progress_widget = ProgressPanel()
111
 
        self.pack_start(self.progress_widget, False, True, 0)
 
111
        self.pack_start(self.progress_widget, expand=False, fill=True)
112
112
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
113
113
            # We'are using our own ui, let's tell it to use our widget.
114
114
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
115
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)
 
116
        self.scrolled_window = gtk.ScrolledWindow()
 
117
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
 
118
                                        gtk.POLICY_AUTOMATIC)
 
119
        self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
120
120
        self.scrolled_window.show()
121
 
        self.pack_start(self.scrolled_window, True, True, 0)
 
121
        self.pack_start(self.scrolled_window, expand=True, fill=True)
122
122
 
123
123
        self.scrolled_window.add(self.construct_treeview())
124
124
 
131
131
        self.maxnum = maxnum
132
132
        self.compact = compact
133
133
 
134
 
        self.model = treemodel.BranchTreeModel(self.branch, [])
135
 
        GObject.idle_add(self.populate)
 
134
        gobject.idle_add(self.populate)
136
135
 
137
136
        self.connect("destroy", self._on_destroy)
138
137
 
156
155
        elif property.name == 'branch':
157
156
            return self.branch
158
157
        elif property.name == 'revision':
159
 
            if self.path is None:
160
 
                return None
161
158
            return self.model.get_value(self.model.get_iter(self.path),
162
159
                                        treemodel.REVISION)
163
160
        elif property.name == 'revision-number':
164
 
            if self.path is None:
165
 
                return None
166
161
            return self.model.get_value(self.model.get_iter(self.path),
167
162
                                        treemodel.REVNO)
168
163
        elif property.name == 'children':
169
 
            if self.path is None:
170
 
                return None
171
164
            return self.model.get_value(self.model.get_iter(self.path),
172
165
                                        treemodel.CHILDREN)
173
166
        elif property.name == 'parents':
174
 
            if self.path is None:
175
 
                return None
176
167
            return self.model.get_value(self.model.get_iter(self.path),
177
168
                                        treemodel.PARENTS)
178
169
        else:
211
202
 
212
203
        :param revid: Revision id of revision to display.
213
204
        """
214
 
        self.treeview.set_cursor(
215
 
            Gtk.TreePath(path=self.index[revid]), None, False)
 
205
        self.treeview.set_cursor(self.index[revid])
216
206
        self.treeview.grab_focus()
217
207
 
218
208
    def get_children(self):
244
234
            self.emit('tag-added', tag, revid)
245
235
 
246
236
    def refresh(self):
247
 
        GObject.idle_add(self.populate, self.get_revision())
 
237
        gobject.idle_add(self.populate, self.get_revision())
248
238
 
249
239
    def update(self):
250
240
        try:
260
250
    def back(self):
261
251
        """Signal handler for the Back button."""
262
252
        parents = self.get_parents()
263
 
        if not parents:
 
253
        if not len(parents):
264
254
            return
265
255
 
266
256
        for parent_id in parents:
275
265
    def forward(self):
276
266
        """Signal handler for the Forward button."""
277
267
        children = self.get_children()
278
 
        if not children:
 
268
        if not len(children):
279
269
            return
280
270
 
281
271
        for child_id in children:
312
302
            show_graph = self.graph_column.get_visible()
313
303
 
314
304
            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)
 
305
            (linegraphdata, index, columns_len) = linegraph(self.branch.repository.get_graph(),
 
306
                                                            self.start,
 
307
                                                            self.maxnum, 
 
308
                                                            broken_line_length,
 
309
                                                            show_graph,
 
310
                                                            self.mainline_only,
 
311
                                                            self.progress_bar)
323
312
 
324
 
            self.model.set_line_graph_data(linegraphdata)
 
313
            self.model = treemodel.TreeModel(self.branch, linegraphdata)
325
314
            self.graph_cell.columns_len = columns_len
326
 
            width = self.graph_cell.get_preferred_width(self.treeview)[1]
 
315
            width = self.graph_cell.get_size(self.treeview)[2]
327
316
            if width > 500:
328
317
                width = 500
329
 
            elif width == 0:
330
 
                # The get_preferred_width() call got an insane value.
331
 
                width = 200
332
318
            self.graph_column.set_fixed_width(width)
333
319
            self.graph_column.set_max_width(width)
334
320
            self.index = index
335
321
            self.treeview.set_model(self.model)
336
322
 
337
323
            if not revision or revision == NULL_REVISION:
338
 
                self.treeview.set_cursor(Gtk.TreePath(path=0), None, False)
 
324
                self.treeview.set_cursor(0)
339
325
            else:
340
326
                self.set_revision(revision)
341
327
 
345
331
            self.progress_bar.finished()
346
332
 
347
333
    def construct_treeview(self):
348
 
        self.treeview = Gtk.TreeView()
 
334
        self.treeview = gtk.TreeView()
349
335
 
350
336
        self.treeview.set_rules_hint(True)
351
337
        # combined revno/summary interactive search
354
340
        # from the key (that is the key is found in a REVNO at the offset 0)
355
341
        # or if a MESSAGE *contains* the key anywhere (that is, the key is
356
342
        # found case insensitively in a MESSAGE at any offset)
357
 
        def search_equal_func(model, column, key, iter, ignored):
 
343
        def search_equal_func(model, column, key, iter):
358
344
            return (model.get_value(iter, treemodel.REVNO).find(key) != 0
359
345
                and model.get_value(iter, treemodel.MESSAGE).lower().find(key.lower()) == -1)
360
346
 
361
 
        self.treeview.set_search_equal_func(search_equal_func, None)
 
347
        self.treeview.set_search_equal_func(search_equal_func)
362
348
        self.treeview.set_enable_search(True)
363
349
 
364
 
        self.treeview.set_tooltip_column(treemodel.MESSAGE)
365
 
        self.treeview.set_headers_visible(True)
 
350
        # Fix old PyGTK bug - by JAM
 
351
        set_tooltip = getattr(self.treeview, 'set_tooltip_column', None)
 
352
        if set_tooltip is not None:
 
353
            set_tooltip(treemodel.MESSAGE)
366
354
 
367
355
        self._prev_cursor_path = None
368
356
        self.treeview.connect("cursor-changed",
378
366
 
379
367
        self.treeview.show()
380
368
 
381
 
        cell = Gtk.CellRendererText()
 
369
        cell = gtk.CellRendererText()
382
370
        cell.set_property("width-chars", 15)
383
 
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
384
 
        self.revno_column = Gtk.TreeViewColumn("Revision No")
385
 
        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)
 
371
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
372
        self.revno_column = gtk.TreeViewColumn("Revision No")
 
373
        self.revno_column.set_resizable(False)
 
374
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
375
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
376
        self.revno_column.pack_start(cell, expand=True)
390
377
        self.revno_column.add_attribute(cell, "text", treemodel.REVNO)
391
378
        self.treeview.append_column(self.revno_column)
392
379
 
393
380
        self.graph_cell = CellRendererGraph()
394
 
        self.graph_column = Gtk.TreeViewColumn()
395
 
        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)
 
381
        self.graph_column = gtk.TreeViewColumn()
 
382
        self.graph_column.set_resizable(False)
 
383
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
384
        self.graph_column.pack_start(self.graph_cell, expand=True)
 
385
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
 
386
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
 
387
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
 
388
        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
406
389
        self.treeview.append_column(self.graph_column)
407
390
 
408
 
        cell = Gtk.CellRendererText()
 
391
        cell = gtk.CellRendererText()
409
392
        cell.set_property("width-chars", 65)
410
 
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
411
 
        self.summary_column = Gtk.TreeViewColumn("Summary")
412
 
        self.summary_column.set_resizable(True)
 
393
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
394
        self.summary_column = gtk.TreeViewColumn("Summary")
 
395
        self.summary_column.set_resizable(False)
413
396
        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)
 
397
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
398
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
399
        self.summary_column.pack_start(cell, expand=True)
418
400
        self.summary_column.add_attribute(cell, "markup", treemodel.SUMMARY)
419
401
        self.treeview.append_column(self.summary_column)
420
402
 
421
 
        cell = Gtk.CellRendererText()
 
403
        cell = gtk.CellRendererText()
422
404
        cell.set_property("width-chars", 15)
423
 
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
424
 
        self.authors_column = Gtk.TreeViewColumn("Author(s)")
 
405
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
406
        self.authors_column = gtk.TreeViewColumn("Author(s)")
425
407
        self.authors_column.set_resizable(False)
426
 
        self.authors_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
 
408
        self.authors_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
427
409
        self.authors_column.set_fixed_width(200)
428
 
        self.authors_column.pack_start(cell, True)
 
410
        self.authors_column.pack_start(cell, expand=True)
429
411
        self.authors_column.add_attribute(cell, "text", treemodel.AUTHORS)
430
412
        self.treeview.append_column(self.authors_column)
431
413
 
432
 
        cell = Gtk.CellRendererText()
 
414
        cell = gtk.CellRendererText()
433
415
        cell.set_property("width-chars", 20)
434
 
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
435
 
        self.date_column = Gtk.TreeViewColumn("Date")
 
416
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
417
        self.date_column = gtk.TreeViewColumn("Date")
436
418
        self.date_column.set_visible(False)
437
 
        self.date_column.set_resizable(True)
438
 
        self.date_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
 
419
        self.date_column.set_resizable(False)
 
420
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
439
421
        self.date_column.set_fixed_width(130)
440
 
        self.date_column.pack_start(cell, True)
 
422
        self.date_column.pack_start(cell, expand=True)
441
423
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
442
424
        self.treeview.append_column(self.date_column)
443
425
 
454
436
    def _on_revision_selected(self, widget, event):
455
437
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
456
438
        if event.button == 3:
457
 
            revs = []
458
 
            rev = self.get_revision()
459
 
            if rev is not None:
460
 
                revs.append(rev.revision_id)
461
 
            menu = RevisionMenu(self.branch.repository, revs, self.branch)
 
439
            menu = RevisionMenu(self.branch.repository, 
 
440
                [self.get_revision().revision_id],
 
441
                self.branch)
462
442
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
463
 
            menu.popup(None, None, None, None, event.button, event.get_time())
 
443
            menu.popup(None, None, None, event.button, event.get_time())
464
444
 
465
445
    def _on_revision_activated(self, widget, path, col):
466
446
        self.emit('revision-activated', path, col)