/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: Daniel Schierbeck
  • Date: 2007-11-22 00:00:19 UTC
  • mto: This revision was merged to the branch mainline in revision 402.
  • Revision ID: daniel.schierbeck@gmail.com-20071122000019-t5psmdwm3cb38xud
Added update() method to TreeView.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/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',
67
60
                                 False,
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),
 
61
                                 gobject.PARAM_READWRITE)
81
62
 
82
63
    }
83
64
 
87
68
                             ()),
88
69
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
89
70
                              gobject.TYPE_NONE,
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))
 
71
                              ())
97
72
    }
98
73
 
99
 
    def __init__(self, branch, start, maxnum, compact=True):
 
74
    def __init__(self, branch, start, maxnum, broken_line_length=None):
100
75
        """Create a new TreeView.
101
76
 
102
77
        :param branch: Branch object for branch to show.
106
81
        :param broken_line_length: After how much lines to break 
107
82
                                   branches.
108
83
        """
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
 
84
        gtk.ScrolledWindow.__init__(self)
 
85
 
 
86
        self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
87
        self.set_shadow_type(gtk.SHADOW_IN)
 
88
 
 
89
        self.construct_treeview()
 
90
 
 
91
        self.iter   = None
126
92
        self.branch = branch
127
 
        self.revision = None
128
93
 
129
94
        self.start = start
130
95
        self.maxnum = maxnum
131
 
        self.compact = compact
 
96
        self.broken_line_length = broken_line_length
132
97
 
133
98
        gobject.idle_add(self.populate)
134
99
 
137
102
    def do_get_property(self, property):
138
103
        if property.name == 'revno-column-visible':
139
104
            return self.revno_column.get_visible()
140
 
        elif property.name == 'graph-column-visible':
141
 
            return self.graph_column.get_visible()
142
105
        elif property.name == 'date-column-visible':
143
106
            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
148
107
        elif property.name == 'branch':
149
108
            return self.branch
150
109
        elif property.name == 'revision':
161
120
    def do_set_property(self, property, value):
162
121
        if property.name == 'revno-column-visible':
163
122
            self.revno_column.set_visible(value)
164
 
        elif property.name == 'graph-column-visible':
165
 
            self.graph_column.set_visible(value)
166
123
        elif property.name == 'date-column-visible':
167
124
            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
172
125
        elif property.name == 'branch':
173
126
            self.branch = value
174
127
        elif property.name == 'revision':
204
157
        :return: list of revision ids.
205
158
        """
206
159
        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)
224
160
        
225
 
    def refresh(self):
226
 
        self.loading_msg_box.show()
227
 
        gobject.idle_add(self.populate, self.get_revision())
228
 
 
229
161
    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()
 
162
        self.iter = None
 
163
        gobject.idle_add(self.populate)
239
164
 
240
165
    def back(self):
241
166
        """Signal handler for the Back button."""
267
192
        else:
268
193
            self.set_revision_id(children[0])
269
194
 
270
 
    def populate(self, revision=None):
 
195
    def populate(self):
271
196
        """Fill the treeview with contents.
272
197
 
273
198
        :param start: Revision id of revision to start with.
276
201
        :param broken_line_length: After how much lines branches \
277
202
                       should be broken.
