/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
 
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
 
                              ()),
91
 
        'revision-activated': (gobject.SIGNAL_RUN_FIRST,
92
 
                              gobject.TYPE_NONE,
93
 
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
94
 
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
95
 
                              gobject.TYPE_NONE,
96
 
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
 
77
                              ())
97
78
    }
98
79
 
99
80
    def __init__(self, branch, start, maxnum, compact=True):
106
87
        :param broken_line_length: After how much lines to break 
107
88
                                   branches.
108
89
        """
109
 
        gtk.VBox.__init__(self, spacing=0)
110
 
 
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)
114
 
 
115
 
        self.scrolled_window = gtk.ScrolledWindow()
116
 
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
117
 
                                        gtk.POLICY_AUTOMATIC)
118
 
        self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
119
 
        self.scrolled_window.show()
120
 
        self.pack_start(self.scrolled_window, expand=True, fill=True)
121
 
 
122
 
        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()
123
96
 
124
97
        self.iter = None
125
98
        self.branch = branch
136
109
    def do_get_property(self, property):
137
110
        if property.name == 'revno-column-visible':
138
111
            return self.revno_column.get_visible()
139
 
        elif property.name == 'graph-column-visible':
140
 
            return self.graph_column.get_visible()
141
112
        elif property.name == 'date-column-visible':
142
113
            return self.date_column.get_visible()
143
114
        elif property.name == 'compact':
144
115
            return self.compact
145
 
        elif property.name == 'mainline-only':
146
 
            return self.mainline_only
147
116
        elif property.name == 'branch':
148
117
            return self.branch
149
118
        elif property.name == 'revision':
160
129
    def do_set_property(self, property, value):
161
130
        if property.name == 'revno-column-visible':
162
131
            self.revno_column.set_visible(value)
163
 
        elif property.name == 'graph-column-visible':
164
 
            self.graph_column.set_visible(value)
165
132
        elif property.name == 'date-column-visible':
166
133
            self.date_column.set_visible(value)
167
134
        elif property.name == 'compact':
168
135
            self.compact = value
169
 
        elif property.name == 'mainline-only':
170
 
            self.mainline_only = value
171
136
        elif property.name == 'branch':
172
137
            self.branch = value
173
138
        elif property.name == 'revision':
218
183
 
219
184
        finally:
220
185
            self.branch.lock_read()
221
 
 
222
 
        self.emit('tag-added', tag, revid)
223
186
        
224
187
    def refresh(self):
225
188
        gobject.idle_add(self.populate, self.get_revision())
275
238
                       should be broken.
276
239
        """
277
240
 
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()
 
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()
316
293
 
317
294
    def construct_treeview(self):
318
295
        self.treeview = gtk.TreeView()
336
313
 
337
314
        self.treeview.set_property('fixed-height-mode', True)
338
315
 
 
316
        self.add(self.treeview)
339
317
        self.treeview.show()
340
318
 
341
319
        cell = gtk.CellRendererText()
342
320
        cell.set_property("width-chars", 15)
343
321
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
344
322
        self.revno_column = gtk.TreeViewColumn("Revision No")
345
 
        self.revno_column.set_resizable(False)
 
323
        self.revno_column.set_resizable(True)
346
324
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
347
325
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
348
326
        self.revno_column.pack_start(cell, expand=True)
351
329
 
352
330
        self.graph_cell = CellRendererGraph()
353
331
        self.graph_column = gtk.TreeViewColumn()
354
 
        self.graph_column.set_resizable(False)
 
332
        self.graph_column.set_resizable(True)
355
333
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
356
 
        self.graph_column.pack_start(self.graph_cell, expand=True)
 
334
        self.graph_column.pack_start(self.graph_cell, expand=False)
357
335
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
358
336
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
359
337
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
363
341
        cell = gtk.CellRendererText()
364
342
        cell.set_property("width-chars", 65)
365
343
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
366
 
        self.summary_column = gtk.TreeViewColumn("Summary")
367
 
        self.summary_column.set_resizable(False)
368
 
        self.summary_column.set_expand(True)
369
 
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
370
 
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
371
 
        self.summary_column.pack_start(cell, expand=True)
372
 
        self.summary_column.add_attribute(cell, "markup", treemodel.SUMMARY)
373
 
        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)
374
351
 
375
352
        cell = gtk.CellRendererText()
376
353
        cell.set_property("width-chars", 15)
377
354
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
378
355
        self.committer_column = gtk.TreeViewColumn("Committer")
379
 
        self.committer_column.set_resizable(False)
 
356
        self.committer_column.set_resizable(True)
380
357
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
381
 
        self.committer_column.set_fixed_width(200)
 
358
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
382
359
        self.committer_column.pack_start(cell, expand=True)
383
 
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
 
360
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITER)
384
361
        self.treeview.append_column(self.committer_column)
385
362
 
386
363
        cell = gtk.CellRendererText()
388
365
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
389
366
        self.date_column = gtk.TreeViewColumn("Date")
390
367
        self.date_column.set_visible(False)
391
 
        self.date_column.set_resizable(False)
 
368
        self.date_column.set_resizable(True)
392
369
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
393
 
        self.date_column.set_fixed_width(130)
 
370
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
394
371
        self.date_column.pack_start(cell, expand=True)
395
372
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
396
373
        self.treeview.append_column(self.date_column)
397
 
        
398
 
        return self.treeview
399
 
    
 
374
 
400
375
    def _on_selection_changed(self, treeview):
401
376
        """callback for when the treeview changes."""
402
377
        (path, focus) = treeview.get_cursor()
410
385
            menu = RevisionPopupMenu(self.branch.repository, 
411
386
                [self.get_revision().revision_id],
412
387
                self.branch)
413
 
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
414
388
            menu.popup(None, None, None, event.button, event.get_time())
415
389
 
416
390
    def _on_revision_activated(self, widget, path, col):
417
 
        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()