/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: Curtis Hovey
  • Date: 2011-08-01 14:46:23 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110801144623-ldjf0bu7kyi5bxzu
Updated commit to gtk3.

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
 
import sys
10
 
import string
11
 
import gtk
12
 
import gobject
13
 
import pango
14
 
import re
15
 
import treemodel
 
9
from gi.repository import Gtk
 
10
from gi.repository import GObject
 
11
from gi.repository import Pango
 
12
 
16
13
from bzrlib import ui
17
 
 
18
 
from bzrlib.plugins.gtk import _i18n
19
 
from linegraph import linegraph, same_branch
20
 
from graphcell import CellRendererGraph
21
 
from treemodel import TreeModel
22
14
from bzrlib.revision import NULL_REVISION
23
15
 
24
 
class TreeView(gtk.VBox):
 
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):
25
24
 
26
25
    __gproperties__ = {
27
 
        'branch': (gobject.TYPE_PYOBJECT,
 
26
        'branch': (GObject.TYPE_PYOBJECT,
28
27
                   'Branch',
29
28
                   'The Bazaar branch being visualized',
30
 
                   gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE),
 
29
                   GObject.PARAM_CONSTRUCT_ONLY | GObject.PARAM_WRITABLE),
31
30
 
32
 
        'revision': (gobject.TYPE_PYOBJECT,
 
31
        'revision': (GObject.TYPE_PYOBJECT,
33
32
                     'Revision',
34
33
                     'The currently selected revision',
35
 
                     gobject.PARAM_READWRITE),
 
34
                     GObject.PARAM_READWRITE),
36
35
 
37
 
        'revision-number': (gobject.TYPE_STRING,
 
36
        'revision-number': (GObject.TYPE_STRING,
38
37
                            'Revision number',
39
38
                            'The number of the selected revision',
40
39
                            '',
41
 
                            gobject.PARAM_READABLE),
 
40
                            GObject.PARAM_READABLE),
42
41
 
43
 
        'children': (gobject.TYPE_PYOBJECT,
 
42
        'children': (GObject.TYPE_PYOBJECT,
44
43
                     'Child revisions',
45
44
                     'Children of the currently selected revision',
46
 
                     gobject.PARAM_READABLE),
 
45
                     GObject.PARAM_READABLE),
47
46
 
48
 
        'parents': (gobject.TYPE_PYOBJECT,
 
47
        'parents': (GObject.TYPE_PYOBJECT,
49
48
                    'Parent revisions',
50
49
                    'Parents to the currently selected revision',
51
 
                    gobject.PARAM_READABLE),
 
50
                    GObject.PARAM_READABLE),
52
51
 
53
 
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
 
52
        'revno-column-visible': (GObject.TYPE_BOOLEAN,
54
53
                                 'Revision number column',
55
54
                                 'Show revision number column',
56
55
                                 True,
57
 
                                 gobject.PARAM_READWRITE),
 
56
                                 GObject.PARAM_READWRITE),
58
57
 
59
 
        'graph-column-visible': (gobject.TYPE_BOOLEAN,
 
58
        'graph-column-visible': (GObject.TYPE_BOOLEAN,
60
59
                                 'Graph column',
61
60
                                 'Show graph column',
62
61
                                 True,
63
 
                                 gobject.PARAM_READWRITE),
 
62
                                 GObject.PARAM_READWRITE),
64
63
 
65
 
        'date-column-visible': (gobject.TYPE_BOOLEAN,
 
64
        'date-column-visible': (GObject.TYPE_BOOLEAN,
66
65
                                 'Date',
67
66
                                 'Show date column',
68
67
                                 False,
69
 
                                 gobject.PARAM_READWRITE),
 
68
                                 GObject.PARAM_READWRITE),
70
69
 
