Changeset b27c681 in sasview

Timestamp:

Oct 7, 2016 3:39:46 PM (8 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:

• LocalConfig.py (modified) (1 diff)
• UI/WelcomePanelUI.ui (modified) (4 diffs)
• WelcomePanel.py (modified) (1 diff)

src/sas/qtgui/LocalConfig.py

@@ -85 +85 @@
 _corner_image = os.path.join(icon_path, "angles_flat.png")
 _welcome_image = os.path.join(icon_path, "SVwelcome.png")
-_copyright = "(c) 2009 - 2013, UTK, UMD, NIST, ORNL, ISIS, ESS and ILL"
+_copyright = "(c) 2009 - 2013, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL and ANSTO"
 
 

src/sas/qtgui/UI/WelcomePanelUI.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>658</width>
-    <height>711</height>
+    <width>746</width>
+    <height>947</height>
    </rect>
   </property>
@@ -22 +22 @@
      <property name="pixmap">
       <pixmap resource="main_resources.qrc">:/res/SVwelcome.png</pixmap>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
      </property>
     </widget>
@@ -41 +44 @@
      </property>
      <property name="text">
-      <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
-and ILL.</string>
+      <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>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
      </property>
     </widget>
@@ -56 +60 @@
      </property>
      <property name="text">
-      <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>
+      <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>
      </property>
     </widget>

src/sas/qtgui/WelcomePanel.py

@@ -21 +21 @@
         build = sas.sasview.__build__
 
-        ver = "\nSasView %s\nBuild: %s" % (version, build)
-        ver += LocalConfig._copyright
+        ver = "\nSasView %s\nBuild: %s\n%s" % (version, build, LocalConfig._copyright)
 
         self.lblVersion.setText(ver)