/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-07 14:19:09 UTC
  • mfrom: (330.3.5 trunk)
  • Revision ID: daniel.schierbeck@gmail.com-20071107141909-3zxf7nw5laldvfxi
Merged with mainline.

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