71
 
        'compact': (gobject.TYPE_BOOLEAN,
 
70
        'compact': (GObject.TYPE_BOOLEAN,
72
71
                    'Compact view',
73
72
                    'Break ancestry lines to save space',
74
73
                    True,
75
 
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
 
74
                    GObject.PARAM_CONSTRUCT | GObject.PARAM_READWRITE),
76
75
 
77
 
        'mainline-only': (gobject.TYPE_BOOLEAN,
 
76
        'mainline-only': (GObject.TYPE_BOOLEAN,
78
77
                    'Mainline only',
79
78
                    'Only show the mainline history.',
80
79
                    False,
81
 
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
 
80
                    GObject.PARAM_CONSTRUCT | GObject.PARAM_READWRITE),
82
81
 
83
82
    }
84
83
 
85
84
    __gsignals__ = {
86
 
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
87
 
                              gobject.TYPE_NONE,
 
85
        'revision-selected': (GObject.SignalFlags.RUN_FIRST,
 
86
                              None,
88
87
                              ()),
89
 
        'revision-activated': (gobject.SIGNAL_RUN_FIRST,
90
 
                              gobject.TYPE_NONE,
91
 
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
92
 
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
93
 
                              gobject.TYPE_NONE,
94
 
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
 
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
                              ())
95
96
    }
96
97
 
97
98
    def __init__(self, branch, start, maxnum, compact=True):
104
105
        :param broken_line_length: After how much lines to break 
105
106
                                   branches.
106
107
        """
107
 
        gtk.VBox.__init__(self, spacing=0)
108
 
 
109
 
        self.scrolled_window = gtk.ScrolledWindow()
110
 
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
111
 
                                        gtk.POLICY_AUTOMATIC)
112
 
        self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
 
108
        GObject.GObject.__init__(self, spacing=0)
 
109
 
 
110
        self.progress_widget = ProgressPanel()
 
111
        self.pack_start(self.progress_widget, expand=False, fill=True)
 
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)
113
120
        self.scrolled_window.show()
114
121
        self.pack_start(self.scrolled_window, expand=True, fill=True)
115
122
 
116
123
        self.scrolled_window.add(self.construct_treeview())
117
124
 
118
 
        self.iter = None
 
125
        self.path = None
119
126
        self.branch = branch
120
127
        self.revision = None
 
128
        self.index = {}
121
129
 
122
130
        self.start = start
123
131
        self.maxnum = maxnum
124
132
        self.compact = compact
125
133
 
126
 
        gobject.idle_add(self.populate)
127
 
 
128
 
        self.connect("destroy", lambda x: self.branch.unlock())
 
134
        self.model = treemodel.TreeModel(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)
129
144
 
130
145
    def do_get_property(self, property):
131
146
        if property.name == 'revno-column-visible':
141
156
        elif property.name == 'branch':
142
157
            return self.branch
143
158
        elif property.name == 'revision':
144
 
            return self.model.get_value(self.iter, treemodel.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)
145
163
        elif property.name == 'revision-number':
146
 
            return self.model.get_value(self.iter, treemodel.REVNO)
 
164
            if self.path is None:
 
165
                return None
 
166
            return self.model.get_value(self.model.get_iter(self.path),
 
167
                                        treemodel.REVNO)
147
168
        elif property.name == 'children':
148
 
            return self.model.get_value(self.iter, treemodel.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)
149
173
        elif property.name == 'parents':
150
 
            return self.model.get_value(self.iter, treemodel.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)
151
178
        else:
152
179
            raise AttributeError, 'unknown property %s' % property.name
153
180
 
173
200
        """Return revision id of currently selected revision, or None."""
174
201
        return self.get_property('revision')
175
202
 
 
203
    def has_revision_id(self, revision_id):
 
204
        return (revision_id in self.index)
 
205
 
176
206
    def set_revision(self, revision):
177
207
        self.set_property('revision', revision)
178
208
 
201
231
    def add_tag(self, tag, revid=None):
202
232
        if revid is None: revid = self.revision.revision_id
203
233
 
204
 
        try:
205
 
            self.branch.unlock()
206
 
 
 
234
        if lock.release(self.branch):
207
235
            try:
208
 
                self.branch.lock_write()
 
236
                lock.acquire(self.branch, lock.WRITE)
209
237
                self.model.add_tag(tag, revid)
210
238
            finally:
211
 
                self.branch.unlock()
212
 
 
213
 
        finally:
214
 
            self.branch.lock_read()
215
 
 
216
 
        self.emit('tag-added', tag, revid)
217
 
        
 
239
                lock.release(self.branch)
 
240
 
 
241
            lock.acquire(self.branch, lock.READ)
 
242
 
 
243
            self.emit('tag-added', tag, revid)
 
244
 
218
245
    def refresh(self):
219
 
        gobject.idle_add(self.populate, self.get_revision())
 
246
        GObject.idle_add(self.populate, self.get_revision())
220
247
 
221
248
    def update(self):
222
249
        try:
269
296
                       should be broken.
270
297
        """
271
298
 
272
 
        loading_progress = ui.ui_factory.nested_progress_bar()
273
 
        loading_progress.update(msg="Loading ancestry graph", total=5)
 
299
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
 
300
            # We'are using our own ui, let's tell it to use our widget.
 
301
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
 
302
        self.progress_bar = ui.ui_factory.nested_progress_bar()
 
303
        self.progress_bar.update("Loading ancestry graph", 0, 5)
274
304
 
275
305
        try:
276
306
            if self.compact:
277
307
                broken_line_length = 32
278
308
            else:
279
309
                broken_line_length = None
280
 
            
 
310
 
281
311
            show_graph = self.graph_column.get_visible()
282
312
 
283
313
            self.branch.lock_read()
287
317
                                                            broken_line_length,
288
318
                                                            show_graph,
289
319
                                                            self.mainline_only,
290
 
                                                            loading_progress)
 
