/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: Jasper Groenewegen
  • Date: 2008-07-27 12:01:40 UTC
  • mfrom: (576.3.2 improve-merge)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: colbrac@xs4all.nl-20080727120140-1agdlzkc9fumjk5f
Merge merge dialog improvements

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
                              ()),
 
91
        'revision-activated': (gobject.SIGNAL_RUN_FIRST,
 
92
                              gobject.TYPE_NONE,
 
93
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
78
94
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
79
95
                              gobject.TYPE_NONE,
80
96
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
92
108
        """
93
109
        gtk.VBox.__init__(self, spacing=0)
94
110
 
95
 
        self.pack_start(self.construct_loading_msg(), expand=False, fill=True)
96
 
        self.connect('revisions-loaded', 
97
 
                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)
98
114
 
99
115
        self.scrolled_window = gtk.ScrolledWindow()
100
 
        self.scrolled_window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
116
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
 
117
                                        gtk.POLICY_AUTOMATIC)
101
118
        self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
102
119
        self.scrolled_window.show()
103
120
        self.pack_start(self.scrolled_window, expand=True, fill=True)
104
121
 
105
122
        self.scrolled_window.add(self.construct_treeview())
106
 
        
107
123
 
108
124
        self.iter = None
109
125
        self.branch = branch
120
136
    def do_get_property(self, property):
121
137
        if property.name == 'revno-column-visible':
122
138
            return self.revno_column.get_visible()
 
139
        elif property.name == 'graph-column-visible':
 
140
            return self.graph_column.get_visible()
123
141
        elif property.name == 'date-column-visible':
124
142
            return self.date_column.get_visible()
125
143
        elif property.name == 'compact':
126
144
            return self.compact
 
145
        elif property.name == 'mainline-only':
 
146
            return self.mainline_only
127
147
        elif property.name == 'branch':
128
148
            return self.branch
129
149
        elif property.name == 'revision':
140
160
    def do_set_property(self, property, value):
141
161
        if property.name == 'revno-column-visible':
142
162
            self.revno_column.set_visible(value)
 
163
        elif property.name == 'graph-column-visible':
 
164
            self.graph_column.set_visible(value)
143
165
        elif property.name == 'date-column-visible':
144
166
            self.date_column.set_visible(value)
145
167
        elif property.name == 'compact':
146
168
            self.compact = value
 
169
        elif property.name == 'mainline-only':
 
170
            self.mainline_only = value
147
171
        elif property.name == 'branch':
148
172
            self.branch = value
149
173
        elif property.name == 'revision':
198
222
        self.emit('tag-added', tag, revid)
199
223
        
200
224
    def refresh(self):
201
 
        self.loading_msg_box.show()
202
225
        gobject.idle_add(self.populate, self.get_revision())
203
226
 
204
227
    def update(self):
252
275
                       should be broken.
253
276
        """
254
277
 
255
 
        if self.compact:
256
 
            broken_line_length = 32
257
 
        else:
258
 
            broken_line_length = None
259
 
 
260
 
        self.branch.lock_read()
261
 
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
262
 
                                                        self.start,
263
 
                                                        self.maxnum, 
264
 
                                                        broken_line_length)
265
 
 
266
 
        self.model = TreeModel(self.branch, linegraphdata)
267
 
        self.graph_cell.columns_len = columns_len
268
 
        width = self.graph_cell.get_size(self.treeview)[2]
269
 
        if width > 500:
270
 
            width = 500
271
 
        self.graph_column.set_fixed_width(width)
272
 
        self.graph_column.set_max_width(width)
273
 
        self.index = index
274
 
        self.treeview.set_model(self.model)
275
 
 
276
 
        if revision is None:
277
 
            self.treeview.set_cursor(0)
278
 
        else:
279
 
            self.set_revision(revision)
280
 
 
281
 
        self.emit('revisions-loaded')
282
 
 
283
 
        return False
284
 
 
285
 
    def show_diff(self, revid=None, parentid=None):
286
 
        """Open a new window to show a diff between the given revisions."""
287
 
        from bzrlib.plugins.gtk.diff import DiffWindow
288
 
        window = DiffWindow(parent=self)
289
 
 
290
 
        parents = self.get_parents()
291
 
 
292
 
        if revid is None:
293
 
            revid = self.get_revision().revision_id
294
 
 
295
 
            if parentid is None and len(parents) > 0:
296
 
                parentid = parents[0]
297
 
 
298
 
        if parentid is None:
299
 
            parentid = NULL_REVISION
300
 
 
301
 
        rev_tree    = self.branch.repository.revision_tree(revid)
302
 
        parent_tree = self.branch.repository.revision_tree(parentid)
303
 
 
304
 
        description = revid + " - " + self.branch.nick
305
 
        window.set_diff(description, rev_tree, parent_tree)
306
 
        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()
