/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-06-29 15:54:40 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629155440-iuzfrlfifnplp9jq
Add simple test for linegraph.

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
9
import sys
14
14
import re
15
15
import treemodel
16
16
 
 
17
from bzrlib.plugins.gtk import _i18n
17
18
from linegraph import linegraph, same_branch
18
19
from graphcell import CellRendererGraph
19
20
from treemodel import TreeModel
20
21
from bzrlib.revision import NULL_REVISION
21
22
 
22
 
class TreeView(gtk.ScrolledWindow):
 
23
class TreeView(gtk.VBox):
23
24
 
24
25
    __gproperties__ = {
25
26
        'branch': (gobject.TYPE_PYOBJECT,
32
33
                     'The currently selected revision',
33
34
                     gobject.PARAM_READWRITE),
34
35
 
 
36
        'revision-number': (gobject.TYPE_STRING,
 
37
                            'Revision number',
 
38
                            'The number of the selected revision',
 
39
                            '',
 
40
                            gobject.PARAM_READABLE),
 
41
 
 
42
        'children': (gobject.TYPE_PYOBJECT,
 
43
                     'Child revisions',
 
44
                     'Children of the currently selected revision',
 
45
                     gobject.PARAM_READABLE),
 
46
 
 
47
        'parents': (gobject.TYPE_PYOBJECT,
 
48
                    'Parent revisions',
 
49
                    'Parents to the currently selected revision',
 
50
                    gobject.PARAM_READABLE),
 
51
 
35
52
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
36
 
                                 'Revision number',
 
53
                                 'Revision number column',
37
54
                                 'Show revision number column',
38
55
                                 True,
39
56
                                 gobject.PARAM_READWRITE),
40
57
 
 
58
        'graph-column-visible': (gobject.TYPE_BOOLEAN,
 
59
                                 'Graph column',
 
60
                                 'Show graph column',
 
61
                                 True,
 
62
                                 gobject.PARAM_READWRITE),
 
63
 
41
64
        'date-column-visible': (gobject.TYPE_BOOLEAN,
42
 
                                 'Revision number',
43
 
                                 'Show revision number column',
 
65
                                 'Date',
 
66
                                 'Show date column',
44
67
                                 False,
45
 
                                 gobject.PARAM_READWRITE)
 
68
                                 gobject.PARAM_READWRITE),
 
69
 
 
70
        'compact': (gobject.TYPE_BOOLEAN,
 
71
                    'Compact view',
 
72
                    'Break ancestry lines to save space',
 
73
                    True,
 
74
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
 
75
 
 
76
        'mainline-only': (gobject.TYPE_BOOLEAN,
 
77
                    'Mainline only',
 
78
                    'Only show the mainline history.',
 
79
                    False,
 
80
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
46
81
 
47
82
    }
48
83
 
52
87
                             ()),
53
88
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
54
89
                              gobject.TYPE_NONE,
55
 
                              ())
 
90
                              ()),
 
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))
56
97
    }
57
98
 
58
 
    def __init__(self, branch, start, maxnum, broken_line_length=None):
 
99
    def __init__(self, branch, start, maxnum, compact=True):
59
100
        """Create a new TreeView.
60
101
 
61
102
        :param branch: Branch object for branch to show.
65
106
        :param broken_line_length: After how much lines to break 
66
107
                                   branches.
67
108
        """
68
 
        gtk.ScrolledWindow.__init__(self)
69
 
 
70
 
        self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
71
 
        self.set_shadow_type(gtk.SHADOW_IN)
72
 
 
73
 
        self.construct_treeview()
74
 
 
 
109
        gtk.VBox.__init__(self, spacing=0)
 
110
 
 
111
        self.pack_start(self.construct_loading_msg(), expand=False, fill=True)
 
112
        self.connect('revisions-loaded', 
 
113
                lambda x: self.loading_msg_box.hide())
 
114
 
 
115
        self.scrolled_window = gtk.ScrolledWindow()
 
