Changes in src/sas/guiframe/documentation_window.py [69032d4:9afc543] in sasview

File:

• src/sas/guiframe/documentation_window.py (modified) (3 diffs)

src/sas/guiframe/documentation_window.py

@@ -9 +9 @@
 else:
     import wx.html as html
+from gui_manager import get_app_dir
 
-   
+PATH_APP = get_app_dir() 
+
 class DocumentationWindow(Frame):
-    def __init__(self, parent, id, path, title, size=(850, 540)):
+    def __init__(self, parent, id, path, title='Help', size=(850, 540)):
         Frame.__init__(self, parent, id, title, size=size)
 
@@ -19 +21 @@
             docs_path = os.path.join(os.environ[SPHINX_DOC_ENV])
         else:
-            docs_path = os.path.join(PATH_APP, "..", "..", "doc")
+            # For the installer, docs are in a top-level directory.  We're not
+            # bothering to worry about docs when running using the old
+            # (non - run.py) way.
+            docs_path = os.path.join(PATH_APP, "doc")
 
-        if (not os.path.exists(docs_path)):
-            print "logging"
+        if not os.path.exists(docs_path):
             logging.error("Could not find Sphinx documentation at %s \
             -- has it been built?", docs_path)
@@ -38 +42 @@
 
             webbrowser.open_new_tab("file:///" + docs_path + "/" + path)
-            print ("file:///" + docs_path + "/" + path)