/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
68
                                 'Date',
43
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
 
 
77
 
        gobject.idle_add(self.populate, start, maxnum, 
78
 
                         broken_line_length)
79
 
 
80
126
        self.revision = None
81
 
        self.children = None
82
 
        self.parents  = 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())
83
135
 
84
136
    def do_get_property(self, property):
85
137
        if property.name == 'revno-column-visible':
86
138
            return self.revno_column.get_visible()
 
139
        elif property.name == 'graph-column-visible':
 
140
            return self.graph_column.get_visible()
87
141
        elif property.name == 'date-column-visible':
88
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
89
147
        elif property.name == 'branch':
90
148
            return self.branch
91
149
        elif property.name == 'revision':
92
 
            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)
93
157
        else:
94
158
            raise AttributeError, 'unknown property %s' % property.name
95
159
 
96
160
    def do_set_property(self, property, value):
97
161
        if property.name == 'revno-column-visible':
98
162
            self.revno_column.set_visible(value)
 
163
        elif property.name == 'graph-column-visible':
 
164
            self.graph_column.set_visible(value)
99
165
        elif property.name == 'date-column-visible':
100
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
101
171
        elif property.name == 'branch':
102
172
            self.branch = value
103
173
        elif property.name == 'revision':
107
177
 
108
178
    def get_revision(self):
109
179
        """Return revision id of currently selected revision, or None."""
110
 
        return self.revision
 
180
        return self.get_property('revision')
 
181
 
 
182
    def set_revision(self, revision):
 
183
        self.set_property('revision', revision)
111
184
 
112
185
    def set_revision_id(self, revid):
113
186
        """Change the currently selected revision.
122
195
 
123
196
        :return: list of revision ids.
124
197
        """
125
 
        return self.children
 
198
        return self.get_property('children')
126
199
 
127
200
    def get_parents(self):
128
201
        """Return the parents of the currently selected revision.
129
202
 
130
203
        :return: list of revision ids.
131
204
        """
132
 
        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)
133
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
 
134
238
    def back(self):
135
239
        """Signal handler for the Back button."""
136
 
        (path, col) = self.treeview.get_cursor()
137
 
        revision = self.model[path][treemodel.REVISION]
138
 
        parents = self.model[path][treemodel.PARENTS]
 
240
        parents = self.get_parents()
139
241
        if not len(parents):
140
242
            return
141
243
 
142
244
        for parent_id in parents:
143
245
            parent_index = self.index[parent_id]
144
246
            parent = self.model[parent_index][treemodel.REVISION]
145
 
            if same_branch(revision, parent):
146
 
                self.treeview.set_cursor(parent_index)
 
247
            if same_branch(self.get_revision(), parent):
 
248
                self.set_revision(parent)
147
249
                break
148
250
        else:
149
 
            self.treeview.set_cursor(self.index[parents[0]])
150
 
        self.treeview.grab_focus()
 
251
            self.set_revision_id(parents[0])
151
252
 
152
253
    def forward(self):
153
254
        """Signal handler for the Forward button."""
154
 
        (path, col) = self.treeview.get_cursor()
155
 
        revision = self.model[path][treemodel.REVISION]
156
 
        children = self.model[path][treemodel.CHILDREN]
 
255
        children = self.get_children()
157
256
        if not len(children):
158
257
            return
159
258
 
160
259
        for child_id in children:
161
260
            child_index = self.index[child_id]
162
261
            child = self.model[child_index][treemodel.REVISION]
163
 
            if same_branch(child, revision):
164
 
                self.treeview.set_cursor(child_index)
 
262
            if same_branch(child, self.get_revision()):
 
263
                self.set_revision(child)
165
264
                break
166
265
        else:
167
 
            self.treeview.set_cursor(self.index[children[0]])
168
 
        self.treeview.grab_focus()
 
266
            self.set_revision_id(children[0])
169
267
 
170
 
    def populate(self, start, maxnum, broken_line_length=None):
 
268
    def populate(self, revision=None):
171
269
        """Fill the treeview with contents.
172
270
 
173
271
        :param start: Revision id of revision to start with.
176
274
        :param broken_line_length: After how much lines branches \
177
275
                       should be broken.
178
276
        """
 
277
 
 
278
        self.progress_bar = ui.ui_factory.nested_progress_bar()
 
279
        self.progress_bar.update(msg="Loading ancestry graph", total_cnt=5)
 
280
 
179
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
 
180
289
            self.branch.lock_read()
