Revert r23205
svn: r23216
This commit is contained in:
@ -56,6 +56,9 @@ try:
|
|||||||
except ImportError:
|
except ImportError:
|
||||||
HAVE_GTKSPELL = False
|
HAVE_GTKSPELL = False
|
||||||
|
|
||||||
|
if not HAVE_GTKSPELL:
|
||||||
|
LOG.warn(_("Spelling checker is not installed"))
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
# GRAMPS classes
|
# GRAMPS classes
|
||||||
@ -63,9 +66,6 @@ except ImportError:
|
|||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
import config
|
import config
|
||||||
|
|
||||||
if (not config.get('behavior.ignore-spellcheck')) and (not HAVE_GTKSPELL):
|
|
||||||
LOG.warn(_("Spelling checker is not installed"))
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
# Constants
|
# Constants
|
||||||
|
@ -139,10 +139,6 @@ register('behavior.date-about-range', 50)
|
|||||||
register('behavior.date-after-range', 50)
|
register('behavior.date-after-range', 50)
|
||||||
register('behavior.date-before-range', 50)
|
register('behavior.date-before-range', 50)
|
||||||
register('behavior.generation-depth', 15)
|
register('behavior.generation-depth', 15)
|
||||||
register('behavior.ignore-gexiv2', False)
|
|
||||||
register('behavior.ignore-osmgpsmap', False)
|
|
||||||
register('behavior.ignore-spellcheck', False)
|
|
||||||
register('behavior.ignore-sdn', False)
|
|
||||||
register('behavior.max-age-prob-alive', 110)
|
register('behavior.max-age-prob-alive', 110)
|
||||||
register('behavior.max-sib-age-diff', 20)
|
register('behavior.max-sib-age-diff', 20)
|
||||||
register('behavior.min-generation-years', 13)
|
register('behavior.min-generation-years', 13)
|
||||||
|
@ -581,9 +581,7 @@ try:
|
|||||||
#TODO maybe alias the other local invented wheels to Calendar convertors
|
#TODO maybe alias the other local invented wheels to Calendar convertors
|
||||||
|
|
||||||
except ImportError:
|
except ImportError:
|
||||||
import config
|
import logging
|
||||||
if not config.get('behavior.ignore-sdn'):
|
LOG = logging.getLogger(".calendar")
|
||||||
import logging
|
LOG.warn("sdn not available. "
|
||||||
LOG = logging.getLogger(".calendar")
|
"Install Calendar with pypi for native Hebrew calendar calculations.")
|
||||||
LOG.warn("sdn not available. "
|
|
||||||
"Install Calendar with pypi for native Hebrew calendar calculations.")
|
|
||||||
|
@ -512,22 +512,6 @@ class GrampsPreferences(ConfigureDialog):
|
|||||||
table, _('Show plugin status dialog on plugin load error.'),
|
table, _('Show plugin status dialog on plugin load error.'),
|
||||||
3, 'behavior.pop-plugin-status')
|
3, 'behavior.pop-plugin-status')
|
||||||
|
|
||||||
self.add_checkbox(
|
|
||||||
table, _('Suppress warning when OsmGpsMap not installed.'),
|
|
||||||
4, 'behavior.ignore-osmgpsmap')
|
|
||||||
|
|
||||||
self.add_checkbox(
|
|
||||||
table, _('Suppress warning when pyexiv2 not installed.'),
|
|
||||||
5, 'behavior.ignore-gexiv2')
|
|
||||||
|
|
||||||
self.add_checkbox(
|
|
||||||
table, _('Suppress warning when spell checking not installed.'),
|
|
||||||
6, 'behavior.ignore-spellcheck')
|
|
||||||
|
|
||||||
self.add_checkbox(
|
|
||||||
table, _("Suppress warning when 'sdn' not installed."),
|
|
||||||
7, 'behavior.ignore-sdn')
|
|
||||||
|
|
||||||
return _('Warnings'), table
|
return _('Warnings'), table
|
||||||
|
|
||||||
def _build_name_format_model(self, active):
|
def _build_name_format_model(self, active):
|
||||||
|
@ -86,11 +86,9 @@ try:
|
|||||||
import pyexiv2
|
import pyexiv2
|
||||||
available = True
|
available = True
|
||||||
except:
|
except:
|
||||||
import config
|
import logging
|
||||||
if not config.get('behavior.ignore-gexiv2'):
|
logging.warning(_("WARNING: pyexiv2 module not loaded. "
|
||||||
import logging
|
"Image metadata functionality will not be available."))
|
||||||
logging.warning(_("WARNING: pyexiv2 module not loaded. "
|
|
||||||
"Image metadata functionality will not be available."))
|
|
||||||
available = False
|
available = False
|
||||||
|
|
||||||
if available:
|
if available:
|
||||||
|
@ -38,11 +38,9 @@ try :
|
|||||||
osmgpsmap.__version__)
|
osmgpsmap.__version__)
|
||||||
except:
|
except:
|
||||||
OSMGPSMAP = False
|
OSMGPSMAP = False
|
||||||
import config
|
import logging
|
||||||
if not config.get('behavior.ignore-osmgpsmap'):
|
logging.warning(_("WARNING: osmgpsmap module not loaded. "
|
||||||
import logging
|
"Geography functionality will not be available."))
|
||||||
logging.warning(_("WARNING: osmgpsmap module not loaded. "
|
|
||||||
"Geography functionality will not be available."))
|
|
||||||
|
|
||||||
if OSMGPSMAP:
|
if OSMGPSMAP:
|
||||||
# Load the view only if osmgpsmap library is present.
|
# Load the view only if osmgpsmap library is present.
|
||||||
|
Reference in New Issue
Block a user