part 3 : split basedoc in files, remove Utils dependance, move fontscale in gen,

update build system


svn: r12603

src/ReportBase/_CommandLineReport.py

@@ -42,8 +42,8 @@ log = logging.getLogger(".")
 #-------------------------------------------------------------------------
 import gen
 import Utils
-from gen.plug.docgen import StyleSheet, StyleSheetList, PaperStyle
-from gen.plug.docgen.basedoc import (PAPER_PORTRAIT, PAPER_LANDSCAPE)
+from gen.plug.docgen import (StyleSheet, StyleSheetList, PaperStyle,
+                             PAPER_PORTRAIT, PAPER_LANDSCAPE)
 from BasicUtils import name_displayer
 from ReportBase import CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_BOOK, \
     CATEGORY_GRAPHVIZ

src/ReportBase/_Endnotes.py

@@ -22,8 +22,7 @@
 """
 Provide utilities for printing endnotes in text reports.
 """
-from gen.plug.docgen import FontStyle, ParagraphStyle
-from gen.plug.docgen.basedoc import FONT_SANS_SERIF
+from gen.plug.docgen import FontStyle, ParagraphStyle, FONT_SANS_SERIF
 from gettext import gettext as _
 
 def add_endnote_styles(style_sheet):

src/ReportBase/_PaperMenu.py

@@ -40,10 +40,10 @@ import gobject
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-from gen.plug.docgen import PaperStyle, PaperSize
-from gen.plug.docgen.basedoc import (PAPER_PORTRAIT, PAPER_LANDSCAPE)
+from gen.plug.docgen import PaperStyle, PaperSize, PAPER_PORTRAIT, \
+                            PAPER_LANDSCAPE
+from gen.plug.utils import gfloat
 import const
-import Utils
 from glade import Glade
 
 #-------------------------------------------------------------------------
@@ -342,8 +342,8 @@ class PageSizeParser(handler.ContentHandler):
     def startElement(self,tag,attrs):
         if tag == "page":
             name = attrs['name']
-            height = Utils.gfloat(attrs['height'])
-            width = Utils.gfloat(attrs['width'])
+            height = gfloat(attrs['height'])
+            width = gfloat(attrs['width'])
             self.paper_list.append(PaperSize(name, height,width))
 
 #-------------------------------------------------------------------------

src/ReportBase/_ReportOptions.py

@@ -55,7 +55,7 @@ except:
 #-------------------------------------------------------------------------
 import const
 import Config
-from gen.plug.docgen.basedoc import PAPER_PORTRAIT
+from gen.plug.docgen import PAPER_PORTRAIT
 from PluginUtils import _Options, GuiMenuOptions
 
 #-------------------------------------------------------------------------

src/ReportBase/_ReportUtils.py

@@ -50,8 +50,7 @@ from gen.lib.person import Person
 from BasicUtils import name_displayer as _nd
 from Utils import media_path_full
 from QuestionDialog import WarningDialog
-from gen.plug.docgen import IndexMark
-from gen.plug.docgen.basedoc import INDEX_TYPE_ALP
+from gen.plug.docgen import IndexMark, INDEX_TYPE_ALP
 
 #------------------------------------------------------------------------
 #

src/ReportBase/_StyleEditor.py

@@ -50,8 +50,7 @@ from gtk.gdk import Color
 #------------------------------------------------------------------------
 import Utils
 import const
-from gen.plug.docgen import StyleSheet
-from gen.plug.docgen.basedoc import (FONT_SERIF, FONT_SANS_SERIF,
+from gen.plug.docgen import (StyleSheet, FONT_SERIF, FONT_SANS_SERIF,
             PARA_ALIGN_RIGHT, PARA_ALIGN_CENTER, PARA_ALIGN_LEFT,  
             PARA_ALIGN_JUSTIFY) 
 import ListModel