/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 16:11:12 UTC
  • mfrom: (475.2.2 gtk)
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629161112-3j4zp0r0e7cv6cds
Merge Chad's progress bar in viz patch.

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
17
19
from linegraph import linegraph, same_branch
18
20
from graphcell import CellRendererGraph
19
21
from treemodel import TreeModel
20
22
from bzrlib.revision import NULL_REVISION
21
23
 
22
 
class TreeView(gtk.ScrolledWindow):
 
24
class TreeView(gtk.VBox):
23
25
 
24
26
    __gproperties__ = {
25
27
        'branch': (gobject.TYPE_PYOBJECT,
49
51
                    gobject.PARAM_READABLE),
50
52
 
51
53
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
52
 
                                 'Revision number',
 
54
                                 'Revision number column',
53
55
                                 'Show revision number column',
54
56
                                 True,
55
57
                                 gobject.PARAM_READWRITE),
56
58
 
 
59
        'graph-column-visible': (gobject.TYPE_BOOLEAN,
 
60
                                 'Graph column',
 
61
                                 'Show graph column',
 
62
                                 True,
 
63
                                 gobject.PARAM_READWRITE),
 
64
 
57
65
        'date-column-visible': (gobject.TYPE_BOOLEAN,
58
66
                                 'Date',
59
67
                                 'Show date column',
60
68
                                 False,
61
 
                                 gobject.PARAM_READWRITE)
 
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),
62
82
 
63
83
    }
64
84
 
65
85
    __gsignals__ = {
66
 
        'revisions-loaded': (gobject.SIGNAL_RUN_FIRST, 
67
 
                             gobject.TYPE_NONE,
68
 
                             ()),
69
86
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
70
87
                              gobject.TYPE_NONE,
71
 
                              ())
 
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))
72
95
    }
73
96
 
74
 
    def __init__(self, branch, start, maxnum, broken_line_length=None):
 
97
    def __init__(self, branch, start, maxnum, compact=True):
75
98
        """Create a new TreeView.
76
99
 
77
100
        :param branch: Branch object for branch to show.
81
104
        :param broken_line_length: After how much lines to break 
82
105
                                   branches.
83
106
        """
84
 
        gtk.ScrolledWindow.__init__(self)
85
 
 
86
 
        self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
87
 
        self.set_shadow_type(gtk.SHADOW_IN)
88
 
 
89
 
        self.construct_treeview()
90
 
 
91
 
        self.iter   = None
 
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
92
119
        self.branch = branch
93
 
 
94
 
        gobject.idle_add(self.populate, start, maxnum, 
95
 
                         broken_line_length)
 
120
        self.revision = None
 
121
 
 
122
        self.start = start
 
123
        self.maxnum = maxnum
 
124
        self.compact = compact
 
125
 
 
126
        gobject.idle_add(self.populate)
96
127
 
97
128
        self.connect("destroy", lambda x: self.branch.unlock())
98
129
 
99
130
    def do_get_property(self, property):
100
131
        if property.name == 'revno-column-visible':
101
132
            return self.revno_column.get_visible()
 
133
        elif property.name == 'graph-column-visible':
 
134
            return self.graph_column.get_visible()
102
135
        elif property.name == 'date-column-visible':
103
136
            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
104
141
        elif property.name == 'branch':
105
142
            return self.branch
106
143
        elif property.name == 'revision':
117
154
    def do_set_property(self, property, value):
118
155
        if property.name == 'revno-column-visible':
119
156
            self.revno_column.set_visible(value)
 
157
        elif property.name == 'graph-column-visible':
 
158
            self.graph_column.set_visible(value)
120
159
        elif property.name == 'date-column-visible':
121
160
            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
122
165
        elif property.name == 'branch':
123
166
            self.branch = value
124
167
        elif property.name == 'revision':
154
197
        :return: list of revision ids.
155
198
        """
156
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)
157
217
        
 
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
 
158
232
    def back(self):
159
233
        """Signal handler for the Back button."""
160
234
        parents = self.get_parents()
185
259
        else:
186
260
            self.set_revision_id(children[0])
187
261
 
188
 
    def populate(self, start, maxnum, broken_line_length=None):
 
262
    def populate(self, revision=None):
189
263
        """Fill the treeview with contents.
190
264
 
191
265
        :param start: Revision id of revision to start with.
194
268
        :param broken_line_length: After how much lines branches \
195
269
                       should be broken.
