/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-12 17:59:50 UTC
  • mto: This revision was merged to the branch mainline in revision 396.
  • Revision ID: daniel.schierbeck@gmail.com-20071112175950-c4hf2n7xg2vznaqw
Cleaned up code in the TreeView, removing instance variables.

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,
33
32
                     'The currently selected revision',
34
33
                     gobject.PARAM_READWRITE),
35
34
 
36
 
        'revision-number': (gobject.TYPE_STRING,
37
 
                            'Revision number',
38
 
                            'The number of the selected revision',
39
 
                            '',
40
 
                            gobject.PARAM_READABLE),
41
 
 
42
35
        'children': (gobject.TYPE_PYOBJECT,
43
36
                     'Child revisions',
44
37
                     'Children of the currently selected revision',
50
43
                    gobject.PARAM_READABLE),
51
44
 
52
45
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
53
 
                                 'Revision number column',
 
46
                                 'Revision number',
54
47
                                 'Show revision number column',
55
48
                                 True,
56
49
                                 gobject.PARAM_READWRITE),
57
50
 
58
 
        'graph-column-visible': (gobject.TYPE_BOOLEAN,
59
 
                                 'Graph column',
60
 
                                 'Show graph column',
61
 
                                 True,
62
 
                                 gobject.PARAM_READWRITE),
63
 
 
64
51
        'date-column-visible': (gobject.TYPE_BOOLEAN,
65
52
                                 'Date',
66
53
                                 'Show date column',
67
54
                                 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),
 
55
                                 gobject.PARAM_READWRITE)
81
56
 
82
57
    }
83
58
 
87
62
                             ()),
88
63
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
89
64
                              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))
 
65
                              ())
97
66
    }
98
67
 
99
 
    def __init__(self, branch, start, maxnum, compact=True):
 
68
    def __init__(self, branch, start, maxnum, broken_line_length=None):
100
69
        """Create a new TreeView.
101
70
 
102
71
        :param branch: Branch object for branch to show.
106
75
        :param broken_line_length: After how much lines to break 
107
76
                                   branches.
108
77
        """
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
 
78
        gtk.ScrolledWindow.__init__(self)
 
79
 
 
80
        self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
81
        self.set_shadow_type(gtk.SHADOW_IN)
 
82
 
 
83
        self.construct_treeview()
 
84
 
 
85
        self.iter   = None
126
86
        self.branch = branch
127
 
        self.revision = None
128
 
 
129
 
        self.start = start
130
 
        self.maxnum = maxnum
131
 
        self.compact = compact
132
 
 
133
 
        gobject.idle_add(self.populate)
 
87
 
 
88
        gobject.idle_add(self.populate, start, maxnum, 
 
89
                         broken_line_length)
134
90
 
135
91
        self.connect("destroy", lambda x: self.branch.unlock())
136
92
 
137
93
    def do_get_property(self, property):
138
94
        if property.name == 'revno-column-visible':
139
95
            return self.revno_column.get_visible()
140
 
        elif property.name == 'graph-column-visible':
141
 
            return self.graph_column.get_visible()
142
96
        elif property.name == 'date-column-visible':
143
97
            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
98
        elif property.name == 'branch':
149
99
            return self.branch
150
100
        elif property.name == 'revision':
151
101
            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
102
        elif property.name == 'children':
155
103
            return self.model.get_value(self.iter, treemodel.CHILDREN)
156
104
        elif property.name == 'parents':
161
109
    def do_set_property(self, property, value):
162
110
        if property.name == 'revno-column-visible':
163
111
            self.revno_column.set_visible(value)
164
 
        elif property.name == 'graph-column-visible':
165
 
            self.graph_column.set_visible(value)
166
112
        elif property.name == 'date-column-visible':
167
113
            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
114
        elif property.name == 'branch':
173
115
            self.branch = value
174
116
        elif property.name == 'revision':
204
146
        :return: list of revision ids.
205
147
        """
206
148
        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
149
        
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
 
 
240
150
    def back(self):
241
151
        """Signal handler for the Back button."""
242
152
        parents = self.get_parents()
247
157
            parent_index = self.index[parent_id]
248
158
            parent = self.model[parent_index][treemodel.REVISION]
249
159
            if same_branch(self.get_revision(), parent):
250
 
                self.set_revision(parent)
 
160
                self.treeview.set_cursor(parent_index)
251
161
                break
252
162
        else:
253
 
            self.set_revision_id(parents[0])
 
163
            self.treeview.set_cursor(self.index[parents[0]])
 
164
        self.treeview.grab_focus()
254
165
 
255
166
    def forward(self):
256
167
        """Signal handler for the Forward button."""
262
173
            child_index = self.index[child_id]
263
174
            child = self.model[child_index][treemodel.REVISION]
264
175
            if same_branch(child, self.get_revision()):
265
 
                self.set_revision(child)
 
176
                self.treeview.set_cursor(child_index)
266
177
                break
267
178
        else:
268
 
            self.set_revision_id(children[0])
 
179
            self.treeview.set_cursor(self.index[children[0]])
 
180
        self.treeview.grab_focus()
269
181
 
270
 
    def populate(self, revision=None):
 
182
    def populate(self, start, maxnum, broken_line_length=None):
271
183
        """Fill the treeview with contents.
272
184
 
273
185
        :param start: Revision id of revision to start with.
276
188
        :param broken_line_length: After how much lines branches \
277
189
                       should be broken.
