Changeset 5e88e27c in sasview


Ignore:
Timestamp:
Sep 17, 2018 12:33:08 PM (5 weeks ago)
Author:
smk78
Branches:
master, gpu-options-handling, py37-all, py37-sascalc, py37-sasgui, pytest, simplify-c-build, ticket-1094-headless, ticket-1111, unittest-saveload
Children:
7d3aa9a
Parents:
893d852
Message:

Create Release Notes option in Help Menu and popup box

Location:
src/sas
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/guiframe/config.py

    r1efbc190 r5e88e27c  
    3333_do_aboutbox = True 
    3434_do_acknowledge = True 
     35_do_release = True 
    3536_do_tutorial = True 
    3637_acknowledgement_preamble =\ 
     
    4950_acknowledgement_citation = \ 
    5051'''M. Doucet et al. SasView Version 4.1.2, Zenodo, 10.5281/zenodo.825675''' 
    51  
    5252_acknowledgement =  \ 
    5353'''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS, and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: http://www.sasview.org/contact.html 
    5454''' 
     55_release_preamble =\ 
     56'''These Release Notes, incorporating Known Issues, can also be found at:''' 
     57_release_location1 =\ 
     58'''{SasView Installation Folder}\sasview\installers\README.txt''' 
     59_release_location2 =\ 
     60'''https://github.com/SasView/sasview/releases/''' 
    5561 
    5662_homepage = "http://www.sasview.org" 
     
    94100_corner_image = os.path.join(icon_path, "angles_flat.png") 
    95101_welcome_image = os.path.join(icon_path, "SVwelcome.png") 
    96 _copyright = "(c) 2009 - 2017, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, and DLS" 
     102_copyright = "(c) 2009 - 2018, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, and DLS" 
    97103marketplace_url = "http://marketplace.sasview.org/" 
    98104 
  • src/sas/sasgui/guiframe/gui_manager.py

    r5f08251 r5e88e27c  
    12761276 
    12771277        wx_id = wx.NewId() 
    1278         self._help_menu.Append(wx_id, '&Documentation', '') 
     1278        self._help_menu.Append(wx_id, '&Documentation', 'Help documentation for SasView') 
    12791279        wx.EVT_MENU(self, wx_id, self._onSphinxDocs) 
    12801280 
     
    12831283            # Pluralised both occurences of 'Tutorial' in the line below 
    12841284            # S King, Sep 2018 
    1285             self._help_menu.Append(wx_id, '&Tutorials', 'Software tutorials') 
     1285            self._help_menu.Append(wx_id, '&Tutorials', 'Tutorials on how to use SasView') 
    12861286            wx.EVT_MENU(self, wx_id, self._onTutorial) 
     1287 
     1288        if config.marketplace_url: 
     1289            wx_id = wx.NewId() 
     1290            self._help_menu.Append(wx_id, '&Model marketplace', 'Plug-in fitting models for SasView') 
     1291            wx.EVT_MENU(self, wx_id, self._on_marketplace_click) 
     1292 
     1293        if config._do_release: 
     1294            wx_id = wx.NewId() 
     1295            self._help_menu.Append(wx_id, '&Release notes', 
     1296                                   'SasView release notes and known issues') 
     1297            wx.EVT_MENU(self, wx_id, self._onRelease) 
    12871298 
    12881299        if config._do_acknowledge: 
     
    12951306            logger.info("Doing help menu") 
    12961307            wx_id = wx.NewId() 
    1297             self._help_menu.Append(wx_id, '&About', 'Software information') 
     1308            self._help_menu.Append(wx_id, '&About', 'Information about SasView') 
    12981309            wx.EVT_MENU(self, wx_id, self._onAbout) 
    1299  
    1300         if config.marketplace_url: 
    1301             wx_id = wx.NewId() 
    1302             self._help_menu.Append(wx_id, '&Model marketplace', '') 
    1303             wx.EVT_MENU(self, wx_id, self._on_marketplace_click) 
    13041310 
    13051311        # Checking for updates 
     
    21372143            import sas.sasgui.guiframe.aboutbox as AboutBox 
    21382144            dialog = AboutBox.DialogAbout(None, -1, "") 
     2145            dialog.ShowModal() 
     2146 
     2147    def _onRelease(self, evt): 
     2148        """ 
     2149        Pop up the release notes 
     2150 
     2151        :param evt: menu event 
     2152 
     2153        """ 
     2154        if config._do_release: 
     2155            import sas.sasgui.guiframe.releasebox as ReleaseBox 
     2156            dialog = ReleaseBox.DialogRelease(None, -1, "") 
    21392157            dialog.ShowModal() 
    21402158 
  • src/sas/sasview/local_config.py

    rb229a3b r5e88e27c  
    3333_do_aboutbox = True 
    3434_do_acknowledge = True 
     35_do_release = True 
    3536_do_tutorial = True 
    3637_acknowledgement_preamble =\ 
     
    4950_acknowledgement_citation = \ 
    5051'''M. Doucet et al. SasView Version 4.2, Zenodo, 10.5281/zenodo.1412041''' 
    51  
    5252_acknowledgement =  \ 
    5353'''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS, and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: http://www.sasview.org/contact.html 
    5454''' 
     55_release_preamble =\ 
     56'''These Release Notes, incorporating Known Issues, can also be found at:''' 
     57_release_location1 =\ 
     58'''{SasView Installation Folder}\sasview\installers\README.txt''' 
     59_release_location2 =\ 
     60'''https://github.com/SasView/sasview/releases/''' 
    5561 
    5662_homepage = "http://www.sasview.org" 
     
    94100_corner_image = os.path.join(icon_path, "angles_flat.png") 
    95101_welcome_image = os.path.join(icon_path, "SVwelcome.png") 
    96 _copyright = "(c) 2009 - 2017, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, and DLS" 
     102_copyright = "(c) 2009 - 2018, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, and DLS" 
    97103marketplace_url = "http://marketplace.sasview.org/" 
    98104 
Note: See TracChangeset for help on using the changeset viewer.