181
 
            (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
182
 
                                                            start,
183
 
                                                            maxnum, 
184
 
                                                            broken_line_length)
 
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)
185
297
 
186
 
            self.model = TreeModel(self.branch.repository, linegraphdata)
 
298
            self.model = TreeModel(self.branch, linegraphdata)
187
299
            self.graph_cell.columns_len = columns_len
188
300
            width = self.graph_cell.get_size(self.treeview)[2]
 
301
            if width > 500:
 
302
                width = 500
189
303
            self.graph_column.set_fixed_width(width)
190
304
            self.graph_column.set_max_width(width)
191
305
            self.index = index
192
306
            self.treeview.set_model(self.model)
193
 
            self.treeview.set_cursor(0)
194
 
            self.emit('revisions-loaded')
195
 
 
 
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
196
314
        finally:
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()
 
315
            self.progress_bar.finished()
221
316
 
222
317
    def construct_treeview(self):
223
318
        self.treeview = gtk.TreeView()
230
325
        if set_tooltip is not None:
231
326
            set_tooltip(treemodel.MESSAGE)
232
327
 
233
 
        self.treeview.get_selection().connect("changed",
 
328
        self.treeview.connect("cursor-changed",
234
329
                self._on_selection_changed)
235
330
 
236
331
        self.treeview.connect("row-activated", 
241
336
 
242
337
        self.treeview.set_property('fixed-height-mode', True)
243
338
 
244
 
        self.add(self.treeview)
245
339
        self.treeview.show()
246
340
 
247
341
        cell = gtk.CellRendererText()
248
342
        cell.set_property("width-chars", 15)
249
343
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
250
344
        self.revno_column = gtk.TreeViewColumn("Revision No")
251
 
        self.revno_column.set_resizable(True)
 
345
        self.revno_column.set_resizable(False)
252
346
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
253
347
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
254
348
        self.revno_column.pack_start(cell, expand=True)
257
351
 
258
352
        self.graph_cell = CellRendererGraph()
259
353
        self.graph_column = gtk.TreeViewColumn()
260
 
        self.graph_column.set_resizable(True)
 
354
        self.graph_column.set_resizable(False)
261
355
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
262
 
        self.graph_column.pack_start(self.graph_cell, expand=False)
 
356
        self.graph_column.pack_start(self.graph_cell, expand=True)
263
357
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
 
358
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
264
359
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
265
360
        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
266
361
        self.treeview.append_column(self.graph_column)
268
363
        cell = gtk.CellRendererText()
269
364
        cell.set_property("width-chars", 65)
270
365
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
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)
 
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)
278
374
 
279
375
        cell = gtk.CellRendererText()
280
376
        cell.set_property("width-chars", 15)
281
377
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
282
378
        self.committer_column = gtk.TreeViewColumn("Committer")
283
 
        self.committer_column.set_resizable(True)
 
379
        self.committer_column.set_resizable(False)
284
380
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
285
 
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
381
        self.committer_column.set_fixed_width(200)
286
382
        self.committer_column.pack_start(cell, expand=True)
287
 
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITER)
 
383
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
288
384
        self.treeview.append_column(self.committer_column)
289
385
 
290
386
        cell = gtk.CellRendererText()
292
388
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
293
389
        self.date_column = gtk.TreeViewColumn("Date")
294
390
        self.date_column.set_visible(False)
295
 
        self.date_column.set_resizable(True)
 
391
        self.date_column.set_resizable(False)
296
392
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
297
 
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
393
        self.date_column.set_fixed_width(130)
298
394
        self.date_column.pack_start(cell, expand=True)
299
395
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
300
396
        self.treeview.append_column(self.date_column)
301
 
 
302
 
    def _on_selection_changed(self, selection, *args):
 
397
        
 
398
        return self.treeview
 
399
    
 
400
    def _on_selection_changed(self, treeview):
303
401
        """callback for when the treeview changes."""
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
 
 
 
402
        (path, focus) = treeview.get_cursor()
 
403
        if path is not None:
 
404
            self.iter = self.model.get_iter(path)
311
405
            self.emit('revision-selected')
312
406
 
313
407
    def _on_revision_selected(self, widget, event):
316
410
            menu = RevisionPopupMenu(self.branch.repository, 
317
411
                [self.get_revision().revision_id],
318
412
                self.branch)
 
413
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
319
414
            menu.popup(None, None, None, event.button, event.get_time())
320
415
 
321
416
    def _on_revision_activated(self, widget, 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()
 
417
        self.emit('revision-activated', path, col)