/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: Adrian Wilkins
  • Date: 2008-04-24 15:26:14 UTC
  • mto: This revision was merged to the branch mainline in revision 470.
  • Revision ID: adrian.wilkins@gmail.com-20080424152614-2rnnljbro6vzqvf7
Detect the reserved null: revision in appropriate places. 

This removes a huge shower of stack traces that get dumped to console when 
you look at the bottom of a log.

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
13
13
import pango
14
14
import re
15
15
import treemodel
16
 
from bzrlib import ui
17
16
 
18
 
from bzrlib.plugins.gtk import _i18n
19
 
from bzrlib.plugins.gtk.ui import GtkProgressBar, ProgressPanel
20
17
from linegraph import linegraph, same_branch
21
18
from graphcell import CellRendererGraph
22
19
from treemodel import TreeModel
23
20
from bzrlib.revision import NULL_REVISION
24
21
 
25
 
 
26
22
class TreeView(gtk.VBox):
27
23
 
28
24
    __gproperties__ = {
85
81
    }
86
82
 
87
83
    __gsignals__ = {
 
84
        'revisions-loaded': (gobject.SIGNAL_RUN_FIRST, 
 
85
                             gobject.TYPE_NONE,
 
86
                             ()),
88
87
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
89
88
                              gobject.TYPE_NONE,
90
89
                              ()),
108
107
        """
109
108
        gtk.VBox.__init__(self, spacing=0)
110
109
 
111
 
        loading_msg_widget = ProgressPanel()
112
 
        ui.ui_factory.set_nested_progress_bar_widget(loading_msg_widget.get_progress_bar)
113
 
        self.pack_start(loading_msg_widget, expand=False, fill=True)
 
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())
114
113
 
115
114
        self.scrolled_window = gtk.ScrolledWindow()
116
115
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
120
119
        self.pack_start(self.scrolled_window, expand=True, fill=True)
121
120
 
122
121
        self.scrolled_window.add(self.construct_treeview())
 
122
        
123
123
 
124
124
        self.iter = None
125
125
        self.branch = branch
222
222
        self.emit('tag-added', tag, revid)
223
223
        
224
224
    def refresh(self):
 
225
        self.loading_msg_box.show()
225
226
        gobject.idle_add(self.populate, self.get_revision())
226
227
 
227
228
    def update(self):
275
276
                       should be broken.
276
277
        """
277
278
 
278
 
        self.progress_bar = ui.ui_factory.nested_progress_bar()
279
 
        self.progress_bar.update(msg="Loading ancestry graph", total_cnt=5)
280
 
 
281
 
        try:
282
 
            if self.compact:
283
 
                broken_line_length = 32
284
 
            else:
285
 
                broken_line_length = None
286
 
            
287
 
            show_graph = self.graph_column.get_visible()
288
 
 
289
 
            self.branch.lock_read()
290
 
            (linegraphdata, index, columns_len) = linegraph(self.branch.repository.get_graph(),
291
 
                                                            self.start,
292
 
                                                            self.maxnum, 
293
 
                                                            broken_line_length,
294
 
                                                            show_graph,
295
 
                                                            self.mainline_only,
296
 
                                                            self.progress_bar)
297
 
 
298
 
            self.model = TreeModel(self.branch, linegraphdata)
299
 
            self.graph_cell.columns_len = columns_len
300
 
            width = self.graph_cell.get_size(self.treeview)[2]
301
 
            if width > 500:
302
 
                width = 500
303
 
            self.graph_column.set_fixed_width(width)
304
 
            self.graph_column.set_max_width(width)
305
 
            self.index = index
306
 
            self.treeview.set_model(self.model)
307
 
 
308
 
            if not revision or revision == NULL_REVISION:
309
 
                self.treeview.set_cursor(0)
310
 
            else:
311
 
                self.set_revision(revision)
312
 
 
313
 
            return False
314
 
        finally:
315
 
            self.progress_bar.finished()
 
279
        if self.compact:
 
280
            broken_line_length = 32
 
281
        else:
 
282
            broken_line_length = None
 
283
        
 
284
        show_graph = self.graph_column.get_visible()
 
285
 
 
286
        self.branch.lock_read()
 
287
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
 
288
                                                        self.start,
 
