/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
14
14
import re
15
15
import treemodel
16
16
 
17
 
from bzrlib.plugins.gtk import _i18n
18
17
from linegraph import linegraph, same_branch
19
18
from graphcell import CellRendererGraph
20
19
from treemodel import TreeModel
50
49
                    gobject.PARAM_READABLE),
51
50
 
52
51
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
53
 
                                 'Revision number column',
 
52
                                 'Revision number',
54
53
                                 'Show revision number column',
55
54
                                 True,
56
55
                                 gobject.PARAM_READWRITE),
57
56
 
58
 
        'graph-column-visible': (gobject.TYPE_BOOLEAN,
59
 
                                 'Graph column',
60
 
                                 'Show graph column',
61
 
                                 True,
62
 
                                 gobject.PARAM_READWRITE),
63
 
 
64
57
        'date-column-visible': (gobject.TYPE_BOOLEAN,
65
58
                                 'Date',
66
59
                                 'Show date column',
71
64
                    'Compact view',
72
65
                    'Break ancestry lines to save space',
73
66
                    True,
74
 
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
75
 
 
76
 
        'mainline-only': (gobject.TYPE_BOOLEAN,
77
 
                    'Mainline only',
78
 
                    'Only show the mainline history.',
79
 
                    False,
80
 
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
 
67
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE)
81
68
 
82
69
    }
83
70
 
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
80
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
113
97
                lambda x: self.loading_msg_box.hide())
114
98
 
115
99
        self.scrolled_window = gtk.ScrolledWindow()
116
 
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
117
 
                                        gtk.POLICY_AUTOMATIC)
 
100
        self.scrolled_window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
118
101
        self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
119
102
        self.scrolled_window.show()
120
103
        self.pack_start(self.scrolled_window, expand=True, fill=True)
137
120
    def do_get_property(self, property):
138
121
        if property.name == 'revno-column-visible':
139
122
            return self.revno_column.get_visible()
140
 
        elif property.name == 'graph-column-visible':
141
 
            return self.graph_column.get_visible()
142
123
        elif property.name == 'date-column-visible':
143
124
            return self.date_column.get_visible()
144
125
        elif property.name == 'compact':
145
126
            return self.compact
146
 
        elif property.name == 'mainline-only':
147
 
            return self.mainline_only
148
127
        elif property.name == 'branch':
149
128
            return self.branch
150
129
        elif property.name == 'revision':
161
140
    def do_set_property(self, property, value):
162
141
        if property.name == 'revno-column-visible':
163
142
            self.revno_column.set_visible(value)
164
 
        elif property.name == 'graph-column-visible':
165
 
            self.graph_column.set_visible(value)
166
143
        elif property.name == 'date-column-visible':
167
144
            self.date_column.set_visible(value)
168
145
        elif property.name == 'compact':
169
146
            self.compact = value
170
 
        elif property.name == 'mainline-only':
171
 
            self.mainline_only = value
172
147
        elif property.name == 'branch':
173
148
            self.branch = value
174
149
        elif property.name == 'revision':
281
256
            broken_line_length = 32
282
257
        else:
283
258
            broken_line_length = None
284
 
        
285
 
        show_graph = self.graph_column.get_visible()
286
259
 
287
260
        self.branch.lock_read()
288
261
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
289
 
                                                        (self.start,) , # Sequence of start revisions
 
262
                                                        self.start,
290
263
                                                        self.maxnum, 
291
 
                                                        broken_line_length,
292
 
                                                        show_graph,
293
 
                                                        self.mainline_only)
 
264
                                                        broken_line_length)
294
265
 
295
266
        self.model = TreeModel(self.branch, linegraphdata)
296
267
        self.graph_cell.columns_len = columns_len
302
273
        self.index = index
303
274
        self.treeview.set_model(self.model)
304
275
 
305
 
        if not revision or revision == NULL_REVISION:
 
276
        if revision is None:
306
277
            self.treeview.set_cursor(0)
307
278
        else:
308
279
            self.set_revision(revision)
311
282
 
312
283
        return False
313
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()
 
307
 
314
308
    def construct_treeview(self):
315
309
        self.treeview = gtk.TreeView()
316
310
 
339
333
        cell.set_property("width-chars", 15)
340
334
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
341
335
        self.revno_column = gtk.TreeViewColumn("Revision No")
342
 
        self.revno_column.set_resizable(False)
 
336
        self.revno_column.set_resizable(True)
343
337
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
344
338
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
345
339
        self.revno_column.pack_start(cell, expand=True)
348
342
 
349
343
        self.graph_cell = CellRendererGraph()
350
344
        self.graph_column = gtk.TreeViewColumn()
351
 
        self.graph_column.set_resizable(False)
 
345
        self.graph_column.set_resizable(True)
352
346
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
353
 
        self.graph_column.pack_start(self.graph_cell, expand=True)
 
347
        self.graph_column.pack_start(self.graph_cell, expand=False)
354
348
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
355
349
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
356
350
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
361
355
        cell.set_property("width-chars", 65)
362
356
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
363
357
        self.summary_column = gtk.TreeViewColumn("Summary")
364
 
        self.summary_column.set_resizable(False)
365
 
        self.summary_column.set_expand(True)
 
358
        self.summary_column.set_resizable(True)
366
359
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
367
360
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
368
361
        self.summary_column.pack_start(cell, expand=True)
373
366
        cell.set_property("width-chars", 15)
374
367
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
375
368
        self.committer_column = gtk.TreeViewColumn("Committer")
376
 
        self.committer_column.set_resizable(False)
 
369
        self.committer_column.set_resizable(True)
377
370
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
378
 
        self.committer_column.set_fixed_width(200)
 
371
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
379
372
        self.committer_column.pack_start(cell, expand=True)
380
373
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
381
374
        self.treeview.append_column(self.committer_column)
385
378
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
386
379
        self.date_column = gtk.TreeViewColumn("Date")
387
380
        self.date_column.set_visible(False)
388
 
        self.date_column.set_resizable(False)
 
381
        self.date_column.set_resizable(True)
389
382
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
390
 
        self.date_column.set_fixed_width(130)
 
383
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
391
384
        self.date_column.pack_start(cell, expand=True)
392
385
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
393
386
        self.treeview.append_column(self.date_column)
399
392
                                                 gtk.ICON_SIZE_BUTTON)
400
393
        image_loading.show()
401
394
        
402
 
        label_loading = gtk.Label(
403
 
            _i18n("Please wait, loading ancestral graph..."))
 
395
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
404
396
        label_loading.set_alignment(0.0, 0.5)
405
397
        label_loading.show()
406
398
        
430
422
            menu.popup(None, None, None, event.button, event.get_time())
431
423
 
432
424
    def _on_revision_activated(self, widget, path, col):
433
 
        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()