/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: Aaron Bentley
  • Date: 2008-02-23 06:39:14 UTC
  • Revision ID: aaron@aaronbentley.com-20080223063914-49gdt7ed630rug9b
Add handle-patch script

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
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
                              ()),
89
 
        'revision-activated': (gobject.SIGNAL_RUN_FIRST,
90
 
                              gobject.TYPE_NONE,
91
 
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
92
78
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
93
79
                              gobject.TYPE_NONE,
94
80
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
106
92
        """
107
93
        gtk.VBox.__init__(self, spacing=0)
108
94
 
 
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())
 
98
 
109
99
        self.scrolled_window = gtk.ScrolledWindow()
110
 
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
111
 
                                        gtk.POLICY_AUTOMATIC)
 
100
        self.scrolled_window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
112
101
        self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
113
102
        self.scrolled_window.show()
114
103
        self.pack_start(self.scrolled_window, expand=True, fill=True)
115
104
 
116
105
        self.scrolled_window.add(self.construct_treeview())
 
106
        
117
107
 
118
108
        self.iter = None
119
109
        self.branch = branch
130
120
    def do_get_property(self, property):
131
121
        if property.name == 'revno-column-visible':
132
122
            return self.revno_column.get_visible()
133
 
        elif property.name == 'graph-column-visible':
134
 
            return self.graph_column.get_visible()
135
123
        elif property.name == 'date-column-visible':
136
124
            return self.date_column.get_visible()
137
125
        elif property.name == 'compact':
138
126
            return self.compact
139
 
        elif property.name == 'mainline-only':
140
 
            return self.mainline_only
141
127
        elif property.name == 'branch':
142
128
            return self.branch
143
129
        elif property.name == 'revision':
154
140
    def do_set_property(self, property, value):
155
141
        if property.name == 'revno-column-visible':
156
142
            self.revno_column.set_visible(value)
157
 
        elif property.name == 'graph-column-visible':
158
 
            self.graph_column.set_visible(value)
159
143
        elif property.name == 'date-column-visible':
160
144
            self.date_column.set_visible(value)
161
145
        elif property.name == 'compact':
162
146
            self.compact = value
163
 
        elif property.name == 'mainline-only':
164
 
            self.mainline_only = value
165
147
        elif property.name == 'branch':
166
148
            self.branch = value
167
149
        elif property.name == 'revision':
216
198
        self.emit('tag-added', tag, revid)
217
199
        
218
200
    def refresh(self):
 
201
        self.loading_msg_box.show()
219
202
        gobject.idle_add(self.populate, self.get_revision())
220
203
 
221
204
    def update(self):
269
252
                       should be broken.
270
253
        """
271
254
 
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()
 
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()
310
307
 
311
308
    def construct_treeview(self):
312
309
        self.treeview = gtk.TreeView()
336
333
        cell.set_property("width-chars", 15)
337
334
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
338
335
        self.revno_column = gtk.TreeViewColumn("Revision No")
339
 
        self.revno_column.set_resizable(False)
 
336
        self.revno_column.set_resizable(True)
340
337
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
341
338
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
342
339
        self.revno_column.pack_start(cell, expand=True)
345
342
 
346
343
        self.graph_cell = CellRendererGraph()
347
344
        self.graph_column = gtk.TreeViewColumn()
348
 
        self.graph_column.set_resizable(False)
 
345
        self.graph_column.set_resizable(True)
349
346
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
350
 
        self.graph_column.pack_start(self.graph_cell, expand=True)
 
347
        self.graph_column.pack_start(self.graph_cell, expand=False)
351
348
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
352
349
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
353
350
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
358
355
        cell.set_property("width-chars", 65)
359
356
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
360
357
        self.summary_column = gtk.TreeViewColumn("Summary")
361
 
        self.summary_column.set_resizable(False)
362
 
        self.summary_column.set_expand(True)
 
358
        self.summary_column.set_resizable(True)
363
359
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
364
360
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
365
361
        self.summary_column.pack_start(cell, expand=True)
370
366
        cell.set_property("width-chars", 15)
371
367
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
372
368
        self.committer_column = gtk.TreeViewColumn("Committer")
373
 
        self.committer_column.set_resizable(False)
 
369
        self.committer_column.set_resizable(True)
374
370
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
375
 
        self.committer_column.set_fixed_width(200)
 
371
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
376
372
        self.committer_column.pack_start(cell, expand=True)
377
373
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
378
374
        self.treeview.append_column(self.committer_column)
382
378
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
383
379
        self.date_column = gtk.TreeViewColumn("Date")
384
380
        self.date_column.set_visible(False)
385
 
        self.date_column.set_resizable(False)
 
381
        self.date_column.set_resizable(True)
386
382
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
387
 
        self.date_column.set_fixed_width(130)
 
383
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
388
384
        self.date_column.pack_start(cell, expand=True)
389
385
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
390
386
        self.treeview.append_column(self.date_column)
391
387
        
392
388
        return self.treeview
 
389
    
 
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
393
407
 
394
408
    def _on_selection_changed(self, treeview):
395
409
        """callback for when the treeview changes."""
408
422
            menu.popup(None, None, None, event.button, event.get_time())
409
423
 
410
424
    def _on_revision_activated(self, widget, path, col):
411
 
        self.emit('revision-activated', 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()