Changeset b27c681 in sasview


Ignore:
Timestamp:
Oct 7, 2016 5:39:46 PM (5 years ago)
Author:
davidm
Branches:
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
Children:
6083d6e
Parents:
d813cad8
Message:

included ANSTO in copyright notice and improved text layout

Location:
src/sas/qtgui
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/LocalConfig.py

    re207c3f rb27c681  
    8585_corner_image = os.path.join(icon_path, "angles_flat.png") 
    8686_welcome_image = os.path.join(icon_path, "SVwelcome.png") 
    87 _copyright = "(c) 2009 - 2013, UTK, UMD, NIST, ORNL, ISIS, ESS and ILL" 
     87_copyright = "(c) 2009 - 2013, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL and ANSTO" 
    8888 
    8989 
  • src/sas/qtgui/UI/WelcomePanelUI.ui

    rf721030 rb27c681  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>658</width> 
    10     <height>711</height> 
     9    <width>746</width> 
     10    <height>947</height> 
    1111   </rect> 
    1212  </property> 
     
    2222     <property name="pixmap"> 
    2323      <pixmap resource="main_resources.qrc">:/res/SVwelcome.png</pixmap> 
     24     </property> 
     25     <property name="alignment"> 
     26      <set>Qt::AlignCenter</set> 
    2427     </property> 
    2528    </widget> 
     
    4144     </property> 
    4245     <property name="text"> 
    43       <string>This work originally developed as part of the DANSE project funded by the NSF 
    44 under grant DMR-0520547, and currently maintained by NIST, UMD, ORNL, ISIS, ESS 
    45 and ILL.</string> 
     46      <string>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, ILL and ANSTO.</string> 
     47     </property> 
     48     <property name="wordWrap"> 
     49      <bool>true</bool> 
    4650     </property> 
    4751    </widget> 
     
    5660     </property> 
    5761     <property name="text"> 
    58       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;SasView 4.0.0-Alpha&lt;br/&gt;Build: 1&lt;br/&gt;(c) 2009 - 2013, UTK, UMD, NIST, ORNL, ISIS, ESS and ILL&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> 
     62      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;SasView 4.0.0-Alpha&lt;br/&gt;Build: 1&lt;br/&gt;(c) 2009 - 2017, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL and ANSTO&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> 
    5963     </property> 
    6064    </widget> 
  • src/sas/qtgui/WelcomePanel.py

    rd813cad8 rb27c681  
    2121        build = sas.sasview.__build__ 
    2222 
    23         ver = "\nSasView %s\nBuild: %s" % (version, build) 
    24         ver += LocalConfig._copyright 
     23        ver = "\nSasView %s\nBuild: %s\n%s" % (version, build, LocalConfig._copyright) 
    2524 
    2625        self.lblVersion.setText(ver) 
Note: See TracChangeset for help on using the changeset viewer.