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

* src/plugins/FilterEditor.py: handle Add/Edit of rules correctly

Browse Source 
svn: r1980
This commit is contained in:
Don Allingham 2003-08-10 21:53:02 +00:00
parent f8b4eb6505
commit eef31737d5
1 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/plugins/FilterEditor.py
View File

@ -22,12 +22,27 @@
__author__ = "Don Allingham" __author__ = "Don Allingham"
#-------------------------------------------------------------------------
#
# Python modules
#
#-------------------------------------------------------------------------
import os
#-------------------------------------------------------------------------
#
# GTK/GNOME
#
#-------------------------------------------------------------------------
import gtk import gtk
import gtk.glade import gtk.glade
import string
import os
import gobject import gobject
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
import const import const
import GenericFilter import GenericFilter
import AutoComp import AutoComp
@ -47,7 +62,7 @@ _name2list = {
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# # MyInteger - spin button with standard interface
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class MyInteger(gtk.SpinButton): class MyInteger(gtk.SpinButton):
@ -65,7 +80,7 @@ class MyInteger(gtk.SpinButton):
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# # MyFilters - Combo box with list of filters with a standard interface
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class MyFilters(gtk.Combo): class MyFilters(gtk.Combo):
@ -96,7 +111,8 @@ class MyFilters(gtk.Combo):
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# # MyPlaces - AutoCombo text entry with list of places attached. Provides
# a standard interface
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class MyPlaces(gtk.Entry): class MyPlaces(gtk.Entry):
@ -115,7 +131,7 @@ class MyPlaces(gtk.Entry):
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# # MyID - Person/GRAMPS ID selection box with a standard interface
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class MyID(gtk.HBox): class MyID(gtk.HBox):
@ -338,11 +354,11 @@ class FilterEditor:
self.top.destroy() self.top.destroy()
def on_ok_clicked(self,obj): def on_ok_clicked(self,obj):
n = string.strip(self.fname.get_text()) n = self.fname.get_text().strip()
if n == '': if n == '':
return return
self.filter.set_name(n) self.filter.set_name(n)
self.filter.set_comment(string.strip(self.comment.get_text())) self.filter.set_comment(self.comment.get_text().strip())
for f in self.filterdb.get_filters()[:]: for f in self.filterdb.get_filters()[:]:
if n == f.get_name(): if n == f.get_name():
self.filterdb.get_filters().remove(f) self.filterdb.get_filters().remove(f)
@ -360,15 +376,15 @@ class FilterEditor:
self.top.destroy() self.top.destroy()
def on_add_clicked(self,obj): def on_add_clicked(self,obj):
self.edit_rule2(None,_('Add Rule')) self.edit_rule(None,_('Add Rule'))
def on_edit_clicked(self,obj): def on_edit_clicked(self,obj):
store,iter = self.rlist.get_selected() store,iter = self.rlist.get_selected()
if iter: if iter:
d = self.rlist.get_object(iter) d = self.rlist.get_object(iter)
self.edit_rule2(d,_('Edit Rule')) self.edit_rule(d,_('Edit Rule'))
def edit_rule2(self,val,label): def edit_rule(self,val,label):
self.pmap = {} self.pmap = {}
self.add_places = [] self.add_places = []
@ -532,16 +548,20 @@ class FilterEditor:
value_list = [] value_list = []
for x in t: for x in t:
value_list.append(x.get_text()) value_list.append(x.get_text())
new_rule = c(value_list)
store,iter = self.rlist.get_selected() store,iter = self.rlist.get_selected()
if iter: new_rule = c(value_list)
if self.active_rule:
rule = self.rlist.get_object(iter) rule = self.rlist.get_object(iter)
self.filter.delete_rule(rule) self.filter.delete_rule(rule)
self.filter.add_rule(new_rule) self.filter.add_rule(new_rule)
self.draw_rules() self.draw_rules()
self.rule_top.destroy() self.rule_top.destroy()
except: except KeyError:
pass pass
except:
import DisplayTrace
self.rule_top.destroy()
DisplayTrace.DisplayTrace()
def rule_cancel(self,obj): def rule_cancel(self,obj):
self.rule_top.destroy() self.rule_top.destroy()