/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-06 14:50:40 UTC
  • Revision ID: jelmer@samba.org-20110406145040-7u37k9hxkhleiqx2
Cleanups, fix compatibility with older versions of pygtk.

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
125
133
 
126
134
        gobject.idle_add(self.populate)
127
135
 
128
 
        self.connect("destroy", lambda x: self.branch.unlock())
 
136
        self.connect("destroy", self._on_destroy)
 
137
 
 
138
    def _on_destroy(self, *ignored):
 
139
        self.branch.unlock()
 
140
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
 
141
            # We'are using our own ui, let's tell it to stop using our widget.
 
142
            ui.ui_factory.set_progress_bar_widget(None)
129
143
 
130
144
    def do_get_property(self, property):
131
145
        if property.name == 'revno-column-visible':
141
155
        elif property.name == 'branch':
142
156
            return self.branch
143
157
        elif property.name == 'revision':
144
 
            return self.model.get_value(self.iter, treemodel.REVISION)
 
158
            return self.model.get_value(self.model.get_iter(self.path),
 
159
                                        treemodel.REVISION)
145
160
        elif property.name == 'revision-number':
146
 
            return self.model.get_value(self.iter, treemodel.REVNO)
 
161
            return self.model.get_value(self.model.get_iter(self.path),
 
162
                                        treemodel.REVNO)
147
163
        elif property.name == 'children':
148
 
            return self.model.get_value(self.iter, treemodel.CHILDREN)
 
164
            return self.model.get_value(self.model.get_iter(self.path),
 
165
                                        treemodel.CHILDREN)
149
166
        elif property.name == 'parents':
150
 
            return self.model.get_value(self.iter, treemodel.PARENTS)
 
167
            return self.model.get_value(self.model.get_iter(self.path),
 
168
                                        treemodel.PARENTS)
151
169
        else:
152
170
            raise AttributeError, 'unknown property %s' % property.name
153
171
 
173
191
        """Return revision id of currently selected revision, or None."""
174
192
        return self.get_property('revision')
175
193
 
 
194
    def has_revision_id(self, revision_id):
 
195
        return (revision_id in self.index)
 
196
 
176
197
    def set_revision(self, revision):
177
198
        self.set_property('revision', revision)
178
199
 
201
222
    def add_tag(self, tag, revid=None):
202
223
        if revid is None: revid = self.revision.revision_id
203
224
 
204
 
        try:
205
 
            self.branch.unlock()
206
 
 
 
225
        if lock.release(self.branch):
207
226
            try:
208
 
                self.branch.lock_write()
 
227
                lock.acquire(self.branch, lock.WRITE)
209
228
                self.model.add_tag(tag, revid)
210
229
            finally:
211
 
                self.branch.unlock()
212
 
 
213
 
        finally:
214
 
            self.branch.lock_read()
215
 
 
216
 
        self.emit('tag-added', tag, revid)
217
 
        
 
230
                lock.release(self.branch)
 
231
 
 
232
            lock.acquire(self.branch, lock.READ)
 
233
 
 
234
            self.emit('tag-added', tag, revid)
 
235
 
218
236
    def refresh(self):
219
237
        gobject.idle_add(self.populate, self.get_revision())
220
238
 
269
287
                       should be broken.
