/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
13
13
import pango
14
14
import re
15
15
import treemodel
16
 
from bzrlib import ui
17
16
 
18
 
from bzrlib.plugins.gtk import _i18n
19
17
from linegraph import linegraph, same_branch
20
18
from graphcell import CellRendererGraph
21
19
from treemodel import TreeModel
22
20
from bzrlib.revision import NULL_REVISION
23
21
 
24
 
class TreeView(gtk.VBox):
 
22
class TreeView(gtk.ScrolledWindow):
25
23
 
26
24
    __gproperties__ = {
27
25
        'branch': (gobject.TYPE_PYOBJECT,
51
49
                    gobject.PARAM_READABLE),
52
50
 
53
51
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
54
 
                                 'Revision number column',
 
52
                                 'Revision number',
55
53
                                 'Show revision number column',
56
54
                                 True,
57
55
                                 gobject.PARAM_READWRITE),
58
56
 
59
 
        'graph-column-visible': (gobject.TYPE_BOOLEAN,
60
 
                                 'Graph column',
61
 
                                 'Show graph column',
62
 
                                 True,
63
 
                                 gobject.PARAM_READWRITE),
64
 
 
65
57
        'date-column-visible': (gobject.TYPE_BOOLEAN,
66
58
                                 'Date',
67
59
                                 'Show date column',
72
64
                    'Compact view',
73
65
                    'Break ancestry lines to save space',
74
66
                    True,
75
 
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
76
 
 
77
 
        'mainline-only': (gobject.TYPE_BOOLEAN,
78
 
                    'Mainline only',
79
 
                    'Only show the mainline history.',
80
 
                    False,
81
 
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
 
67
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE)
82
68
 
83
69
    }
84
70
 
85
71
    __gsignals__ = {
 
72
        'revisions-loaded': (gobject.SIGNAL_RUN_FIRST, 
 
73
                             gobject.TYPE_NONE,
 
74
                             ()),
86
75
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
87
76
                              gobject.TYPE_NONE,
88
77
                              ()),
89
 
        'revision-activated': (gobject.SIGNAL_RUN_FIRST,
90
 
                              gobject.TYPE_NONE,
91
 
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
92
78
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
93
79
                              gobject.TYPE_NONE,
94
80
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
104
90
        :param broken_line_length: After how much lines to break 
105
91
                                   branches.
106
92
        """
107
 
        gtk.VBox.__init__(self, spacing=0)
108
 
 
109
 
        self.scrolled_window = gtk.ScrolledWindow()
110
 
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
111
 
                                        gtk.POLICY_AUTOMATIC)
112
 
        self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
113
 
        self.scrolled_window.show()
114
 
        self.pack_start(self.scrolled_window, expand=True, fill=True)
115
 
 
116
 
        self.scrolled_window.add(self.construct_treeview())
 
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()
117
99
 
118
100
        self.iter = None
119
101
        self.branch = branch
130
112
    def do_get_property(self, property):
131
113
        if property.name == 'revno-column-visible':
132
114
            return self.revno_column.get_visible()
133
 
        elif property.name == 'graph-column-visible':
134
 
            return self.graph_column.get_visible()
135
115
        elif property.name == 'date-column-visible':
136
116
            return self.date_column.get_visible()
137
117
        elif property.name == 'compact':
138
118
            return self.compact
139
 
        elif property.name == 'mainline-only':
140
 
            return self.mainline_only
141
119
        elif property.name == 'branch':
142
120
            return self.branch
143
121
        elif property.name == 'revision':
154
132
    def do_set_property(self, property, value):
155
133
        if property.name == 'revno-column-visible':
156
134
            self.revno_column.set_visible(value)
157
 
        elif property.name == 'graph-column-visible':
158
 
            self.graph_column.set_visible(value)
159
135
        elif property.name == 'date-column-visible':
160
136
            self.date_column.set_visible(value)
161
137
        elif property.name == 'compact':
162
138
            self.compact = value
163
 
        elif property.name == 'mainline-only':
164
 
            self.mainline_only = value
165
139
        elif property.name == 'branch':
166
140
            self.branch = value
167
141
        elif property.name == 'revision':
269
243
                       should be broken.
270
244
        """
271
245
 
272
 
        loading_progress = ui.ui_factory.nested_progress_bar()
273
 
        loading_progress.update(msg="Loading ancestry graph", total=5)
274
 
 
275
 
        try:
276
 
            if self.compact:
277
 
                broken_line_length = 32
278
 
            else:
279
 
                broken_line_length = None
280
 
            
281
 
            show_graph = self.graph_column.get_visible()
282
 
 
283
 
            self.branch.lock_read()
284
 
            (linegraphdata, index, columns_len) = linegraph(self.branch.repository.get_graph(),
285
 
                                                            self.start,
286
 
                                                            self.maxnum, 
287
 
                                                            broken_line_length,
288
 
                                                            show_graph,
289
 
                                                            self.mainline_only,
290
 
                                                            loading_progress)
291
 
 
292
 
            self.model = TreeModel(self.branch, linegraphdata)
293
 
            self.graph_cell.columns_len = columns_len
294
 
            width = self.graph_cell.get_size(self.treeview)[2]
295
 
            if width > 500:
296
 
                width = 500
297
 
            self.graph_column.set_fixed_width(width)
298
 
            self.graph_column.set_max_width(width)
299
 
            self.index = index
300
 
            self.treeview.set_model(self.model)
301
 
 
302
 
            if not revision or revision == NULL_REVISION:
303
 
                self.treeview.set_cursor(0)
304
 
            else:
305
 
                self.set_revision(revision)
306
 
 
307
 
            self.emit('revisions-loaded')
308
 
 
309
 
            return False
310
 
        finally:
311
 
            loading_progress.finished()
 
246
        if self.compact:
 
247
            broken_line_length = 32
 
248
        else:
 
249
            broken_line_length = None
 
250
 
 
251
        self.branch.lock_read()
 
252
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
 
253
                                                        self.start,
 
254
                                                        self.maxnum, 
 
255
                                                        broken_line_length)
 
