/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 viz/treeview.py

  • Committer: Daniel Schierbeck
  • Date: 2007-12-06 23:37:06 UTC
  • mto: This revision was merged to the branch mainline in revision 417.
  • Revision ID: daniel.schierbeck@gmail.com-20071206233706-eeinks66w86r3gfm
Fixed bug in gmissing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/treeview.py
17
17
from linegraph import linegraph, same_branch
18
18
from graphcell import CellRendererGraph
19
19
from treemodel import TreeModel
 
20
from bzrlib.revision import NULL_REVISION
20
21
 
21
22
class TreeView(gtk.ScrolledWindow):
22
23
 
 
24
    __gproperties__ = {
 
25
        'branch': (gobject.TYPE_PYOBJECT,
 
26
                   'Branch',
 
27
                   'The Bazaar branch being visualized',
 
28
                   gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE),
 
29
 
 
30
        'revision': (gobject.TYPE_PYOBJECT,
 
31
                     'Revision',
 
32
                     'The currently selected revision',
 
33
                     gobject.PARAM_READWRITE),
 
34
 
 
35
        'revision-number': (gobject.TYPE_STRING,
 
36
                            'Revision number',
 
37
                            'The number of the selected revision',
 
38
                            '',
 
39
                            gobject.PARAM_READABLE),
 
40
 
 
41
        'children': (gobject.TYPE_PYOBJECT,
 
42
                     'Child revisions',
 
43
                     'Children of the currently selected revision',
 
44
                     gobject.PARAM_READABLE),
 
45
 
 
46
        'parents': (gobject.TYPE_PYOBJECT,
 
47
                    'Parent revisions',
 
48
                    'Parents to the currently selected revision',
 
49
                    gobject.PARAM_READABLE),
 
50
 
 
51
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
 
52
                                 'Revision number',
 
53
                                 'Show revision number column',
 
54
                                 True,
 
55
                                 gobject.PARAM_READWRITE),
 
56
 
 
57
        'date-column-visible': (gobject.TYPE_BOOLEAN,
 
58
                                 'Date',
 
59
                                 'Show date column',
 
60
                                 False,
 
61
                                 gobject.PARAM_READWRITE),
 
62
 
 
63
        'compact': (gobject.TYPE_BOOLEAN,
 
64
                    'Compact view',
 
65
                    'Break ancestry lines to save space',
 
66
                    True,
 
67
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE)
 
68
 
 
69
    }
 
70
 
23
71
    __gsignals__ = {
24
 
            'revisions-loaded': (gobject.SIGNAL_RUN_FIRST, 
25
 
                                 gobject.TYPE_NONE,
26
 
                                 ()),
27
 
            'revision-selected': (gobject.SIGNAL_RUN_FIRST,
28
 
                                  gobject.TYPE_NONE,
29
 
                                  ())
 
72
        'revisions-loaded': (gobject.SIGNAL_RUN_FIRST, 
 
73
                             gobject.TYPE_NONE,
 
74
                             ()),
 
75
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
 
76
                              gobject.TYPE_NONE,
 
77
                              ())
30
78
    }
31
79
 
32
 
    def __init__(self, branch, start, maxnum):
 
80
    def __init__(self, branch, start, maxnum, compact=True):
33
81
        """Create a new TreeView.
34
82
 
35
83
        :param branch: Branch object for branch to show.
36
84
        :param start: Revision id of top revision.
37
85
        :param maxnum: Maximum number of revisions to display, 
38
86
                       None for no limit.
 
87
        :param broken_line_length: After how much lines to break 
 
88
                                   branches.
39
89
        """
40
90
        gtk.ScrolledWindow.__init__(self)
41
91
 
44
94
 
45
95
        self.construct_treeview()
46
96
 
 
97
        self.iter   = None
47
98
        self.branch = branch
48
 
        self.branch.lock_read()
49
 
 
50
 
        gobject.idle_add(self.populate, start, maxnum)
51
 
 
52
 
        self.revision = None
53
 
        self.children = None
54
 
        self.parents  = None
55
 
 
56
 
        self.connect('destroy', lambda w: self.branch.unlock())
 
99
 
 
100
        self.start = start
 
101
        self.maxnum = maxnum
 
102
        self.compact = compact
 
103
 
 
104
        gobject.idle_add(self.populate)
 
105
 
 
106
        self.connect("destroy", lambda x: self.branch.unlock())
 
