/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: Daniel Schierbeck
  • Date: 2008-01-13 14:12:49 UTC
  • mto: (423.1.2 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: daniel.schierbeck@gmail.com-20080113141249-gd0i2lknr3yik55r
Moved branch view to its own package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branchview/treeview.py
19
19
from treemodel import TreeModel
20
20
from bzrlib.revision import NULL_REVISION
21
21
 
22
 
class TreeView(gtk.VBox):
 
22
class TreeView(gtk.ScrolledWindow):
23
23
 
24
24
    __gproperties__ = {
25
25
        'branch': (gobject.TYPE_PYOBJECT,
49
49
                    gobject.PARAM_READABLE),
50
50
 
51
51
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
52
 
                                 'Revision number column',
 
52
                                 'Revision number',
53
53
                                 'Show revision number column',
54
54
                                 True,
55
55
                                 gobject.PARAM_READWRITE),
56
56
 
57
 
        'graph-column-visible': (gobject.TYPE_BOOLEAN,
58
 
                                 'Graph column',
59
 
                                 'Show graph column',
60
 
                                 True,
61
 
                                 gobject.PARAM_READWRITE),
62
 
 
63
57
        'date-column-visible': (gobject.TYPE_BOOLEAN,
64
58
                                 'Date',
65
59
                                 'Show date column',
70
64
                    'Compact view',
71
65
                    'Break ancestry lines to save space',
72
66
                    True,
73
 
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
74
 
 
75
 
        'mainline-only': (gobject.TYPE_BOOLEAN,
76
 
                    'Mainline only',
77
 
                    'Only show the mainline history.',
78
 
                    False,
79
 
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
 
67
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE)
80
68
 
81
69
    }
82
70
 
86
74
                             ()),
87
75
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
88
76
                              gobject.TYPE_NONE,
89
 
                              ()),
90
 
        'revision-activated': (gobject.SIGNAL_RUN_FIRST,
91
 
                              gobject.TYPE_NONE,
92
 
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
93
 
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
94
 
                              gobject.TYPE_NONE,
95
 
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
 
77
                              ())
96
78
    }
97
79
 
98
80
    def __init__(self, branch, start, maxnum, compact=True):
105
87
        :param broken_line_length: After how much lines to break 
106
88
                                   branches.
107
89
        """
108
 
        gtk.VBox.__init__(self, spacing=0)
109
 
 
110
 
        self.pack_start(self.construct_loading_msg(), expand=False, fill=True)
111
 
        self.connect('revisions-loaded', 
112
 
                lambda x: self.loading_msg_box.hide())
113
 
 
114
 
        self.scrolled_window = gtk.ScrolledWindow()
115
 
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
116
 
                                        gtk.POLICY_AUTOMATIC)
117
 
        self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
118
 
        self.scrolled_window.show()
119
 
        self.pack_start(self.scrolled_window, expand=True, fill=True)
120
 
 
121
 
        self.scrolled_window.add(self.construct_treeview())
122
 
        
123
 
 
124
 
        self.iter = None
 
90
        gtk.ScrolledWindow.__init__(self)
 
91
 
 
92
        self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
93
        self.set_shadow_type(gtk.SHADOW_IN)
 
94
 
 
95
        self.construct_treeview()
 
96
 
 
97
        self.iter   = None
125
98
        self.branch = branch
126
 
        self.revision = None
127
99
 
128
100
        self.start = start
129
101
        self.maxnum = maxnum
136
108
    def do_get_property(self, property):
137
109
        if property.name == 'revno-column-visible':
138
110
            return self.revno_column.get_visible()
139
 
        elif property.name == 'graph-column-visible':
140
 
            return self.graph_column.get_visible()
141
111
        elif property.name == 'date-column-visible':
142
112
            return self.date_column.get_visible()
143
113
        elif property.name == 'compact':
144
114
            return self.compact
145
 
        elif property.name == 'mainline-only':
146
 
            return self.mainline_only
147
115
        elif property.name == 'branch':
148
116
            return self.branch
149
117
        elif property.name == 'revision':
160
128
    def do_set_property(self, property, value):
161
129
        if property.name == 'revno-column-visible':
162
130
            self.revno_column.set_visible(value)
163
 
        elif property.name == 'graph-column-visible':
164
 
            self.graph_column.set_visible(value)
165
131
        elif property.name == 'date-column-visible':
166
132
            self.date_column.set_visible(value)
167
133
        elif property.name == 'compact':
168
134
            self.compact = value
169
 
        elif property.name == 'mainline-only':
170
 
            self.mainline_only = value
171
135
        elif property.name == 'branch':
172
136
            self.branch = value
173
137
        elif property.name == 'revision':
203
167
        :return: list of revision ids.
204
168
        """
205
169
        return self.get_property('parents')
206
 
 
207
 
    def add_tag(self, tag, revid=None):
208
 
        if revid is None: revid = self.revision.revision_id
209
 
 
210
 
        try:
211
 
            self.branch.unlock()
212
 
 
213
 
            try:
214
 
                self.branch.lock_write()
215
 
                self.model.add_tag(tag, revid)
216
 
            finally:
217
 
                self.branch.unlock()
