/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-21 17:23:10 UTC
  • mto: (423.1.8 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: daniel.schierbeck@gmail.com-20080121172310-l4o0m19lc6ghhulh
Moved tag writing logic inside the branchview treemodel.

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
17
from linegraph import linegraph, same_branch
20
18
from graphcell import CellRendererGraph
21
19
from treemodel import TreeModel
22
20
from bzrlib.revision import NULL_REVISION
23
21
 
24
 
class TreeView(gtk.VBox):
 
22
class TreeView(gtk.ScrolledWindow):
25
23
 
26
24
    __gproperties__ = {
27
25
        'branch': (gobject.TYPE_PYOBJECT,
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
 
                              ()),
89
 
        'revision-activated': (gobject.SIGNAL_RUN_FIRST,
90
 
                              gobject.TYPE_NONE,
91
 
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
92
 
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
93
 
                              gobject.TYPE_NONE,
94
 
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
 
77
                              ())
95
78
    }
96
79
 
97
80
    def __init__(self, branch, start, maxnum, compact=True):
104
87
        :param broken_line_length: After how much lines to break 
105
88
                                   branches.
106
89
        """
107
 
        gtk.VBox.__init__(self, spacing=0)
108
 
 
109
 
        self.scrolled_window = gtk.ScrolledWindow()
110
 
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
111
 
                                        gtk.POLICY_AUTOMATIC)
112
 
        self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
113
 
        self.scrolled_window.show()
114
 
        self.pack_start(self.scrolled_window, expand=True, fill=True)
115
 
 
116
 
        self.scrolled_window.add(self.construct_treeview())
 
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()
117
96
 
118
97
        self.iter = None
119
98
        self.branch = branch
130
109
    def do_get_property(self, property):
131
110
        if property.name == 'revno-column-visible':
132
111
            return self.revno_column.get_visible()
133
 
        elif property.name == 'graph-column-visible':
134
 
            return self.graph_column.get_visible()
135
112
        elif property.name == 'date-column-visible':
136
113
            return self.date_column.get_visible()
137
114
        elif property.name == 'compact':
138
115
            return self.compact
139
 
        elif property.name == 'mainline-only':
140
 
            return self.mainline_only
141
116
        elif property.name == 'branch':
142
117
            return self.branch
143
118
        elif property.name == 'revision':
154
129
    def do_set_property(self, property, value):
155
130
        if property.name == 'revno-column-visible':
156
131
            self.revno_column.set_visible(value)
157
 
        elif property.name == 'graph-column-visible':
158
 
            self.graph_column.set_visible(value)
159
132
        elif property.name == 'date-column-visible':
160
133
            self.date_column.set_visible(value)
161
134
        elif property.name == 'compact':
162
135
            self.compact = value
163
 
        elif property.name == 'mainline-only':
164
 
            self.mainline_only = value
165
136
        elif property.name == 'branch':
166
137
            self.branch = value
167
138
        elif property.name == 'revision':
212
183
 
213
184
        finally:
214
185
            self.branch.lock_read()
215
 
 
216
 
        self.emit('tag-added', tag, revid)
217
186
        
218
187
    def refresh(self):
219
188
        gobject.idle_add(self.populate, self.get_revision())
269
238
                       should be broken.
270
239
        """
271
240
 
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
 
            self.emit('revisions-loaded')
308
 
 
309
 
            return False
310
 
        finally:
311
 
            loading_progress.finished()
 
241
        if self.compact:
 
242
            broken_line_length = 32
 
243
        else:
 
244
            broken_line_length = None
 
245
 
 
246
        self.branch.lock_read()
 
247
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
 
248
                                                        self.start,
 
249
                                                        self.maxnum, 
 
250
                                                        broken_line_length)
 
251
 
 
252
        self.model = TreeModel(self.branch, linegraphdata)
 
253
        self.graph_cell.columns_len = columns_len
 
254
        width = self.graph_cell.get_size(self.treeview)[2]
 
255
        if width > 500:
 
256
            width = 500
 
257
        self.graph_column.set_fixed_width(width)
 
258
        self.graph_column.set_max_width(width)
 
259
        self.index = index
 
260
        self.treeview.set_model(self.model)
 
261
 
 
262
        if revision is None:
 
263
            self.treeview.set_cursor(0)
 
264
        else:
 
265
            self.set_revision(revision)
 
266
 
 
267
        self.emit('revisions-loaded')
 
268
 
 
269
        return False
 
270
 
 
271
    def show_diff(self, revid=None, parentid=None):
 
272
        """Open a new window to show a diff between the given revisions."""
 
273
        from bzrlib.plugins.gtk.diff import DiffWindow
 
274
        window = DiffWindow(parent=self)
 
275
 
 
276
        parents = self.get_parents()
 
277
 
 
278
        if revid is None:
 
