/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: 2011-04-15 01:02:16 UTC
  • mto: This revision was merged to the branch mainline in revision 731.
  • Revision ID: jelmer@samba.org-20110415010216-u6h7cxpv3cu7bvmg
Construct model early.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branchview/treeview.py
6
6
__copyright__ = "Copyright © 2005 Canonical Ltd."
7
7
__author__    = "Daniel Schierbeck <daniel.schierbeck@gmail.com>"
8
8
 
9
 
import sys
10
 
import string
11
9
import gtk
12
10
import gobject
13
11
import pango
14
 
import re
15
 
import treemodel
 
12
 
16
13
from bzrlib import ui
17
 
 
18
 
from bzrlib.plugins.gtk import _i18n
19
 
from linegraph import linegraph, same_branch
20
 
from graphcell import CellRendererGraph
21
 
from treemodel import TreeModel
22
14
from bzrlib.revision import NULL_REVISION
23
15
 
 
16
from bzrlib.plugins.gtk import lock
 
17
from bzrlib.plugins.gtk.ui import ProgressPanel
 
18
from bzrlib.plugins.gtk.branchview import treemodel
 
19
from bzrlib.plugins.gtk.branchview.linegraph import linegraph, same_branch
 
20
from bzrlib.plugins.gtk.branchview.graphcell import CellRendererGraph
 
21
 
 
22
 
24
23
class TreeView(gtk.VBox):
25
24
 
26
25
    __gproperties__ = {
91
90
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
92
91
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
93
92
                              gobject.TYPE_NONE,
94
 
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
 
93
                              (gobject.TYPE_STRING, gobject.TYPE_STRING)),
 
94
        'refreshed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
 
95
                              ())
95
96
    }
96
97
 
97
98
    def __init__(self, branch, start, maxnum, compact=True):
106
107
        """
107
108
        gtk.VBox.__init__(self, spacing=0)
108
109
 
 
110
        self.progress_widget = ProgressPanel()
 
111
        self.pack_start(self.progress_widget, expand=False, fill=True)
 
112
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
 
113
            # We'are using our own ui, let's tell it to use our widget.
 
114
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
 
115
 
109
116
        self.scrolled_window = gtk.ScrolledWindow()
110
117
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
111
118
                                        gtk.POLICY_AUTOMATIC)
115
122
 
116
123
        self.scrolled_window.add(self.construct_treeview())
117
124
 
118
 
        self.iter = None
 
125
        self.path = None
119
126
        self.branch = branch
120
127
        self.revision = None
 
128
        self.index = {}
121
129
 
122
130
        self.start = start
123
131
        self.maxnum = maxnum
124
132
        self.compact = compact
125
133
 
 
134
        self.model = treemodel.TreeModel(self.branch, [])
126
135
        gobject.idle_add(self.populate)
127
136
 
128
 
        self.connect("destroy", lambda x: self.branch.unlock())
 
137
        self.connect("destroy", self._on_destroy)
 
138
 
 
139
    def _on_destroy(self, *ignored):
 
140
        self.branch.unlock()
 
141
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
 
142
            # We'are using our own ui, let's tell it to stop using our widget.
 
143
            ui.ui_factory.set_progress_bar_widget(None)
129
144
 
130
145
    def do_get_property(self, property):
131
146
        if property.name == 'revno-column-visible':
141
156
        elif property.name == 'branch':
142
157
            return self.branch
143
158
        elif property.name == 'revision':
144
 
            return self.model.get_value(self.iter, treemodel.REVISION)
 
159
            return self.model.get_value(self.model.get_iter(self.path),
 
160
                                        treemodel.REVISION)
145
161
        elif property.name == 'revision-number':
146
 
            return self.model.get_value(self.iter, treemodel.REVNO)
 
162
            return self.model.get_value(self.model.get_iter(self.path),
 
163
                                        treemodel.REVNO)
147
164
        elif property.name == 'children':
148
 
            return self.model.get_value(self.iter, treemodel.CHILDREN)
 
165
            return self.model.get_value(self.model.get_iter(self.path),
 
166
                                        treemodel.CHILDREN)
149
167
        elif property.name == 'parents':
150
 
            return self.model.get_value(self.iter, treemodel.PARENTS)
 
168
            return self.model.get_value(self.model.get_iter(self.path),
 
169
                                        treemodel.PARENTS)
151
170
        else:
152
171
            raise AttributeError, 'unknown property %s' % property.name
153
172
 
173
192
        """Return revision id of currently selected revision, or None."""
174
193
        return self.get_property('revision')
175
194
 
 
195
    def has_revision_id(self, revision_id):
 
196
        return (revision_id in self.index)
 
197
 
176
198
    def set_revision(self, revision):
177
199
        self.set_property('revision', revision)
178
200
 
201
223
    def add_tag(self, tag, revid=None):
202
224
        if revid is None: revid = self.revision.revision_id
203
225
 
204
 
        try:
205
 
            self.branch.unlock()
206
 
 
 
226
        if lock.release(self.branch):
207
227
            try:
208
 
                self.branch.lock_write()
 
228
                lock.acquire(self.branch, lock.WRITE)
209
229
                self.model.add_tag(tag, revid)
210
230
            finally:
211
 
                self.branch.unlock()
212
 
 
213
 
        finally:
214
 
            self.branch.lock_read()
215
 
 
216
 
        self.emit('tag-added', tag, revid)
217
 
        
 
231
                lock.release(self.branch)
 
232
 
 
233
            lock.acquire(self.branch, lock.READ)
 
234
 
 
235
            self.emit('tag-added', tag, revid)
 
236
 
218
237
    def refresh(self):
219
238
        gobject.idle_add(self.populate, self.get_revision())
220
239
 
269
288
                       should be broken.
270
289
        """
