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

don't warn, WebKit is not in Mac or Windows bundles

Browse Source
This commit is contained in:
Paul Franklin 2014-02-19 19:18:00 -08:00
parent 2e062d4edc
commit c2635cd94b
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gramps/gen/config.py
View File

@ -214,6 +214,7 @@ register('interface.grampletbar-close', False)
register('interface.height', 500) register('interface.height', 500)
register('interface.ignore-gexiv2', False) register('interface.ignore-gexiv2', False)
register('interface.ignore-osmgpsmap', False) register('interface.ignore-osmgpsmap', False)
register('interface.ignore-webkit', False)
register('interface.lds-height', 450) register('interface.lds-height', 450)
register('interface.lds-width', 600) register('interface.lds-width', 600)
register('interface.location-height', 250) register('interface.location-height', 250)

17
gramps/plugins/view/htmlrenderer.gpr.py
View File

@ -58,10 +58,19 @@ if repository.enumerate_versions("WebKit"):
TOOLKIT = WEBKIT TOOLKIT = WEBKIT
except: except:
pass pass
else:
_LOG.warning("Webkit module not loaded. " from gramps.gen.config import config
"Embedded web page viewing will not be available. " if TOOLKIT == NOWEB and not config.get('interface.ignore-webkit'):
"Use your package manager to install gir1.2-webkit-3.0"); from gramps.gen.constfunc import has_display, mac, win
if win() or mac(): # WebKit is not put into either Windows or Mac bundles
config.set('interface.ignore-webkit', True)
if has_display() and not config.get('interface.ignore-webkit'):
from gramps.gui.dialog import MessageHideDialog
title = _("Webkit module not loaded.")
msg = _("Webkit module not loaded. "
"Embedded web page viewing will not be available. "
"Use your package manager to install gir1.2-webkit-3.0")
MessageHideDialog(title, msg, 'interface.ignore-webkit')
#no interfaces present, we do not register these plugins #no interfaces present, we do not register these plugins
if not (TOOLKIT == NOWEB): if not (TOOLKIT == NOWEB):