/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 viz/treeview.py

  • Committer: John Arbash Meinel
  • Date: 2007-10-30 21:15:13 UTC
  • mfrom: (326 trunk)
  • mto: (330.3.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 368.
  • Revision ID: john@arbash-meinel.com-20071030211513-l8ukdfa81g1y74mi
Merge the latest trunk 326

Show diffs side-by-side

added added

removed removed

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