116
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
 
117
                                        gtk.POLICY_AUTOMATIC)
 
118
        self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
 
119
        self.scrolled_window.show()
 
120
        self.pack_start(self.scrolled_window, expand=True, fill=True)
 
121
 
 
122
        self.scrolled_window.add(self.construct_treeview())
 
123
        
 
124
 
 
125
        self.iter = None
75
126
        self.branch = branch
76
 
        self.branch.lock_read()
77
 
 
78
 
        gobject.idle_add(self.populate, start, maxnum, 
79
 
                         broken_line_length)
80
 
 
81
127
        self.revision = None
82
 
        self.children = None
83
 
        self.parents  = None
84
 
 
85
 
        self.connect('destroy', lambda w: self.branch.unlock())
 
128
 
 
129
        self.start = start
 
130
        self.maxnum = maxnum
 
131
        self.compact = compact
 
132
 
 
133
        gobject.idle_add(self.populate)
 
134
 
 
135
        self.connect("destroy", lambda x: self.branch.unlock())
86
136
 
87
137
    def do_get_property(self, property):
88
138
        if property.name == 'revno-column-visible':
89
139
            return self.revno_column.get_visible()
 
140
        elif property.name == 'graph-column-visible':
 
141
            return self.graph_column.get_visible()
90
142
        elif property.name == 'date-column-visible':
91
143
            return self.date_column.get_visible()
 
144
        elif property.name == 'compact':
 
145
            return self.compact
 
146
        elif property.name == 'mainline-only':
 
147
            return self.mainline_only
92
148
        elif property.name == 'branch':
93
149
            return self.branch
94
150
        elif property.name == 'revision':
95
 
            return self.revision
 
151
            return self.model.get_value(self.iter, treemodel.REVISION)
 
152
        elif property.name == 'revision-number':
 
153
            return self.model.get_value(self.iter, treemodel.REVNO)
 
154
        elif property.name == 'children':
 
155
            return self.model.get_value(self.iter, treemodel.CHILDREN)
 
156
        elif property.name == 'parents':
 
157
            return self.model.get_value(self.iter, treemodel.PARENTS)
96
158
        else:
97
159
            raise AttributeError, 'unknown property %s' % property.name
98
160
 
99
161
    def do_set_property(self, property, value):
100
162
        if property.name == 'revno-column-visible':
101
163
            self.revno_column.set_visible(value)
 
164
        elif property.name == 'graph-column-visible':
 
165
            self.graph_column.set_visible(value)
102
166
        elif property.name == 'date-column-visible':
103
167
            self.date_column.set_visible(value)
 
168
        elif property.name == 'compact':
 
169
            self.compact = value
 
170
        elif property.name == 'mainline-only':
 
171
            self.mainline_only = value
104
172
        elif property.name == 'branch':
105
173
            self.branch = value
106
174
        elif property.name == 'revision':
110
178
 
111
179
    def get_revision(self):
112
180
        """Return revision id of currently selected revision, or None."""
113
 
        return self.revision
 
181
        return self.get_property('revision')
 
182
 
 
183
    def set_revision(self, revision):
 
184
        self.set_property('revision', revision)
114
185
 
115
186
    def set_revision_id(self, revid):
116
187
        """Change the currently selected revision.
125
196
 
126
197
        :return: list of revision ids.
127
198
        """
128
 
        return self.children
 
199
        return self.get_property('children')
129
200
 
130
201
    def get_parents(self):
131
202
        """Return the parents of the currently selected revision.
132
203
 
133
204
        :return: list of revision ids.
134
205
        """
135
 
        return self.parents
 
206
        return self.get_property('parents')
 
207
 
 
208
    def add_tag(self, tag, revid=None):
 
209
        if revid is None: revid = self.revision.revision_id
 
210
 
 
211
        try:
 
212
            self.branch.unlock()
 
213
 
 
214
            try:
 
215
                self.branch.lock_write()
 
216
                self.model.add_tag(tag, revid)
 