320
                                                            self.progress_bar)
291
321
 
292
 
            self.model = TreeModel(self.branch, linegraphdata)
 
322
            self.model.line_graph_data = linegraphdata
293
323
            self.graph_cell.columns_len = columns_len
294
324
            width = self.graph_cell.get_size(self.treeview)[2]
295
325
            if width > 500:
304
334
            else:
305
335
                self.set_revision(revision)
306
336
 
307
 
            self.emit('revisions-loaded')
308
 
 
 
337
            self.emit('refreshed')
309
338
            return False
310
339
        finally:
311
 
            loading_progress.finished()
 
340
            self.progress_bar.finished()
312
341
 
313
342
    def construct_treeview(self):
314
 
        self.treeview = gtk.TreeView()
 
343
        self.treeview = Gtk.TreeView()
315
344
 
316
345
        self.treeview.set_rules_hint(True)
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
 
 
 
346
        # combined revno/summary interactive search
 
347
        #
 
348
        # the row in a treemodel is considered "matched" if a REVNO *starts*
 
349
        # from the key (that is the key is found in a REVNO at the offset 0)
 
350
        # or if a MESSAGE *contains* the key anywhere (that is, the key is
 
351
        # found case insensitively in a MESSAGE at any offset)
 
352
        def search_equal_func(model, column, key, iter):
 
353
            return (model.get_value(iter, treemodel.REVNO).find(key) != 0
 
354
                and model.get_value(iter, treemodel.MESSAGE).lower().find(key.lower()) == -1)
 
355
 
 
356
        self.treeview.set_search_equal_func(search_equal_func)
 
357
        self.treeview.set_enable_search(True)
 
358
 
 
359
        set_tooltip(treemodel.MESSAGE)
 
360
 
 
361
        self._prev_cursor_path = None
324
362
        self.treeview.connect("cursor-changed",
325
363
                self._on_selection_changed)
326
364
 
334
372
 
335
373
        self.treeview.show()
336
374
 
337
 
        cell = gtk.CellRendererText()
 
375
        cell = Gtk.CellRendererText()
338
376
        cell.set_property("width-chars", 15)
339
 
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
340
 
        self.revno_column = gtk.TreeViewColumn("Revision No")
341
 
        self.revno_column.set_resizable(False)
342
 
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
377
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
 
378
        self.revno_column = Gtk.TreeViewColumn("Revision No")
 
379
        self.revno_column.set_resizable(True)
 
380
        self.revno_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
343
381
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
344
 
        self.revno_column.pack_start(cell, expand=True)
 
382
        self.revno_column.pack_start(cell, True, True, 0)
345
383
        self.revno_column.add_attribute(cell, "text", treemodel.REVNO)
346
384
        self.treeview.append_column(self.revno_column)
347
385
 
