Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2008-01-02 Benny Malengier <benny.malengier@gramps-project.org>

Browse Source 
* src/Filters/SideBar/_PlaceSidebarFilter.py: correct string, bug #1275


svn: r9686
This commit is contained in:
Benny Malengier 2008-01-02 19:20:23 +00:00
parent cbce0ac6b4
commit f492d26a9c
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2008-01-02 Benny Malengier <benny.malengier@gramps-project.org>
* src/Filters/SideBar/_PlaceSidebarFilter.py: correct string, bug #1275
2008-01-02 Douglas S. Blank <dblank@cs.brynmawr.edu> 2008-01-02 Douglas S. Blank <dblank@cs.brynmawr.edu>
* src/Simple/_SimpleTable.py (SimpleTable.row): added obj handlers * src/Simple/_SimpleTable.py (SimpleTable.row): added obj handlers
* src/plugins/References.py: new quick report for listing refs * src/plugins/References.py: new quick report for listing refs

24
src/Filters/SideBar/_PlaceSidebarFilter.py
View File

@ -72,14 +72,14 @@ class PlaceSidebarFilter(SidebarFilter):
self.filter_regex = gtk.CheckButton(_('Use regular expressions')) self.filter_regex = gtk.CheckButton(_('Use regular expressions'))
self.generic = gtk.ComboBox() self.generic = gtk.ComboBox()
cell = gtk.CellRendererText() cell = gtk.CellRendererText()
self.generic.pack_start(cell, True) self.generic.pack_start(cell, True)
self.generic.add_attribute(cell, 'text', 0) self.generic.add_attribute(cell, 'text', 0)
self.on_filters_changed('Place') self.on_filters_changed('Place')
self.add_text_entry(_('ID'), self.filter_id) self.add_text_entry(_('ID'), self.filter_id)
self.add_text_entry(_('Name'), self.filter_title) self.add_text_entry(_('Place Name'), self.filter_title)
self.add_text_entry(_('Church parish'), self.filter_parish) self.add_text_entry(_('Church parish'), self.filter_parish)
self.add_text_entry(_('Zip/Postal code'), self.filter_zip) self.add_text_entry(_('Zip/Postal code'), self.filter_zip)
self.add_text_entry(_('City'), self.filter_city) self.add_text_entry(_('City'), self.filter_city)
@ -113,7 +113,7 @@ class PlaceSidebarFilter(SidebarFilter):
country = unicode(self.filter_country.get_text()).strip() country = unicode(self.filter_country.get_text()).strip()
note = unicode(self.filter_note.get_text()).strip() note = unicode(self.filter_note.get_text()).strip()
regex = self.filter_regex.get_active() regex = self.filter_regex.get_active()
gen = self.generic.get_active() > 0 gen = self.generic.get_active() > 0
empty = not (gid or title or parish or zipc or city or county empty = not (gid or title or parish or zipc or city or county
or state or country or note or regex or gen) or state or country or note or regex or gen)
@ -138,12 +138,12 @@ class PlaceSidebarFilter(SidebarFilter):
rule = HasNoteMatchingSubstringOf([note]) rule = HasNoteMatchingSubstringOf([note])
generic_filter.add_rule(rule) generic_filter.add_rule(rule)
if self.generic.get_active() != 0: if self.generic.get_active() != 0:
model = self.generic.get_model() model = self.generic.get_model()
node = self.generic.get_active_iter() node = self.generic.get_active_iter()
obj = model.get_value(node, 0) obj = model.get_value(node, 0)
rule = MatchesFilter([obj]) rule = MatchesFilter([obj])
generic_filter.add_rule(rule) generic_filter.add_rule(rule)
return generic_filter return generic_filter