307
316
 
308
317
    def construct_treeview(self):
309
318
        self.treeview = gtk.TreeView()
316
325
        if set_tooltip is not None:
317
326
            set_tooltip(treemodel.MESSAGE)
318
327
 
 
328
        self._prev_cursor_path = None
319
329
        self.treeview.connect("cursor-changed",
320
330
                self._on_selection_changed)
321
331
 
333
343
        cell.set_property("width-chars", 15)
334
344
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
335
345
        self.revno_column = gtk.TreeViewColumn("Revision No")
336
 
        self.revno_column.set_resizable(True)
 
346
        self.revno_column.set_resizable(False)
337
347
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
338
348
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
339
349
        self.revno_column.pack_start(cell, expand=True)
342
352
 
343
353
        self.graph_cell = CellRendererGraph()
344
354
        self.graph_column = gtk.TreeViewColumn()
345
 
        self.graph_column.set_resizable(True)
 
355
        self.graph_column.set_resizable(False)
346
356
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
347
 
        self.graph_column.pack_start(self.graph_cell, expand=False)
 
357
        self.graph_column.pack_start(self.graph_cell, expand=True)
348
358
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
349
359
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
350
360
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
355
365
        cell.set_property("width-chars", 65)
356
366
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
357
367
        self.summary_column = gtk.TreeViewColumn("Summary")
358
 
        self.summary_column.set_resizable(True)
 
368
        self.summary_column.set_resizable(False)
 
369
        self.summary_column.set_expand(True)
359
370
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
360
371
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
361
372
        self.summary_column.pack_start(cell, expand=True)
366
377
        cell.set_property("width-chars", 15)
367
378
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
368
379
        self.committer_column = gtk.TreeViewColumn("Committer")
369
 
        self.committer_column.set_resizable(True)
 
380
        self.committer_column.set_resizable(False)
370
381
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
371
 
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
382
        self.committer_column.set_fixed_width(200)
372
383
        self.committer_column.pack_start(cell, expand=True)
373
384
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
374
385
        self.treeview.append_column(self.committer_column)
378
389
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
379
390
        self.date_column = gtk.TreeViewColumn("Date")
380
391
        self.date_column.set_visible(False)
381
 
        self.date_column.set_resizable(True)
 
392
        self.date_column.set_resizable(False)
382
393
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
383
 
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
394
        self.date_column.set_fixed_width(130)
384
395
        self.date_column.pack_start(cell, expand=True)
385
396
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
386
397
        self.treeview.append_column(self.date_column)
387
398
        
388
399
        return self.treeview
389
400
    
390
 
    def construct_loading_msg(self):
391
 
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
392
 
                                                 gtk.ICON_SIZE_BUTTON)
393
 
        image_loading.show()
394
 
        
395
 
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
396
 
        label_loading.set_alignment(0.0, 0.5)
397
 
        label_loading.show()
398
 
        
399
 
        self.loading_msg_box = gtk.HBox()
400
 
        self.loading_msg_box.set_spacing(5)
401
 
        self.loading_msg_box.set_border_width(5)        
402
 
        self.loading_msg_box.pack_start(image_loading, False, False)
403
 
        self.loading_msg_box.pack_start(label_loading, True, True)
404
 
        self.loading_msg_box.show()
405
 
        
406
 
        return self.loading_msg_box
407
 
 
408
401
    def _on_selection_changed(self, treeview):
409
402
        """callback for when the treeview changes."""
410
403
        (path, focus) = treeview.get_cursor()
411
 
        if path is not None:
 
404
        if (path is not None) and (path != self._prev_cursor_path):
 
405
            self._prev_cursor_path = path # avoid emitting twice per click
412
406
            self.iter = self.model.get_iter(path)
413
407
            self.emit('revision-selected')
414
408
 
415
409
    def _on_revision_selected(self, widget, event):
416
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
 
410
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
417
411
        if event.button == 3:
418
 
            menu = RevisionPopupMenu(self.branch.repository, 
 
412
            menu = RevisionMenu(self.branch.repository, 
419
413
                [self.get_revision().revision_id],
420
414
                self.branch)
421
415
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
422
416
            menu.popup(None, None, None, event.button, event.get_time())
423
417
 
424
418
    def _on_revision_activated(self, widget, path, col):
425
 
        # TODO: more than one parent
426
 
        """Callback for when a treeview row gets activated."""
427
 
        revision_id = self.model[path][treemodel.REVID]
428
 
        parents = self.model[path][treemodel.PARENTS]
429
 
 
430
 
        if len(parents) == 0:
431
 
            parent_id = None
432
 
        else:
433
 
            parent_id = parents[0]
434
 
 
435
 
        self.show_diff(revision_id, parent_id)
436
 
        self.treeview.grab_focus()
 
419
        self.emit('revision-activated', path, col)