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

Revert change to suppress warnings

Browse Source 
svn: r23218
This commit is contained in:
Nick Hall 2013-09-28 14:00:49 +00:00
parent 659f1bec17
commit e5a929c8b3
6 changed files with 24 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps/gen/config.py
View File

@ -140,10 +140,6 @@ register('behavior.date-about-range', 50)
register('behavior.date-after-range', 50)
register('behavior.date-before-range', 50)
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-sib-age-diff', 20)
register('behavior.min-generation-years', 13)

10
gramps/gen/lib/calendar.py
View File

@ -580,9 +580,7 @@ try:
#TODO maybe alias the other local invented wheels to Calendar convertors
except ImportError:
from gramps.gen.config import config
if not config.get('behavior.ignore-sdn'):
import logging
LOG = logging.getLogger(".calendar")
LOG.warn("sdn not available. "
"Install Calendar with pypi for native Hebrew calendar calculations.")
import logging
LOG = logging.getLogger(".calendar")
LOG.warn("sdn not available. "
"Install Calendar with pypi for native Hebrew calendar calculations.")

16
gramps/gui/configure.py
View File

@ -609,22 +609,6 @@ class GrampsPreferences(ConfigureDialog):
table, _('Show plugin status dialog on plugin load error.'),
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
def _build_name_format_model(self, active):

14
gramps/gui/spell.py
View File

@ -70,6 +70,13 @@ elif repository.enumerate_versions("Gtkspell"):
except:
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
@ -77,13 +84,6 @@ elif repository.enumerate_versions("Gtkspell"):
#-------------------------------------------------------------------------
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

16
gramps/plugins/gramplet/gramplet.gpr.py
View File

@ -388,15 +388,13 @@ if available:
navtypes=["Media"],
)
else:
from gramps.gen.config import config
if not config.get('behavior.ignore-gexiv2'):
import logging
logging.warning(_("GExiv2 module not loaded. Image metadata "
"functionality 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#GExiv2_for_Image_metadata"))
import logging
logging.warning(_("GExiv2 module not loaded. Image metadata "
"functionality 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#GExiv2_for_Image_metadata"))
register(GRAMPLET,
id="Person Residence",

14
gramps/plugins/view/geography.gpr.py
View File

@ -58,14 +58,12 @@ if repository.enumerate_versions("OsmGpsMap"):
pass
if not OSMGPSMAP:
from gramps.gen.config import config
if not config.get('behavior.ignore-osmgpsmap'):
_LOG.warning(_("OsmGpsMap module not loaded. "
"Geography functionality 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"
"#OsmGpsMap_for_Geography"))
_LOG.warning(_("OsmGpsMap module not loaded. "
"Geography functionality 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"
"#OsmGpsMap_for_Geography"))
else:
# Load the view only if osmgpsmap library is present.
register(VIEW,