/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: Jelmer Vernooij
  • Date: 2007-12-21 20:20:37 UTC
  • mto: This revision was merged to the branch mainline in revision 422.
  • Revision ID: jelmer@samba.org-20071221202037-6zvbwefvrte3e2zy
Fix URL.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/treeview.py
32
32
                     'The currently selected revision',
33
33
                     gobject.PARAM_READWRITE),
34
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
 
35
51
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
36
52
                                 'Revision number',
37
53
                                 'Show revision number column',
39
55
                                 gobject.PARAM_READWRITE),
40
56
 
41
57
        'date-column-visible': (gobject.TYPE_BOOLEAN,
42
 
                                 'Revision number',
43
 
                                 'Show revision number column',
 
58
                                 'Date',
 
59
                                 'Show date column',
44
60
                                 False,
45
 
                                 gobject.PARAM_READWRITE)
 
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)
46
68
 
47
69
    }
48
70
 
55
77
                              ())
56
78
    }
57
79
 
58
 
    def __init__(self, branch, start, maxnum, broken_line_length=None):
 
80
    def __init__(self, branch, start, maxnum, compact=True):
59
81
        """Create a new TreeView.
60
82
 
61
83
        :param branch: Branch object for branch to show.
72
94
 
73
95
        self.construct_treeview()
74
96
 
 
97
        self.iter   = None
75
98
        self.branch = branch
76
 
        self.branch.lock_read()
77
 
 
78
 
        gobject.idle_add(self.populate, start, maxnum, 
79
 
                         broken_line_length)
80
 
 
81
 
        self.revision = None
82
 
        self.children = None
83
 
        self.parents  = None
84
 
 
85
 
        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())
86
107
 
87
108
    def do_get_property(self, property):
88
109
        if property.name == 'revno-column-visible':
89
110
            return self.revno_column.get_visible()
90
111
        elif property.name == 'date-column-visible':
91
112
            return self.date_column.get_visible()
 
113
        elif property.name == 'compact':
 
114
            return self.compact
92
115
        elif property.name == 'branch':
93
116
            return self.branch
94
117
        elif property.name == 'revision':
95
 
            return self.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)
96
125
        else:
97
126
            raise AttributeError, 'unknown property %s' % property.name
98
127
 
101
130
            self.revno_column.set_visible(value)
102
131
        elif property.name == 'date-column-visible':
103
132
            self.date_column.set_visible(value)
 
133
        elif property.name == 'compact':
 
134
            self.compact = value
104
135
        elif property.name == 'branch':
105
136
            self.branch = value
106
137
        elif property.name == 'revision':
110
141
 
111
142
    def get_revision(self):
112
143
        """Return revision id of currently selected revision, or None."""
113
 
        return self.revision
 
144
        return self.get_property('revision')
 
145
 
 
146
    def set_revision(self, revision):
 
147
        self.set_property('revision', revision)
114
148
 
115
149
    def set_revision_id(self, revid):
116
150
        """Change the currently selected revision.
125
159
 
126
160
        :return: list of revision ids.
127
161
        """
128
 
        return self.children
 
162
        return self.get_property('children')
129
163
 
130
164
    def get_parents(self):
131
165
        """Return the parents of the currently selected revision.
132
166
 
133
167
        :return: list of revision ids.
134
168
        """
135
 
        return self.parents
 
169
        return self.get_property('parents')
136
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
 
137
185
    def back(self):
138
186
        """Signal handler for the Back button."""
139
 
        (path, col) = self.treeview.get_cursor()
140
 
        revision = self.model[path][treemodel.REVISION]
141
 
        parents = self.model[path][treemodel.PARENTS]
 
187
        parents = self.get_parents()
142
188
        if not len(parents):
143
189
            return
144
190
 
145
191
        for parent_id in parents:
146
192
            parent_index = self.index[parent_id]
147
193
            parent = self.model[parent_index][treemodel.REVISION]
148
 
            if same_branch(revision, parent):
149
 
                self.treeview.set_cursor(parent_index)
 
194
            if same_branch(self.get_revision(), parent):
 
195
                self.set_revision(parent)
150
196
                break
151
197
        else:
152
 
            self.treeview.set_cursor(self.index[parents[0]])
153
 
        self.treeview.grab_focus()
 
198
            self.set_revision_id(parents[0])
154
199
 
155
200
    def forward(self):
156
201
        """Signal handler for the Forward button."""
157
 
        (path, col) = self.treeview.get_cursor()
158
 
        revision = self.model[path][treemodel.REVISION]
159
 
        children = self.model[path][treemodel.CHILDREN]
 
202
        children = self.get_children()
160
203
        if not len(children):
161
204
            return
162
205
 
163
206
        for child_id in children:
164
207
            child_index = self.index[child_id]
165
208
            child = self.model[child_index][treemodel.REVISION]
166
 
            if same_branch(child, revision):
167
 
                self.treeview.set_cursor(child_index)
 
209
            if same_branch(child, self.get_revision()):
 
210
                self.set_revision(child)
168
211
                break
169
212
        else:
170
 
            self.treeview.set_cursor(self.index[children[0]])
171
 
        self.treeview.grab_focus()
 
213
            self.set_revision_id(children[0])
172
214
 
173
 
    def populate(self, start, maxnum, broken_line_length=None):
 
215
    def populate(self, revision=None):
174
216
        """Fill the treeview with contents.
