/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

Reuse the viz treeview in the revision browser.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
17
16
 
18
 
from bzrlib.plugins.gtk import _i18n
19
17
from linegraph import linegraph, same_branch
20
18
from graphcell import CellRendererGraph
21
19
from treemodel import TreeModel
51
49
                    gobject.PARAM_READABLE),
52
50
 
53
51
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
54
 
                                 'Revision number column',
 
52
                                 'Revision number',
55
53
                                 'Show revision number column',
56
54
                                 True,
57
55
                                 gobject.PARAM_READWRITE),
58
56
 
59
 
        'graph-column-visible': (gobject.TYPE_BOOLEAN,
60
 
                                 'Graph column',
61
 
                                 'Show graph column',
62
 
                                 True,
63
 
                                 gobject.PARAM_READWRITE),
64
 
 
65
57
        'date-column-visible': (gobject.TYPE_BOOLEAN,
66
58
                                 'Date',
67
59
                                 'Show date column',
72
64
                    'Compact view',
73
65
                    'Break ancestry lines to save space',
74
66
                    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),
 
67
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE)
82
68
 
83
69
    }
84
70
 
85
71
    __gsignals__ = {
 
72
        'revisions-loaded': (gobject.SIGNAL_RUN_FIRST, 
 
73
                             gobject.TYPE_NONE,
 
74
                             ()),
86
75
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
87
76
                              gobject.TYPE_NONE,
88
77
                              ()),
106
95
        """
107
96
        gtk.VBox.__init__(self, spacing=0)
108
97
 
 
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())
 
101
 
109
102
        self.scrolled_window = gtk.ScrolledWindow()
110
 
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
111
 
                                        gtk.POLICY_AUTOMATIC)
 
103
        self.scrolled_window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
112
104
        self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
113
105
        self.scrolled_window.show()
114
106
        self.pack_start(self.scrolled_window, expand=True, fill=True)
115
107
 
116
108
        self.scrolled_window.add(self.construct_treeview())
 
109
        
117
110
 
118
111
        self.iter = None
119
112
        self.branch = branch
130
123
    def do_get_property(self, property):
131
124
        if property.name == 'revno-column-visible':
132
125
            return self.revno_column.get_visible()
133
 
        elif property.name == 'graph-column-visible':
134
 
            return self.graph_column.get_visible()
135
126
        elif property.name == 'date-column-visible':
136
127
            return self.date_column.get_visible()
137
128
        elif property.name == 'compact':
138
129
            return self.compact
139
 
        elif property.name == 'mainline-only':
140
 
            return self.mainline_only
141
130
        elif property.name == 'branch':
142
131
            return self.branch
143
132
        elif property.name == 'revision':
154
143
    def do_set_property(self, property, value):
155
144
        if property.name == 'revno-column-visible':
156
145
            self.revno_column.set_visible(value)
157
 
        elif property.name == 'graph-column-visible':
158
 
            self.graph_column.set_visible(value)
159
146
        elif property.name == 'date-column-visible':
160
147
            self.date_column.set_visible(value)
161
148
        elif property.name == 'compact':
162
149
            self.compact = value
163
 
        elif property.name == 'mainline-only':
164
 
            self.mainline_only = value
165
150
        elif property.name == 'branch':
166
151
            self.branch = value
167
152
        elif property.name == 'revision':
216
201
        self.emit('tag-added', tag, revid)
217
202
        
218
203
    def refresh(self):
 
204
        self.loading_msg_box.show()
219
205
        gobject.idle_add(self.populate, self.get_revision())
220
206
 
221
207
    def update(self):
269
255
                       should be broken.
270
256
        """
271
257
 
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
 
            return False
308
 
        finally:
309
 
            loading_progress.finished()
 
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
310
287
 
311
288
    def construct_treeview(self):
312
289
        self.treeview = gtk.TreeView()
336
313
        cell.set_property("width-chars", 15)
337
314
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
338
315
        self.revno_column = gtk.TreeViewColumn("Revision No")
339
 
        self.revno_column.set_resizable(False)
 
316
        self.revno_column.set_resizable(True)
340
317
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
341
318
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
342
319
        self.revno_column.pack_start(cell, expand=True)
345
322
 
346
323
        self.graph_cell = CellRendererGraph()
347
324
        self.graph_column = gtk.TreeViewColumn()
348
 
        self.graph_column.set_resizable(False)
 
325
        self.graph_column.set_resizable(True)
349
326
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
350
 
        self.graph_column.pack_start(self.graph_cell, expand=True)
 
327
        self.graph_column.pack_start(self.graph_cell, expand=False)
351
328
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
352
329
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
353
330
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
358
335
        cell.set_property("width-chars", 65)
359
336
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
360
337
        self.summary_column = gtk.TreeViewColumn("Summary")
361
 
        self.summary_column.set_resizable(False)
362
 
        self.summary_column.set_expand(True)
 
338
        self.summary_column.set_resizable(True)
363
339
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
364
340
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
365
341
        self.summary_column.pack_start(cell, expand=True)
370
346
        cell.set_property("width-chars", 15)
371
347
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
372
348
        self.committer_column = gtk.TreeViewColumn("Committer")
373
 
        self.committer_column.set_resizable(False)
 
349
        self.committer_column.set_resizable(True)
374
350
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
375
 
        self.committer_column.set_fixed_width(200)
 
351
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
376
352
        self.committer_column.pack_start(cell, expand=True)
377
353
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
378
354
        self.treeview.append_column(self.committer_column)
382
358
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
383
359
        self.date_column = gtk.TreeViewColumn("Date")
384
360
        self.date_column.set_visible(False)
385
 
        self.date_column.set_resizable(False)
 
361
        self.date_column.set_resizable(True)
386
362
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
387
 
        self.date_column.set_fixed_width(130)
 
363
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
388
364
        self.date_column.pack_start(cell, expand=True)
389
365
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
390
366
        self.treeview.append_column(self.date_column)
391
367
        
392
368
        return self.treeview
 
369
    
 
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
393
387
 
394
388
    def _on_selection_changed(self, treeview):
395
389
        """callback for when the treeview changes."""