/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: Jelmer Vernooij
  • Date: 2008-06-29 18:12:29 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629181229-1l2m4cf7vvbyh8qg
Simplify progress bar code, use embedded progress bar inside viz window.

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