175
217
 
176
218
        :param start: Revision id of revision to start with.
179
221
        :param broken_line_length: After how much lines branches \
180
222
                       should be broken.
181
223
        """
 
224
 
 
225
        if self.compact:
 
226
            broken_line_length = 32
 
227
        else:
 
228
            broken_line_length = None
 
229
 
 
230
        self.branch.lock_read()
182
231
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
183
 
                                                        start,
184
 
                                                        maxnum, 
 
232
                                                        self.start,
 
233
                                                        self.maxnum, 
185
234
                                                        broken_line_length)
186
235
 
187
236
        self.model = TreeModel(self.branch.repository, linegraphdata)
188
237
        self.graph_cell.columns_len = columns_len
189
238
        width = self.graph_cell.get_size(self.treeview)[2]
 
239
        if width > 500:
 
240
            width = 500
190
241
        self.graph_column.set_fixed_width(width)
191
242
        self.graph_column.set_max_width(width)
192
243
        self.index = index
193
244
        self.treeview.set_model(self.model)
194
 
        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
 
195
251
        self.emit('revisions-loaded')
196
252
 
197
253
        return False
198
254
 
199
 
    def show_diff(self, branch, revid, parentid=None):
 
255
    def show_diff(self, revid=None, parentid=None):
200
256
        """Open a new window to show a diff between the given revisions."""
201
257
        from bzrlib.plugins.gtk.diff import DiffWindow
202
258
        window = DiffWindow(parent=self)
203
259
 
204
 
        rev_tree = branch.repository.revision_tree(revid)
 
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]
205
267
 
206
268
        if parentid is None:
207
269
            parentid = NULL_REVISION
208
270
 
209
 
        parent_tree = branch.repository.revision_tree(parentid)
 
271
        rev_tree    = self.branch.repository.revision_tree(revid)
 
272
        parent_tree = self.branch.repository.revision_tree(parentid)
210
273
 
211
 
        description = revid + " - " + branch.nick
 
274
        description = revid + " - " + self.branch.nick
212
275
        window.set_diff(description, rev_tree, parent_tree)
213
276
        window.show()
214
277
 
217
280
 
218
281
        self.treeview.set_rules_hint(True)
219
282
        self.treeview.set_search_column(treemodel.REVNO)
220
 
        self.treeview.set_tooltip_column(treemodel.MESSAGE)
 
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)
221
288
 
222
 
        self.treeview.get_selection().connect("changed",
 
289
        self.treeview.connect("cursor-changed",
223
290
                self._on_selection_changed)
224
291
 
225
292
        self.treeview.connect("row-activated", 
277
344
        self.treeview.append_column(self.committer_column)
278
345
 
279
346
        cell = gtk.CellRendererText()
280
 
        cell.set_property("width-chars", 40)
 
347
        cell.set_property("width-chars", 20)
281
348
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
282
349
        self.date_column = gtk.TreeViewColumn("Date")
283
350
        self.date_column.set_visible(False)
288
355
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
289
356
        self.treeview.append_column(self.date_column)
290
357
 
291
 
    def _on_selection_changed(self, selection, *args):
 
358
    def _on_selection_changed(self, treeview):
292
359
        """callback for when the treeview changes."""
293
 
        (model, selected_rows) = selection.get_selected_rows()
294
 
        if len(selected_rows) > 0:
295
 
            iter = self.model.get_iter(selected_rows[0])
296
 
            self.revision = self.model.get_value(iter, treemodel.REVISION)
297
 
            self.parents = self.model.get_value(iter, treemodel.PARENTS)
298
 
            self.children = self.model.get_value(iter, treemodel.CHILDREN)
299
 
 
 
360
        (path, focus) = treeview.get_cursor()
 
361
        if path is not None:
 
362
            self.iter = self.model.get_iter(path)
300
363
            self.emit('revision-selected')
301
364
 
302
365
    def _on_revision_selected(self, widget, event):
318
381
        else:
319
382
            parent_id = parents[0]
320
383
 
321
 
        self.show_diff(self.branch, revision_id, parent_id)
 
384
        self.show_diff(revision_id, parent_id)
322
385
        self.treeview.grab_focus()