* src/RelLib/_Name.py: default utf8 strings

* src/RelLib/_MarkerType.py: default utf8 strings
	* src/RelLib/_Place.py: default utf8 strings
	* src/RelLib/_GrampsType.py: default utf8 strings
	* src/Filters/SideBar/_EventSidebarFilter.py: default utf8 strings
	* src/Filters/SideBar/_FamilySidebarFilter.py: default utf8 strings
	* src/Filters/SideBar/_PersonSidebarFilter.py: default utf8 strings
	as a fallback. (bug #779), convert string to unicode if needed (bug #604)


svn: r7883
This commit is contained in:
Don Allingham
2007-01-08 21:40:51 +00:00
parent de760c6c66
commit 610ee95aa9
9 changed files with 56 additions and 47 deletions

View File

@@ -62,7 +62,7 @@ class EventSidebarFilter(SidebarFilter):
self.filter_id = gtk.Entry()
self.filter_desc = gtk.Entry()
self.filter_event = RelLib.Event()
self.filter_event.set_type((RelLib.EventType.CUSTOM,''))
self.filter_event.set_type((RelLib.EventType.CUSTOM,u''))
self.etype = gtk.ComboBoxEntry()
self.event_menu = GrampsWidgets.MonitoredDataType(
@@ -92,12 +92,12 @@ class EventSidebarFilter(SidebarFilter):
self.add_entry(None, self.filter_regex)
def clear(self, obj):
self.filter_id.set_text('')
self.filter_desc.set_text('')
self.filter_date.set_text('')
self.filter_place.set_text('')
self.filter_note.set_text('')
self.etype.child.set_text('')
self.filter_id.set_text(u'')
self.filter_desc.set_text(u'')
self.filter_date.set_text(u'')
self.filter_place.set_text(u'')
self.filter_note.set_text(u'')
self.etype.child.set_text(u'')
self.generic.set_active(0)
def get_filter(self):

View File

@@ -65,11 +65,11 @@ class FamilySidebarFilter(SidebarFilter):
self.filter_child = gtk.Entry()
self.filter_event = RelLib.Event()
self.filter_event.set_type((RelLib.EventType.CUSTOM,''))
self.filter_event.set_type((RelLib.EventType.CUSTOM,u''))
self.etype = gtk.ComboBoxEntry()
self.family_stub = RelLib.Family()
self.family_stub.set_relationship((RelLib.FamilyRelType.CUSTOM,''))
self.family_stub.set_relationship((RelLib.FamilyRelType.CUSTOM,u''))
self.rtype = gtk.ComboBoxEntry()
self.event_menu = GrampsWidgets.MonitoredDataType(
@@ -83,7 +83,7 @@ class FamilySidebarFilter(SidebarFilter):
self.family_stub.get_relationship)
self.filter_marker = RelLib.Family()
self.filter_marker.set_marker((RelLib.MarkerType.CUSTOM,''))
self.filter_marker.set_marker((RelLib.MarkerType.CUSTOM,u''))
self.mtype = gtk.ComboBoxEntry()
self.marker_menu = GrampsWidgets.MonitoredDataType(
self.mtype,
@@ -112,14 +112,14 @@ class FamilySidebarFilter(SidebarFilter):
self.add_entry(None, self.filter_regex)
def clear(self, obj):
self.filter_id.set_text('')
self.filter_father.set_text('')
self.filter_mother.set_text('')
self.filter_child.set_text('')
self.filter_note.set_text('')
self.etype.child.set_text('')
self.rtype.child.set_text('')
self.mtype.child.set_text('')
self.filter_id.set_text(u'')
self.filter_father.set_text(u'')
self.filter_mother.set_text(u'')
self.filter_child.set_text(u'')
self.filter_note.set_text(u'')
self.etype.child.set_text(u'')
self.rtype.child.set_text(u'')
self.mtype.child.set_text(u'')
self.generic.set_active(0)
def get_filter(self):
@@ -169,7 +169,7 @@ class FamilySidebarFilter(SidebarFilter):
generic_filter.add_rule(rule)
if etype:
rule = HasEvent([etype, '', '', ''])
rule = HasEvent([etype, u'', u'', u''])
generic_filter.add_rule(rule)
if rtype:

View File

@@ -63,7 +63,7 @@ class PersonSidebarFilter(SidebarFilter):
self.filter_birth = gtk.Entry()
self.filter_death = gtk.Entry()
self.filter_event = RelLib.Event()
self.filter_event.set_type((RelLib.EventType.CUSTOM,''))
self.filter_event.set_type((RelLib.EventType.CUSTOM,u''))
self.etype = gtk.ComboBoxEntry()
self.event_menu = GrampsWidgets.MonitoredDataType(
self.etype,
@@ -71,7 +71,7 @@ class PersonSidebarFilter(SidebarFilter):
self.filter_event.get_type)
self.filter_marker = RelLib.Person()
self.filter_marker.set_marker((RelLib.MarkerType.CUSTOM,''))
self.filter_marker.set_marker((RelLib.MarkerType.CUSTOM,u''))
self.mtype = gtk.ComboBoxEntry()
self.marker_menu = GrampsWidgets.MonitoredDataType(
self.mtype,
@@ -104,14 +104,14 @@ class PersonSidebarFilter(SidebarFilter):
self.add_entry(None, self.filter_regex)
def clear(self, obj):
self.filter_name.set_text('')
self.filter_id.set_text('')
self.filter_birth.set_text('')
self.filter_death.set_text('')
self.filter_note.set_text('')
self.filter_name.set_text(u'')
self.filter_id.set_text(u'')
self.filter_birth.set_text(u'')
self.filter_death.set_text(u'')
self.filter_note.set_text(u'')
self.filter_gender.set_active(0)
self.etype.child.set_text('')
self.mtype.child.set_text('')
self.etype.child.set_text(u'')
self.mtype.child.set_text(u'')
self.generic.set_active(0)
def get_filter(self):
@@ -158,14 +158,14 @@ class PersonSidebarFilter(SidebarFilter):
generic_filter.add_rule(rule)
if etype:
rule = HasEvent([etype, '', '', ''])
rule = HasEvent([etype, u'', u'', u''])
generic_filter.add_rule(rule)
if birth:
rule = HasBirth([birth,'',''])
rule = HasBirth([birth,u'',u''])
generic_filter.add_rule(rule)
if death:
rule = HasDeath([death,'',''])
rule = HasDeath([death,u'',u''])
generic_filter.add_rule(rule)
if note:
if regex: