/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: Daniel Schierbeck
  • Date: 2008-01-23 16:36:21 UTC
  • mto: (423.1.8 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: daniel.schierbeck@gmail.com-20080123163621-x8kublc38ojipnly
Made the revision popup menu correctly add tags.

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
17
16
 
18
 
from bzrlib.plugins.gtk import _i18n
19
 
from bzrlib.plugins.gtk.ui import GtkProgressBar, ProgressPanel
20
17
from linegraph import linegraph, same_branch
21
18
from graphcell import CellRendererGraph
22
19
from treemodel import TreeModel
23
20
from bzrlib.revision import NULL_REVISION
24
21
 
25
 
 
26
 
class TreeView(gtk.VBox):
 
22
class TreeView(gtk.ScrolledWindow):
27
23
 
28
24
    __gproperties__ = {
29
25
        'branch': (gobject.TYPE_PYOBJECT,
53
49
                    gobject.PARAM_READABLE),
54
50
 
55
51
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
56
 
                                 'Revision number column',
 
52
                                 'Revision number',
57
53
                                 'Show revision number column',
58
54
                                 True,
59
55
                                 gobject.PARAM_READWRITE),
60
56
 
61
 
        'graph-column-visible': (gobject.TYPE_BOOLEAN,
62
 
                                 'Graph column',
63
 
                                 'Show graph column',
64
 
                                 True,
65
 
                                 gobject.PARAM_READWRITE),
66
 
 
67
57
        'date-column-visible': (gobject.TYPE_BOOLEAN,
68
58
                                 'Date',
69
59
                                 'Show date column',
74
64
                    'Compact view',
75
65
                    'Break ancestry lines to save space',
76
66
                    True,
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),
 
67
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE)
84
68
 
85
69
    }
86
70
 
87
71
    __gsignals__ = {
 
72
        'revisions-loaded': (gobject.SIGNAL_RUN_FIRST, 
 
73
                             gobject.TYPE_NONE,
 
74
                             ()),
88
75
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
89
76
                              gobject.TYPE_NONE,
90
77
                              ()),
91
 
        'revision-activated': (gobject.SIGNAL_RUN_FIRST,
92
 
                              gobject.TYPE_NONE,
93
 
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
94
78
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
95
79
                              gobject.TYPE_NONE,
96
 
                              (gobject.TYPE_STRING, gobject.TYPE_STRING)),
97
 
        'refreshed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
98
 
                              ())
 
80
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
99
81
    }
100
82
 
101
83
    def __init__(self, branch, start, maxnum, compact=True):
108
90
        :param broken_line_length: After how much lines to break 
109
91
                                   branches.
110
92
        """
111
 
        gtk.VBox.__init__(self, spacing=0)
112
 
 
113
 
        self.progress_widget = ProgressPanel()
114
 
        self.pack_start(self.progress_widget, expand=False, fill=True)
115
 
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
116
 
            # We'are using our own ui, let's tell it to use our widget.
117
 
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
118
 
 
119
 
        self.scrolled_window = gtk.ScrolledWindow()
120
 
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
121
 
                                        gtk.POLICY_AUTOMATIC)
122
 
        self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
123
 
        self.scrolled_window.show()
124
 
        self.pack_start(self.scrolled_window, expand=True, fill=True)
125
 
 
126
 
        self.scrolled_window.add(self.construct_treeview())
127
 
 
128
 
        self.path = None
 
93
        gtk.ScrolledWindow.__init__(self)
 
94
 
 
95
        self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
96
        self.set_shadow_type(gtk.SHADOW_IN)
 
97
 
 
98
        self.construct_treeview()
 
99
 
 
100
        self.iter = None
129
101
        self.branch = branch
130
102
        self.revision = None
131
 
        self.index = {}
132
103
 
133
104
        self.start = start
134
105
        self.maxnum = maxnum
136
107
 
137
108
        gobject.idle_add(self.populate)
138
109
 
139
 
        self.connect("destroy", self._on_destroy)
140
 
 
141
 
    def _on_destroy(self, *ignored):
142
 
        self.branch.unlock()
143
 
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
144
 
            # We'are using our own ui, let's tell it to stop using our widget.
145
 
            ui.ui_factory.set_progress_bar_widget(None)
 
110
        self.connect("destroy", lambda x: self.branch.unlock())
146
111
 
147
112
    def do_get_property(self, property):
148
113
        if property.name == 'revno-column-visible':
149
114
            return self.revno_column.get_visible()
150
 
        elif property.name == 'graph-column-visible':
151
 
            return self.graph_column.get_visible()
152
115
        elif property.name == 'date-column-visible':
153
116
            return self.date_column.get_visible()
154
117
        elif property.name == 'compact':
155
118
            return self.compact
156
 
        elif property.name == 'mainline-only':
157
 
            return self.mainline_only
158
119
        elif property.name == 'branch':
159
120
            return self.branch
160
121
        elif property.name == 'revision':
161
 
            return self.model.get_value(self.model.get_iter(self.path),
162
 
                                        treemodel.REVISION)
 
122
            return self.model.get_value(self.iter, treemodel.REVISION)
163
123
        elif property.name == 'revision-number':
164
 
            return self.model.get_value(self.model.get_iter(self.path),
165
 
                                        treemodel.REVNO)
 
124
            return self.model.get_value(self.iter, treemodel.REVNO)
166
125
        elif property.name == 'children':
167
 
            return self.model.get_value(self.model.get_iter(self.path),
168
 
                                        treemodel.CHILDREN)
 
126
            return self.model.get_value(self.iter, treemodel.CHILDREN)
169
127
        elif property.name == 'parents':
170
 
            return self.model.get_value(self.model.get_iter(self.path),
171
 
                                        treemodel.PARENTS)
 
128
            return self.model.get_value(self.iter, treemodel.PARENTS)
172
129
        else:
173
130
            raise AttributeError, 'unknown property %s' % property.name
174
131
 
175
132
    def do_set_property(self, property, value):
176
133
        if property.name == 'revno-column-visible':
177
134
            self.revno_column.set_visible(value)
178
 
        elif property.name == 'graph-column-visible':
179
 
            self.graph_column.set_visible(value)
180
135
        elif property.name == 'date-column-visible':
181
136
            self.date_column.set_visible(value)
182
137
        elif property.name == 'compact':
183
138
            self.compact = value
184
 
        elif property.name == 'mainline-only':
185
 
            self.mainline_only = value
186
139
        elif property.name == 'branch':
187
140
            self.branch = value
188
141
        elif property.name == 'revision':
194
147
        """Return revision id of currently selected revision, or None."""
195
148
        return self.get_property('revision')
196
149
 
197
 
    def has_revision_id(self, revision_id):
198
 
        return (revision_id in self.index)
199
 
 
200
150
    def set_revision(self, revision):
201
151
        self.set_property('revision', revision)
202
152
 
293
243
                       should be broken.
294
244
        """
