/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: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

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