/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: Jelmer Vernooij
  • Date: 2008-06-29 18:12:29 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629181229-1l2m4cf7vvbyh8qg
Simplify progress bar code, use embedded progress bar inside viz window.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branchview/treeview.py
16
16
from bzrlib import ui
17
17
 
18
18
from bzrlib.plugins.gtk import _i18n
 
19
from bzrlib.plugins.gtk.ui import GtkProgressBar, ProgressPanel
19
20
from linegraph import linegraph, same_branch
20
21
from graphcell import CellRendererGraph
21
22
from treemodel import TreeModel
22
23
from bzrlib.revision import NULL_REVISION
23
24
 
 
25
 
24
26
class TreeView(gtk.VBox):
25
27
 
26
28
    __gproperties__ = {
106
108
        """
107
109
        gtk.VBox.__init__(self, spacing=0)
108
110
 
 
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)
 
114
 
109
115
        self.scrolled_window = gtk.ScrolledWindow()
110
116
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
111
117
                                        gtk.POLICY_AUTOMATIC)
269
275
                       should be broken.
270
276
        """
271
277
 
272
 
        loading_progress = ui.ui_factory.nested_progress_bar()
273
 
        loading_progress.update(msg="Loading ancestry graph", total=5)
 
278
        self.progress_bar = ui.ui_factory.nested_progress_bar()
 
279
        self.progress_bar.update(msg="Loading ancestry graph", total_cnt=5)
274
280
 
275
281
        try:
276
282
            if self.compact:
287
293
                                                            broken_line_length,
288
294
                                                            show_graph,
289
295
                                                            self.mainline_only,
290
 
                                                            loading_progress)
 
296
                                                            self.progress_bar)
291
297
 
292
298
            self.model = TreeModel(self.branch, linegraphdata)
293
299
            self.graph_cell.columns_len = columns_len
306
312
 
307
313
            return False
308
314
        finally:
309
 
            loading_progress.finished()
 
315
            self.progress_bar.finished()
310
316
 
311
317
    def construct_treeview(self):
312
318
        self.treeview = gtk.TreeView()
390
396
        self.treeview.append_column(self.date_column)
391
397
        
392
398
        return self.treeview
393
 
 
 
399
    
394
400
    def _on_selection_changed(self, treeview):
395
401
        """callback for when the treeview changes."""
396
402
        (path, focus) = treeview.get_cursor()