Changes in / [2366fb2:97f05432] in sasview

Location:

src/sas/qtgui

Files:

• AboutBox.py (modified) (1 diff)
• LocalConfig.py (modified) (2 diffs)
• UI/AboutUI.ui (modified) (3 diffs)
• UnitTesting/AboutBoxTest.py (modified) (1 diff)
• images/ansto_logo.png (added)
• images/icons/ansto_logo.png (added)
• images/images.qrc (modified) (1 diff)

src/sas/qtgui/AboutBox.py

@@ -60 +60 @@
         self.cmdLinkILL.clicked.connect(functools.partial(
             GuiUtils.openLink, LocalConfig._ill_url))
+        self.cmdLinkANSTO.clicked.connect(functools.partial(
+            GuiUtils.openLink, LocalConfig._ansto_url))
 
         self.cmdOK.clicked.connect(self.close)

src/sas/qtgui/LocalConfig.py

@@ -69 +69 @@
 _ess_logo = os.path.join(icon_path, "ess_logo.png")
 _ill_logo = os.path.join(icon_path, "ill_logo.png")
+_ansto_logo = os.path.join(icon_path, "ansto_logo.png")
 _nsf_logo = os.path.join(icon_path, "nsf_logo.png")
 _danse_logo = os.path.join(icon_path, "danse_logo.png")
@@ -79 +80 @@
 _ess_url = "http://ess-scandinavia.eu/"
 _ill_url = "http://www.ill.eu/"
+_ansto_url = "http://www.ansto.gov.au/"
 _danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html"
 _inst_url = "http://www.utk.edu"

src/sas/qtgui/UI/AboutUI.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>695</width>
+    <width>1107</width>
     <height>449</height>
    </rect>
@@ -160 +160 @@
       </widget>
      </item>
+     <item row="0" column="7">
+      <widget class="QPushButton" name="cmdLinkANSTO">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../images/images.qrc">
+         <normaloff>:/about/ansto_logo.png</normaloff>:/about/ansto_logo.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>175</width>
+         <height>48</height>
+        </size>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
@@ -217 +234 @@
      </property>
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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 last but not least ANSTO.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="wordWrap">

src/sas/qtgui/UnitTesting/AboutBoxTest.py

@@ -75 +75 @@
                 LocalConfig._ess_url,
                 LocalConfig._ill_url,
+                LocalConfig._ansto_url,
                 LocalConfig._inst_url]
 

src/sas/qtgui/images/images.qrc

@@ -1 +1 @@
 <RCC>
   <qresource prefix="about">
+    <file>ansto_logo.png</file>
     <file>danse_logo.png</file>
     <file>ess_logo.png</file>