src/Config/_GrampsConfigKeys.py: Better default for report output.

src/gen/db/dbconst.py: Remove constants that are duplicated in const.py.
src/GrampsDb/_GrampsBSDDB.py: Use ENV_DIR from const.py.

svn: r9601
This commit is contained in:
Brian Matherly 2007-12-27 21:44:15 +00:00
parent 88ff3ab413
commit 85fd9a2d1b
4 changed files with 8 additions and 14 deletions

View File

@ -1,3 +1,8 @@
2007-12-27 Brian Matherly <brian@gramps-project.org>
* src/Config/_GrampsConfigKeys.py: Better default for report output.
* src/gen/db/dbconst.py: Remove constants that are duplicated in const.py.
* src/GrampsDb/_GrampsBSDDB.py: Use ENV_DIR from const.py.
2007-12-27 Brian Matherly <brian@gramps-project.org> 2007-12-27 Brian Matherly <brian@gramps-project.org>
* src/docgen/CairoDoc.py: Fix 0001431: Tried to run a statistics report: * src/docgen/CairoDoc.py: Fix 0001431: Tried to run a statistics report:

View File

@ -236,7 +236,7 @@ default_value = {
RECENT_EXPORT_DIR : '', RECENT_EXPORT_DIR : '',
RECENT_EXPORT_TYPE : 1, RECENT_EXPORT_TYPE : 1,
NAME_FORMAT : 1, NAME_FORMAT : 1,
REPORT_DIRECTORY : './', REPORT_DIRECTORY : const.USER_HOME,
RESEARCHER_ADDR : '', RESEARCHER_ADDR : '',
RESEARCHER_CITY : '', RESEARCHER_CITY : '',
RESEARCHER_COUNTRY : '', RESEARCHER_COUNTRY : '',
@ -254,7 +254,7 @@ default_value = {
POP_PLUGIN_STATUS : False, POP_PLUGIN_STATUS : False,
VIEW : True, VIEW : True,
SIDEBAR_TEXT : True, SIDEBAR_TEXT : True,
WEBSITE_DIRECTORY : './', WEBSITE_DIRECTORY : const.USER_HOME,
PORT_WARN : False, PORT_WARN : False,
TRANSACTIONS : True, TRANSACTIONS : True,
LDS_HEIGHT : 450, LDS_HEIGHT : 450,

View File

@ -47,7 +47,7 @@ __LOG = logging.getLogger(".GrampsDb")
from gen.lib import * from gen.lib import *
from gen.db.base import * from gen.db.base import *
from gen.utils import db_copy from gen.utils import db_copy
import gen.db.dbconst as const import const
from gen.db.exceptions import FileVersionError from gen.db.exceptions import FileVersionError
from BasicUtils import UpdateCallback from BasicUtils import UpdateCallback

View File

@ -32,17 +32,6 @@ import os
# constants # constants
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
if os.environ.has_key('USERPROFILE'):
USER_HOME = os.environ['USERPROFILE']
HOME_DIR = os.path.join(USER_HOME,'gramps')
else:
USER_HOME = os.environ['HOME']
HOME_DIR = os.path.join(USER_HOME,'.gramps')
ENV_DIR = os.path.join(HOME_DIR,"env")
APP_GRAMPS = "application/x-gramps" APP_GRAMPS = "application/x-gramps"
APP_GRAMPS_XML = "application/x-gramps-xml" APP_GRAMPS_XML = "application/x-gramps-xml"
APP_GEDCOM = "application/x-gedcom" APP_GEDCOM = "application/x-gedcom"