Changes in / [a4c2445:381bafd] in sasview

Files:

• docs/sphinx-docs/source/user/tools.rst (modified) (1 diff)
• sasview/setup_mac.py (modified) (1 diff)
• src/sas/sasgui/perspectives/calculator/calculator.py (modified) (1 diff)
• src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) (2 diffs)

docs/sphinx-docs/source/user/tools.rst

@@ -11 +11 @@
    Data Operations Utility <sasgui/perspectives/calculator/data_operator_help>
 
+   SLD Calculator <sasgui/perspectives/calculator/sld_calculator_help>
+
    Density/Volume Calculator <sasgui/perspectives/calculator/density_calculator_help>
+
+   Slit Size Calculator <sasgui/perspectives/calculator/slit_calculator_help>
+
+   Kiessig Thickness Calculator <sasgui/perspectives/calculator/kiessig_calculator_help>
+
+   Q Resolution Estimator <sasgui/perspectives/calculator/resolution_calculator_help>
 
    Generic SANS Calculator <sasgui/perspectives/calculator/sas_calculator_help>
 
+   Python Shell <sasgui/perspectives/calculator/python_shell_help>
+
    Image Viewer <sasgui/perspectives/calculator/image_viewer_help>
 
-   Kiessig Thickness Calculator <sasgui/perspectives/calculator/kiessig_calculator_help>
-
-   SLD Calculator <sasgui/perspectives/calculator/sld_calculator_help>
-
-   Slit Size Calculator <sasgui/perspectives/calculator/slit_calculator_help>
-
-   Q Resolution Estimator <sasgui/perspectives/calculator/resolution_calculator_help>
-
-   Python Shell <sasgui/perspectives/calculator/python_shell_help>
-
    File Converter <sasgui/perspectives/file_converter/file_converter_help>
+   

sasview/setup_mac.py

@@ -62 +62 @@
 
 APP = ['sasview.py']
-DATA_FILES += ['images','test','media', 'custom_config.py', 'local_config.py',
-               'default_categories.json']
+DATA_FILES += ['images','test','media', 'custom_config.py', 'local_config.py']
 if os.path.isfile("BUILD_NUMBER"):
     DATA_FILES.append("BUILD_NUMBER")

src/sas/sasgui/perspectives/calculator/calculator.py

@@ -80 +80 @@
                 ("Kiessig Thickness Calculator",
                         kiessig_help, self.on_calculate_kiessig),
-                          ("SAS Resolution Estimator",
+                          ("Q Resolution Estimator",
                         resolution_help, self.on_calculate_resoltuion),
                 ("Generic Scattering Calculator",

src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py

@@ -63 +63 @@
     """
     ## Internal nickname for the window, used by the AUI manager
-    window_name = "SAS Resolution Estimator"
+    window_name = "Q Resolution Estimator"
     ## Name to appear on the window title bar
     window_caption = ""
@@ -1329 +1329 @@
     """
     def __init__(self, parent=None, manager=None,
-                 title="SAS Resolution Estimator",
+                 title="Q Resolution Estimator",
                  size=(PANEL_WIDTH * 2, PANEL_HEIGHT), *args, **kwds):
         kwds['title'] = title