From 74b02836d9a8cd6a7153b7d0b27a9560e62f9370 Mon Sep 17 00:00:00 2001
From: Andreas Schenk <andreas_schenk@hms.harvard.edu>
Date: Thu, 21 Apr 2011 10:24:00 -0400
Subject: [PATCH] fixed help widget
---
modules/gui/pymod/dng/init.py | 1 -
modules/gui/pymod/helpwidget.py | 14 ++++++++------
scripts/init.py | 1 +
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/modules/gui/pymod/dng/init.py b/modules/gui/pymod/dng/init.py
index 99773b4bc..661ddadc4 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 117230ece..5322bbe66 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 e96acc915..a770bea7d 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
--
GitLab