diff --git a/modules/gui/pymod/dng/init.py b/modules/gui/pymod/dng/init.py index 99773b4bc51b0d60369b18506fb82c9fdf11605d..661ddadc40d4c2d02c2d90588a5bc3d625437908 100644 --- a/modules/gui/pymod/dng/init.py +++ b/modules/gui/pymod/dng/init.py @@ -21,7 +21,6 @@ from ost.gui.init_spacenav import _InitSpaceNav from ost.gui.init_context_menu import _InitContextMenu from ost.gui.init_splash import _InitSplash from ost.gui.dng import termuse -from ost.gui.helpwidget import help import ost.gui.dng.menu from PyQt4.QtGui import * def _my_exit(code): diff --git a/modules/gui/pymod/helpwidget.py b/modules/gui/pymod/helpwidget.py index 117230ece30d2a1d1ec1488d9c66020b24ff100d..5322bbe668f5c37b6c73236fab79097eb791aa16 100644 --- a/modules/gui/pymod/helpwidget.py +++ b/modules/gui/pymod/helpwidget.py @@ -19,7 +19,7 @@ class DocWidget(QWidget): doc_widget=DocWidget() doc_widget_for_panel=gui.Widget(doc_widget) panels=gui.GostyApp.Instance().perspective.panels -panels.AddWidgetToPool("Doc",doc_widget_for_panel) +panels.AddWidgetToPool("OpenStructure Help",doc_widget_for_panel) class Help: @@ -28,12 +28,14 @@ class Help: d=pydoc.HTMLDoc() if what==None: doc_widget.doctext.setHtml('') - doc_widget.show() doc_widget.searchbox.setText('') - return - s=d.document(pydoc.resolve(what)[0]) - doc_widget.doctext.setHtml(s) - doc_widget.searchbox.setText('') + else: + try: + s=d.document(pydoc.resolve(what)[0]) + except ImportError as detail: + s=str(detail) + doc_widget.doctext.setHtml(s) + doc_widget.searchbox.setText('') if not doc_widget.isVisible(): panels.AddWidget(gui.PanelPosition.RIGHT_PANEL, doc_widget_for_panel, False) def __repr__(self): diff --git a/scripts/init.py b/scripts/init.py index e96acc915fd88ac85fd900960f3a0c055aaff0b9..a770bea7d8669e20860cd67face6b21a9c0ecad9 100644 --- a/scripts/init.py +++ b/scripts/init.py @@ -2,3 +2,4 @@ from ost import * from ost import gui import ost.gui.dng.init from ost.gui import PushVerbosityLevel,PopVerbosityLevel +from ost.gui.helpwidget import help