Changes in / [5e326a6:83eff66] in sasview

Files:

• sasview/local_config.py (modified) (2 diffs)
• src/sas/guiframe/acknowledgebox.py (added)
• src/sas/guiframe/config.py (modified) (1 diff)
• src/sas/guiframe/gui_manager.py (modified) (2 diffs)

sasview/local_config.py

@@ -7 +7 @@
 import sas.sasview
 import logging
+from sas.guiframe.config import _do_acknowledge
 
 # Version of the application
@@ -29 +30 @@
 # About box info
 _do_aboutbox = True
+_do_acknowledge = True
 _do_tutorial = True
+_acknowledgement_preamble =\
+'''If you found this software useful to your work please remember to acknowledge 
+its use in your publications as suggested below and reference the SasView website: 
+http://www.sasview.org/index.html. Please also consider letting us know by sending us the 
+reference to your work. This will help us to ensure the long term support and 
+development of the software.
+'''
+_acknowledgement_publications = \
+'''This work originally developed as part of the DANSE project funded by the NSF
+under grant DMR-0520547, and currently maintained by NIST, UMD, ORNL, ISIS, ESS 
+and ILL.
+'''
 _acknowledgement =  \
 '''This work originally developed as part of the DANSE project funded by the NSF

src/sas/guiframe/config.py

@@ -26 +26 @@
 # About box info
 _do_aboutbox = True
+_do_acknowledge = True
 _do_tutorial = True
+_acknowledgement_preamble =\
+'''If you found this software useful to your work please remember to acknowledge 
+its use in your publications as suggested below and reference the SasView website: 
+http://www.sasview.org/index.html. Please also consider letting us know by sending us the 
+reference to your work. This will help us to ensure the long term support and 
+development of the software.
+'''
+_acknowledgement_publications = \
+'''This work originally developed as part of the DANSE project funded by the NSF
+under grant DMR-0520547, and currently maintained by NIST, UMD, ORNL, ISIS, ESS 
+and ILL.
+'''
 _acknowledgement =  \
 '''This software was developed by the University of Tennessee as part of the

src/sas/guiframe/gui_manager.py

@@ -1351 +1351 @@
             wx.EVT_MENU(self, id, self._onTutorial)
             
+        if config._do_acknowledge:
+            self._help_menu.AppendSeparator()
+            self._help_menu.Append(id, '&Acknowledge', 'Acknowledging SasView')
+            wx.EVT_MENU(self, id, self._onAcknowledge)
+        
         if config._do_aboutbox:
             self._help_menu.AppendSeparator()
@@ -2098 +2103 @@
                 self.SetStatusText(msg)
                     
+    def _onAcknowledge(self, evt):
+        """
+        Pop up the acknowledge dialog
+        
+        :param evt: menu event
+        
+        """
+        if config._do_acknowledge:
+            import sas.guiframe.acknowledgebox as AcknowledgeBox
+            dialog = AcknowledgeBox.DialogAcknowledge(None, -1, "")
+            dialog.ShowModal()
+                     
     def _onAbout(self, evt):
         """