Changes in / [4cf8db9:88daca8] in sasview

Files:

• docs/sphinx-docs/source/conf.py (modified) (2 diffs)
• sasview/README.txt (modified) (5 diffs)
• src/sas/guiframe/documentation_window.py (modified) (3 diffs)
• src/sas/perspectives/fitting/fitpage.py (modified) (1 diff)

docs/sphinx-docs/source/conf.py

@@ -51 +51 @@
 # General information about the project.
 project = u'SasView'
-copyright = u'2013, The SasView Project'
+copyright = u'2015, The SasView Project'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -58 +58 @@
 #
 # The short X.Y version.
-version = '3.0.0'
+version = '3.1.0'
 # The full version, including alpha/beta/rc tags.
-release = '3.0.0'
+release = '3.1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation

sasview/README.txt

@@ -219 +219 @@
 2- Downloading and Installing
         
-        *** Note 1:  Much more information is available at www.sasview.org under links.
+    *** Note 1:  Much more information is available at www.sasview.org under links.
                      Look in the 'For Developers' section and particularly the wiki at
                      www.sasview.org/trac/wiki.
@@ -232 +232 @@
 
     2.2- Installing from source:
-        - Get the code from sourceforge at https://github.com/SasView/sasview.git
+        - Get the code from GitHub at https://github.com/SasView/sasview.git
           for this release version use: https://github.com/SasView/sasview/releases
             - run 'python setup.py install' under the 'sasview-x.x.x' folder
@@ -263 +263 @@
           - vcredist_x86.exe (version 9.0.21022.8  -microsoft visual C 2008 
               re-distributable)
-          - Innosetup (WIN - isetup 5.4.2-unicode) - used to create distributalbe
+          - Innosetup (WIN - isetup 5.4.2-unicode) - used to create distributable
             
         - MAC Specifci Packages:
@@ -274 +274 @@
 
     3.1- All systems:
+        - Documentation Window may take a few seconds to load the first time
+          it i called.  Also, an internet connection is required before
+          equations will render properly. Until then they will show in their
+          original TeX format.
+        - The copy and paste functions (^C, ^V) in the batch mode results grid
+          require two clicks: one to select the cell and a second to select the
+          contents of the cell. 
         - Tutorial has not yet been updated and is somewhat out of date
         - Very old computers may not be able to run
@@ -317 +324 @@
 
     - Latest release Version
-        - http://sourceforge.net/projects/sasview/files/
-    - Latest developer Windows or Ubuntu build
-        - http://build.sasview.org/
-    - Latest developer Mac OS build
-        - http://download.mantidproject.org/jenkins/view/All/job/sasview_snowleopard_32bit/
+        - https://github.com/SasView/sasview/releases
+    - Latest developer builds
+        - https://jenkins.esss.dk/sasview/view/Master-Builds/
 
     

src/sas/guiframe/documentation_window.py

@@ -19 +19 @@
 import webbrowser
 import urllib
+import sys
 
 SPHINX_DOC_ENV = "SASVIEW_DOC_PATH"
@@ -27 +28 @@
     WX_SUPPORTS_HTML2 = False
 
+MAC = True
+if sys.platform.count("win32") > 0:
+    MAC = False
 
 from gui_manager import get_app_dir
@@ -73 +77 @@
             -- has it been built?", file_path)
         elif WX_SUPPORTS_HTML2:
+            if MAC:
+                logging.error('url = ' + url)
             # Complete HTML/CSS support!
             self.view = html.WebView.New(self)

src/sas/perspectives/fitting/fitpage.py

@@ -3115 +3115 @@
                     mag_on_button.Show(True)
                 mag_help_button.Show(False)
+                mag_angle_help_button.Show(False)
                 if mag_on_button.IsShown():
                     if self.magnetic_on: