Revert change to suppress warnings

svn: r23217
This commit is contained in:
Nick Hall 2013-09-28 14:00:29 +00:00
parent 42462e4bf2
commit 98ebecf03c
6 changed files with 24 additions and 50 deletions

View File

@ -140,10 +140,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)

View File

@ -581,8 +581,6 @@ 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:
from gramps.gen.config import config
if not config.get('behavior.ignore-sdn'):
import logging import logging
LOG = logging.getLogger(".calendar") LOG = logging.getLogger(".calendar")
LOG.warn("sdn not available. " LOG.warn("sdn not available. "

View File

@ -609,22 +609,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 GExiv2 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):

View File

@ -70,6 +70,13 @@ elif repository.enumerate_versions("Gtkspell"):
except: except:
pass pass
if not HAVE_GTKSPELL:
LOG.warning(_("GtkSpell not loaded. "
"Spell checking will not be available.\n"
"To build it for Gramps see http://www.gramps-project.org/"
"wiki/index.php?title=GEPS_029:_GTK3-GObject_introspection_"
"Conversion#Spell_Check_Install"))
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# GRAMPS classes # GRAMPS classes
@ -77,13 +84,6 @@ elif repository.enumerate_versions("Gtkspell"):
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gramps.gen.config import config from gramps.gen.config import config
if (not config.get('behavior.ignore-spellcheck')) and (not HAVE_GTKSPELL):
LOG.warning(_("GtkSpell not loaded. "
"Spell checking will not be available.\n"
"To build it for Gramps see http://www.gramps-project.org/"
"wiki/index.php?title=GEPS_029:_GTK3-GObject_introspection_"
"Conversion#Spell_Check_Install"))
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# Constants # Constants

View File

@ -388,8 +388,6 @@ if available:
navtypes=["Media"], navtypes=["Media"],
) )
else: else:
from gramps.gen.config import config
if not config.get('behavior.ignore-gexiv2'):
import logging import logging
logging.warning(_("GExiv2 module not loaded. Image metadata " logging.warning(_("GExiv2 module not loaded. Image metadata "
"functionality will not be available.\n" "functionality will not be available.\n"

View File

@ -58,8 +58,6 @@ if repository.enumerate_versions("OsmGpsMap"):
pass pass
if not OSMGPSMAP: if not OSMGPSMAP:
from gramps.gen.config import config
if not config.get('behavior.ignore-osmgpsmap'):
_LOG.warning(_("OsmGpsMap module not loaded. " _LOG.warning(_("OsmGpsMap module not loaded. "
"Geography functionality will not be available.\n" "Geography functionality will not be available.\n"
"To build it for Gramps see " "To build it for Gramps see "