217
            finally:
 
218
                self.branch.unlock()
 
219
 
 
220
        finally:
 
221
            self.branch.lock_read()
 
222
 
 
223
        self.emit('tag-added', tag, revid)
136
224
        
 
225
    def refresh(self):
 
226
        self.loading_msg_box.show()
 
227
        gobject.idle_add(self.populate, self.get_revision())
 
228
 
 
229
    def update(self):
 
230
        try:
 
231
            self.branch.unlock()
 
232
            try:
 
233
                self.branch.lock_write()
 
234
                self.branch.update()
 
235
            finally:
 
236
                self.branch.unlock()
 
237
        finally:
 
238
            self.branch.lock_read()
 
239
 
137
240
    def back(self):
138
241
        """Signal handler for the Back button."""
139
 
        (path, col) = self.treeview.get_cursor()
140
 
        revision = self.model[path][treemodel.REVISION]
141
 
        parents = self.model[path][treemodel.PARENTS]
 
242
        parents = self.get_parents()
142
243
        if not len(parents):
143
244
            return
144
245
 
145
246
        for parent_id in parents:
146
247
            parent_index = self.index[parent_id]
147
248
            parent = self.model[parent_index][treemodel.REVISION]
148
 
            if same_branch(revision, parent):
149
 
                self.treeview.set_cursor(parent_index)
 
249
            if same_branch(self.get_revision(), parent):
 
250
                self.set_revision(parent)
150
251
                break
151
252
        else:
152
 
            self.treeview.set_cursor(self.index[parents[0]])
153
 
        self.treeview.grab_focus()
 
253
            self.set_revision_id(parents[0])
154
254
 
155
255
    def forward(self):
156
256
        """Signal handler for the Forward button."""
157
 
        (path, col) = self.treeview.get_cursor()
158
 
        revision = self.model[path][treemodel.REVISION]
159
 
        children = self.model[path][treemodel.CHILDREN]
 
257
        children = self.get_children()
160
258
        if not len(children):
161
259
            return
162
260
 
163
261
        for child_id in children:
164
262
            child_index = self.index[child_id]
165
263
            child = self.model[child_index][treemodel.REVISION]
166
 
            if same_branch(child, revision):
167
 
                self.treeview.set_cursor(child_index)
 
264
            if same_branch(child, self.get_revision()):
 
265
                self.set_revision(child)
168
266
                break
169
267
        else:
170
 
            self.treeview.set_cursor(self.index[children[0]])
171
 
        self.treeview.grab_focus()
 
268
            self.set_revision_id(children[0])
172
269
 
173
 
    def populate(self, start, maxnum, broken_line_length=None):
 
270
    def populate(self, revision=None):
174
271
        """Fill the treeview with contents.
175
272
 
176
273
        :param start: Revision id of revision to start with.
179
276
        :param broken_line_length: After how much lines branches \
180
277
                       should be broken.
181
278
        """
182
 
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
183
 
                                                        start,
184
 
                                                        maxnum, 
185
 
                                                        broken_line_length)
186
 
 
187
 
        self.model = TreeModel(self.branch.repository, linegraphdata)
 
279
 
 
280
        if self.compact:
 
281
            broken_line_length = 32
 
282
        else:
 
283
            broken_line_length = None
 
284
        
 
285
        show_graph = self.graph_column.get_visible()
 
286
 
 
287
        self.branch.lock_read()
 
288
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository.get_graph(),
 
289
                                                        (self.start,) , # Sequence of start revisions
 
290
                                                        self.maxnum, 
 
291
                                                        broken_line_length,
 
292
                                                        show_graph,
 
293
                                                        self.mainline_only)
 
294
 
 
295
        self.model = TreeModel(self.branch, linegraphdata)
188
296
        self.graph_cell.columns_len = columns_len
189
297
        width = self.graph_cell.get_size(self.treeview)[2]
 
298
        if width > 500:
 
299
            width = 500