271
290
 
272
 
        loading_progress = ui.ui_factory.nested_progress_bar()
273
 
        loading_progress.update(msg="Loading ancestry graph", total=5)
 
291
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
 
292
            # We'are using our own ui, let's tell it to use our widget.
 
293
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
 
294
        self.progress_bar = ui.ui_factory.nested_progress_bar()
 
295
        self.progress_bar.update("Loading ancestry graph", 0, 5)
274
296
 
275
297
        try:
276
298
            if self.compact:
277
299
                broken_line_length = 32
278
300
            else:
279
301
                broken_line_length = None
280
 
            
 
302
 
281
303
            show_graph = self.graph_column.get_visible()
282
304
 
283
305
            self.branch.lock_read()
287
309
                                                            broken_line_length,
288
310
                                                            show_graph,
289
311
                                                            self.mainline_only,
290
 
                                                            loading_progress)
 
312
                                                            self.progress_bar)
291
313
 
292
 
            self.model = TreeModel(self.branch, linegraphdata)
 
314
            self.model.line_graph_data = linegraphdata
293
315
            self.graph_cell.columns_len = columns_len
294
316
            width = self.graph_cell.get_size(self.treeview)[2]
295
317
            if width > 500:
304
326
            else:
305
327
                self.set_revision(revision)
306
328
 
 
329
            self.emit('refreshed')
307
330
            return False
308
331
        finally:
309
 
            loading_progress.finished()
 
332
            self.progress_bar.finished()
310
333
 
311
334
    def construct_treeview(self):
312
335
        self.treeview = gtk.TreeView()
313
336
 
314
337
        self.treeview.set_rules_hint(True)
315
 
        self.treeview.set_search_column(treemodel.REVNO)
316
 
        
 
338
        # combined revno/summary interactive search
 
339
        #
 
340
        # the row in a treemodel is considered "matched" if a REVNO *starts*
 
341
        # from the key (that is the key is found in a REVNO at the offset 0)
 
342
        # or if a MESSAGE *contains* the key anywhere (that is, the key is
 
343
        # found case insensitively in a MESSAGE at any offset)
 
344
        def search_equal_func(model, column, key, iter):
 
345
            return (model.get_value(iter, treemodel.REVNO).find(key) != 0
 
346
                and model.get_value(iter, treemodel.MESSAGE).lower().find(key.lower()) == -1)
 
