Changeset 7385fec in sasview for src/sas/qtgui/images

Timestamp:

Sep 28, 2018 9:07:44 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

62c6dc0

Parents:

f1b696d

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (09/28/18 09:06:36)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (09/28/18 09:07:44)

Message:

Updated About and Acknowledgement windows. SASVIEW-1184

Location:

src/sas/qtgui/images

Files:

• ansto_logo.png (modified) (previous)
• bam_logo.png (added)
• convert_rc.bat (modified) (1 diff)
• dls_logo.png (added)
• images.qrc (modified) (1 diff)
• ornl_logo.png (added)
• tudelft_logo.png (added)

src/sas/qtgui/images/convert_rc.bat

@@ -2 +2 @@
 
 
-pyrcc4.exe -py3 %1.qrc -o ..\UI\%1_rc.py
+pyrcc5.exe %1.qrc -o ..\UI\%1_rc.py
 

src/sas/qtgui/images/images.qrc

@@ -8 +8 @@
     <file>nist_logo.png</file>
     <file>nsf_logo.png</file>
+    <file>dls_logo.png</file>
     <file>sns_logo.png</file>
     <file>SVwelcome.png</file>
+    <file>ornl_logo.png</file>
+    <file>tudelft_logo.png</file>
     <file>SVwelcome_mini.png</file>
     <file>umd_logo.png</file>
     <file>utlogo.gif</file>
+    <file>bam_logo.png</file>
     <file>angles_flat.png</file>
   </qresource>