/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: Curtis Hovey
  • Date: 2011-09-03 22:00:09 UTC
  • mto: This revision was merged to the branch mainline in revision 738.
  • Revision ID: sinzui.is@verizon.net-20110903220009-rvrgi2q1npy27jsw
Added basic tests to verify __eq__ is fixed.

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 bzrlib.plugins.gtk.ui import GtkProgressBar, ProgressPanel
20
 
from linegraph import linegraph, same_branch
21
 
from graphcell import CellRendererGraph
22
 
from treemodel import TreeModel
23
14
from bzrlib.revision import NULL_REVISION
24
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
 
25
22
 
26
23
class TreeView(gtk.VBox):
27
24
 
134
131
        self.maxnum = maxnum
135
132
        self.compact = compact
136
133
 
 
134
        self.model = treemodel.TreeModel(self.branch, [])
137
135
        gobject.idle_add(self.populate)
138
136
 
139
137
        self.connect("destroy", self._on_destroy)
158
156
        elif property.name == 'branch':
159
157
            return self.branch
160
158
        elif property.name == 'revision':
 
159
            if self.path is None:
 
160
                return None
161
161
            return self.model.get_value(self.model.get_iter(self.path),
162
162
                                        treemodel.REVISION)
163
163
        elif property.name == 'revision-number':
 
164
            if self.path is None:
 
165
                return None
164
166
            return self.model.get_value(self.model.get_iter(self.path),
165
167
                                        treemodel.REVNO)
166
168
        elif property.name == 'children':
 
169
            if self.path is None:
 
170
                return None
167
171
            return self.model.get_value(self.model.get_iter(self.path),
168
172
                                        treemodel.CHILDREN)
169
173
        elif property.name == 'parents':
 
174
            if self.path is None:
 
175
                return None
170
176
            return self.model.get_value(self.model.get_iter(self.path),
171
177
                                        treemodel.PARENTS)
172
178
        else:
225
231
    def add_tag(self, tag, revid=None):
226
232
        if revid is None: revid = self.revision.revision_id
227
233
 
228
 
        try:
229
 
            self.branch.unlock()
230
 
 
 
234
        if lock.release(self.branch):
231
235
            try:
232
 
                self.branch.lock_write()
 
236
                lock.acquire(self.branch, lock.WRITE)
233
237
                self.model.add_tag(tag, revid)
234
238
            finally:
235
 
                self.branch.unlock()
236
 
 
237
 
        finally:
238
 
            self.branch.lock_read()
239
 
 
240
 
        self.emit('tag-added', tag, revid)
241
 
        
 
239
                lock.release(self.branch)
 
240
 
 
241
            lock.acquire(self.branch, lock.READ)
 
242
 
 
243
            self.emit('tag-added', tag, revid)
 
244
 
242
245
    def refresh(self):
243
246
        gobject.idle_add(self.populate, self.get_revision())
244
247
 
304
307
                broken_line_length = 32
305
308
            else:
306
309
                broken_line_length = None
307
 
            
 
310
 
308
311
            show_graph = self.graph_column.get_visible()
309
312
 
310
313
            self.branch.lock_read()
316
319
                                                            self.mainline_only,
317
320
                                                            self.progress_bar)
318
321
 
319
 
            self.model = TreeModel(self.branch, linegraphdata)
 
322
            self.model.line_graph_data = linegraphdata
320
323
            self.graph_cell.columns_len = columns_len
321
324
            width = self.graph_cell.get_size(self.treeview)[2]
322
325
            if width > 500:
340
343
        self.treeview = gtk.TreeView()
341
344
 
342
345
        self.treeview.set_rules_hint(True)
343
 
        self.treeview.set_search_column(treemodel.REVNO)
344
 
        
 
346
        # combined revno/summary interactive search
 
347
        #
 
348
        # the row in a treemodel is considered "matched" if a REVNO *starts*
 
349
        # from the key (that is the key is found in a REVNO at the offset 0)
 
350
        # or if a MESSAGE *contains* the key anywhere (that is, the key is
 
351
        # found case insensitively in a MESSAGE at any offset)
 
352
        def search_equal_func(model, column, key, iter):
 
353
            return (model.get_value(iter, treemodel.REVNO).find(key) != 0
 
354
                and model.get_value(iter, treemodel.MESSAGE).lower().find(key.lower()) == -1)
 
355
 
 
356
        self.treeview.set_search_equal_func(search_equal_func)
 
357
        self.treeview.set_enable_search(True)
 
358
 
345
359
        # Fix old PyGTK bug - by JAM
346
360
        set_tooltip = getattr(self.treeview, 'set_tooltip_column', None)
347
361
        if set_tooltip is not None:
365
379
        cell.set_property("width-chars", 15)
366
380
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
367
381
        self.revno_column = gtk.TreeViewColumn("Revision No")
368
 
        self.revno_column.set_resizable(False)
 
382
        self.revno_column.set_resizable(True)
369
383
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
370
384
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
371
385
        self.revno_column.pack_start(cell, expand=True)
374
388
 
375
389
        self.graph_cell = CellRendererGraph()
376
390
        self.graph_column = gtk.TreeViewColumn()
377
 
        self.graph_column.set_resizable(False)
 
391
        self.graph_column.set_resizable(True)
378
392
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
379
393
        self.graph_column.pack_start(self.graph_cell, expand=True)
380
394
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
387
401
        cell.set_property("width-chars", 65)
388
402
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
389
403
        self.summary_column = gtk.TreeViewColumn("Summary")
390
 
        self.summary_column.set_resizable(False)
 
404
        self.summary_column.set_resizable(True)
391
405
        self.summary_column.set_expand(True)
392
406
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
393
407
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
398
412
        cell = gtk.CellRendererText()
399
413
        cell.set_property("width-chars", 15)
400
414
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
401
 
        self.committer_column = gtk.TreeViewColumn("Committer")
402
 
        self.committer_column.set_resizable(False)
403
 
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
404
 
        self.committer_column.set_fixed_width(200)
405
 
        self.committer_column.pack_start(cell, expand=True)
406
 
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
407
 
        self.treeview.append_column(self.committer_column)
 
415
        self.authors_column = gtk.TreeViewColumn("Author(s)")
 
416
        self.authors_column.set_resizable(False)
 
417
        self.authors_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
418
        self.authors_column.set_fixed_width(200)
 
419
        self.authors_column.pack_start(cell, expand=True)
 
420
        self.authors_column.add_attribute(cell, "text", treemodel.AUTHORS)
 
421
        self.treeview.append_column(self.authors_column)
408
422
 
409
423
        cell = gtk.CellRendererText()
410
424
        cell.set_property("width-chars", 20)
411
425
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
412
426
        self.date_column = gtk.TreeViewColumn("Date")
413
427
        self.date_column.set_visible(False)
414
 
        self.date_column.set_resizable(False)
 
428
        self.date_column.set_resizable(True)
415
429
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
416
430
        self.date_column.set_fixed_width(130)
417
431
        self.date_column.pack_start(cell, expand=True)
418
432
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
419
433
        self.treeview.append_column(self.date_column)
420
 
        
 
434
 
421
435
        return self.treeview
422
 
    
 
436
 
423
437
    def _on_selection_changed(self, treeview):
424
438
        """callback for when the treeview changes."""
425
439
        (path, focus) = treeview.get_cursor()