190
300
        self.graph_column.set_fixed_width(width)
191
301
        self.graph_column.set_max_width(width)
192
302
        self.index = index
193
303
        self.treeview.set_model(self.model)
194
 
        self.treeview.set_cursor(0)
 
304
 
 
305
        if not revision or revision == NULL_REVISION:
 
306
            self.treeview.set_cursor(0)
 
307
        else:
 
308
            self.set_revision(revision)
 
309
 
195
310
        self.emit('revisions-loaded')
196
311
 
197
312
        return False
198
313
 
199
 
    def show_diff(self, branch, revid, parentid=None):
200
 
        """Open a new window to show a diff between the given revisions."""
201
 
        from bzrlib.plugins.gtk.diff import DiffWindow
202
 
        window = DiffWindow(parent=self)
203
 
 
204
 
        rev_tree = branch.repository.revision_tree(revid)
205
 
 
206
 
        if parentid is None:
207
 
            parentid = NULL_REVISION
208
 
 
209
 
        parent_tree = branch.repository.revision_tree(parentid)
210
 
 
211
 
        description = revid + " - " + branch.nick
212
 
        window.set_diff(description, rev_tree, parent_tree)
213
 
        window.show()
214
 
 
215
314
    def construct_treeview(self):
216
315
        self.treeview = gtk.TreeView()
217
316
 
218
317
        self.treeview.set_rules_hint(True)
219
318
        self.treeview.set_search_column(treemodel.REVNO)
220
 
        self.treeview.set_tooltip_column(treemodel.MESSAGE)
 
319
        
 
320
        # Fix old PyGTK bug - by JAM
 
321
        set_tooltip = getattr(self.treeview, 'set_tooltip_column', None)
 
322
        if set_tooltip is not None:
 
323
            set_tooltip(treemodel.MESSAGE)
221
324
 
222
 
        self.treeview.get_selection().connect("changed",
 
325
        self.treeview.connect("cursor-changed",
223
326
                self._on_selection_changed)
224
327
 
225
328
        self.treeview.connect("row-activated", 
230
333
 
231
334
        self.treeview.set_property('fixed-height-mode', True)
232
335
 
233
 
        self.add(self.treeview)
234
336
        self.treeview.show()
235
337
 
236
338
        cell = gtk.CellRendererText()
237
339
        cell.set_property("width-chars", 15)
238
340
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
239
341
        self.revno_column = gtk.TreeViewColumn("Revision No")
240
 
        self.revno_column.set_resizable(True)
 
342
        self.revno_column.set_resizable(False)
241
343
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
242
344
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
243
345
        self.revno_column.pack_start(cell, expand=True)
246
348
 
247
349
        self.graph_cell = CellRendererGraph()
248
350
        self.graph_column = gtk.TreeViewColumn()
249
 
        self.graph_column.set_resizable(True)
 
351
        self.graph_column.set_resizable(False)
250
352
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
251
 
        self.graph_column.pack_start(self.graph_cell, expand=False)
 
353
        self.graph_column.pack_start(self.graph_cell, expand=True)
252
354
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
 
355
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
253
356
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
254
357
        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
255
358
        self.treeview.append_column(self.graph_column)
257
360
        cell = gtk.CellRendererText()
258
361
        cell.set_property("width-chars", 65)
259
362
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
260
 
        self.msg_column = gtk.TreeViewColumn("Message")
261
 
        self.msg_column.set_resizable(True)
262
 
        self.msg_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
263
 
        self.msg_column.set_fixed_width(cell.get_size(self.treeview)[2])
264
 
        self.msg_column.pack_start(cell, expand=True)
265
 
        self.msg_column.add_attribute(cell, "text", treemodel.MESSAGE)
266
 
        self.treeview.append_column(self.msg_column)
 
363
        self.summary_column = gtk.TreeViewColumn("Summary")
 
364
        self.summary_column.set_resizable(False)
 
365
        self.summary_column.set_expand(True)
 
366
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
367
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
368
        self.summary_column.pack_start(cell, expand=True)
 
369
        self.summary_column.add_attribute(cell, "markup", treemodel.SUMMARY)
 
370
        self.treeview.append_column(self.summary_column)
267
371
 
268
372
        cell = gtk.CellRendererText()
269
373
        cell.set_property("width-chars", 15)
270
374
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
271
375
        self.committer_column = gtk.TreeViewColumn("Committer")
272
 
        self.committer_column.set_resizable(True)
 
376
        self.committer_column.set_resizable(False)
273
377
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
274
 
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
378
        self.committer_column.set_fixed_width(200)
275
379
        self.committer_column.pack_start(cell, expand=True)
276
 
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITER)
 
380
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
277
381
        self.treeview.append_column(self.committer_column)
278
382
 
279
383
        cell = gtk.CellRendererText()
281
385
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
282
386
        self.date_column = gtk.TreeViewColumn("Date")
283
387
        self.date_column.set_visible(False)
284
 
        self.date_column.set_resizable(True)
 
388
        self.date_column.set_resizable(False)
285
389
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
286
 
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
390
        self.date_column.set_fixed_width(130)
287
391
        self.date_column.pack_start(cell, expand=True)
288
392
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
289
393
        self.treeview.append_column(self.date_column)
 
394
        
 
395
        return self.treeview
 
396
    
 
397
    def construct_loading_msg(self):
 
398
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
 
399
                                                 gtk.ICON_SIZE_BUTTON)
 
