/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: David Planella
  • Date: 2011-03-06 08:24:07 UTC
  • mfrom: (718 trunk)
  • mto: This revision was merged to the branch mainline in revision 719.
  • Revision ID: david.planella@ubuntu.com-20110306082407-y9zwkjje5oue9egw
Added preliminary internationalization support. Merged from trunk.

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
12
import treemodel
16
13
from bzrlib import ui
17
14
 
18
 
from bzrlib.plugins.gtk import _i18n
19
 
from bzrlib.plugins.gtk.ui import GtkProgressBar, ProgressPanel
 
15
from bzrlib.plugins.gtk.ui import ProgressPanel
20
16
from linegraph import linegraph, same_branch
21
17
from graphcell import CellRendererGraph
22
18
from treemodel import TreeModel
23
19
from bzrlib.revision import NULL_REVISION
 
20
from bzrlib.plugins.gtk import lock
24
21
 
25
22
 
26
23
class TreeView(gtk.VBox):
225
222
    def add_tag(self, tag, revid=None):
226
223
        if revid is None: revid = self.revision.revision_id
227
224
 
228
 
        try:
229
 
            self.branch.unlock()
230
 
 
 
225
        if lock.release(self.branch):
231
226
            try:
232
 
                self.branch.lock_write()
 
227
                lock.acquire(self.branch, lock.WRITE)
233
228
                self.model.add_tag(tag, revid)
234
229
            finally:
235
 
                self.branch.unlock()
236
 
 
237
 
        finally:
238
 
            self.branch.lock_read()
239
 
 
240
 
        self.emit('tag-added', tag, revid)
 
230
                lock.release(self.branch)
 
231
 
 
232
            lock.acquire(self.branch, lock.READ)
 
233
 
 
234
            self.emit('tag-added', tag, revid)
241
235
        
242
236
    def refresh(self):
243
237
        gobject.idle_add(self.populate, self.get_revision())
398
392
        cell = gtk.CellRendererText()
399
393
        cell.set_property("width-chars", 15)
400
394
        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)
 
395
        self.authors_column = gtk.TreeViewColumn("Author(s)")
 
396
        self.authors_column.set_resizable(False)
 
397
        self.authors_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
398
        self.authors_column.set_fixed_width(200)
 
399
        self.authors_column.pack_start(cell, expand=True)
 
400
        self.authors_column.add_attribute(cell, "text", treemodel.AUTHORS)
 
401
        self.treeview.append_column(self.authors_column)
408
402
 
409
403
        cell = gtk.CellRendererText()
410
404
        cell.set_property("width-chars", 20)