196
270
        """
197
 
        self.branch.lock_read()
198
 
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
199
 
                                                        start,
200
 
                                                        maxnum, 
201
 
                                                        broken_line_length)
202
 
 
203
 
        self.model = TreeModel(self.branch.repository, linegraphdata)
204
 
        self.graph_cell.columns_len = columns_len
205
 
        width = self.graph_cell.get_size(self.treeview)[2]
206
 
        self.graph_column.set_fixed_width(width)
207
 
        self.graph_column.set_max_width(width)
208
 
        self.index = index
209
 
        self.treeview.set_model(self.model)
210
 
        self.treeview.set_cursor(0)
211
 
        self.emit('revisions-loaded')
212
 
 
213
 
        return False
214
 
 
215
 
    def show_diff(self, revid=None, parentid=None):
216
 
        """Open a new window to show a diff between the given revisions."""
217
 
        from bzrlib.plugins.gtk.diff import DiffWindow
218
 
        window = DiffWindow(parent=self)
219
 
 
220
 
        parents = self.get_parents()
221
 
 
222
 
        if revid is None:
223
 
            revid = self.get_revision().revision_id
224
 
 
225
 
            if parentid is None and len(parents) > 0:
226
 
                parentid = parents[0]
227
 
 
228
 
        if parentid is None:
229
 
            parentid = NULL_REVISION
230
 
 
231
 
        rev_tree    = self.branch.repository.revision_tree(revid)
232
 
        parent_tree = self.branch.repository.revision_tree(parentid)
233
 
 
234
 
        description = revid + " - " + self.branch.nick
235
 
        window.set_diff(description, rev_tree, parent_tree)
236
 
        window.show()
 
271
 
 
272
        loading_progress = ui.ui_factory.nested_progress_bar()
 
273
        loading_progress.update(msg="Loading ancestry graph", total=5)
 
274
 
 
275
        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
            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)
 
291
 
 
292
            self.model = TreeModel(self.branch, linegraphdata)
 
293
            self.graph_cell.columns_len = columns_len
 
294
            width = self.graph_cell.get_size(self.treeview)[2]
 
295
            if width > 500:
 
296
                width = 500
 
297
            self.graph_column.set_fixed_width(width)
 
298
            self.graph_column.set_max_width(width)
 
299
            self.index = index
 
300
            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
            self.emit('revisions-loaded')
 
308
 
 
309
            return False
 
310
        finally:
 
311
            loading_progress.finished()
237
312
 
238
313
    def construct_treeview(self):
239
314
        self.treeview = gtk.TreeView()
257
332
 
258
333
        self.treeview.set_property('fixed-height-mode', True)
259
334
 
260
 
        self.add(self.treeview)
261
335
        self.treeview.show()
262
336
 
263
337
        cell = gtk.CellRendererText()
264
338
        cell.set_property("width-chars", 15)
265
339
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
266
340
        self.revno_column = gtk.TreeViewColumn("Revision No")
267
 
        self.revno_column.set_resizable(True)
 
341
        self.revno_column.set_resizable(False)
268
342
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
269
343
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
270
344
        self.revno_column.pack_start(cell, expand=True)
273
347
 
274
348
        self.graph_cell = CellRendererGraph()
275
349
        self.graph_column = gtk.TreeViewColumn()
276
 
        self.graph_column.set_resizable(True)
 
350
        self.graph_column.set_resizable(False)
277
351
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
278
 
        self.graph_column.pack_start(self.graph_cell, expand=False)
 
352
        self.graph_column.pack_start(self.graph_cell, expand=True)
279
353
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
 
354
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
280
355
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
281
356
        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
282
357
        self.treeview.append_column(self.graph_column)
284
359
        cell = gtk.CellRendererText()
285
360
        cell.set_property("width-chars", 65)
286
361
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
287
 
        self.msg_column = gtk.TreeViewColumn("Message")
288
 
        self.msg_column.set_resizable(True)
289
 
        self.msg_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
290
 
        self.msg_column.set_fixed_width(cell.get_size(self.treeview)[2])
291
 
        self.msg_column.pack_start(cell, expand=True)
292
 
        self.msg_column.add_attribute(cell, "text", treemodel.MESSAGE)
293
 
        self.treeview.append_column(self.msg_column)
 
362
        self.summary_column = gtk.TreeViewColumn("Summary")
 
363
        self.summary_column.set_resizable(False)
 
364
        self.summary_column.set_expand(True)
 
365
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
366
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
367
        self.summary_column.pack_start(cell, expand=True)
 
368
        self.summary_column.add_attribute(cell, "markup", treemodel.SUMMARY)
 
369
        self.treeview.append_column(self.summary_column)
294
370
 
295
371
        cell = gtk.CellRendererText()
296
372
        cell.set_property("width-chars", 15)
297
373
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
298
374
        self.committer_column = gtk.TreeViewColumn("Committer")
299
 
        self.committer_column.set_resizable(True)
 
375
        self.committer_column.set_resizable(False)
300
376
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
301
 
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
377
        self.committer_column.set_fixed_width(200)
302
378
        self.committer_column.pack_start(cell, expand=True)
303
 
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITER)
 
379
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
304
380
        self.treeview.append_column(self.committer_column)
305
381
 
306
382
        cell = gtk.CellRendererText()
308
384
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
309
385
        self.date_column = gtk.TreeViewColumn("Date")
310
386
        self.date_column.set_visible(False)
311
 
        self.date_column.set_resizable(True)
 
387
        self.date_column.set_resizable(False)
312
388
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
313
 
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
389
        self.date_column.set_fixed_width(130)
314
390
        self.date_column.pack_start(cell, expand=True)
315
391
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
316
392
        self.treeview.append_column(self.date_column)
 
393
        
 
394
        return self.treeview
317
395
 
318
396
    def _on_selection_changed(self, treeview):
319
397
        """callback for when the treeview changes."""
328
406
            menu = RevisionPopupMenu(self.branch.repository, 
329
407
                [self.get_revision().revision_id],
330
408
                self.branch)
 
409
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
331
410
            menu.popup(None, None, None, event.button, event.get_time())
332
411
 
333
412
    def _on_revision_activated(self, widget, path, col):
334
 
        # TODO: more than one parent
335
 
        """Callback for when a treeview row gets activated."""
336
 
        revision_id = self.model[path][treemodel.REVID]
337
 
        parents = self.model[path][treemodel.PARENTS]
338
 
 
339
 
        if len(parents) == 0:
340
 
            parent_id = None
341
 
        else:
342
 
            parent_id = parents[0]
343
 
 
344
 
        self.show_diff(revision_id, parent_id)
345
 
        self.treeview.grab_focus()
 
413
        self.emit('revision-activated', path, col)