270
288
        """
271
289
 
272
 
        loading_progress = ui.ui_factory.nested_progress_bar()
273
 
        loading_progress.update(msg="Loading ancestry graph", total=5)
 
290
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
 
291
            # We'are using our own ui, let's tell it to use our widget.
 
292
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
 
293
        self.progress_bar = ui.ui_factory.nested_progress_bar()
 
294
        self.progress_bar.update("Loading ancestry graph", 0, 5)
274
295
 
275
296
        try:
276
297
            if self.compact:
277
298
                broken_line_length = 32
278
299
            else:
279
300
                broken_line_length = None
280
 
            
 
301
 
281
302
            show_graph = self.graph_column.get_visible()
282
303
 
283
304
            self.branch.lock_read()
287
308
                                                            broken_line_length,
288
309
                                                            show_graph,
289
310
                                                            self.mainline_only,
290
 
                                                            loading_progress)
 
311
                                                            self.progress_bar)
291
312
 
292
 
            self.model = TreeModel(self.branch, linegraphdata)
 
313
            self.model = treemodel.TreeModel(self.branch, linegraphdata)
293
314
            self.graph_cell.columns_len = columns_len
294
315
            width = self.graph_cell.get_size(self.treeview)[2]
295
316
            if width > 500:
304
325
            else:
305
326
                self.set_revision(revision)
306
327
 
 
328
            self.emit('refreshed')
307
329
            return False
308
330
        finally:
309
 
            loading_progress.finished()
 
331
            self.progress_bar.finished()
310
332
 
311
333
    def construct_treeview(self):
312
334
        self.treeview = gtk.TreeView()
313
335
 
314
336
        self.treeview.set_rules_hint(True)
315
 
        self.treeview.set_search_column(treemodel.REVNO)
316
 
        
 
337
        # combined revno/summary interactive search
 
338
        #
 
339
        # the row in a treemodel is considered "matched" if a REVNO *starts*
 
340
        # from the key (that is the key is found in a REVNO at the offset 0)
 
341
        # or if a MESSAGE *contains* the key anywhere (that is, the key is
 
342
        # found case insensitively in a MESSAGE at any offset)
 
343
        def search_equal_func(model, column, key, iter):
 
344
            return (model.get_value(iter, treemodel.REVNO).find(key) != 0
 
345
                and model.get_value(iter, treemodel.MESSAGE).lower().find(key.lower()) == -1)
 
346
 
 
347
        self.treeview.set_search_equal_func(search_equal_func)
 
348
        self.treeview.set_enable_search(True)
 
349
 
317
350
        # Fix old PyGTK bug - by JAM
318
351
        set_tooltip = getattr(self.treeview, 'set_tooltip_column', None)
319
352
        if set_tooltip is not None:
320
353
            set_tooltip(treemodel.MESSAGE)
321
354
 
 
355
        self._prev_cursor_path = None
322
356
        self.treeview.connect("cursor-changed",
323
357
                self._on_selection_changed)
324
358
 
369
403
        cell = gtk.CellRendererText()
370
404
        cell.set_property("width-chars", 15)
371
405
        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)
 
406
        self.authors_column = gtk.TreeViewColumn("Author(s)")
 
407
        self.authors_column.set_resizable(False)
 
408
        self.authors_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
409
        self.authors_column.set_fixed_width(200)
 
410
        self.authors_column.pack_start(cell, expand=True)
 
411
        self.authors_column.add_attribute(cell, "text", treemodel.AUTHORS)
 
412
        self.treeview.append_column(self.authors_column)
379
413
 
380
414
        cell = gtk.CellRendererText()
381
415
        cell.set_property("width-chars", 20)
388
422
        self.date_column.pack_start(cell, expand=True)
389
423
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
390
424
        self.treeview.append_column(self.date_column)
391
 
        
 
425
 
392
426
        return self.treeview
393
427
 
394
428
    def _on_selection_changed(self, treeview):
395
429
        """callback for when the treeview changes."""
396
430
        (path, focus) = treeview.get_cursor()
397
 
        if path is not None:
398
 
            self.iter = self.model.get_iter(path)
 
431
        if (path is not None) and (path != self._prev_cursor_path):
 
432
            self._prev_cursor_path = path # avoid emitting twice per click
 
433
            self.path = path
399
434
            self.emit('revision-selected')
400
435
 
401
436
    def _on_revision_selected(self, widget, event):
402
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
 
437
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
403
438
        if event.button == 3:
404
 
            menu = RevisionPopupMenu(self.branch.repository, 
 
439
            menu = RevisionMenu(self.branch.repository, 
405
440
                [self.get_revision().revision_id],
406
441
                self.branch)
407
442
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))