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
- browse files at revision 793.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 793.1.1
- 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
Remove bzr-notify.
- files added:
- avatarproviders.py
- files removed:
- bzr-notify
- olive
- files renamed:
- bazaar-properties.desktop => bazaar-properties.desktop.in
- bzr-handle-patch.desktop => bzr-handle-patch.desktop.in
- files modified:
- AUTHORS
added
removed
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)
112
113
loading_msg_widget = ProgressPanel()
114
if getattr(ui.ui_factory, "set_nested_progress_bar_widget", None) is not None:
115
ui.ui_factory.set_nested_progress_bar_widget(loading_msg_widget.get_progress_bar)
116
self.pack_start(loading_msg_widget, expand=False, fill=True)
117
118
self.scrolled_window = gtk.ScrolledWindow()
119
self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
120
gtk.POLICY_AUTOMATIC)
121
self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
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)
122
120
self.scrolled_window.show()
123
self.pack_start(self.scrolled_window, expand=True, fill=True)
121
self.pack_start(self.scrolled_window, True, True, 0)
124
122
125
123
self.scrolled_window.add(self.construct_treeview())
126
124
127
self.iter = None
125
self.path = None
128
126
self.branch = branch
129
127
self.revision = None
130
128
self.index = {}
133
131
self.maxnum = maxnum
134
132
self.compact = compact
135
133
136
gobject.idle_add(self.populate)
137
138
self.connect("destroy", lambda x: self.branch.unlock())
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)
139
144
140
145
def do_get_property(self, property):
141
146
if property.name == 'revno-column-visible':
151
156
elif property.name == 'branch':
152
157
return self.branch
153
158
elif property.name == 'revision':
154
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)
155
163
elif property.name == 'revision-number':
156
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)
157
168
elif property.name == 'children':
158
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)
159
173
elif property.name == 'parents':
160
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)
161
178
else:
162
179
raise AttributeError, 'unknown property %s' % property.name
163
180
194
211
195
212
:param revid: Revision id of revision to display.
196
213
"""
197
self.treeview.set_cursor(self.index[revid])
214
self.treeview.set_cursor(
215
Gtk.TreePath(path=self.index[revid]), None, False)
198
216
self.treeview.grab_focus()
199
217
200
218
def get_children(self):
214
232
def add_tag(self, tag, revid=None):
215
233
if revid is None: revid = self.revision.revision_id
216
234
217
try:
218
self.branch.unlock()
219
235
if lock.release(self.branch):
220
236
try:
221
self.branch.lock_write()
237
lock.acquire(self.branch, lock.WRITE)
222
238
self.model.add_tag(tag, revid)
223
239
finally:
224
self.branch.unlock()
225
226
finally:
227
self.branch.lock_read()
228
229
self.emit('tag-added', tag, revid)
230
240
lock.release(self.branch)
241
242
lock.acquire(self.branch, lock.READ)
243
244
self.emit('tag-added', tag, revid)
245
231
246
def refresh(self):
232
gobject.idle_add(self.populate, self.get_revision())
247
GObject.idle_add(self.populate, self.get_revision())
233
248
234
249
def update(self):
235
250
try:
245
260
def back(self):
246
261
"""Signal handler for the Back button."""
247
262
parents = self.get_parents()
248
if not len(parents):
263
if not parents:
249
264
return
250
265
251
266
for parent_id in parents:
260
275
def forward(self):
261
276
"""Signal handler for the Forward button."""
262
277
children = self.get_children()
263
if not len(children):
278
if not children:
264
279
return
265
280
266
281
for child_id in children:
282
297
should be broken.
283
298
"""
284
299
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)
285
303
self.progress_bar = ui.ui_factory.nested_progress_bar()
286
304
self.progress_bar.update("Loading ancestry graph", 0, 5)
287
305
290
308
broken_line_length = 32
291
309
else:
292
310
broken_line_length = None
293
311
294
312
show_graph = self.graph_column.get_visible()
295
313
296
314
self.branch.lock_read()
297
(linegraphdata, index, columns_len) = linegraph(self.branch.repository.get_graph(),
298
self.start,
299
self.maxnum,
300
broken_line_length,
301
show_graph,
302
self.mainline_only,
303
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)
304
323
305
self.model = TreeModel(self.branch, linegraphdata)
324
self.model.set_line_graph_data(linegraphdata)
306
325
self.graph_cell.columns_len = columns_len
307
width = self.graph_cell.get_size(self.treeview)[2]
326
width = self.graph_cell.get_preferred_width(self.treeview)[1]
308
327
if width > 500:
309
328
width = 500
329
elif width == 0:
330
# The get_preferred_width() call got an insane value.
331
width = 200
310
332
self.graph_column.set_fixed_width(width)
311
333
self.graph_column.set_max_width(width)
312
334
self.index = index
313
335
self.treeview.set_model(self.model)
314
336
315
337
if not revision or revision == NULL_REVISION:
316
self.treeview.set_cursor(0)
338
self.treeview.set_cursor(Gtk.TreePath(path=0), None, False)
317
339
else:
318
340
self.set_revision(revision)
319
341
323
345
self.progress_bar.finished()
324
346
325
347
def construct_treeview(self):
326
self.treeview = gtk.TreeView()
348
self.treeview = Gtk.TreeView()
327
349
328
350
self.treeview.set_rules_hint(True)
329
self.treeview.set_search_column(treemodel.REVNO)
330
331
# Fix old PyGTK bug - by JAM
332
set_tooltip = getattr(self.treeview, 'set_tooltip_column', None)
333
if set_tooltip is not None:
334
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)
335
366
336
367
self._prev_cursor_path = None
337
368
self.treeview.connect("cursor-changed",
347
378
348
379
self.treeview.show()
349
380
350
cell = gtk.CellRendererText()
381
cell = Gtk.CellRendererText()
351
382
cell.set_property("width-chars", 15)
352
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
353
self.revno_column = gtk.TreeViewColumn("Revision No")
354
self.revno_column.set_resizable(False)
355
self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
356
self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
357
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)
358
390
self.revno_column.add_attribute(cell, "text", treemodel.REVNO)
359
391
self.treeview.append_column(self.revno_column)
360
392
361
393
self.graph_cell = CellRendererGraph()
362
self.graph_column = gtk.TreeViewColumn()
363
self.graph_column.set_resizable(False)
364
self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
365
self.graph_column.pack_start(self.graph_cell, expand=True)
366
self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
367
self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
368
self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
369
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)
370
406
self.treeview.append_column(self.graph_column)
371
407
372
cell = gtk.CellRendererText()
408
cell = Gtk.CellRendererText()
373
409
cell.set_property("width-chars", 65)
374
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
375
self.summary_column = gtk.TreeViewColumn("Summary")
376
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)
377
413
self.summary_column.set_expand(True)
378
self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
379
self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
380
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)
381
418
self.summary_column.add_attribute(cell, "markup", treemodel.SUMMARY)
382
419
self.treeview.append_column(self.summary_column)
383
420
384
cell = gtk.CellRendererText()
421
cell = Gtk.CellRendererText()
385
422
cell.set_property("width-chars", 15)
386
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
387
self.committer_column = gtk.TreeViewColumn("Committer")
388
self.committer_column.set_resizable(False)
389
self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
390
self.committer_column.set_fixed_width(200)
391
self.committer_column.pack_start(cell, expand=True)
392
self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
393
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)
394
431
395
cell = gtk.CellRendererText()
432
cell = Gtk.CellRendererText()
396
433
cell.set_property("width-chars", 20)
397
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
398
self.date_column = gtk.TreeViewColumn("Date")
434
cell.set_property("ellipsize", Pango.EllipsizeMode.END)
435
self.date_column = Gtk.TreeViewColumn("Date")
399
436
self.date_column.set_visible(False)
400
self.date_column.set_resizable(False)
401
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)
402
439
self.date_column.set_fixed_width(130)
403
self.date_column.pack_start(cell, expand=True)
440
self.date_column.pack_start(cell, True)
404
441
self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
405
442
self.treeview.append_column(self.date_column)
406
443
407
444
return self.treeview
408
445
409
446
def _on_selection_changed(self, treeview):
410
447
"""callback for when the treeview changes."""
411
448
(path, focus) = treeview.get_cursor()
412
449
if (path is not None) and (path != self._prev_cursor_path):
413
450
self._prev_cursor_path = path # avoid emitting twice per click
414
self.iter = self.model.get_iter(path)
451
self.path = path
415
452
self.emit('revision-selected')
416
453
417
454
def _on_revision_selected(self, widget, event):
418
455
from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
419
456
if event.button == 3:
420
menu = RevisionMenu(self.branch.repository,
421
[self.get_revision().revision_id],
422
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)
423
462
menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
424
menu.popup(None, None, None, event.button, event.get_time())
463
menu.popup(None, None, None, None, event.button, event.get_time())
425
464
426
465
def _on_revision_activated(self, widget, path, col):
427
466
self.emit('revision-activated', path, col)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0