278
203
        """
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
204
        self.branch.lock_read()
288
205
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
289
 
                                                        (self.start,) , # Sequence of start revisions
 
206
                                                        self.start,
290
207
                                                        self.maxnum, 
291
 
                                                        broken_line_length,
292
 
                                                        show_graph,
293
 
                                                        self.mainline_only)
 
208
                                                        self.broken_line_length)
294
209
 
295
 
        self.model = TreeModel(self.branch, linegraphdata)
 
210
        self.model = TreeModel(self.branch.repository, linegraphdata)
296
211
        self.graph_cell.columns_len = columns_len
297
212
        width = self.graph_cell.get_size(self.treeview)[2]
298
 
        if width > 500:
299
 
            width = 500
300
213
        self.graph_column.set_fixed_width(width)
301
214
        self.graph_column.set_max_width(width)
302
215
        self.index = index
303
216
        self.treeview.set_model(self.model)
304
 
 
305
 
        if not revision or revision == NULL_REVISION:
306
 
            self.treeview.set_cursor(0)
307
 
        else:
308
 
            self.set_revision(revision)
309
 
 
 
217
        self.treeview.set_cursor(0)
310
218
        self.emit('revisions-loaded')
311
219
 
312
220
        return False
313
221
 
 
222
    def show_diff(self, revid=None, parentid=None):
 
223
        """Open a new window to show a diff between the given revisions."""
 
224
        from bzrlib.plugins.gtk.diff import DiffWindow
 
225
        window = DiffWindow(parent=self)
 
226
 
 
227
        parents = self.get_parents()
 
228
 
 
229
        if revid is None:
 
230
            revid = self.get_revision().revision_id
 
231
 
 
232
            if parentid is None and len(parents) > 0:
 
233
                parentid = parents[0]
 
234
 
 
235
        if parentid is None:
 
236
            parentid = NULL_REVISION
 
237
 
 
238
        rev_tree    = self.branch.repository.revision_tree(revid)
 
239
        parent_tree = self.branch.repository.revision_tree(parentid)
 
240
 
 
241
        description = revid + " - " + self.branch.nick
 
242
        window.set_diff(description, rev_tree, parent_tree)
 
243
        window.show()
 
244
 
314
245
    def construct_treeview(self):
315
246
        self.treeview = gtk.TreeView()
316
247
 
333
264
 
334
265
        self.treeview.set_property('fixed-height-mode', True)
335
266
 
 
267
        self.add(self.treeview)
336
268
        self.treeview.show()
337
269
 
338
270
        cell = gtk.CellRendererText()
339
271
        cell.set_property("width-chars", 15)
340
272
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
341
273
        self.revno_column = gtk.TreeViewColumn("Revision No")
342
 
        self.revno_column.set_resizable(False)
 
274
        self.revno_column.set_resizable(True)
343
275
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
344
276
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
345
277
        self.revno_column.pack_start(cell, expand=True)
348
280
 
349
281
        self.graph_cell = CellRendererGraph()
350
282
        self.graph_column = gtk.TreeViewColumn()
351
 
        self.graph_column.set_resizable(False)
 
283
        self.graph_column.set_resizable(True)
352
284
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
353
 
        self.graph_column.pack_start(self.graph_cell, expand=True)
 
285
        self.graph_column.pack_start(self.graph_cell, expand=False)
354
286
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
355
 
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
356
287
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
357
288
        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
358
289
        self.treeview.append_column(self.graph_column)
360
291
        cell = gtk.CellRendererText()
361
292
        cell.set_property("width-chars", 65)
362
293
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
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)
 
294
        self.msg_column = gtk.TreeViewColumn("Message")
 
295
        self.msg_column.set_resizable(True)
 
296
        self.msg_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
297
        self.msg_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
298
        self.msg_column.pack_start(cell, expand=True)
 
299
        self.msg_column.add_attribute(cell, "text", treemodel.MESSAGE)
 
300
        self.treeview.append_column(self.msg_column)
371
301
 
372
302
        cell = gtk.CellRendererText()
373
303
        cell.set_property("width-chars", 15)
374
304
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
375
305
        self.committer_column = gtk.TreeViewColumn("Committer")
376
 
        self.committer_column.set_resizable(False)
 
306
        self.committer_column.set_resizable(True)
377
307
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
378
 
        self.committer_column.set_fixed_width(200)
 
308
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
379
309
        self.committer_column.pack_start(cell, expand=True)
380
 
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
 
310
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITER)
381
311
        self.treeview.append_column(self.committer_column)
382
312
 
383
313
        cell = gtk.CellRendererText()
385
315
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
386
316
        self.date_column = gtk.TreeViewColumn("Date")
387
317
        self.date_column.set_visible(False)
388
 
        self.date_column.set_resizable(False)
 
318
        self.date_column.set_resizable(True)
389
319
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
390
 
        self.date_column.set_fixed_width(130)
 
320
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
391
321
        self.date_column.pack_start(cell, expand=True)
392
322
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
393
323
        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
324
 
416
325
    def _on_selection_changed(self, treeview):
417
326
        """callback for when the treeview changes."""
426
335
            menu = RevisionPopupMenu(self.branch.repository, 
427
336
                [self.get_revision().revision_id],
428
337
                self.branch)
429
 
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
430
338
            menu.popup(None, None, None, event.button, event.get_time())
431
339
 
432
340
    def _on_revision_activated(self, widget, path, col):
433
 
        self.emit('revision-activated', path, col)
 
341
        # TODO: more than one parent
 
342
        """Callback for when a treeview row gets activated."""
 
343
        revision_id = self.model[path][treemodel.REVID]
 
344
        parents = self.model[path][treemodel.PARENTS]
 
345
 
 
346
        if len(parents) == 0:
 
347
            parent_id = None
 
348
        else:
 
349
            parent_id = parents[0]
 
350
 
 
351
        self.show_diff(revision_id, parent_id)
 
352
        self.treeview.grab_focus()