part 3 : split basedoc in files, remove Utils dependance, move fontscale in gen,
update build system svn: r12603
This commit is contained in:
@@ -35,8 +35,8 @@ from TransUtils import sgettext as _
|
||||
# GRAMPS modules
|
||||
#
|
||||
#------------------------------------------------------------------------
|
||||
from gen.plug.docgen import FontStyle, ParagraphStyle, GraphicsStyle
|
||||
from gen.plug.docgen.basedoc import FONT_SANS_SERIF, PARA_ALIGN_CENTER
|
||||
from gen.plug.docgen import FontStyle, ParagraphStyle, GraphicsStyle,\
|
||||
FONT_SANS_SERIF, PARA_ALIGN_CENTER
|
||||
from SubstKeywords import SubstKeywords
|
||||
from gen.plug import PluginManager
|
||||
from gen.plug.menu import BooleanOption, NumberOption, TextOption, PersonOption
|
||||
|
||||
@@ -34,9 +34,10 @@ import time
|
||||
# GRAMPS modules
|
||||
#
|
||||
#------------------------------------------------------------------------
|
||||
from gen.plug.docgen import FontStyle, ParagraphStyle, GraphicsStyle
|
||||
from gen.plug.docgen.basedoc import (FONT_SERIF, PARA_ALIGN_CENTER
|
||||
, PARA_ALIGN_LEFT, PARA_ALIGN_RIGHT)
|
||||
from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle,
|
||||
FONT_SERIF, PARA_ALIGN_CENTER,
|
||||
PARA_ALIGN_LEFT, PARA_ALIGN_RIGHT)
|
||||
from gen.plug.docgen.fontscale import string_trim
|
||||
from BasicUtils import name_displayer
|
||||
from gen.plug import PluginManager
|
||||
from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_DRAW
|
||||
@@ -45,7 +46,7 @@ from gen.plug.menu import BooleanOption, StringOption, NumberOption, \
|
||||
import GrampsLocale
|
||||
import gen.lib
|
||||
from Utils import probably_alive, ProgressMeter
|
||||
from FontScale import string_trim
|
||||
|
||||
|
||||
import libholiday
|
||||
from libholiday import g2iso
|
||||
|
||||
@@ -35,8 +35,8 @@ from gen.plug.menu import TextOption, NumberOption, BooleanOption, PersonOption
|
||||
from ReportBase import Report, MenuReportOptions, ReportUtils, CATEGORY_DRAW
|
||||
from SubstKeywords import SubstKeywords
|
||||
from TransUtils import sgettext as _
|
||||
from gen.plug.docgen import GraphicsStyle, FontStyle, ParagraphStyle
|
||||
from gen.plug.docgen.basedoc import FONT_SANS_SERIF, PARA_ALIGN_CENTER
|
||||
from gen.plug.docgen import GraphicsStyle, FontStyle, ParagraphStyle,\
|
||||
FONT_SANS_SERIF, PARA_ALIGN_CENTER
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
||||
@@ -33,8 +33,8 @@ from gettext import gettext as _
|
||||
# gramps modules
|
||||
#
|
||||
#------------------------------------------------------------------------
|
||||
from gen.plug.docgen import FontStyle, ParagraphStyle, GraphicsStyle
|
||||
from gen.plug.docgen.basedoc import FONT_SANS_SERIF, PARA_ALIGN_CENTER
|
||||
from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle,
|
||||
FONT_SANS_SERIF, PARA_ALIGN_CENTER)
|
||||
from gen.plug import PluginManager
|
||||
from gen.plug.menu import EnumeratedListOption, NumberOption, PersonOption
|
||||
from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_DRAW
|
||||
|
||||
@@ -43,9 +43,9 @@ from TransUtils import sgettext as _
|
||||
# Person and relation types
|
||||
from gen.lib import Person, FamilyRelType, EventType
|
||||
# gender and report type names
|
||||
from gen.plug.docgen import FontStyle, ParagraphStyle, GraphicsStyle
|
||||
from gen.plug.docgen.basedoc import (FONT_SANS_SERIF, FONT_SERIF,
|
||||
PARA_ALIGN_CENTER, PARA_ALIGN_LEFT)
|
||||
from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle,
|
||||
FONT_SANS_SERIF, FONT_SERIF,
|
||||
PARA_ALIGN_CENTER, PARA_ALIGN_LEFT)
|
||||
from gen.plug import PluginManager
|
||||
from gen.plug.menu import BooleanOption, NumberOption, EnumeratedListOption, \
|
||||
FilterOption, PersonOption
|
||||
|
||||
@@ -41,9 +41,8 @@ from gen.plug import PluginManager
|
||||
from gen.plug.menu import PersonOption, FilterOption, EnumeratedListOption
|
||||
from ReportBase import Report, ReportUtils, MenuReportOptions, CATEGORY_DRAW
|
||||
pt2cm = ReportUtils.pt2cm
|
||||
from gen.plug.docgen import FontStyle, ParagraphStyle, GraphicsStyle
|
||||
from gen.plug.docgen.basedoc import (FONT_SANS_SERIF,
|
||||
DASHED, PARA_ALIGN_CENTER)
|
||||
from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle,
|
||||
FONT_SANS_SERIF, DASHED, PARA_ALIGN_CENTER)
|
||||
import Sort
|
||||
from QuestionDialog import ErrorDialog
|
||||
from BasicUtils import name_displayer
|
||||
|
||||
Reference in New Issue
Block a user