/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: Szilveszter Farkas (Phanatic)
  • Date: 2008-05-23 13:14:58 UTC
  • mfrom: (487.3.1 bug.228709)
  • Revision ID: szilveszter.farkas@gmail.com-20080523131458-l53e1pcace4hnbtw
Merged fix for #228709 by Javier.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branchview/treeview.py
14
14
import re
15
15
import treemodel
16
16
 
 
17
from bzrlib.plugins.gtk import _i18n
17
18
from linegraph import linegraph, same_branch
18
19
from graphcell import CellRendererGraph
19
20
from treemodel import TreeModel
49
50
                    gobject.PARAM_READABLE),
50
51
 
51
52
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
52
 
                                 'Revision number',
 
53
                                 'Revision number column',
53
54
                                 'Show revision number column',
54
55
                                 True,
55
56
                                 gobject.PARAM_READWRITE),
56
57
 
 
58
        'graph-column-visible': (gobject.TYPE_BOOLEAN,
 
59
                                 'Graph column',
 
60
                                 'Show graph column',
 
61
                                 True,
 
62
                                 gobject.PARAM_READWRITE),
 
63
 
57
64
        'date-column-visible': (gobject.TYPE_BOOLEAN,
58
65
                                 'Date',
59
66
                                 'Show date column',
64
71
                    'Compact view',
65
72
                    'Break ancestry lines to save space',
66
73
                    True,
67
 
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE)
 
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),
68
81
 
69
82
    }
70
83
 
75
88
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
76
89
                              gobject.TYPE_NONE,
77
90
                              ()),
 
91
        'revision-activated': (gobject.SIGNAL_RUN_FIRST,
 
92
                              gobject.TYPE_NONE,
 
93
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
78
94
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
79
95
                              gobject.TYPE_NONE,
80
96
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
97
113
                lambda x: self.loading_msg_box.hide())
98
114
 
99
115
        self.scrolled_window = gtk.ScrolledWindow()
100
 
        self.scrolled_window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
116
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
 
117
                                        gtk.POLICY_AUTOMATIC)
101
118
        self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
102
119
        self.scrolled_window.show()
103
120
        self.pack_start(self.scrolled_window, expand=True, fill=True)
120
137
    def do_get_property(self, property):
121
138
        if property.name == 'revno-column-visible':
122
139
            return self.revno_column.get_visible()
 
140
        elif property.name == 'graph-column-visible':
 
141
            return self.graph_column.get_visible()
123
142
        elif property.name == 'date-column-visible':
124
143
            return self.date_column.get_visible()
125
144
        elif property.name == 'compact':
126
145
            return self.compact
 
146
        elif property.name == 'mainline-only':
 
147
            return self.mainline_only
127
148
        elif property.name == 'branch':
128
149
            return self.branch
129
150
        elif property.name == 'revision':
140
161
    def do_set_property(self, property, value):
141
162
        if property.name == 'revno-column-visible':
142
163
            self.revno_column.set_visible(value)
 
164
        elif property.name == 'graph-column-visible':
 
165
            self.graph_column.set_visible(value)
143
166
        elif property.name == 'date-column-visible':
144
167
            self.date_column.set_visible(value)
145
168
        elif property.name == 'compact':
146
169
            self.compact = value
 
170
        elif property.name == 'mainline-only':
 
171
            self.mainline_only = value
147
172
        elif property.name == 'branch':
148
173
            self.branch = value
149
174
        elif property.name == 'revision':
256
281
            broken_line_length = 32
257
282
        else:
258
283
            broken_line_length = None
 
284
        
 
285
        show_graph = self.graph_column.get_visible()
259
286
 
260
287
        self.branch.lock_read()
261
288
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
262
289
                                                        self.start,
263
290
                                                        self.maxnum, 
264
 
                                                        broken_line_length)
 
291
                                                        broken_line_length,
 
292
                                                        show_graph,
 
293
                                                        self.mainline_only)
265
294
 
266
295
        self.model = TreeModel(self.branch, linegraphdata)
267
296
        self.graph_cell.columns_len = columns_len
273
302
        self.index = index
274
303
        self.treeview.set_model(self.model)
275
304
 
276
 
        if revision is None:
 
305
        if not revision or revision == NULL_REVISION:
277
306
            self.treeview.set_cursor(0)
278
307
        else:
279
308
            self.set_revision(revision)
282
311
 
283
312
        return False
284
313
 
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
 
 
308
314
    def construct_treeview(self):
309
315
        self.treeview = gtk.TreeView()
310
316
 
392
398
                                                 gtk.ICON_SIZE_BUTTON)
393
399
        image_loading.show()
394
400
        
395
 
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
 
401
        label_loading = gtk.Label(
 
402
            _i18n("Please wait, loading ancestral graph..."))
396
403
        label_loading.set_alignment(0.0, 0.5)
397
404
        label_loading.show()
398
405
        
422
429
            menu.popup(None, None, None, event.button, event.get_time())
423
430
 
424
431
    def _on_revision_activated(self, widget, 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()
 
432
        self.emit('revision-activated', path, col)