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

2007-06-01 Alex Roitman <shura@gramps-project.org>

Browse Source 
* src/FilterEditor/_FilterEditor.py (check_recursive_filters,
	clean_after_rename, _do_delete_filter,_do_delete_selected_filter):
	Handle renaming and deletion of filters when other filters depend
	on them.
	* src/FilterEditor/_EditFilter.py (filter_name_changed): Prohibit
	creating new filter names colliding with existing filter names;
	(on_ok_clicked): Signal the name change.
	* src/DisplayState.py (DisplayState.__signals__): Add new signal
	to indicate filter name change: necessary for renaming/removing
	filters based on the changed name.



svn: r8525
This commit is contained in:
Alex Roitman 2007-06-01 08:24:12 +00:00
parent d8acc51b79
commit 0a2e6ad8b0
4 changed files with 86 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gramps2/ChangeLog
View File

@ -1,3 +1,15 @@
2007-06-01 Alex Roitman <shura@gramps-project.org>
* src/FilterEditor/_FilterEditor.py (check_recursive_filters,
clean_after_rename, _do_delete_filter,_do_delete_selected_filter):
Handle renaming and deletion of filters when other filters depend
on them.
* src/FilterEditor/_EditFilter.py (filter_name_changed): Prohibit
creating new filter names colliding with existing filter names;
(on_ok_clicked): Signal the name change.
* src/DisplayState.py (DisplayState.__signals__): Add new signal
to indicate filter name change: necessary for renaming/removing
filters based on the changed name.
2007-05-31 Alex Roitman <shura@gramps-project.org>
* src/GrampsDb/_WriteXML.py (_xml_version): Bump up version.
* data/grampsxml.rng: Add privacy for sourceref and lds_ord.

1
gramps2/src/DisplayState.py
View File

@ -256,6 +256,7 @@ class DisplayState(GrampsDb.GrampsDBCallback):
__signals__ = {
'filters-changed' : (str,),
'filter-name-changed' : (str,unicode,unicode),
'nameformat-changed' : None,
'plugins-reloaded' : (list,list),
}

10
gramps2/src/FilterEditor/_EditFilter.py
View File

@ -127,7 +127,12 @@ class EditFilter(ManagedWindow.ManagedWindow):
def filter_name_changed(self,obj):
name = unicode(self.fname.get_text())
self.ok_btn.set_sensitive(len(name) != 0)
# Make sure that the name is not empty
# and not in the list of existing filters (excluding this one)
names = [filt.get_name()
for filt in self.filterdb.get_filters(self.space)
if filt != self.filter]
self.ok_btn.set_sensitive((len(name) != 0) and (name not in names))
def select_row(self,obj):
store,node = self.rlist.get_selected()
@ -147,6 +152,9 @@ class EditFilter(ManagedWindow.ManagedWindow):
n = unicode(self.fname.get_text()).strip()
if n == '':
return
if n != self.filter.get_name():
self.uistate.emit('filter-name-changed',
(self.space,unicode(self.filter.get_name()),n))
self.filter.set_name(n)
self.filter.set_comment(unicode(self.comment.get_text()).strip())
for f in self.filterdb.get_filters(self.space)[:]:

66
gramps2/src/FilterEditor/_FilterEditor.py
View File

@ -1,7 +1,7 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2000-2006 Donald N. Allingham
# Copyright (C) 2000-2007 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -56,8 +56,10 @@ import GrampsDisplay
import const
from Filters import GenericFilterFactory, FilterList, \
reload_custom_filters, reload_system_filters
from Filters.Rules._MatchesFilterBase import MatchesFilterBase
import ListModel
import ManagedWindow
from QuestionDialog import QuestionDialog
#-------------------------------------------------------------------------
#
@ -100,6 +102,8 @@ class FilterEditor(ManagedWindow.ManagedWindow):
self.connect_button('close', self.close)
self.connect_button('add', self.add_new_filter)
self.uistate.connect('filter-name-changed',self.clean_after_rename)
self.clist = ListModel.ListModel(
self.filter_list,
[(_('Filter'),0,150),(_('Comment'),1,150)],
@ -181,9 +185,43 @@ class FilterEditor(ManagedWindow.ManagedWindow):
store,node = self.clist.get_selected()
if node:
gfilter = self.clist.get_object(node)
self.filterdb.get_filters(self.space).remove(gfilter)
name = gfilter.get_name()
if self.check_recursive_filters(self.space,name):
QuestionDialog( _('Delete Filter?'),
_('This filter is currently being used '
'as the base for other filters. Deleting'
'this filter will result in removing all '
'other filters that depend on it.'),
_('Delete Filter'),
self._do_delete_selected_filter,
self.window)
else:
self._do_delete_selected_filter()
def _do_delete_selected_filter(self):
store,node = self.clist.get_selected()
if node:
gfilter = self.clist.get_object(node)
self._do_delete_filter(self.space,gfilter)
self.draw_filters()
def _do_delete_filter(self,space,gfilter):
"""
This method recursively calls itself to delete all dependent filters
before removing this filter. Otherwise when A is 'matches B'
and C is 'matches D' the removal of A leads to two broken filter
being left behind.
"""
filters = self.filterdb.get_filters(space)
name = gfilter.get_name()
for the_filter in filters:
for rule in the_filter.get_rules():
values = rule.values()
if issubclass(rule.__class__,MatchesFilterBase) \
and (name in values):
self._do_delete_filter(space,the_filter)
filters.remove(gfilter)
def get_all_handles(self):
if self.space == 'Person':
return self.db.get_person_handles(sort_handles=False)
@ -199,3 +237,27 @@ class FilterEditor(ManagedWindow.ManagedWindow):
return self.db.get_media_object_handles()
elif self.space == 'Repository':
return self.db.get_repository_handles()
def clean_after_rename(self,space,old_name,new_name):
if old_name == "":
return
if old_name == new_name:
return
for the_filter in self.filterdb.get_filters(space):
for rule in the_filter.get_rules():
values = rule.values()
if issubclass(rule.__class__,MatchesFilterBase) \
and (old_name in values):
ind = values.index(old_name)
values[ind] = new_name
def check_recursive_filters(self,space,name):
for the_filter in self.filterdb.get_filters(space):
for rule in the_filter.get_rules():
values = rule.values()
if issubclass(rule.__class__,MatchesFilterBase) \
and (name in values):
return True
return False