/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 Room
  • Date: 2009-12-23 05:17:26 UTC
  • mto: This revision was merged to the branch mainline in revision 684.
  • Revision ID: ingolemo@gmail.com-20091223051726-zfl6dt9hslbyxuuh
Added tooltips and 'important button' status to the olive toolbar buttons

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
16
17
 
 
18
from bzrlib.plugins.gtk import _i18n
 
19
from bzrlib.plugins.gtk.ui import GtkProgressBar, ProgressPanel
17
20
from linegraph import linegraph, same_branch
18
21
from graphcell import CellRendererGraph
19
22
from treemodel import TreeModel
20
23
from bzrlib.revision import NULL_REVISION
21
24
 
 
25
 
22
26
class TreeView(gtk.VBox):
23
27
 
24
28
    __gproperties__ = {
81
85
    }
82
86
 
83
87
    __gsignals__ = {
84
 
        'revisions-loaded': (gobject.SIGNAL_RUN_FIRST, 
85
 
                             gobject.TYPE_NONE,
86
 
                             ()),
87
88
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
88
89
                              gobject.TYPE_NONE,
89
90
                              ()),
92
93
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
93
94
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
94
95
                              gobject.TYPE_NONE,
95
 
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
 
96
                              (gobject.TYPE_STRING, gobject.TYPE_STRING)),
 
97
        'refreshed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
 
98
                              ())
96
99
    }
97
100
 
98
101
    def __init__(self, branch, start, maxnum, compact=True):
107
110
        """
108
111
        gtk.VBox.__init__(self, spacing=0)
109
112
 
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
        self.progress_widget = ProgressPanel()
 
114
        self.pack_start(self.progress_widget, expand=False, fill=True)
 
115
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
 
116
            # We'are using our own ui, let's tell it to use our widget.
 
117
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
113
118
 
114
119
        self.scrolled_window = gtk.ScrolledWindow()
115
120
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
119
124
        self.pack_start(self.scrolled_window, expand=True, fill=True)
120
125
 
121
126
        self.scrolled_window.add(self.construct_treeview())
122
 
        
123
127
 
124
 
        self.iter = None
 
128
        self.path = None
125
129
        self.branch = branch
126
130
        self.revision = None
 
131
        self.index = {}
127
132
 
128
133
        self.start = start
129
134
        self.maxnum = maxnum
131
136
 
132
137
        gobject.idle_add(self.populate)
133
138
 
134
 
        self.connect("destroy", lambda x: self.branch.unlock())
 
139
        self.connect("destroy", self._on_destroy)
 
140
 
 
141
    def _on_destroy(self, *ignored):
 
142
        self.branch.unlock()
 
143
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
 
144
            # We'are using our own ui, let's tell it to stop using our widget.
 
145
            ui.ui_factory.set_progress_bar_widget(None)
135
146
 
136
147
    def do_get_property(self, property):
137
148
        if property.name == 'revno-column-visible':
147
158
        elif property.name == 'branch':
148
159
            return self.branch
149
160
        elif property.name == 'revision':
150
 
            return self.model.get_value(self.iter, treemodel.REVISION)
 
161
            return self.model.get_value(self.model.get_iter(self.path),
 
162
                                        treemodel.REVISION)
151
163
        elif property.name == 'revision-number':
152
 
            return self.model.get_value(self.iter, treemodel.REVNO)
 
164
            return self.model.get_value(self.model.get_iter(self.path),
 
165
                                        treemodel.REVNO)
153
166
        elif property.name == 'children':
154
 
            return self.model.get_value(self.iter, treemodel.CHILDREN)
 
167
            return self.model.get_value(self.model.get_iter(self.path),
 
168
                                        treemodel.CHILDREN)
155
169
        elif property.name == 'parents':
156
 
            return self.model.get_value(self.iter, treemodel.PARENTS)
 
170
            return self.model.get_value(self.model.get_iter(self.path),
 
171
                                        treemodel.PARENTS)
157
172
        else:
158
173
            raise AttributeError, 'unknown property %s' % property.name
159
174
 
179
194
        """Return revision id of currently selected revision, or None."""
180
195
        return self.get_property('revision')
181
196
 
 
197
    def has_revision_id(self, revision_id):
 
198
        return (revision_id in self.index)
 
199
 
182
200
    def set_revision(self, revision):
183
201
        self.set_property('revision', revision)
184
202
 
222
240
        self.emit('tag-added', tag, revid)
223
241
        
224
242
    def refresh(self):
225
 
        self.loading_msg_box.show()
226
243
        gobject.idle_add(self.populate, self.get_revision())
227
244
 
228
245
    def update(self):
276
293
                       should be broken.
277
294
        """
278
295
 
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 revision is None:
305
 
            self.treeview.set_cursor(0)
306
 
        else:
307
 
            self.set_revision(revision)
308
 
 
309
 
        self.emit('revisions-loaded')
310
 
 
311
 
        return False
 
296
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
 
297
            # We'are using our own ui, let's tell it to use our widget.
 
