GEPS008: Re-structure GUI logger files

svn: r19726

configure.in

@@ -125,6 +125,7 @@ src/gui/editors/displaytabs/Makefile
 src/gui/filters/Makefile
 src/gui/filters/sidebar/Makefile
 src/gui/glade/Makefile
+src/gui/logger/Makefile
 src/gui/merge/Makefile
 src/gui/plug/Makefile
 src/gui/plug/report/Makefile
@@ -132,7 +133,6 @@ src/gui/selectors/Makefile
 src/gui/views/Makefile
 src/gui/views/treemodels/Makefile
 src/gui/widgets/Makefile
-src/GrampsLogger/Makefile
 src/docgen/Makefile
 src/Simple/Makefile
 src/GrampsLocale/Makefile

src/DisplayState.py

@@ -305,7 +305,7 @@ def by_time(first, second):
     return cmp(second.get_time(), first.get_time())
 
 
-from GrampsLogger import RotateHandler
+from gui.logger import RotateHandler
 
 class WarnHandler(RotateHandler):
 

src/Makefile.am

@@ -7,7 +7,6 @@ SUBDIRS = \
 	docgen \
 	gen \
 	GrampsLocale \
-	GrampsLogger \
 	gui \
 	images \
 	plugins \

src/gui/Makefile.am

@@ -8,6 +8,7 @@ SUBDIRS = \
 	editors \
 	filters \
 	glade \
+	logger \
 	merge \
 	plug \
 	selectors \

src/gui/__init__.py

@@ -26,4 +26,5 @@ Package init for the gui package.
 
 # DO NOT IMPORT METHODS/CLASSES FROM src/gui HERE ! Only __all__ 
 
-__all__ = [ "editors", "filters", "merge", "selectors", "views", "widgets" ]
+__all__ = [ "editors", "filters", "logger", "merge", "selectors", "views", 
+            "widgets" ]

src/gui/grampsgui.py

@@ -269,7 +269,7 @@ def __startgramps(errors, argparser):
         sys.exit(1)
 
     # add gui logger
-    from GrampsLogger import RotateHandler, GtkHandler
+    from gui.logger import RotateHandler, GtkHandler
     form = logging.Formatter(fmt="%(relativeCreated)d: %(levelname)s: "
                                 "%(filename)s: line %(lineno)d: %(message)s")
     # Create the log handlers

src/gui/logger/Makefile.am

@@ -5,19 +5,19 @@
 # If not using GNU make, then list all .py files individually
 
 pkgpython_PYTHON = \
-	_ErrorReportAssistant.py\
+	_errorreportassistant.py\
-	_ErrorView.py\
+	_errorview.py\
-	_GtkHandler.py\
+	_gtkhandler.py\
 	__init__.py\
-	_RotateHandler.py
+	_rotatehandler.py
 
-pkgpyexecdir = @pkgpyexecdir@/GrampsLogger
+pkgpyexecdir = @pkgpyexecdir@/gui/logger
-pkgpythondir = $(datadir)/@PACKAGE@/GrampsLogger
+pkgpythondir = $(datadir)/@PACKAGE@/gui/logger
 
 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
 
-GRAMPS_PY_MODPATH = "../"
+GRAMPS_PY_MODPATH = "../../"
 
 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \

src/gui/logger/__init__.py

@@ -18,7 +18,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# GrampsLogger/__init__.py
 # $Id$
 
 """
@@ -41,7 +40,7 @@ Usage:
 
    Simple example:
 
-        from GrampsLogger import GtkHandler, RotateHandler
+        from gui.logger import GtkHandler, RotateHandler
 
         rh = RotateHandler(capacity=20)
         rh.setLevel(logging.DEBUG)
@@ -65,5 +64,5 @@ Usage:
 
 """
 
-from _GtkHandler import GtkHandler
+from _gtkhandler import GtkHandler
-from _RotateHandler import RotateHandler
+from _rotatehandler import RotateHandler

src/gui/logger/_errorreportassistant.py

@@ -18,7 +18,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# GrampsLogger/_ErrorReportAssistant.py
 # $Id$
 
 from gen.ggettext import gettext as _

src/gui/logger/_errorview.py

@@ -18,7 +18,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# GrampsLogger/_ErrorView.py
 # $Id$
 
 #-------------------------------------------------------------------------
@@ -35,7 +34,7 @@ import gtk
 #-------------------------------------------------------------------------
 import const
 from gen.ggettext import sgettext as _
-from _ErrorReportAssistant import ErrorReportAssistant
+from _errorreportassistant import ErrorReportAssistant
 import GrampsDisplay
 
 #-------------------------------------------------------------------------

src/gui/logger/_gtkhandler.py

@@ -18,13 +18,12 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# GrampsLogger/_GtkHandler.py
 # $Id$
 
 
 import logging
 
-from _ErrorView import ErrorView
+from _errorview import ErrorView
 
 
 class GtkHandler(logging.Handler):

src/gui/logger/_rotatehandler.py

@@ -18,7 +18,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# GrampsLogger/_RotateHandler.py
 # $Id$
 
 import logging

src/guiQML/grampsqml.py

@@ -116,7 +116,7 @@ def startqml(errors, argparser):
         sys.exit()
 
     # add gui logger
-    from GrampsLogger import RotateHandler
+    from gui.logger import RotateHandler
     form = logging.Formatter(fmt="%(relativeCreated)d: %(levelname)s: "
                                 "%(filename)s: line %(lineno)d: %(message)s")
     # Create the log handlers