/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,
49
53
                    gobject.PARAM_READABLE),
50
54
 
51
55
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
52
 
                                 'Revision number',
 
56
                                 'Revision number column',
53
57
                                 'Show revision number column',
54
58
                                 True,
55
59
                                 gobject.PARAM_READWRITE),
56
60
 
 
61
        'graph-column-visible': (gobject.TYPE_BOOLEAN,
 
62
                                 'Graph column',
 
63
                                 'Show graph column',
 
64
                                 True,
 
65
                                 gobject.PARAM_READWRITE),
 
66
 
57
67
        'date-column-visible': (gobject.TYPE_BOOLEAN,
58
68
                                 'Date',
59
69
                                 'Show date column',
64
74
                    'Compact view',
65
75
                    'Break ancestry lines to save space',
66
76
                    True,
67
 
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE)
 
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),
68
84
 
69
85
    }
70
86
 
71
87
    __gsignals__ = {
72
 
        'revisions-loaded': (gobject.SIGNAL_RUN_FIRST, 
73
 
                             gobject.TYPE_NONE,
74
 
                             ()),
75
88
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
76
89
                              gobject.TYPE_NONE,
77
 
                              ())
 
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))
78
97
    }
79
98
 
80
99
    def __init__(self, branch, start, maxnum, compact=True):
87
106
        :param broken_line_length: After how much lines to break 
88
107
                                   branches.
89
108
        """
90
 
        gtk.ScrolledWindow.__init__(self)
91
 
 
92
 
        self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
93
 
        self.set_shadow_type(gtk.SHADOW_IN)
94
 
 
95
 
        self.construct_treeview()
96
 
 
97
 
        self.iter   = None
 
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
98
125
        self.branch = branch
 
126
        self.revision = None
99
127
 
100
128
        self.start = start
101
129
        self.maxnum = maxnum
108
136
    def do_get_property(self, property):
109
137
        if property.name == 'revno-column-visible':
110
138
            return self.revno_column.get_visible()
 
139
        elif property.name == 'graph-column-visible':
 
140
            return self.graph_column.get_visible()
111
141
        elif property.name == 'date-column-visible':
112
142
            return self.date_column.get_visible()
113
143
        elif property.name == 'compact':
114
144
            return self.compact
 
145
        elif property.name == 'mainline-only':
 
146
            return self.mainline_only
115
147
        elif property.name == 'branch':
116
148
            return self.branch
117
149
        elif property.name == 'revision':
128
160
    def do_set_property(self, property, value):
129
161
        if property.name == 'revno-column-visible':
130
162
            self.revno_column.set_visible(value)
 
163
        elif property.name == 'graph-column-visible':
 
164
            self.graph_column.set_visible(value)
131
165
        elif property.name == 'date-column-visible':
132
166
            self.date_column.set_visible(value)
133
167
        elif property.name == 'compact':
134
168
            self.compact = value
 
169
        elif property.name == 'mainline-only':
 
170
            self.mainline_only = value
135
171
        elif property.name == 'branch':
136
172
            self.branch = value
137
173
        elif property.name == 'revision':
167
203
        :return: list of revision ids.
168
204
        """
169
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)
170
223
        
171
224
    def refresh(self):
172
225
        gobject.idle_add(self.populate, self.get_revision())
222
275
                       should be broken.
