/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 15:47:30 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629154730-xfsotoxwkiytf0ph
Pass graph object rather than full repository to linegraph.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branchview/treeview.py
13
13
import pango
14
14
import re
15
15
import treemodel
16
 
from bzrlib import ui
17
16
 
18
17
from bzrlib.plugins.gtk import _i18n
19
 
from bzrlib.plugins.gtk.ui import GtkProgressBar, ProgressPanel
20
18
from linegraph import linegraph, same_branch
21
19
from graphcell import CellRendererGraph
22
20
from treemodel import TreeModel
23
21
from bzrlib.revision import NULL_REVISION
24
22
 
25
 
 
26
23
class TreeView(gtk.VBox):
27
24
 
28
25
    __gproperties__ = {
85
82
    }
86
83
 
87
84
    __gsignals__ = {
 
85
        'revisions-loaded': (gobject.SIGNAL_RUN_FIRST, 
 
86
                             gobject.TYPE_NONE,
 
87
                             ()),
88
88
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
89
89
                              gobject.TYPE_NONE,
90
90
                              ()),
108
108
        """
109
109
        gtk.VBox.__init__(self, spacing=0)
110
110
 
111
 
        loading_msg_widget = ProgressPanel()
112
 
        if getattr(ui.ui_factory, "set_nested_progress_bar_widget", None) is not None:
113
 
            ui.ui_factory.set_nested_progress_bar_widget(loading_msg_widget.get_progress_bar)
114
 
        self.pack_start(loading_msg_widget, expand=False, fill=True)
 
111
        self.pack_start(self.construct_loading_msg(), expand=False, fill=True)
 
112
        self.connect('revisions-loaded', 
 
113
                lambda x: self.loading_msg_box.hide())
115
114
 
116
115
        self.scrolled_window = gtk.ScrolledWindow()
117
116
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
121
120
        self.pack_start(self.scrolled_window, expand=True, fill=True)
122
121
 
123
122
        self.scrolled_window.add(self.construct_treeview())
 
123
        
124
124
 
125
125
        self.iter = None
126
126
        self.branch = branch
223
223
        self.emit('tag-added', tag, revid)
224
224
        
225
225
    def refresh(self):
 
226
        self.loading_msg_box.show()
226
227
        gobject.idle_add(self.populate, self.get_revision())
227
228
 
228
229
    def update(self):
276
277
                       should be broken.
277
278
        """
278
279
 
279
 
        self.progress_bar = ui.ui_factory.nested_progress_bar()
280
 
        self.progress_bar.update("Loading ancestry graph", 0, 5)
281
 
 
282
 
        try:
283
 
            if self.compact:
284
 
                broken_line_length = 32
285
 
            else:
286
 
                broken_line_length = None
287
 
            
288
 
            show_graph = self.graph_column.get_visible()
289
 
 
290
 
            self.branch.lock_read()
291
 
            (linegraphdata, index, columns_len) = linegraph(self.branch.repository.get_graph(),
292
 
                                                            self.start,
293
 
                                                            self.maxnum, 
294
 
                                                            broken_line_length,
295
 
                                                            show_graph,
296
 
                                                            self.mainline_only,
297
 
                                                            self.progress_bar)
298
 
 
299
 
            self.model = TreeModel(self.branch, linegraphdata)
300
 
            self.graph_cell.columns_len = columns_len
301
 
            width = self.graph_cell.get_size(self.treeview)[2]
302
 
            if width > 500:
303
 
                width = 500
304
 
            self.graph_column.set_fixed_width(width)
305
 
            self.graph_column.set_max_width(width)
306
 
            self.index = index
307
 
            self.treeview.set_model(self.model)
308
 
 
309
 
            if not revision or revision == NULL_REVISION:
310
 
                self.treeview.set_cursor(0)
311
 
            else:
312
 
                self.set_revision(revision)
313
 
 
314
 
            return False
315
 
        finally:
316
 
            self.progress_bar.finished()
 
280
        if self.compact:
 
281
            broken_line_length = 32
 
282
        else:
 
283
            broken_line_length = None
 
284
        
 
285
        show_graph = self.graph_column.get_visible()
 
286
 
 
287
        self.branch.lock_read()
 
288
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository.get_graph(),
 
289
                                                        (self.start,) , # Sequence of start revisions
 
290
                                                        self.maxnum, 
 
291
                                                        broken_line_length,
 
292
                                                        show_graph,
 
293
                                                        self.mainline_only)
 
294
 
 
295
        self.model = TreeModel(self.branch, linegraphdata)
 
296
        self.graph_cell.columns_len = columns_len
 
297
        width = self.graph_cell.get_size(self.treeview)[2]
 
298
        if width > 500:
 
299
            width = 500
 
300
        self.graph_column.set_fixed_width(width)
 
301
        self.graph_column.set_max_width(width)
 
302
        self.index = index
 
303
        self.treeview.set_model(self.model)
 
304
 
 
305
        if not revision or revision == NULL_REVISION:
 
306
            self.treeview.set_cursor(0)
 
307
        else:
 
308
            self.set_revision(revision)
 
309
 
 
310
        self.emit('revisions-loaded')
 
311
 
 
312
        return False
317
313
 
318
314
    def construct_treeview(self):
319
315
        self.treeview = gtk.TreeView()
326
322
        if set_tooltip is not None:
327
323
            set_tooltip(treemodel.MESSAGE)
328
324
 
329
 
        self._prev_cursor_path = None
330
325
        self.treeview.connect("cursor-changed",
331
326
                self._on_selection_changed)
332
327
 
399
394
        
400
395
        return self.treeview
401
396
    
 
397
    def construct_loading_msg(self):
 
398
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
 
399
                                                 gtk.ICON_SIZE_BUTTON)
 
400
        image_loading.show()
 
401
        
 
402
        label_loading = gtk.Label(
 
403
            _i18n("Please wait, loading ancestral graph..."))
 
404
        label_loading.set_alignment(0.0, 0.5)
 
405
        label_loading.show()
 
406
        
 
407
        self.loading_msg_box = gtk.HBox()
 
408
        self.loading_msg_box.set_spacing(5)
 
409
        self.loading_msg_box.set_border_width(5)        
 
410
        self.loading_msg_box.pack_start(image_loading, False, False)
 
411
        self.loading_msg_box.pack_start(label_loading, True, True)
 
412
        self.loading_msg_box.show()
 
413
        
 
414
        return self.loading_msg_box
 
415
 
402
416
    def _on_selection_changed(self, treeview):
403
417
        """callback for when the treeview changes."""
404
418
        (path, focus) = treeview.get_cursor()
405
 
        if (path is not None) and (path != self._prev_cursor_path):
406
 
            self._prev_cursor_path = path # avoid emitting twice per click
 
419
        if path is not None:
407
420
            self.iter = self.model.get_iter(path)
408
421
            self.emit('revision-selected')
409
422
 
410
423
    def _on_revision_selected(self, widget, event):
411
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
 
424
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
412
425
        if event.button == 3:
413
 
            menu = RevisionMenu(self.branch.repository, 
 
426
            menu = RevisionPopupMenu(self.branch.repository, 
414
427
                [self.get_revision().revision_id],
415
428
                self.branch)
416
429
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))