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

Update

Browse Source 
svn: r6823
This commit is contained in:
Alex Roitman 2006-05-31 02:03:29 +00:00
parent 66a321e2ee
commit 2e9af64722
7 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ArgHandler.py
View File

@ -55,7 +55,8 @@ import Config
import RecentFiles import RecentFiles
import Utils import Utils
from PluginUtils import Report, Tool, cl_list, cli_tool_list from PluginUtils import Tool, cl_list, cli_tool_list
from ReportBase import CATEGORY_BOOK, CATEGORY_CODE, CATEGORY_WEB, cl_report
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# ArgHandler # ArgHandler
@ -644,12 +645,11 @@ class ArgHandler:
category = item[1] category = item[1]
report_class = item[2] report_class = item[2]
options_class = item[3] options_class = item[3]
if category in (Report.CATEGORY_BOOK,Report.CATEGORY_CODE, if category in (CATEGORY_BOOK,CATEGORY_CODE,CATEGORY_WEB):
Report.CATEGORY_WEB):
options_class(self.state.db,name, options_class(self.state.db,name,
category,options_str_dict) category,options_str_dict)
else: else:
Report.cl_report(self.state.db,name,category, cl_report(self.state.db,name,category,
report_class,options_class, report_class,options_class,
options_str_dict) options_str_dict)
return return

2
src/DataViews/_PedigreeView.py
View File

@ -56,7 +56,7 @@ import Utils
import DateHandler import DateHandler
import ImgManip import ImgManip
import Errors import Errors
from PluginUtils.Report import ReportUtils from ReportBase import ReportUtils
from Editors import EditPerson from Editors import EditPerson
from DdTargets import DdTargets from DdTargets import DdTargets
import cPickle as pickle import cPickle as pickle

2
src/DataViews/_RelationView.py
View File

@ -28,7 +28,7 @@ import GrampsWidgets
import Errors import Errors
import GrampsDb import GrampsDb
from PluginUtils.Report import ReportUtils from ReportBase import ReportUtils
_GenderCode = { _GenderCode = {
RelLib.Person.MALE : u'\u2642', RelLib.Person.MALE : u'\u2642',

2
src/Editors/_EditFamily.py
View File

@ -71,7 +71,7 @@ import Config
import Errors import Errors
from _EditPrimary import EditPrimary from _EditPrimary import EditPrimary
from PluginUtils.Report import ReportUtils from ReportBase import ReportUtils
from DdTargets import DdTargets from DdTargets import DdTargets
from DisplayTabs import \ from DisplayTabs import \
EmbeddedList,EventEmbedList,SourceEmbedList,FamilyAttrEmbedList,\ EmbeddedList,EventEmbedList,SourceEmbedList,FamilyAttrEmbedList,\

2
src/ReportBase/_CommandLineReport.py
View File

@ -27,7 +27,7 @@ import PluginUtils
import NameDisplay import NameDisplay
import Utils import Utils
import BaseDoc import BaseDoc
from Report import CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_BOOK from _Constants import CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_BOOK
from _PaperMenu import paper_sizes from _PaperMenu import paper_sizes
#------------------------------------------------------------------------ #------------------------------------------------------------------------

1
src/ReportBase/__init__.py
View File

@ -31,6 +31,7 @@ from _TemplateParser import _template_map
from _Report import Report from _Report import Report
from _ReportDialog import report from _ReportDialog import report
from _CommandLineReport import cl_report
from _DrawReportDialog import DrawReportDialog from _DrawReportDialog import DrawReportDialog
from _TextReportDialog import TextReportDialog from _TextReportDialog import TextReportDialog

8
src/ViewManager.py
View File

@ -59,9 +59,10 @@ import gobject
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from PluginUtils import Plugins, Report, Tool, PluginStatus, \ from PluginUtils import Plugins, Tool, PluginStatus, \
relationship_class, load_plugins, \ relationship_class, load_plugins, \
tool_list, report_list tool_list, report_list
from ReportBase import standalone_categories, report
import DisplayState import DisplayState
import const import const
import Config import Config
@ -897,7 +898,7 @@ class ViewManager:
self.reportactions = gtk.ActionGroup('ReportWindow') self.reportactions = gtk.ActionGroup('ReportWindow')
(ui, actions) = self.build_plugin_menu('ReportsMenu', (ui, actions) = self.build_plugin_menu('ReportsMenu',
report_list, report_list,
Report.standalone_categories, standalone_categories,
make_report_callback) make_report_callback)
self.reportactions.add_actions(actions) self.reportactions.add_actions(actions)
self.uistate.uimanager.add_ui_from_string(ui) self.uistate.uimanager.add_ui_from_string(ui)
@ -965,11 +966,10 @@ def by_menu_name(a, b):
def make_report_callback(lst, dbstate, uistate): def make_report_callback(lst, dbstate, uistate):
return lambda x: Report.report(dbstate.db, dbstate.get_active_person(), return lambda x: report(dbstate.db, dbstate.get_active_person(),
lst[0], lst[1], lst[2], lst[3], lst[4]) lst[0], lst[1], lst[2], lst[3], lst[4])
def make_tool_callback(lst, dbstate, uistate): def make_tool_callback(lst, dbstate, uistate):
return lambda x: Tool.gui_tool(dbstate, uistate, return lambda x: Tool.gui_tool(dbstate, uistate,
lst[0], lst[1], lst[2], lst[3], lst[4], lst[0], lst[1], lst[2], lst[3], lst[4],
dbstate.db.request_rebuild) dbstate.db.request_rebuild)