Changeset 9afc543 in sasview for src/sas/guiframe

Timestamp:

Feb 18, 2015 8:12:03 AM (10 years ago)

Author:

Peter Parker

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

573e7034

Parents:

25ab07c

Message:

Allow the docs to reachable from inside the installer.

File:

• src/sas/guiframe/documentation_window.py (modified) (2 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='Help', size=(850, 540)):
@@ -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)