347
 
 
348
        self.treeview.set_search_equal_func(search_equal_func)
 
349
        self.treeview.set_enable_search(True)
 
350
 
317
351
        # Fix old PyGTK bug - by JAM
318
352
        set_tooltip = getattr(self.treeview, 'set_tooltip_column', None)
319
353
        if set_tooltip is not None:
320
354
            set_tooltip(treemodel.MESSAGE)
321
355
 
 
356
        self._prev_cursor_path = None
322
357
        self.treeview.connect("cursor-changed",
323
358
                self._on_selection_changed)
324
359
 
336
371
        cell.set_property("width-chars", 15)
337
372
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
338
373
        self.revno_column = gtk.TreeViewColumn("Revision No")
339
 
        self.revno_column.set_resizable(False)
 
374
        self.revno_column.set_resizable(True)
340
375
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
341
376
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
342
377
        self.revno_column.pack_start(cell, expand=True)
345
380
 
346
381
        self.graph_cell = CellRendererGraph()
347
382
        self.graph_column = gtk.TreeViewColumn()
348
 
        self.graph_column.set_resizable(False)
 
383
        self.graph_column.set_resizable(True)
349
384
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
350
385
        self.graph_column.pack_start(self.graph_cell, expand=True)
351
386
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
358
393
        cell.set_property("width-chars", 65)
359
394
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
360
395
        self.summary_column = gtk.TreeViewColumn("Summary")
361
 
        self.summary_column.set_resizable(False)
 
396
        self.summary_column.set_resizable(True)
362
397
        self.summary_column.set_expand(True)
363
398
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
364
399
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
369
404
        cell = gtk.CellRendererText()
370
405
        cell.set_property("width-chars", 15)
371
406
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
372
 
        self.committer_column = gtk.TreeViewColumn("Committer")
373
 
        self.committer_column.set_resizable(False)
374
 
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
375
 
        self.committer_column.set_fixed_width(200)
376
 
        self.committer_column.pack_start(cell, expand=True)
377
 
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
378
 
        self.treeview.append_column(self.committer_column)
 
407
        self.authors_column = gtk.TreeViewColumn("Author(s)")
 
408
        self.authors_column.set_resizable(False)
 
409
        self.authors_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
410
        self.authors_column.set_fixed_width(200)
 
411
        self.authors_column.pack_start(cell, expand=True)
 
412
        self.authors_column.add_attribute(cell, "text", treemodel.AUTHORS)
 
413
        self.treeview.append_column(self.authors_column)
379
414
 
380
415
        cell = gtk.CellRendererText()
381
416
        cell.set_property("width-chars", 20)
382
417
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
383
418
        self.date_column = gtk.TreeViewColumn("Date")
384
419
        self.date_column.set_visible(False)
385
 
        self.date_column.set_resizable(False)
 
420
        self.date_column.set_resizable(True)
386
421
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
387
422
        self.date_column.set_fixed_width(130)
388
423
        self.date_column.pack_start(cell, expand=True)
389
424
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
390
425
        self.treeview.append_column(self.date_column)
391
 
        
 
426
 
392
427
        return self.treeview
393
428
 
394
429
    def _on_selection_changed(self, treeview):
395
430
        """callback for when the treeview changes."""
396
431
        (path, focus) = treeview.get_cursor()
397
 
        if path is not None:
398
 
            self.iter = self.model.get_iter(path)
 
432
        if (path is not None) and (path != self._prev_cursor_path):
 
433
            self._prev_cursor_path = path # avoid emitting twice per click
 
434
            self.path = path
399
435
            self.emit('revision-selected')
400
436
 
401
437
    def _on_revision_selected(self, widget, event):
402
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
 
438
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
403
439
        if event.button == 3:
404
 
            menu = RevisionPopupMenu(self.branch.repository, 
 
440
            menu = RevisionMenu(self.branch.repository, 
405
441
                [self.get_revision().revision_id],
406
442
                self.branch)
407
443
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))