295
245
 
296
 
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
297
 
            # We'are using our own ui, let's tell it to use our widget.
298
 
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
299
 
        self.progress_bar = ui.ui_factory.nested_progress_bar()
300
 
        self.progress_bar.update("Loading ancestry graph", 0, 5)
301
 
 
302
 
        try:
303
 
            if self.compact:
304
 
                broken_line_length = 32
305
 
            else:
306
 
                broken_line_length = None
307
 
            
308
 
            show_graph = self.graph_column.get_visible()
309
 
 
310
 
            self.branch.lock_read()
311
 
            (linegraphdata, index, columns_len) = linegraph(self.branch.repository.get_graph(),
312
 
                                                            self.start,
313
 
                                                            self.maxnum, 
314
 
                                                            broken_line_length,
315
 
                                                            show_graph,
316
 
                                                            self.mainline_only,
317
 
                                                            self.progress_bar)
318
 
 
319
 
            self.model = TreeModel(self.branch, linegraphdata)
320
 
            self.graph_cell.columns_len = columns_len
321
 
            width = self.graph_cell.get_size(self.treeview)[2]
322
 
            if width > 500:
323
 
                width = 500
324
 
            self.graph_column.set_fixed_width(width)
325
 
            self.graph_column.set_max_width(width)
326
 
            self.index = index
327
 
            self.treeview.set_model(self.model)
328
 
 
329
 
            if not revision or revision == NULL_REVISION:
330
 
                self.treeview.set_cursor(0)
331
 
            else:
332
 
                self.set_revision(revision)
333
 
 
334
 
            self.emit('refreshed')
335
 
            return False
336
 
        finally:
337
 
            self.progress_bar.finished()
 
246
        if self.compact:
 
247
            broken_line_length = 32
 
248
        else:
 
249
            broken_line_length = None
 
250
 
 
251
        self.branch.lock_read()
 
252
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
 
253
                                                        self.start,
 
254
                                                        self.maxnum, 
 
255
                                                        broken_line_length)
 
256
 
 
257
        self.model = TreeModel(self.branch, linegraphdata)
 
258
        self.graph_cell.columns_len = columns_len
 
259
        width = self.graph_cell.get_size(self.treeview)[2]
 
260
        if width > 500:
 
261
            width = 500
 
262
        self.graph_column.set_fixed_width(width)
 
263
        self.graph_column.set_max_width(width)
 
264
        self.index = index
 
265
        self.treeview.set_model(self.model)
 
266
 
 
267
        if revision is None:
 
268
            self.treeview.set_cursor(0)
 
269
        else:
 
270
            self.set_revision(revision)
 
271
 
 
272
        self.emit('revisions-loaded')
 
273
 
 
274
        return False
 
275
 
 
276
    def show_diff(self, revid=None, parentid=None):
 
277
        """Open a new window to show a diff between the given revisions."""
 
278
        from bzrlib.plugins.gtk.diff import DiffWindow
 
279
        window = DiffWindow(parent=self)
 
280
 
 
281
        parents = self.get_parents()
 