107
 
 
108
    def do_get_property(self, property):
 
109
        if property.name == 'revno-column-visible':
 
110
            return self.revno_column.get_visible()
 
111
        elif property.name == 'date-column-visible':
 
112
            return self.date_column.get_visible()
 
113
        elif property.name == 'compact':
 
114
            return self.compact
 
115
        elif property.name == 'branch':
 
116
            return self.branch
 
117
        elif property.name == 'revision':
 
118
            return self.model.get_value(self.iter, treemodel.REVISION)
 
119
        elif property.name == 'revision-number':
 
120
            return self.model.get_value(self.iter, treemodel.REVNO)
 
121
        elif property.name == 'children':
 
122
            return self.model.get_value(self.iter, treemodel.CHILDREN)
 
123
        elif property.name == 'parents':
 
124
            return self.model.get_value(self.iter, treemodel.PARENTS)
 
125
        else:
 
126
            raise AttributeError, 'unknown property %s' % property.name
 
127
 
 
128
    def do_set_property(self, property, value):
 
129
        if property.name == 'revno-column-visible':
 
130
            self.revno_column.set_visible(value)
 
131
        elif property.name == 'date-column-visible':
 
132
            self.date_column.set_visible(value)
 
133
        elif property.name == 'compact':
 
134
            self.compact = value
 
135
        elif property.name == 'branch':
 
136
            self.branch = value
 
137
        elif property.name == 'revision':
 
138
            self.set_revision_id(value.revision_id)
 
139
        else:
 
140
            raise AttributeError, 'unknown property %s' % property.name
57
141
 
58
142
    def get_revision(self):
59
143
        """Return revision id of currently selected revision, or None."""
60
 
        return self.revision
61
 
 
62
 
    def set_revision(self, revid):
 
144
        return self.get_property('revision')
 
145
 
 
146
    def set_revision(self, revision):
 
147
        self.set_property('revision', revision)
 
148
 
 
149
    def set_revision_id(self, revid):
63
150
        """Change the currently selected revision.
64
151
 
65
152
        :param revid: Revision id of revision to display.
72
159
 
73
160
        :return: list of revision ids.
74
161
        """
75
 
        return self.children
 
162
        return self.get_property('children')
76
163
 
77
164
    def get_parents(self):
78
165
        """Return the parents of the currently selected revision.
79
166
 
80
167
        :return: list of revision ids.
81
168
        """
82
 
        return self.parents
 
169
        return self.get_property('parents')
83
170
        
 
171
    def refresh(self):
 
172
        gobject.idle_add(self.populate, self.get_revision())
 
173
 
 
174
    def update(self):
 
175
        try:
 
176
            self.branch.unlock()
 
177
            try:
 
178
                self.branch.lock_write()
 
179
                self.branch.update()
 
180
            finally:
 
181
                self.branch.unlock()
 
182
        finally:
 
183
            self.branch.lock_read()
 
184
 
84
185
    def back(self):
85
186
        """Signal handler for the Back button."""
86
 
        (path, col) = self.treeview.get_cursor()
87
 
        revision = self.model[path][treemodel.REVISION]
88
 
        parents = self.model[path][treemodel.PARENTS]
 
187
        parents = self.get_parents()
89
188
        if not len(parents):
90
189
            return
91
190
 
92
191
        for parent_id in parents:
93
192
            parent_index = self.index[parent_id]
94
193
            parent = self.model[parent_index][treemodel.REVISION]
95
 
            if same_branch(revision, parent):
96
 
                self.treeview.set_cursor(parent_index)
 
194
            if same_branch(self.get_revision(), parent):
 
195
                self.set_revision(parent)
97
196
                break
98
197
        else:
99
 
            self.treeview.set_cursor(self.index[parents[0]])
100
 
        self.treeview.grab_focus()
 
198
            self.set_revision_id(parents[0])
101
199
 
102
200
    def forward(self):
103
201
        """Signal handler for the Forward button."""
104
 
        (path, col) = self.treeview.get_cursor()
105
 
        revision = self.model[path][treemodel.REVISION]
106
 
        children = self.model[path][treemodel.CHILDREN]
 
202
        children = self.get_children()
107
203
        if not len(children):
108
204
            return
109
205
 
110
206
        for child_id in children:
111
207
            child_index = self.index[child_id]
112
208
            child = self.model[child_index][treemodel.REVISION]