279
            revid = self.get_revision().revision_id
 
280
 
 
281
            if parentid is None and len(parents) > 0:
 
282
                parentid = parents[0]
 
283
 
 
284
        if parentid is None:
 
285
            parentid = NULL_REVISION
 
286
 
 
287
        rev_tree    = self.branch.repository.revision_tree(revid)
 
288
        parent_tree = self.branch.repository.revision_tree(parentid)
 
289
 
 
290
        description = revid + " - " + self.branch.nick
 
291
        window.set_diff(description, rev_tree, parent_tree)
 
292
        window.show()
312
293
 
313
294
    def construct_treeview(self):
314
295
        self.treeview = gtk.TreeView()
332
313
 
333
314
        self.treeview.set_property('fixed-height-mode', True)
334
315
 
 
316
        self.add(self.treeview)
335
317
        self.treeview.show()
336
318
 
337
319
        cell = gtk.CellRendererText()
338
320
        cell.set_property("width-chars", 15)
339
321
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
340
322
        self.revno_column = gtk.TreeViewColumn("Revision No")
341
 
        self.revno_column.set_resizable(False)
 
323
        self.revno_column.set_resizable(True)
342
324
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
343
325
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
344
326
        self.revno_column.pack_start(cell, expand=True)
347
329
 
348
330
        self.graph_cell = CellRendererGraph()
349
331
        self.graph_column = gtk.TreeViewColumn()
350
 
        self.graph_column.set_resizable(False)
 
332
        self.graph_column.set_resizable(True)
351
333
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
352
 
        self.graph_column.pack_start(self.graph_cell, expand=True)
 
334
        self.graph_column.pack_start(self.graph_cell, expand=False)
353
335
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
354
336
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
355
337
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
359
341
        cell = gtk.CellRendererText()
360
342
        cell.set_property("width-chars", 65)
361
343
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
362
 
        self.summary_column = gtk.TreeViewColumn("Summary")
363
 
        self.summary_column.set_resizable(False)
364
 
        self.summary_column.set_expand(True)
365
 
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
366
 
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
367
 
        self.summary_column.pack_start(cell, expand=True)
368
 
        self.summary_column.add_attribute(cell, "markup", treemodel.SUMMARY)
369
 
        self.treeview.append_column(self.summary_column)
 
344
        self.msg_column = gtk.TreeViewColumn("Message")
 
345
        self.msg_column.set_resizable(True)
 
346
        self.msg_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
347
        self.msg_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
348
        self.msg_column.pack_start(cell, expand=True)
 
349
        self.msg_column.add_attribute(cell, "markup", treemodel.MESSAGE)
 
350
        self.treeview.append_column(self.msg_column)
370
351
 
371
352
        cell = gtk.CellRendererText()
372
353
        cell.set_property("width-chars", 15)
373
354
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
374
355
        self.committer_column = gtk.TreeViewColumn("Committer")
375
 
        self.committer_column.set_resizable(False)
 
356
        self.committer_column.set_resizable(True)
376
357
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
377
 
        self.committer_column.set_fixed_width(200)
 
358
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
378
359
        self.committer_column.pack_start(cell, expand=True)
379
 
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
 
360
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITER)
380
361
        self.treeview.append_column(self.committer_column)
381
362
 
382
363
        cell = gtk.CellRendererText()
384
365
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
385
366
        self.date_column = gtk.TreeViewColumn("Date")
386
367
        self.date_column.set_visible(False)
387
 
        self.date_column.set_resizable(False)
 
368
        self.date_column.set_resizable(True)
388
369
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
389
 
        self.date_column.set_fixed_width(130)
 
370
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
390
371
        self.date_column.pack_start(cell, expand=True)
391
372
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
392
373
        self.treeview.append_column(self.date_column)
393
 
        
394
 
        return self.treeview
395
374
 
396
375
    def _on_selection_changed(self, treeview):
397
376
        """callback for when the treeview changes."""
406
385
            menu = RevisionPopupMenu(self.branch.repository, 
407
386
                [self.get_revision().revision_id],
408
387
                self.branch)
409
 
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
410
388
            menu.popup(None, None, None, event.button, event.get_time())
411
389
 
412
390
    def _on_revision_activated(self, widget, path, col):
413
 
        self.emit('revision-activated', path, col)
 
391
        # TODO: more than one parent
 
392
        """Callback for when a treeview row gets activated."""
 
393
        revision_id = self.model[path][treemodel.REVID]
 
394
        parents = self.model[path][treemodel.PARENTS]
 
395
 
 
396
        if len(parents) == 0:
 
397
            parent_id = None
 
398
        else:
 
399
            parent_id = parents[0]
 
400
 
 
401
        self.show_diff(revision_id, parent_id)
 
402
        self.treeview.grab_focus()