289
                                                        self.maxnum, 
 
290
                                                        broken_line_length,
 
291
                                                        show_graph,
 
292
                                                        self.mainline_only)
 
293
 
 
294
        self.model = TreeModel(self.branch, linegraphdata)
 
295
        self.graph_cell.columns_len = columns_len
 
296
        width = self.graph_cell.get_size(self.treeview)[2]
 
297
        if width > 500:
 
298
            width = 500
 
299
        self.graph_column.set_fixed_width(width)
 
300
        self.graph_column.set_max_width(width)
 
301
        self.index = index
 
302
        self.treeview.set_model(self.model)
 
303
 
 
304
        if not revision or revision == NULL_REVISION:
 
305
            self.treeview.set_cursor(0)
 
306
        else:
 
307
            self.set_revision(revision)
 
308
 
 
309
        self.emit('revisions-loaded')
 
310
 
 
311
        return False
316
312
 
317
313
    def construct_treeview(self):
318
314
        self.treeview = gtk.TreeView()
325
321
        if set_tooltip is not None:
326
322
            set_tooltip(treemodel.MESSAGE)
327
323
 
328
 
        self._prev_cursor_path = None
329
324
        self.treeview.connect("cursor-changed",
330
325
                self._on_selection_changed)
331
326
 
343
338
        cell.set_property("width-chars", 15)
344
339
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
345
340
        self.revno_column = gtk.TreeViewColumn("Revision No")
346
 
        self.revno_column.set_resizable(False)
 
341
        self.revno_column.set_resizable(True)
347
342
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
348
343
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
349
344
        self.revno_column.pack_start(cell, expand=True)
352
347
 
353
348
        self.graph_cell = CellRendererGraph()
354
349
        self.graph_column = gtk.TreeViewColumn()
355
 
        self.graph_column.set_resizable(False)
 
350
        self.graph_column.set_resizable(True)
356
351
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
357
 
        self.graph_column.pack_start(self.graph_cell, expand=True)
 
352
        self.graph_column.pack_start(self.graph_cell, expand=False)
358
353
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
359
354
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
360
355
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
365
360
        cell.set_property("width-chars", 65)
366
361
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
367
362
        self.summary_column = gtk.TreeViewColumn("Summary")
368
 
        self.summary_column.set_resizable(False)
369
 
        self.summary_column.set_expand(True)
 
363
        self.summary_column.set_resizable(True)
370
364
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
371
365
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
372
366
        self.summary_column.pack_start(cell, expand=True)
377
371
        cell.set_property("width-chars", 15)
378
372
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
379
373
        self.committer_column = gtk.TreeViewColumn("Committer")
380
 
        self.committer_column.set_resizable(False)
 
374
        self.committer_column.set_resizable(True)
381
375
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
382
 
        self.committer_column.set_fixed_width(200)
 
376
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
383
377
        self.committer_column.pack_start(cell, expand=True)
384
378
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
385
379
        self.treeview.append_column(self.committer_column)
389
383
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
390
384
        self.date_column = gtk.TreeViewColumn("Date")
391
385
        self.date_column.set_visible(False)
392
 
        self.date_column.set_resizable(False)
 
386
        self.date_column.set_resizable(True)
393
387
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
394
 
        self.date_column.set_fixed_width(130)
 
388
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
395
389
        self.date_column.pack_start(cell, expand=True)
396
390
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
397
391
        self.treeview.append_column(self.date_column)
398
392
        
399
393
        return self.treeview
400
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
 
401
413
    def _on_selection_changed(self, treeview):
402
414
        """callback for when the treeview changes."""
403
415
        (path, focus) = treeview.get_cursor()
404
 
        if (path is not None) and (path != self._prev_cursor_path):
405
 
            self._prev_cursor_path = path # avoid emitting twice per click
 
416
        if path is not None:
406
417
            self.iter = self.model.get_iter(path)
407
418
            self.emit('revision-selected')
408
419
 
409
420
    def _on_revision_selected(self, widget, event):
410
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
 
421
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
411
422
        if event.button == 3:
412
 
            menu = RevisionMenu(self.branch.repository, 
 
423
            menu = RevisionPopupMenu(self.branch.repository, 
413
424
                [self.get_revision().revision_id],
414
425
                self.branch)
415
426
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))