/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-06 18:02:09 UTC
  • Revision ID: daniel.schierbeck@gmail.com-20071106180209-mrlhg28ma5a6jebf
Fixed locks and made tagging work.

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