/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
 
 
25
 
22
26
class TreeView(gtk.VBox):
23
27
 
24
28
    __gproperties__ = {
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
                              ()),
95
108
        """
96
109
        gtk.VBox.__init__(self, spacing=0)
97
110
 
98
 
        self.pack_start(self.construct_loading_msg(), expand=False, fill=True)
99
 
        self.connect('revisions-loaded', 
100
 
                lambda x: self.loading_msg_box.hide())
 
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)
101
114
 
102
115
        self.scrolled_window = gtk.ScrolledWindow()
103
 
        self.scrolled_window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
116
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
 
117
                                        gtk.POLICY_AUTOMATIC)
104
118
        self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
105
119
        self.scrolled_window.show()
106
120
        self.pack_start(self.scrolled_window, expand=True, fill=True)
107
121
 
108
122
        self.scrolled_window.add(self.construct_treeview())
109
 
        
110
123
 
111
124
        self.iter = None
112
125
        self.branch = branch
123
136
    def do_get_property(self, property):
124
137
        if property.name == 'revno-column-visible':
125
138
            return self.revno_column.get_visible()
 
139
        elif property.name == 'graph-column-visible':
 
140
            return self.graph_column.get_visible()
126
141
        elif property.name == 'date-column-visible':
127
142
            return self.date_column.get_visible()
128
143
        elif property.name == 'compact':
129
144
            return self.compact
 
145
        elif property.name == 'mainline-only':
 
146
            return self.mainline_only
130
147
        elif property.name == 'branch':
131
148
            return self.branch
132
149
        elif property.name == 'revision':
143
160
    def do_set_property(self, property, value):
144
161
        if property.name == 'revno-column-visible':
145
162
            self.revno_column.set_visible(value)
 
163
        elif property.name == 'graph-column-visible':
 
164
            self.graph_column.set_visible(value)
146
165
        elif property.name == 'date-column-visible':
147
166
            self.date_column.set_visible(value)
148
167
        elif property.name == 'compact':
149
168
            self.compact = value
 
169
        elif property.name == 'mainline-only':
 
170
            self.mainline_only = value
150
171
        elif property.name == 'branch':
151
172
            self.branch = value
152
173
        elif property.name == 'revision':
201
222
        self.emit('tag-added', tag, revid)
202
223
        
203
224
    def refresh(self):
204
 
        self.loading_msg_box.show()
205
225
        gobject.idle_add(self.populate, self.get_revision())
206
226
 
207
227
    def update(self):
255
275
                       should be broken.
256
276
        """
257
277
 
258
 
        if self.compact:
259
 
            broken_line_length = 32
260
 
        else:
261
 
            broken_line_length = None
262
 
 
263
 
        self.branch.lock_read()
264
 
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
265
 
                                                        self.start,
266
 
                                                        self.maxnum, 
267
 
                                                        broken_line_length)
268
 
 
269
 
        self.model = TreeModel(self.branch, linegraphdata)
270
 
        self.graph_cell.columns_len = columns_len
271
 
        width = self.graph_cell.get_size(self.treeview)[2]
272
 
        if width > 500:
273
 
            width = 500
274
 
        self.graph_column.set_fixed_width(width)
275
 
        self.graph_column.set_max_width(width)
276
 
        self.index = index
277
 
        self.treeview.set_model(self.model)
278
 
 
279
 
        if revision is None:
280
 
            self.treeview.set_cursor(0)
281
 
        else:
282
 
            self.set_revision(revision)
283
 
 
284
 
        self.emit('revisions-loaded')
285
 
 
286
 
        return False
 
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()
287
316
 
288
317
    def construct_treeview(self):
289
318
        self.treeview = gtk.TreeView()
313
342
        cell.set_property("width-chars", 15)
314
343
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
315
344
        self.revno_column = gtk.TreeViewColumn("Revision No")
316
 
        self.revno_column.set_resizable(True)
 
345
        self.revno_column.set_resizable(False)
317
346
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
318
347
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
319
348
        self.revno_column.pack_start(cell, expand=True)
322
351
 
323
352
        self.graph_cell = CellRendererGraph()
324
353
        self.graph_column = gtk.TreeViewColumn()
325
 
        self.graph_column.set_resizable(True)
 
354
        self.graph_column.set_resizable(False)
326
355
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
327
 
        self.graph_column.pack_start(self.graph_cell, expand=False)
 
356
        self.graph_column.pack_start(self.graph_cell, expand=True)
328
357
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
329
358
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
330
359
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
335
364
        cell.set_property("width-chars", 65)
336
365
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
337
366
        self.summary_column = gtk.TreeViewColumn("Summary")
338
 
        self.summary_column.set_resizable(True)
 
367
        self.summary_column.set_resizable(False)
 
368
        self.summary_column.set_expand(True)
339
369
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
340
370
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
341
371
        self.summary_column.pack_start(cell, expand=True)
346
376
        cell.set_property("width-chars", 15)
347
377
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
348
378
        self.committer_column = gtk.TreeViewColumn("Committer")
349
 
        self.committer_column.set_resizable(True)
 
379
        self.committer_column.set_resizable(False)
350
380
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
351
 
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
381
        self.committer_column.set_fixed_width(200)
352
382
        self.committer_column.pack_start(cell, expand=True)
353
383
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
354
384
        self.treeview.append_column(self.committer_column)
358
388
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
359
389
        self.date_column = gtk.TreeViewColumn("Date")
360
390
        self.date_column.set_visible(False)
361
 
        self.date_column.set_resizable(True)
 
391
        self.date_column.set_resizable(False)
362
392
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
363
 
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
393
        self.date_column.set_fixed_width(130)
364
394
        self.date_column.pack_start(cell, expand=True)
365
395
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
366
396
        self.treeview.append_column(self.date_column)
367
397
        
368
398
        return self.treeview
369
399
    
370
 
    def construct_loading_msg(self):
371
 
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
372
 
                                                 gtk.ICON_SIZE_BUTTON)
373
 
        image_loading.show()
374
 
        
375
 
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
376
 
        label_loading.set_alignment(0.0, 0.5)
377
 
        label_loading.show()
378
 
        
379
 
        self.loading_msg_box = gtk.HBox()
380
 
        self.loading_msg_box.set_spacing(5)
381
 
        self.loading_msg_box.set_border_width(5)        
382
 
        self.loading_msg_box.pack_start(image_loading, False, False)
383
 
        self.loading_msg_box.pack_start(label_loading, True, True)
384
 
        self.loading_msg_box.show()
385
 
        
386
 
        return self.loading_msg_box
387
 
 
388
400
    def _on_selection_changed(self, treeview):
389
401
        """callback for when the treeview changes."""
390
402
        (path, focus) = treeview.get_cursor()