256
 
 
257
        self.model = TreeModel(self.branch, linegraphdata)
 
258
        self.graph_cell.columns_len = columns_len
 
259
        width = self.graph_cell.get_size(self.treeview)[2]
 
260
        if width > 500:
 
261
            width = 500
 
262
        self.graph_column.set_fixed_width(width)
 
263
        self.graph_column.set_max_width(width)
 
264
        self.index = index
 
265
        self.treeview.set_model(self.model)
 
266
 
 
267
        if revision is None:
 
268
            self.treeview.set_cursor(0)
 
269
        else:
 
270
            self.set_revision(revision)
 
271
 
 
272
        self.emit('revisions-loaded')
 
273
 
 
274
        return False
 
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()
312
298
 
313
299
    def construct_treeview(self):
314
300
        self.treeview = gtk.TreeView()
332
318
 
333
319
        self.treeview.set_property('fixed-height-mode', True)
334
320
 
 
321
        self.add(self.treeview)
335
322
        self.treeview.show()
336
323
 
337
324
        cell = gtk.CellRendererText()
338
325
        cell.set_property("width-chars", 15)
339
326
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
340
327
        self.revno_column = gtk.TreeViewColumn("Revision No")
341
 
        self.revno_column.set_resizable(False)
 
328
        self.revno_column.set_resizable(True)
342
329
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
343
330
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
344
331
        self.revno_column.pack_start(cell, expand=True)
347
334
 
348
335
        self.graph_cell = CellRendererGraph()
349
336
        self.graph_column = gtk.TreeViewColumn()
350
 
        self.graph_column.set_resizable(False)
 
337
        self.graph_column.set_resizable(True)
351
338
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
352
 
        self.graph_column.pack_start(self.graph_cell, expand=True)
 
339
        self.graph_column.pack_start(self.graph_cell, expand=False)
353
340
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
354
341
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
355
342
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
360
347
        cell.set_property("width-chars", 65)
361
348
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
362
349
        self.summary_column = gtk.TreeViewColumn("Summary")
363
 
        self.summary_column.set_resizable(False)
364
 
        self.summary_column.set_expand(True)
 
350
        self.summary_column.set_resizable(True)
365
351
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
366
352
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
367
353
        self.summary_column.pack_start(cell, expand=True)
372
358
        cell.set_property("width-chars", 15)
373
359
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
374
360
        self.committer_column = gtk.TreeViewColumn("Committer")
375
 
        self.committer_column.set_resizable(False)
 
361
        self.committer_column.set_resizable(True)
376
362
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
377
 
        self.committer_column.set_fixed_width(200)
 
363
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
378
364
        self.committer_column.pack_start(cell, expand=True)
379
365
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
380
366
        self.treeview.append_column(self.committer_column)
384
370
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
385
371
        self.date_column = gtk.TreeViewColumn("Date")
386
372
        self.date_column.set_visible(False)
387
 
        self.date_column.set_resizable(False)
 
373
        self.date_column.set_resizable(True)
388
374
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
389
 
        self.date_column.set_fixed_width(130)
 
375
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
390
376
        self.date_column.pack_start(cell, expand=True)
391
377
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
392
378
        self.treeview.append_column(self.date_column)
393
 
        
394
 
        return self.treeview
395
379
 
396
380
    def _on_selection_changed(self, treeview):
397
381
        """callback for when the treeview changes."""
410
394
            menu.popup(None, None, None, event.button, event.get_time())
411
395
 
412
396
    def _on_revision_activated(self, widget, path, col):
413
 
        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()