218
 
 
219
 
        finally:
220
 
            self.branch.lock_read()
221
 
 
222
 
        self.emit('tag-added', tag, revid)
223
170
        
224
171
    def refresh(self):
225
 
        self.loading_msg_box.show()
226
172
        gobject.idle_add(self.populate, self.get_revision())
227
173
 
228
174
    def update(self):
280
226
            broken_line_length = 32
281
227
        else:
282
228
            broken_line_length = None
283
 
        
284
 
        show_graph = self.graph_column.get_visible()
285
229
 
286
230
        self.branch.lock_read()
287
231
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
288
232
                                                        self.start,
289
233
                                                        self.maxnum, 
290
 
                                                        broken_line_length,
291
 
                                                        show_graph,
292
 
                                                        self.mainline_only)
 
234
                                                        broken_line_length)
293
235
 
294
 
        self.model = TreeModel(self.branch, linegraphdata)
 
236
        self.model = TreeModel(self.branch.repository, linegraphdata)
295
237
        self.graph_cell.columns_len = columns_len
296
238
        width = self.graph_cell.get_size(self.treeview)[2]
297
239
        if width > 500:
301
243
        self.index = index
302
244
        self.treeview.set_model(self.model)
303
245
 
304
 
        if not revision or revision == NULL_REVISION:
 
246
        if revision is None:
305
247
            self.treeview.set_cursor(0)
306
248
        else:
307
249
            self.set_revision(revision)
310
252
 
311
253
        return False
312
254
 
 
255
    def show_diff(self, revid=None, parentid=None):
 
256
        """Open a new window to show a diff between the given revisions."""
 
257
        from bzrlib.plugins.gtk.diff import DiffWindow
 
258
        window = DiffWindow(parent=self)
 
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
 
275
        window.set_diff(description, rev_tree, parent_tree)
 
276
        window.show()
 
277
 
313
278
    def construct_treeview(self):
314
279
        self.treeview = gtk.TreeView()
315
280
 
332
297
 
333
298
        self.treeview.set_property('fixed-height-mode', True)
334
299
 
 
300
        self.add(self.treeview)
335
301
        self.treeview.show()
336
302
 
337
303
        cell = gtk.CellRendererText()
351
317
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
352
318
        self.graph_column.pack_start(self.graph_cell, expand=False)
353
319
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
354
 
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
355
320
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
356
321
        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
357
322
        self.treeview.append_column(self.graph_column)
359
324
        cell = gtk.CellRendererText()
360
325
        cell.set_property("width-chars", 65)
361
326
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
362
 
        self.summary_column = gtk.TreeViewColumn("Summary")
363
 
        self.summary_column.set_resizable(True)
364
 
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
365
 
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
366
 
        self.summary_column.pack_start(cell, expand=True)
367
 
        self.summary_column.add_attribute(cell, "markup", treemodel.SUMMARY)
368
 
        self.treeview.append_column(self.summary_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)
369
334
 
370
335
        cell = gtk.CellRendererText()
371
336
        cell.set_property("width-chars", 15)
375
340
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
376
341
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
377
342
        self.committer_column.pack_start(cell, expand=True)
378
 
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
 
343
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITER)
379
344
        self.treeview.append_column(self.committer_column)
380
345
 
381
346
        cell = gtk.CellRendererText()
389
354
        self.date_column.pack_start(cell, expand=True)
390
355
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
391
356
        self.treeview.append_column(self.date_column)
392
 
        
393
 
        return self.treeview
394
 
    
395
 
    def construct_loading_msg(self):
396
 
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
397
 
                                                 gtk.ICON_SIZE_BUTTON)
398
 
        image_loading.show()
399
 
        
400
 
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
401
 
        label_loading.set_alignment(0.0, 0.5)
402
 
        label_loading.show()
403
 
        
404
 
        self.loading_msg_box = gtk.HBox()
405
 
        self.loading_msg_box.set_spacing(5)
406
 
        self.loading_msg_box.set_border_width(5)        
407
 
        self.loading_msg_box.pack_start(image_loading, False, False)
408
 
        self.loading_msg_box.pack_start(label_loading, True, True)
409
 
        self.loading_msg_box.show()
410
 
        
411
 
        return self.loading_msg_box
412
357
 
413
358
    def _on_selection_changed(self, treeview):
414
359
        """callback for when the treeview changes."""
423
368
            menu = RevisionPopupMenu(self.branch.repository, 
424
369
                [self.get_revision().revision_id],
425
370
                self.branch)
426
 
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
427
371
            menu.popup(None, None, None, event.button, event.get_time())
428
372
 
429
373
    def _on_revision_activated(self, widget, path, col):
430
 
        self.emit('revision-activated', path, col)
 
374
        # TODO: more than one parent
 
375
        """Callback for when a treeview row gets activated."""
 
376
        revision_id = self.model[path][treemodel.REVID]
 
377
        parents = self.model[path][treemodel.PARENTS]
 
378
 
 
379
        if len(parents) == 0:
 
380
            parent_id = None
 
381
        else:
 
382
            parent_id = parents[0]
 
383
 
 
384
        self.show_diff(revision_id, parent_id)
 
385
        self.treeview.grab_focus()