/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: Vincent Ladeuil
  • Date: 2008-06-10 15:25:47 UTC
  • mto: This revision was merged to the branch mainline in revision 504.
  • Revision ID: v.ladeuil+lp@free.fr-20080610152547-dwmil1p8pd0mfpnl
Fix third failing test (thanks to jam).

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge): Fix
provided by jam: bzr we now filter the pending merges so that only
the 'heads()' are included. We just ensure that the pending merges
contain the unique tips for the ancestries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
import re
15
15
import treemodel
16
16
 
 
17
from bzrlib.plugins.gtk import _i18n
17
18
from linegraph import linegraph, same_branch
18
19
from graphcell import CellRendererGraph
19
20
from treemodel import TreeModel
338
339
        cell.set_property("width-chars", 15)
339
340
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
340
341
        self.revno_column = gtk.TreeViewColumn("Revision No")
341
 
        self.revno_column.set_resizable(True)
 
342
        self.revno_column.set_resizable(False)
342
343
        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
343
344
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
344
345
        self.revno_column.pack_start(cell, expand=True)
347
348
 
348
349
        self.graph_cell = CellRendererGraph()
349
350
        self.graph_column = gtk.TreeViewColumn()
350
 
        self.graph_column.set_resizable(True)
 
351
        self.graph_column.set_resizable(False)
351
352
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
352
 
        self.graph_column.pack_start(self.graph_cell, expand=False)
 
353
        self.graph_column.pack_start(self.graph_cell, expand=True)
353
354
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
354
355
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
355
356
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
360
361
        cell.set_property("width-chars", 65)
361
362
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
362
363
        self.summary_column = gtk.TreeViewColumn("Summary")
363
 
        self.summary_column.set_resizable(True)
 
364
        self.summary_column.set_resizable(False)
 
365
        self.summary_column.set_expand(True)
364
366
        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
365
367
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
366
368
        self.summary_column.pack_start(cell, expand=True)
371
373
        cell.set_property("width-chars", 15)
372
374
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
373
375
        self.committer_column = gtk.TreeViewColumn("Committer")
374
 
        self.committer_column.set_resizable(True)
 
376
        self.committer_column.set_resizable(False)
375
377
        self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
376
 
        self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
378
        self.committer_column.set_fixed_width(200)
377
379
        self.committer_column.pack_start(cell, expand=True)
378
380
        self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
379
381
        self.treeview.append_column(self.committer_column)
383
385
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
384
386
        self.date_column = gtk.TreeViewColumn("Date")
385
387
        self.date_column.set_visible(False)
386
 
        self.date_column.set_resizable(True)
 
388
        self.date_column.set_resizable(False)
387
389
        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
388
 
        self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
390
        self.date_column.set_fixed_width(130)
389
391
        self.date_column.pack_start(cell, expand=True)
390
392
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
391
393
        self.treeview.append_column(self.date_column)
397
399
                                                 gtk.ICON_SIZE_BUTTON)
398
400
        image_loading.show()
399
401
        
400
 
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
 
402
        label_loading = gtk.Label(
 
403
            _i18n("Please wait, loading ancestral graph..."))
401
404
        label_loading.set_alignment(0.0, 0.5)
402
405
        label_loading.show()
403
406