113
 
            if same_branch(child, revision):
114
 
                self.treeview.set_cursor(child_index)
 
209
            if same_branch(child, self.get_revision()):
 
210
                self.set_revision(child)
115
211
                break
116
212
        else:
117
 
            self.treeview.set_cursor(self.index[children[0]])
118
 
        self.treeview.grab_focus()
 
213
            self.set_revision_id(children[0])
119
214
 
120
 
    def populate(self, start, maxnum):
 
215
    def populate(self, revision=None):
121
216
        """Fill the treeview with contents.
122
217
 
123
218
        :param start: Revision id of revision to start with.
124
219
        :param maxnum: Maximum number of revisions to display, or None 
125
220
                       for no limit.
 
221
        :param broken_line_length: After how much lines branches \
 
222
                       should be broken.
126
223
        """
127
 
        (linegraphdata, index, columns_len) = linegraph(self.branch,
128
 
                                                        start,
129
 
                                                        maxnum)
130
 
 
131
 
        self.model = TreeModel(self.branch, linegraphdata)
 
224
 
 
225
        if self.compact:
 
226
            broken_line_length = 32
 
227
        else:
 
228
            broken_line_length = None
 
229
 
 
230
        self.branch.lock_read()
 
231
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
 
232
                                                        self.start,
 
233
                                                        self.maxnum, 
 
234
                                                        broken_line_length)
 
235
 
 
236
        self.model = TreeModel(self.branch.repository, linegraphdata)
132
237
        self.graph_cell.columns_len = columns_len
133
238
        width = self.graph_cell.get_size(self.treeview)[2]
 
239
        if width > 500:
 
240
            width = 500
134
241
        self.graph_column.set_fixed_width(width)
135
242
        self.graph_column.set_max_width(width)
136
243
        self.index = index
137
244
        self.treeview.set_model(self.model)
138
 
        self.treeview.set_cursor(0)
 
245
 
 
246
        if revision is None:
 
247
            self.treeview.set_cursor(0)
 
248
        else:
 
249
            self.set_revision(revision)
 
250
 
139
251
        self.emit('revisions-loaded')
140
252
 
141
253
        return False
142
254
 
143
 
    def show_diff(self, branch, revid, parentid):
 
255
    def show_diff(self, revid=None, parentid=None):
144
256
        """Open a new window to show a diff between the given revisions."""
145
257
        from bzrlib.plugins.gtk.diff import DiffWindow
146
258
        window = DiffWindow(parent=self)
147
 
        (parent_tree, rev_tree) = branch.repository.revision_trees([parentid, 
148
 
                                                                   revid])
149
 
        description = revid + " - " + branch.nick
 
259
 
 
260
        parents = self.get_parents()
 
261
 
 
262
        if revid is None:
 
263
            revid = self.get_revision().revision_id
 
264
 
 
265
            if parentid is None and len(parents) > 0:
 
266
                parentid = parents[0]
 
267
 
 
268
        if parentid is None:
 
269
            parentid = NULL_REVISION
 
270
 
 
271
        rev_tree    = self.branch.repository.revision_tree(revid)
 
272
        parent_tree = self.branch.repository.revision_tree(parentid)
 
273
 
 
274
        description = revid + " - " + self.branch.nick
150
275
        window.set_diff(description, rev_tree, parent_tree)
151
276
        window.show()
152
277
 
154
279
        self.treeview = gtk.TreeView()
155
280
 
156
281
        self.treeview.set_rules_hint(True)
157
 
        self.treeview.set_search_column(4)
 
282
        self.treeview.set_search_column(treemodel.REVNO)
 
283
        
 
284
        # Fix old PyGTK bug - by JAM
 
285
        set_tooltip = getattr(self.treeview, 'set_tooltip_column', None)
 
286
        if set_tooltip is not None:
 
287
            set_tooltip(treemodel.MESSAGE)
158
288
 