282
 
 
283
        if revid is None:
 
284
            revid = self.get_revision().revision_id
 
285
 
 
286
            if parentid is None and len(parents) > 0:
 
287
                parentid = parents[0]
 
288
 
 
289
        if parentid is None:
 
290
            parentid = NULL_REVISION
 
291
 
 
292
        rev_tree    = self.branch.repository.revision_tree(revid)
 
293
        parent_tree = self.branch.repository.revision_tree(parentid)
 
294
 
 
295
        description = revid + " - " + self.branch.nick
 
296
        window.set_diff(description, rev_tree, parent_tree)
 
297
        window.show()
338
298
 
339
299
    def construct_treeview(self):
340
300
        self.treeview = gtk.TreeView()
347
307
        if set_tooltip is not None:
348
308
            set_tooltip(treemodel.MESSAGE)
349
309
 
350
 
        self._prev_cursor_path = None
351
310
        self.treeview.connect("cursor-changed",
352
311
                self._on_selection_changed)
353
312
 
359
318
 
360
319
        self.treeview.set_property('fixed-height-mode', True)
361
320
 
 
321
        self.add(self.treeview)
362
322
        self.treeview.show()
363
323
 
364
324
        cell = gtk.CellRendererText()
365
325
        cell.set_property("width-chars", 15)
366
326
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
367
327
        self.revno_column = gtk.TreeViewColumn("Revision No")
368
 
        self.revno_column.set_resizable(False)
 
328
        self.revno_column.set_resizable(True)
369
329
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
370
330
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
371
331
        self.revno_column.pack_start(cell, expand=True)
374
334
 
375
335
        self.graph_cell = CellRendererGraph()
376
336
        self.graph_column = gtk.TreeViewColumn()
377
 
        self.graph_column.set_resizable(False)
 
337
        self.graph_column.set_resizable(True)
378
338
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
379
 
        self.graph_column.pack_start(self.graph_cell, expand=True)
 
339
        self.graph_column.pack_start(self.graph_cell, expand=False)
380
340
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
381
341
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
382
342
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
387
347
        cell.set_property("width-chars", 65)
388
348
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
389
349
        self.summary_column = gtk.TreeViewColumn("Summary")
390
 
        self.summary_column.set_resizable(False)
391
 
        self.summary_column.set_expand(True)
 
350
        self.summary_column.set_resizable(True)
392
351
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
393
352
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
394
353
        self.summary_column.pack_start(cell, expand=True)
399
358
        cell.set_property("width-chars", 15)
400
359
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
401
360
        self.committer_column = gtk.TreeViewColumn("Committer")
402
 
        self.committer_column.set_resizable(False)
 
361
        self.committer_column.set_resizable(True)
403
362
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
404
 
        self.committer_column.set_fixed_width(200)
 
363
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
405
364
        self.committer_column.pack_start(cell, expand=True)
406
365
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
407
366
        self.treeview.append_column(self.committer_column)
411
370
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
412
371
        self.date_column = gtk.TreeViewColumn("Date")
413
372
        self.date_column.set_visible(False)
414
 
        self.date_column.set_resizable(False)
 
373
        self.date_column.set_resizable(True)
415
374
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
416
 
        self.date_column.set_fixed_width(130)
 
375
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
417
376
        self.date_column.pack_start(cell, expand=True)
418
377
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
419
378
        self.treeview.append_column(self.date_column)
420
 
        
421
 
        return self.treeview
422
 
    
 
379
 
423
380
    def _on_selection_changed(self, treeview):
424
381
        """callback for when the treeview changes."""
425
382
        (path, focus) = treeview.get_cursor()
426
 
        if (path is not None) and (path != self._prev_cursor_path):
427
 
            self._prev_cursor_path = path # avoid emitting twice per click
428
 
            self.path = path
 
383
        if path is not None:
 
384
            self.iter = self.model.get_iter(path)
429
385
            self.emit('revision-selected')
430
386
 
431
387
    def _on_revision_selected(self, widget, event):
432
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
 
388
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
433
389
        if event.button == 3:
434
 
            menu = RevisionMenu(self.branch.repository, 
 
390
            menu = RevisionPopupMenu(self.branch.repository, 
435
391
                [self.get_revision().revision_id],
436
392
                self.branch)
437
393
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
438
394
            menu.popup(None, None, None, event.button, event.get_time())
439
395
 
440
396
    def _on_revision_activated(self, widget, path, col):
441
 
        self.emit('revision-activated', path, col)
 
397
        # TODO: more than one parent
 
398
        """Callback for when a treeview row gets activated."""
 
399
        revision_id = self.model[path][treemodel.REVID]
 
400
        parents = self.model[path][treemodel.PARENTS]
 
401
 
 
402
        if len(parents) == 0:
 
403
            parent_id = None
 
404
        else:
 
405
            parent_id = parents[0]
 
406
 
 
407
        self.show_diff(revision_id, parent_id)
 
408
        self.treeview.grab_focus()