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

action 'tool' CLI handler broken w/o DISPLAY

Browse Source 
Preparing to port my fix for 6953: remove "undo history warning"
when the BatchTool run from cli (e.g., "check")
from gramps34, the ground state was worse in gramps40...

svn: r22898
This commit is contained in:
Vassilii Khachaturov 2013-08-21 17:24:18 +00:00
parent 0bba5fcfdb
commit 949c41107a
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gramps/grampsapp.py
View File

@ -420,7 +420,7 @@ def run():
LOG.debug('environment: LANGUAGE is not defined') LOG.debug('environment: LANGUAGE is not defined')
if argpars.need_gui(): if argpars.need_gui():
#A GUI is needed, set it up LOG.debug("A GUI is needed, set it up")
if "--qml" in sys.argv: if "--qml" in sys.argv:
from .guiQML.grampsqml import startqml from .guiQML.grampsqml import startqml
startqml(error, argpars) startqml(error, argpars)

11
gramps/gui/plug/__init__.py
View File

@ -29,11 +29,14 @@ __date__ ="$Apr 20, 2010 3:13:24 PM$"
from . import tool from . import tool
from ._guioptions import make_gui_option, add_gui_options try:
from gramps.gen.plug import MenuOptions from ._guioptions import make_gui_option, add_gui_options
from ._dialogs import ReportPluginDialog, ToolPluginDialog
from . import _windows as PluginWindows
except TypeError: # No GUI
pass
from ._dialogs import ReportPluginDialog, ToolPluginDialog from gramps.gen.plug import MenuOptions
from . import _windows as PluginWindows
# This needs to go above Tool and MenuOption as it needs both # This needs to go above Tool and MenuOption as it needs both
class MenuToolOptions(MenuOptions, tool.ToolOptions): class MenuToolOptions(MenuOptions, tool.ToolOptions):