/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: Daniel Schierbeck
  • Date: 2008-01-23 16:36:21 UTC
  • mto: (423.1.8 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: daniel.schierbeck@gmail.com-20080123163621-x8kublc38ojipnly
Made the revision popup menu correctly add tags.

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
18
17
from linegraph import linegraph, same_branch
19
18
from graphcell import CellRendererGraph
20
19
from treemodel import TreeModel
21
20
from bzrlib.revision import NULL_REVISION
22
21
 
23
 
class TreeView(gtk.VBox):
 
22
class TreeView(gtk.ScrolledWindow):
24
23
 
25
24
    __gproperties__ = {
26
25
        'branch': (gobject.TYPE_PYOBJECT,
50
49
                    gobject.PARAM_READABLE),
51
50
 
52
51
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
53
 
                                 'Revision number column',
 
52
                                 'Revision number',
54
53
                                 'Show revision number column',
55
54
                                 True,
56
55
                                 gobject.PARAM_READWRITE),
57
56
 
58
 
        'graph-column-visible': (gobject.TYPE_BOOLEAN,
59
 
                                 'Graph column',
60
 
                                 'Show graph column',
61
 
                                 True,
62
 
                                 gobject.PARAM_READWRITE),
63
 
 
64
57
        'date-column-visible': (gobject.TYPE_BOOLEAN,
65
58
                                 'Date',
66
59
                                 'Show date column',
71
64
                    'Compact view',
72
65
                    'Break ancestry lines to save space',
73
66
                    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),
 
67
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE)
81
68
 
82
69
    }
83
70
 
88
75
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
89
76
                              gobject.TYPE_NONE,
90
77
                              ()),