278
190
        """
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
191
        self.branch.lock_read()
288
192
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
289
 
                                                        (self.start,) , # Sequence of start revisions
290
 
                                                        self.maxnum, 
291
 
                                                        broken_line_length,
292
 
                                                        show_graph,
293
 
                                                        self.mainline_only)
 
193
                                                        start,
 
194
                                                        maxnum, 
 
195
                                                        broken_line_length)
294
196
 
295
 
        self.model = TreeModel(self.branch, linegraphdata)
 
197
        self.model = TreeModel(self.branch.repository, linegraphdata)
296
198
        self.graph_cell.columns_len = columns_len
297
199
        width = self.graph_cell.get_size(self.treeview)[2]
298
 
        if width > 500:
299
 
            width = 500
300
200
        self.graph_column.set_fixed_width(width)
301
201
        self.graph_column.set_max_width(width)
302
202
        self.index = index
303
203
        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
 
 
 
204
        self.treeview.set_cursor(0)
310
205
        self.emit('revisions-loaded')
311
206
 
312
207
        return False
313
208
 
 
209
    def show_diff(self, revid=None, parentid=None):
 
210
        """Open a new window to show a diff between the given revisions."""
 
211
        from bzrlib.plugins.gtk.diff import DiffWindow
 
212
        window = DiffWindow(parent=self)
 
213
 
 
214
        parents = self.get_parents()
 
215
 
 
216
        if revid is None:
 
217
            revid = self.get_revision().revision_id
 
218
 
 
219
            if parentid is None and len(parents) > 0:
 
220
                parentid = parents[0]
 
221
 
 
222
        if parentid is None:
 
223
            parentid = NULL_REVISION
 
224
 
 
225
        rev_tree    = self.branch.repository.revision_tree(revid)
 
226
        parent_tree = self.branch.repository.revision_tree(parentid)
 
227
 
 
228
        description = revid + " - " + self.branch.nick
 
229
        window.set_diff(description, rev_tree, parent_tree)
 
230
        window.show()
 
231
 
314
232
    def construct_treeview(self):
315
233
        self.treeview = gtk.TreeView()
316
234
 
333
251
 
334
252
        self.treeview.set_property('fixed-height-mode', True)
335
253
 
 
254
        self.add(self.treeview)
336
255
        self.treeview.show()
337
256
 
338
257
        cell = gtk.CellRendererText()
339
258
        cell.set_property("width-chars", 15)
340
259
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
341
260
        self.revno_column = gtk.TreeViewColumn("Revision No")
342
 
        self.revno_column.set_resizable(False)
 
261
        self.revno_column.set_resizable(True)
343
262
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
344
263
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
345
264
        self.revno_column.pack_start(cell, expand=True)
348
267
 
349
268
        self.graph_cell = CellRendererGraph()
350
269
        self.graph_column = gtk.TreeViewColumn()
351
 
        self.graph_column.set_resizable(False)
 
270
        self.graph_column.set_resizable(True)
352
271
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
353
 
        self.graph_column.pack_start(self.graph_cell, expand=True)
 
272
        self.graph_column.pack_start(self.graph_cell, expand=False)
354
273
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
355
 
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
356
274
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
357
275
        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
358
276
        self.treeview.append_column(self.graph_column)
360
278
        cell = gtk.CellRendererText()
361
279
        cell.set_property("width-chars", 65)
362
280
        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)
 
281
        self.msg_column = gtk.TreeViewColumn("Message")
 
282
        self.msg_column.set_resizable(True)
 
283
        self.msg_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
284
        self.msg_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
285
        self.msg_column.pack_start(cell, expand=True)
 
286
        self.msg_column.add_attribute(cell, "text", treemodel.MESSAGE)
 
287
        self.treeview.append_column(self.msg_column)
371
288
 
372
289
        cell = gtk.CellRendererText()
373
290
        cell.set_property("width-chars", 15)
374
291
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
375
292
        self.committer_column = gtk.TreeViewColumn("Committer")
376
 
        self.committer_column.set_resizable(False)
 
293
        self.committer_column.set_resizable(True)
377
294
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
378
 
        self.committer_column.set_fixed_width(200)
 
295
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
379
296
        self.committer_column.pack_start(cell, expand=True)
380
 
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
 
297
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITER)
381
298
        self.treeview.append_column(self.committer_column)
382
299
 
383
300
        cell = gtk.CellRendererText()
385
302
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
386
303
        self.date_column = gtk.TreeViewColumn("Date")
387
304
        self.date_column.set_visible(False)
388
 
        self.date_column.set_resizable(False)
 
305
        self.date_column.set_resizable(True)
389
306
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
390
 
        self.date_column.set_fixed_width(130)
 
307
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
391
308
        self.date_column.pack_start(cell, expand=True)
392
309
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
393
310
        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
311
 
416
312
    def _on_selection_changed(self, treeview):
417
313
        """callback for when the treeview changes."""
426
322
            menu = RevisionPopupMenu(self.branch.repository, 
427
323
                [self.get_revision().revision_id],
428
324
                self.branch)
429
 
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
430
325
            menu.popup(None, None, None, event.button, event.get_time())
431
326
 
432
327
    def _on_revision_activated(self, widget, path, col):
433
 
        self.emit('revision-activated', path, col)
 
328
        # TODO: more than one parent
 
329
        """Callback for when a treeview row gets activated."""
 
330
        revision_id = self.model[path][treemodel.REVID]
 
331
        parents = self.model[path][treemodel.PARENTS]
 
332
 
 
333
        if len(parents) == 0:
 
334
            parent_id = None
 
335
        else:
 
336
            parent_id = parents[0]
 
337
 
 
338
        self.show_diff(revision_id, parent_id)
 
339
        self.treeview.grab_focus()