400
        image_loading.show()
 
401
        
 
402
        label_loading = gtk.Label(
 
403
            _i18n("Please wait, loading ancestral graph..."))
 
404
        label_loading.set_alignment(0.0, 0.5)
 
405
        label_loading.show()
 
406
        
 
407
        self.loading_msg_box = gtk.HBox()
 
408
        self.loading_msg_box.set_spacing(5)
 
409
        self.loading_msg_box.set_border_width(5)        
 
410
        self.loading_msg_box.pack_start(image_loading, False, False)
 
411
        self.loading_msg_box.pack_start(label_loading, True, True)
 
412
        self.loading_msg_box.show()
 
413
        
 
414
        return self.loading_msg_box
290
415
 
291
 
    def _on_selection_changed(self, selection, *args):
 
416
    def _on_selection_changed(self, treeview):
292
417
        """callback for when the treeview changes."""
293
 
        (model, selected_rows) = selection.get_selected_rows()
294
 
        if len(selected_rows) > 0:
295
 
            iter = self.model.get_iter(selected_rows[0])
296
 
            self.revision = self.model.get_value(iter, treemodel.REVISION)
297
 
            self.parents = self.model.get_value(iter, treemodel.PARENTS)
298
 
            self.children = self.model.get_value(iter, treemodel.CHILDREN)
299
 
 
 
418
        (path, focus) = treeview.get_cursor()
 
419
        if path is not None:
 
420
            self.iter = self.model.get_iter(path)
300
421
            self.emit('revision-selected')
301
422
 
302
423
    def _on_revision_selected(self, widget, event):
305
426
            menu = RevisionPopupMenu(self.branch.repository, 
306
427
                [self.get_revision().revision_id],
307
428
                self.branch)
 
429
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
308
430
            menu.popup(None, None, None, event.button, event.get_time())
309
431
 
310
432
    def _on_revision_activated(self, widget, path, col):
311
 
        # TODO: more than one parent
312
 
        """Callback for when a treeview row gets activated."""
313
 
        revision_id = self.model[path][treemodel.REVID]
314
 
        parents = self.model[path][treemodel.PARENTS]
315
 
 
316
 
        if len(parents) == 0:
317
 
            parent_id = None
318
 
        else:
319
 
            parent_id = parents[0]
320
 
 
321
 
        self.show_diff(self.branch, revision_id, parent_id)
322
 
        self.treeview.grab_focus()
 
433
        self.emit('revision-activated', path, col)