GEPS008: Moved filter editors

svn: r19797

po/POTFILES.in

@@ -333,7 +333,6 @@ src/gui/dbloader.py
 src/gui/dbman.py
 src/gui/dialog.py
 src/gui/displaystate.py
-src/gui/filtereditor.py
 src/gui/grampsbar.py
 src/gui/grampsgui.py
 src/gui/makefilter.py
@@ -369,6 +368,7 @@ src/gui/editors/editrepository.py
 src/gui/editors/editsource.py
 src/gui/editors/edittaglist.py
 src/gui/editors/editurl.py
+src/gui/editors/filtereditor.py
 
 # gui/editors/displaytabs - the GUI display tabs package
 src/gui/editors/displaytabs/addrembedlist.py

src/ExportOptions.py

@@ -619,7 +619,7 @@ class WriterOptionBox(object):
         Callback which invokes the EditFilter dialog. Will create new
         filter if called if none is selected.
         """
-        from gui.filtereditor import EditFilter
+        from gui.editors import EditFilter
         from gen.filters import FilterList, GenericFilterFactory
         import const
         the_filter = None

src/gui/Makefile.am

@@ -31,7 +31,6 @@ pkgpython_PYTHON = \
 	dialog.py \
 	display.py \
 	displaystate.py \
-	filtereditor.py \
 	glade.py \
 	grampsbar.py \
 	grampsgui.py \

src/gui/editors/Makefile.am

@@ -38,6 +38,7 @@ pkgpython_PYTHON = \
 	editsource.py \
 	edittaglist.py \
 	editurl.py \
+	filtereditor.py \
 	objectentries.py
 
 pkgpyexecdir = @pkgpyexecdir@/gui/editors

src/gui/editors/__init__.py

@@ -45,6 +45,7 @@ from editsource import EditSource, DeleteSrcQuery
 from edittaglist import EditTagList
 from editurl import EditUrl
 from editlink import EditLink
+from filtereditor import FilterEditor, EditFilter
 
 # Map from gen.lib name to Editor:
 EDITORS = {

src/gui/filters/sidebar/_sidebarfilter.py

@@ -226,7 +226,7 @@ class SidebarFilter(DbGUIElement):
         Callback which invokes the EditFilter dialog. Will create new
         filter if called if none is selected.
         """
-        from gui.filtereditor import EditFilter
+        from gui.editors import EditFilter
         from gen.filters import FilterList, GenericFilterFactory
         import const
         the_filter = None

src/gui/makefilter.py

@@ -22,7 +22,7 @@
 
 import time
 import gen.filters 
-from gui.filtereditor import EditFilter
+from gui.editors import EditFilter
 import const
 from gen.filters import reload_custom_filters
 from gen.ggettext import sgettext as _

src/gui/views/listview.py

@@ -61,7 +61,7 @@ from gui.utils import add_menuitem
 import const
 import Utils
 from gui.dialog import QuestionDialog, QuestionDialog2
-from gui.filtereditor import FilterEditor
+from gui.editors import FilterEditor
 from gen.ggettext import sgettext as _
 from gui.ddtargets import DdTargets
 from gui.plug.quick import create_quickreport_menu, create_web_connect_menu

src/plugins/tool/EventCmp.py

@@ -60,7 +60,7 @@ from gui.display import display_help
 from gui.managedwindow import ManagedWindow
 from gen.ggettext import sgettext as _
 from gui.glade import Glade
-from gui.filtereditor import FilterEditor
+from gui.editors import FilterEditor
 
 #-------------------------------------------------------------------------
 #

src/plugins/view/pedigreeview.py

@@ -49,7 +49,7 @@ import gtk
 #-------------------------------------------------------------------------
 import gen.lib
 from gui.views.navigationview import NavigationView
-from gui.filtereditor import FilterEditor
+from gui.editors import FilterEditor
 from gen.display.name import displayer as name_displayer
 from Utils import (media_path_full, probably_alive, find_children, 
                    find_parents, find_witnessed_people)

src/plugins/view/relview.py

@@ -50,7 +50,7 @@ import gen.lib
 from gen.db import DbTxn
 from gui.views.navigationview import NavigationView
 from gui.editors import EditPerson, EditFamily
-from gui.filtereditor import FilterEditor
+from gui.editors import FilterEditor
 from gen.display.name import displayer as name_displayer
 from Utils import media_path_full, probably_alive
 from gui.utils import open_file_with_default_application