Changeset c3866b8 in sasview

Timestamp:

Feb 19, 2015 9:03:42 AM (10 years ago)

Author:

krzywon

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:

064723b

Parents:

74d679d (diff), 78bcf3c3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview/

Files:

• .gitignore (modified) (2 diffs)
• Vagrantfile (added)
• Vagrantprovision.sh (added)
• src/sas/guiframe/documentation_window.py (modified) (2 diffs)
• src/sas/perspectives/calculator/media/image_viewer_help.rst (modified) (1 diff)
• src/sas/perspectives/calculator/media/python_shell_help.rst (modified) (1 diff)
• src/sas/guiframe/gui_manager.py (modified) (1 diff)

.gitignore

@@ -12 +12 @@
 .project
 .pydevproject
+.vagrant
 build
 dist
@@ -20 +21 @@
 html
 build
-
+sasview-install
 docs/sphinx-docs
 

src/sas/guiframe/documentation_window.py

@@ -26 +26 @@
             docs_path = os.path.join(PATH_APP, "doc")
 
+        file_path = "file:///" + docs_path + "/" + path
+
         if not os.path.exists(docs_path):
             logging.error("Could not find Sphinx documentation at %s \
             -- has it been built?", docs_path)
-
         elif wx_supports_html2:
             # Complete HTML/CSS support!
             self.view = html.WebView.New(self)
-            self.view.LoadURL("file://" + docs_path + '\\' + path)
+            self.view.LoadURL(file_path)
             self.Show()
         else: 
@@ -40 +41 @@
             #Red hat used at SNS for which Wx 3.0 is not available.  This
             #does not deal with issue of math in docs of course. 
-
-            webbrowser.open_new_tab("file:///" + docs_path + "/" + path)
-            print ("file:///" + docs_path + "/" + path)
+            webbrowser.open_new_tab(file_path)
 
  

src/sas/perspectives/calculator/media/image_viewer_help.rst

@@ -29 +29 @@
 1) Select *Image Viewer* from the *Tool* menu on the SasView toolbar.
 
-2) Select a file and then click *Open*.
+2) Select a file and then click *Open*. If the loading is successful the image 
+   will be displayed.
 
 .. image:: load_image.bmp
-
-   If the loading is successful the image will be displayed.
 
 3) To save, print, or copy the image, or to apply a grid overlay, right-click 

src/sas/perspectives/calculator/media/python_shell_help.rst

@@ -23 +23 @@
 PyCrust has its own Help.
 
-*NOTE! Help() and Credits() do not work on Macs.*
+*NOTE! The Help() and Credits() calls do not work on Macs.*
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ

src/sas/guiframe/gui_manager.py

@@ -1353 +1353 @@
         if config._do_acknowledge:
             self._help_menu.AppendSeparator()
+            id = wx.NewId()
             self._help_menu.Append(id, '&Acknowledge', 'Acknowledging SasView')
             wx.EVT_MENU(self, id, self._onAcknowledge)
-        
+        `
         if config._do_aboutbox:
             self._help_menu.AppendSeparator()