159
 
        self.treeview.get_selection().connect("changed",
 
289
        self.treeview.connect("cursor-changed",
160
290
                self._on_selection_changed)
161
291
 
162
292
        self.treeview.connect("row-activated", 
173
303
        cell = gtk.CellRendererText()
174
304
        cell.set_property("width-chars", 15)
175
305
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
176
 
        column = gtk.TreeViewColumn("Revision No")
177
 
        column.set_resizable(True)
178
 
        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
179
 
        column.set_fixed_width(cell.get_size(self.treeview)[2])
180
 
        column.pack_start(cell, expand=True)
181
 
        column.add_attribute(cell, "text", treemodel.REVNO)
182
 
        self.treeview.append_column(column)
 
306
        self.revno_column = gtk.TreeViewColumn("Revision No")
 
307
        self.revno_column.set_resizable(True)
 
308
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
309
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
310
        self.revno_column.pack_start(cell, expand=True)
 
311
        self.revno_column.add_attribute(cell, "text", treemodel.REVNO)
 
312
        self.treeview.append_column(self.revno_column)
183
313
 
184
314
        self.graph_cell = CellRendererGraph()
185
315
        self.graph_column = gtk.TreeViewColumn()
194
324
        cell = gtk.CellRendererText()
195
325
        cell.set_property("width-chars", 65)
196
326
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
197
 
        column = gtk.TreeViewColumn("Message")
198
 
        column.set_resizable(True)
199
 
        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
200
 
        column.set_fixed_width(cell.get_size(self.treeview)[2])
201
 
        column.pack_start(cell, expand=True)
202
 
        column.add_attribute(cell, "text", treemodel.MESSAGE)
203
 
        self.treeview.append_column(column)
 
327
        self.msg_column = gtk.TreeViewColumn("Message")
 
328
        self.msg_column.set_resizable(True)
 
329
        self.msg_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
330
        self.msg_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
331
        self.msg_column.pack_start(cell, expand=True)
 
332
        self.msg_column.add_attribute(cell, "markup", treemodel.MESSAGE)
 
333
        self.treeview.append_column(self.msg_column)
204
334
 
205
335
        cell = gtk.CellRendererText()
206
336
        cell.set_property("width-chars", 15)
207
337
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
208
 
        column = gtk.TreeViewColumn("Committer")
209
 
        column.set_resizable(True)
210
 
        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
211
 
        column.set_fixed_width(cell.get_size(self.treeview)[2])
212
 
        column.pack_start(cell, expand=True)
213
 
        column.add_attribute(cell, "text", treemodel.COMMITER)
214
 
        self.treeview.append_column(column)
215
 
 
216
 
    def _on_selection_changed(self, selection, *args):
 
338
        self.committer_column = gtk.TreeViewColumn("Committer")
 
339
        self.committer_column.set_resizable(True)
 
340
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
341
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
342
        self.committer_column.pack_start(cell, expand=True)
 
343
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITER)
 
344
        self.treeview.append_column(self.committer_column)
 
345
 
 
346
        cell = gtk.CellRendererText()
 
347
        cell.set_property("width-chars", 20)
 
348
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
349
        self.date_column = gtk.TreeViewColumn("Date")
 
350
        self.date_column.set_visible(False)
 
351
        self.date_column.set_resizable(True)
 
352
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
353
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
354
        self.date_column.pack_start(cell, expand=True)
 
355
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
 
356
        self.treeview.append_column(self.date_column)
 
357
 
 
358
    def _on_selection_changed(self, treeview):
217
359
        """callback for when the treeview changes."""
218
 
        (model, selected_rows) = selection.get_selected_rows()
219
 
        if len(selected_rows) > 0:
220
 
            iter = self.model.get_iter(selected_rows[0])
221
 
            self.revision = self.model.get_value(iter, treemodel.REVISION)
222
 
            self.parents = self.model.get_value(iter, treemodel.PARENTS)
223
 
            self.children = self.model.get_value(iter, treemodel.CHILDREN)
224
 
 
 
360
        (path, focus) = treeview.get_cursor()
 
361
        if path is not None:
 
362
            self.iter = self.model.get_iter(path)
225
363
            self.emit('revision-selected')
226
364
 
227
365
    def _on_revision_selected(self, widget, event):
237
375
        """Callback for when a treeview row gets activated."""
238
376
        revision_id = self.model[path][treemodel.REVID]
239
377
        parents = self.model[path][treemodel.PARENTS]
 
378
 
240
379
        if len(parents) == 0:
241
 
            # Ignore revisions without parent
242
 
            return
243
 
        parent_id = parents[0]
244
 
        self.show_diff(self.branch, revision_id, parent_id)
 
380
            parent_id = None
 
381
        else:
 
382
            parent_id = parents[0]
 
383
 
 
384
        self.show_diff(revision_id, parent_id)
245
385
        self.treeview.grab_focus()