223
276
        """
224
277
 
225
 
        if self.compact:
226
 
            broken_line_length = 32
227
 
        else:
228
 
            broken_line_length = None
229
 
 
230
 
        self.branch.lock_read()
231
 
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
232
 
                                                        self.start,
233
 
                                                        self.maxnum, 
234
 
                                                        broken_line_length)
235
 
 
236
 
        self.model = TreeModel(self.branch.repository, linegraphdata)
237
 
        self.graph_cell.columns_len = columns_len
238
 
        width = self.graph_cell.get_size(self.treeview)[2]
239
 
        if width > 500:
240
 
            width = 500
241
 
        self.graph_column.set_fixed_width(width)
242
 
        self.graph_column.set_max_width(width)
243
 
        self.index = index
244
 
        self.treeview.set_model(self.model)
245
 
 
246
 
        if revision is None:
247
 
            self.treeview.set_cursor(0)
248
 
        else:
249
 
            self.set_revision(revision)
250
 
 
251
 
        self.emit('revisions-loaded')
252
 
 
253
 
        return False
254
 
 
255
 
    def show_diff(self, revid=None, parentid=None):
256
 
        """Open a new window to show a diff between the given revisions."""
257
 
        from bzrlib.plugins.gtk.diff import DiffWindow
258
 
        window = DiffWindow(parent=self)
259
 
 
260
 
        parents = self.get_parents()
261
 
 
262
 
        if revid is None:
263
 
            revid = self.get_revision().revision_id
264
 
 
265
 
            if parentid is None and len(parents) > 0:
266
 
                parentid = parents[0]
267
 
 
268
 
        if parentid is None:
269
 
            parentid = NULL_REVISION
270
 
 
271
 
        rev_tree    = self.branch.repository.revision_tree(revid)
272
 
        parent_tree = self.branch.repository.revision_tree(parentid)
273
 
 
274
 
        description = revid + " - " + self.branch.nick
275
 
        window.set_diff(description, rev_tree, parent_tree)
276
 
        window.show()
 
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()
277
316
 
278
317
    def construct_treeview(self):
279
318
        self.treeview = gtk.TreeView()
297
336
 
298
337
        self.treeview.set_property('fixed-height-mode', True)
299
338
 
300
 
        self.add(self.treeview)
301
339
        self.treeview.show()
302
340
 
303
341
        cell = gtk.CellRendererText()
304
342
        cell.set_property("width-chars", 15)
305
343
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
306
344
        self.revno_column = gtk.TreeViewColumn("Revision No")
307
 
        self.revno_column.set_resizable(True)
 
345
        self.revno_column.set_resizable(False)
308
346
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
309
347
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
310
348
        self.revno_column.pack_start(cell, expand=True)
313
351
 
314
352
        self.graph_cell = CellRendererGraph()
315
353
        self.graph_column = gtk.TreeViewColumn()
316
 
        self.graph_column.set_resizable(True)
 
354
        self.graph_column.set_resizable(False)
317
355
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
318
 
        self.graph_column.pack_start(self.graph_cell, expand=False)
 
356
        self.graph_column.pack_start(self.graph_cell, expand=True)
319
357
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
 
358
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
320
359
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
321
360
        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
322
361
        self.treeview.append_column(self.graph_column)
324
363
        cell = gtk.CellRendererText()
325
364
        cell.set_property("width-chars", 65)
326
365
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
327
 
        self.msg_column = gtk.TreeViewColumn("Message")
328
 
        self.msg_column.set_resizable(True)
329
 
        self.msg_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
330
 
        self.msg_column.set_fixed_width(cell.get_size(self.treeview)[2])
331
 
        self.msg_column.pack_start(cell, expand=True)
332
 
        self.msg_column.add_attribute(cell, "text", treemodel.MESSAGE)
333
 
        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)
334
374
 
335
375
        cell = gtk.CellRendererText()
336
376
        cell.set_property("width-chars", 15)
337
377
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
338
378
        self.committer_column = gtk.TreeViewColumn("Committer")
339
 
        self.committer_column.set_resizable(True)
 
379
        self.committer_column.set_resizable(False)
340
380
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
341
 
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
381
        self.committer_column.set_fixed_width(200)
342
382
        self.committer_column.pack_start(cell, expand=True)
343
 
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITER)
 
383
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
344
384
        self.treeview.append_column(self.committer_column)
345
385
 
346
386
        cell = gtk.CellRendererText()
348
388
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
349
389
        self.date_column = gtk.TreeViewColumn("Date")
350
390
        self.date_column.set_visible(False)
351
 
        self.date_column.set_resizable(True)
 
391
        self.date_column.set_resizable(False)
352
392
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
353
 
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
393
        self.date_column.set_fixed_width(130)
354
394
        self.date_column.pack_start(cell, expand=True)
355
395
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
356
396
        self.treeview.append_column(self.date_column)
357
 
 
 
397
        
 
398
        return self.treeview
 
399
    
358
400
    def _on_selection_changed(self, treeview):
359
401
        """callback for when the treeview changes."""
360
402
        (path, focus) = treeview.get_cursor()
368
410
            menu = RevisionPopupMenu(self.branch.repository, 
369
411
                [self.get_revision().revision_id],
370
412
                self.branch)
 
413
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
371
414
            menu.popup(None, None, None, event.button, event.get_time())
372
415
 
373
416
    def _on_revision_activated(self, widget, path, col):
374
 
        # TODO: more than one parent
375
 
        """Callback for when a treeview row gets activated."""
376
 
        revision_id = self.model[path][treemodel.REVID]
377
 
        parents = self.model[path][treemodel.PARENTS]
378
 
 
379
 
        if len(parents) == 0:
380
 
            parent_id = None
381
 
        else:
382
 
            parent_id = parents[0]
383
 
 
384
 
        self.show_diff(revision_id, parent_id)
385
 
        self.treeview.grab_focus()
 
417
        self.emit('revision-activated', path, col)