298
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
 
299
        self.progress_bar = ui.ui_factory.nested_progress_bar()
 
300
        self.progress_bar.update("Loading ancestry graph", 0, 5)
 
301
 
 
302
        try:
 
303
            if self.compact:
 
304
                broken_line_length = 32
 
305
            else:
 
306
                broken_line_length = None
 
307
            
 
308
            show_graph = self.graph_column.get_visible()
 
309
 
 
310
            self.branch.lock_read()
 
311
            (linegraphdata, index, columns_len) = linegraph(self.branch.repository.get_graph(),
 
312
                                                            self.start,
 
313
                                                            self.maxnum, 
 
314
                                                            broken_line_length,
 
315
                                                            show_graph,
 
316
                                                            self.mainline_only,
 
317
                                                            self.progress_bar)
 
318
 
 
319
            self.model = TreeModel(self.branch, linegraphdata)
 
320
            self.graph_cell.columns_len = columns_len
 
321
            width = self.graph_cell.get_size(self.treeview)[2]
 
322
            if width > 500:
 
323
                width = 500
 
324
            self.graph_column.set_fixed_width(width)
 
325
            self.graph_column.set_max_width(width)
 
326
            self.index = index
 
327
            self.treeview.set_model(self.model)
 
328
 
 
329
            if not revision or revision == NULL_REVISION:
 
330
                self.treeview.set_cursor(0)
 
331
            else:
 
332
                self.set_revision(revision)
 
333
 
 
334
            self.emit('refreshed')
 
335
            return False
 
336
        finally:
 
337
            self.progress_bar.finished()
312
338
 
313
339
    def construct_treeview(self):
314
340
        self.treeview = gtk.TreeView()
321
347
        if set_tooltip is not None:
322
348
            set_tooltip(treemodel.MESSAGE)
323
349
 
 
350
        self._prev_cursor_path = None
324
351
        self.treeview.connect("cursor-changed",
325
352
                self._on_selection_changed)
326
353
 
338
365
        cell.set_property("width-chars", 15)
339
366
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
340
367
        self.revno_column = gtk.TreeViewColumn("Revision No")
341
 
        self.revno_column.set_resizable(True)
 
368
        self.revno_column.set_resizable(False)
342
369
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
343
370
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
344
371
        self.revno_column.pack_start(cell, expand=True)
347
374
 
348
375
        self.graph_cell = CellRendererGraph()
349
376
        self.graph_column = gtk.TreeViewColumn()
350
 
        self.graph_column.set_resizable(True)
 
377
        self.graph_column.set_resizable(False)
351
378
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
352
 
        self.graph_column.pack_start(self.graph_cell, expand=False)
 
379
        self.graph_column.pack_start(self.graph_cell, expand=True)
353
380
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
354
381
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
355
382
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
360
387
        cell.set_property("width-chars", 65)
361
388
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
362
389
        self.summary_column = gtk.TreeViewColumn("Summary")
363
 
        self.summary_column.set_resizable(True)
 
390
        self.summary_column.set_resizable(False)
 
391
        self.summary_column.set_expand(True)
364
392
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
365
393
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
366
394
        self.summary_column.pack_start(cell, expand=True)
371
399
        cell.set_property("width-chars", 15)
372
400
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
373
401
        self.committer_column = gtk.TreeViewColumn("Committer")
374
 
        self.committer_column.set_resizable(True)
 
402
        self.committer_column.set_resizable(False)
375
403
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
376
 
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
404
        self.committer_column.set_fixed_width(200)
377
405
        self.committer_column.pack_start(cell, expand=True)
378
406
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
379
407
        self.treeview.append_column(self.committer_column)
383
411
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
384
412
        self.date_column = gtk.TreeViewColumn("Date")
385
413
        self.date_column.set_visible(False)
386
 
        self.date_column.set_resizable(True)
 
414
        self.date_column.set_resizable(False)
387
415
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
388
 
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
416
        self.date_column.set_fixed_width(130)
389
417
        self.date_column.pack_start(cell, expand=True)
390
418
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
391
419
        self.treeview.append_column(self.date_column)
392
420
        
393
421
        return self.treeview
394
422
    
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
 
 
413
423
    def _on_selection_changed(self, treeview):
414
424
        """callback for when the treeview changes."""
415
425
        (path, focus) = treeview.get_cursor()
416
 
        if path is not None:
417
 
            self.iter = self.model.get_iter(path)
 
426
        if (path is not None) and (path != self._prev_cursor_path):
 
427
            self._prev_cursor_path = path # avoid emitting twice per click
 
428
            self.path = path
418
429
            self.emit('revision-selected')
419
430
 
420
431
    def _on_revision_selected(self, widget, event):
421
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
 
432
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
422
433
        if event.button == 3:
423
 
            menu = RevisionPopupMenu(self.branch.repository, 
 
434
            menu = RevisionMenu(self.branch.repository, 
424
435
                [self.get_revision().revision_id],
425
436
                self.branch)
426
437
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))