91
 
        'revision-activated': (gobject.SIGNAL_RUN_FIRST,
92
 
                              gobject.TYPE_NONE,
93
 
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
94
78
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
95
79
                              gobject.TYPE_NONE,
96
80
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
106
90
        :param broken_line_length: After how much lines to break 
107
91
                                   branches.
108
92
        """
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
 
        
 
93
        gtk.ScrolledWindow.__init__(self)
 
94
 
 
95
        self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
96
        self.set_shadow_type(gtk.SHADOW_IN)
 
97
 
 
98
        self.construct_treeview()
124
99
 
125
100
        self.iter = None
126
101
        self.branch = branch
137
112
    def do_get_property(self, property):
138
113
        if property.name == 'revno-column-visible':
139
114
            return self.revno_column.get_visible()
140
 
        elif property.name == 'graph-column-visible':
141
 
            return self.graph_column.get_visible()
142
115
        elif property.name == 'date-column-visible':
143
116
            return self.date_column.get_visible()
144
117
        elif property.name == 'compact':
145
118
            return self.compact
146
 
        elif property.name == 'mainline-only':
147
 
            return self.mainline_only
148
119
        elif property.name == 'branch':
149
120
            return self.branch
150
121
        elif property.name == 'revision':
161
132
    def do_set_property(self, property, value):
162
133
        if property.name == 'revno-column-visible':
163
134
            self.revno_column.set_visible(value)
164
 
        elif property.name == 'graph-column-visible':
165
 
            self.graph_column.set_visible(value)
166
135
        elif property.name == 'date-column-visible':
167
136
            self.date_column.set_visible(value)
168
137
        elif property.name == 'compact':
169
138
            self.compact = value
170
 
        elif property.name == 'mainline-only':
171
 
            self.mainline_only = value
172
139
        elif property.name == 'branch':
173
140
            self.branch = value
174
141
        elif property.name == 'revision':
223
190
        self.emit('tag-added', tag, revid)
224
191
        
225
192
    def refresh(self):
226
 
        self.loading_msg_box.show()
227
193
        gobject.idle_add(self.populate, self.get_revision())
228
194
 
229
195
    def update(self):
281
247
            broken_line_length = 32
282
248
        else:
283
249
            broken_line_length = None
284
 
        
285
 
        show_graph = self.graph_column.get_visible()
286
250
 
287
251
        self.branch.lock_read()
288
252
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
289
 
                                                        (self.start,) , # Sequence of start revisions
 
253
                                                        self.start,
290
254
                                                        self.maxnum, 
291
 
                                                        broken_line_length,
292
 
                                                        show_graph,
293
 
                                                        self.mainline_only)
 
255
                                                        broken_line_length)
294
256
 
295
257
        self.model = TreeModel(self.branch, linegraphdata)
296
258
        self.graph_cell.columns_len = columns_len
302
264
        self.index = index
303
265
        self.treeview.set_model(self.model)
304
266
 
305
 
        if not revision or revision == NULL_REVISION:
 
267
        if revision is None:
306
268
            self.treeview.set_cursor(0)
307
269
        else:
308
270
            self.set_revision(revision)
311
273
 
312
274
        return False
313
275
 
 
276
    def show_diff(self, revid=None, parentid=None):
 
277
        """Open a new window to show a diff between the given revisions."""
 
278
        from bzrlib.plugins.gtk.diff import DiffWindow
 
279
        window = DiffWindow(parent=self)
 
280
 
 
281
        parents = self.get_parents()
 
282
 
 
283
        if revid is None:
 
284
            revid = self.get_revision().revision_id
 
285
 
 
286
            if parentid is None and len(parents) > 0:
 
287
                parentid = parents[0]
 
288
 
 
289
        if parentid is None:
 
290
            parentid = NULL_REVISION
 
291
 
 
292
        rev_tree    = self.branch.repository.revision_tree(revid)
 
293
        parent_tree = self.branch.repository.revision_tree(parentid)
 
294
 
 
295
        description = revid + " - " + self.branch.nick
 
296
        window.set_diff(description, rev_tree, parent_tree)
 
297
        window.show()
 
298
 
314
299
    def construct_treeview(self):
315
300
        self.treeview = gtk.TreeView()
316
301
 
333
318
 
334
319
        self.treeview.set_property('fixed-height-mode', True)
335
320
 
 
321
        self.add(self.treeview)
336
322
        self.treeview.show()
337
323
 
338
324
        cell = gtk.CellRendererText()
339
325
        cell.set_property("width-chars", 15)
340
326
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
341
327
        self.revno_column = gtk.TreeViewColumn("Revision No")
342
 
        self.revno_column.set_resizable(False)
 
328
        self.revno_column.set_resizable(True)
343
329
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
344
330
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
345
331
        self.revno_column.pack_start(cell, expand=True)
348
334
 
349
335
        self.graph_cell = CellRendererGraph()
350
336
        self.graph_column = gtk.TreeViewColumn()
351
 
        self.graph_column.set_resizable(False)
 
337
        self.graph_column.set_resizable(True)
352
338
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
353
 
        self.graph_column.pack_start(self.graph_cell, expand=True)
 
339
        self.graph_column.pack_start(self.graph_cell, expand=False)
354
340
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
355
341
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
356
342
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
361
347
        cell.set_property("width-chars", 65)
362
348
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
363
349
        self.summary_column = gtk.TreeViewColumn("Summary")
364
 
        self.summary_column.set_resizable(False)
365
 
        self.summary_column.set_expand(True)
 
350
        self.summary_column.set_resizable(True)
366
351
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
367
352
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
368
353
        self.summary_column.pack_start(cell, expand=True)
373
358
        cell.set_property("width-chars", 15)
374
359
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
375
360
        self.committer_column = gtk.TreeViewColumn("Committer")
376
 
        self.committer_column.set_resizable(False)
 
361
        self.committer_column.set_resizable(True)
377
362
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
378
 
        self.committer_column.set_fixed_width(200)
 
363
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
379
364
        self.committer_column.pack_start(cell, expand=True)
380
365
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
381
366
        self.treeview.append_column(self.committer_column)
385
370
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
386
371
        self.date_column = gtk.TreeViewColumn("Date")
387
372
        self.date_column.set_visible(False)
388
 
        self.date_column.set_resizable(False)
 
373
        self.date_column.set_resizable(True)
389
374
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
390
 
        self.date_column.set_fixed_width(130)
 
375
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
391
376
        self.date_column.pack_start(cell, expand=True)
392
377
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
393
378
        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
415
379
 
416
380
    def _on_selection_changed(self, treeview):
417
381
        """callback for when the treeview changes."""
430
394
            menu.popup(None, None, None, event.button, event.get_time())
431
395
 
432
396
    def _on_revision_activated(self, widget, path, col):
433
 
        self.emit('revision-activated', path, col)
 
397
        # TODO: more than one parent
 
398
        """Callback for when a treeview row gets activated."""
 
399
        revision_id = self.model[path][treemodel.REVID]
 
400
        parents = self.model[path][treemodel.PARENTS]
 
401
 
 
402
        if len(parents) == 0:
 
403
            parent_id = None
 
404
        else:
 
405
            parent_id = parents[0]
 
406
 
 
407
        self.show_diff(revision_id, parent_id)
 
408
        self.treeview.grab_focus()