348
386
        self.graph_cell = CellRendererGraph()
349
 
        self.graph_column = gtk.TreeViewColumn()
350
 
        self.graph_column.set_resizable(False)
351
 
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
352
 
        self.graph_column.pack_start(self.graph_cell, expand=True)
 
387
        self.graph_column = Gtk.TreeViewColumn()
 
388
        self.graph_column.set_resizable(True)
 
389
        self.graph_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
 
390
        self.graph_column.pack_start(self.graph_cell, True, True, 0)
353
391
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
354
392
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
355
393
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
356
394
        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
357
395
        self.treeview.append_column(self.graph_column)
358
396
 
359
 
        cell = gtk.CellRendererText()
 
397
        cell = Gtk.CellRendererText()
360
398
        cell.set_property("width-chars", 65)
361
 
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
362
 
        self.summary_column = gtk.TreeViewColumn("Summary")
363
 
        self.summary_column.set_resizable(False)
 
399
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
 
400
        self.summary_column = Gtk.TreeViewColumn("Summary")
 
401
        self.summary_column.set_resizable(True)
364
402
        self.summary_column.set_expand(True)
365
 
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
403
        self.summary_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
366
404
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
367
 
        self.summary_column.pack_start(cell, expand=True)
 
405
        self.summary_column.pack_start(cell, True, True, 0)
368
406
        self.summary_column.add_attribute(cell, "markup", treemodel.SUMMARY)
369
407
        self.treeview.append_column(self.summary_column)
370
408
 
371
 
        cell = gtk.CellRendererText()
 
409
        cell = Gtk.CellRendererText()
372
410
        cell.set_property("width-chars", 15)
373
 
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
374
 
        self.committer_column = gtk.TreeViewColumn("Committer")
375
 
        self.committer_column.set_resizable(False)
376
 
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
377
 
        self.committer_column.set_fixed_width(200)
378
 
        self.committer_column.pack_start(cell, expand=True)
379
 
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
380
 
        self.treeview.append_column(self.committer_column)
 
411
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
 
412
        self.authors_column = Gtk.TreeViewColumn("Author(s)")
 
413
        self.authors_column.set_resizable(False)
 
414
        self.authors_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
 
415
        self.authors_column.set_fixed_width(200)
 
416
        self.authors_column.pack_start(cell, True, True, 0)
 
417
        self.authors_column.add_attribute(cell, "text", treemodel.AUTHORS)
 
418
        self.treeview.append_column(self.authors_column)
381
419
 
382
 
        cell = gtk.CellRendererText()
 
420
        cell = Gtk.CellRendererText()
383
421
        cell.set_property("width-chars", 20)
384
 
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
385
 
        self.date_column = gtk.TreeViewColumn("Date")
 
422
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
 
423
        self.date_column = Gtk.TreeViewColumn("Date")
386
424
        self.date_column.set_visible(False)
387
 
        self.date_column.set_resizable(False)
388
 
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
425
        self.date_column.set_resizable(True)
 
426
        self.date_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
389
427
        self.date_column.set_fixed_width(130)
390
 
        self.date_column.pack_start(cell, expand=True)
 
428
        self.date_column.pack_start(cell, True, True, 0)
391
429
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
392
430
        self.treeview.append_column(self.date_column)
393
 
        
 
431
 
394
432
        return self.treeview
395
433
 
396
434
    def _on_selection_changed(self, treeview):
397
435
        """callback for when the treeview changes."""
398
436
        (path, focus) = treeview.get_cursor()
399
 
        if path is not None:
400
 
            self.iter = self.model.get_iter(path)
 
437
        if (path is not None) and (path != self._prev_cursor_path):
 
438
            self._prev_cursor_path = path # avoid emitting twice per click
 
439
            self.path = path
401
440
            self.emit('revision-selected')
402
441
 
403
442
    def _on_revision_selected(self, widget, event):
404
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
 
443
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
405
444
        if event.button == 3:
406
 
            menu = RevisionPopupMenu(self.branch.repository, 
 
445
            menu = RevisionMenu(self.branch.repository, 
407
446
                [self.get_revision().revision_id],
408
447
                self.branch)
409
448
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))