* src/PeopleStore.py: handle unicode conversion from get_value
svn: r2638
This commit is contained in:
parent
42c6d627a8
commit
5e5e61aa26
@ -23,7 +23,7 @@
|
|||||||
# GNOME
|
# GNOME
|
||||||
#
|
#
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
from gobject import TYPE_STRING, TYPE_PYOBJECT, TYPE_INT
|
from gobject import TYPE_STRING, TYPE_INT
|
||||||
import gtk
|
import gtk
|
||||||
import pango
|
import pango
|
||||||
|
|
||||||
@ -42,6 +42,9 @@ from gettext import gettext as _
|
|||||||
_BCOL = 8
|
_BCOL = 8
|
||||||
_IDCOL = 1
|
_IDCOL = 1
|
||||||
|
|
||||||
|
_TOP_FONT=pango.WEIGHT_ULTRABOLD
|
||||||
|
_TEXT_FONT=pango.WEIGHT_NORMAL
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
# PeopleStore
|
# PeopleStore
|
||||||
@ -79,9 +82,6 @@ class PeopleStore:
|
|||||||
renderer = gtk.CellRendererText()
|
renderer = gtk.CellRendererText()
|
||||||
renderer.set_fixed_height_from_font(1)
|
renderer.set_fixed_height_from_font(1)
|
||||||
if name[0] != '':
|
if name[0] != '':
|
||||||
if cnum == 0:
|
|
||||||
column = gtk.TreeViewColumn(name[0],renderer,text=cnum)
|
|
||||||
else:
|
|
||||||
column = gtk.TreeViewColumn(name[0],renderer,text=cnum)
|
column = gtk.TreeViewColumn(name[0],renderer,text=cnum)
|
||||||
column.set_min_width(name[2])
|
column.set_min_width(name[2])
|
||||||
column.set_resizable(gtk.TRUE)
|
column.set_resizable(gtk.TRUE)
|
||||||
@ -199,10 +199,13 @@ class PeopleStore:
|
|||||||
iter_parent = self.model.iter_parent (iter)
|
iter_parent = self.model.iter_parent (iter)
|
||||||
self.model.remove(iter)
|
self.model.remove(iter)
|
||||||
if iter_parent and not self.model.iter_has_child (iter_parent):
|
if iter_parent and not self.model.iter_has_child (iter_parent):
|
||||||
name = self.model.get_value(iter_parent,0)
|
name = unicode(self.model.get_value(iter_parent,0))
|
||||||
self.model.remove (iter_parent)
|
self.model.remove (iter_parent)
|
||||||
|
if self.tree_roots.has_key(name):
|
||||||
del self.tree_roots[name]
|
del self.tree_roots[name]
|
||||||
|
if self.tree_open.has_key(name):
|
||||||
del self.tree_open[name]
|
del self.tree_open[name]
|
||||||
|
if self.tree_list.has_key(name):
|
||||||
del self.tree_list[name]
|
del self.tree_list[name]
|
||||||
self.count = self.count - 1
|
self.count = self.count - 1
|
||||||
|
|
||||||
@ -227,7 +230,7 @@ class PeopleStore:
|
|||||||
self.model.set_value(iter,col,object)
|
self.model.set_value(iter,col,object)
|
||||||
col = col + 1
|
col = col + 1
|
||||||
self.model.set_value(iter,_IDCOL,info)
|
self.model.set_value(iter,_IDCOL,info)
|
||||||
self.model.set_value(iter,_BCOL,pango.WEIGHT_NORMAL)
|
self.model.set_value(iter,_BCOL,_TOP_FONT)
|
||||||
if select:
|
if select:
|
||||||
self.selection.select_iter(iter)
|
self.selection.select_iter(iter)
|
||||||
return iter
|
return iter
|
||||||
@ -274,7 +277,7 @@ class PeopleStore:
|
|||||||
self.tree_list[name] = []
|
self.tree_list[name] = []
|
||||||
self.model.set_value(top,0,name)
|
self.model.set_value(top,0,name)
|
||||||
self.model.set_value(top,5,name.upper())
|
self.model.set_value(top,5,name.upper())
|
||||||
self.model.set_value(top,_BCOL,pango.WEIGHT_BOLD)
|
self.model.set_value(top,_BCOL,_TOP_FONT)
|
||||||
self.tree_roots[name] = top
|
self.tree_roots[name] = top
|
||||||
|
|
||||||
if self.tree_open[name] or select:
|
if self.tree_open[name] or select:
|
||||||
@ -283,7 +286,7 @@ class PeopleStore:
|
|||||||
for object in data[:-1]:
|
for object in data[:-1]:
|
||||||
self.model.set_value(iter,col,object)
|
self.model.set_value(iter,col,object)
|
||||||
col = col + 1
|
col = col + 1
|
||||||
self.model.set_value(iter,_BCOL,pango.WEIGHT_NORMAL)
|
self.model.set_value(iter,_BCOL,_TEXT_FONT)
|
||||||
if select:
|
if select:
|
||||||
self.sel_iter = iter
|
self.sel_iter = iter
|
||||||
self.selection.select_iter(self.sel_iter)
|
self.selection.select_iter(self.sel_iter)
|
||||||
@ -297,7 +300,7 @@ class PeopleStore:
|
|||||||
for object in data:
|
for object in data:
|
||||||
self.model.set_value(iter,col,object)
|
self.model.set_value(iter,col,object)
|
||||||
col = col + 1
|
col = col + 1
|
||||||
self.model.set_value(iter,_BCOL,pango.WEIGHT_NORMAL)
|
self.model.set_value(iter,_BCOL,_TEXT_FONT)
|
||||||
if select:
|
if select:
|
||||||
self.sel_iter = iter
|
self.sel_iter = iter
|
||||||
return iter
|
return iter
|
||||||
@ -309,7 +312,7 @@ class PeopleStore:
|
|||||||
for object in data:
|
for object in data:
|
||||||
self.model.set_value(iter,col,object)
|
self.model.set_value(iter,col,object)
|
||||||
col = col + 1
|
col = col + 1
|
||||||
self.model.set_value(iter,_BCOL,pango.WEIGHT_NORMAL)
|
self.model.set_value(iter,_BCOL,_TEXT_FONT)
|
||||||
self.selection.select_iter(iter)
|
self.selection.select_iter(iter)
|
||||||
|
|
||||||
def center_selected(self):
|
def center_selected(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user