Changeset cd2cc745 in sasview for src/sas/qtgui/MainWindow

Timestamp:

Apr 19, 2017 6:51:48 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

9d266d2

Parents:

83eb5208

Message:

Workaround for the resource file requirement in each UI directory

Location:

src/sas/qtgui/MainWindow

Files:

• AboutBox.py (modified) (1 diff)
• DroppableDataLoadWidget.py (modified) (1 diff)
• MainWindow.py (modified) (1 diff)
• UI/AboutUI.ui (modified) (2 diffs)
• UI/DataExplorerUI.ui (modified) (4 diffs)
• UI/MainWindowUI.ui (modified) (10 diffs)
• UI/WelcomePanelUI.ui (modified) (3 diffs)
• WelcomePanel.py (modified) (1 diff)

src/sas/qtgui/MainWindow/AboutBox.py

@@ -5 +5 @@
 import sas.qtgui.Utilities.LocalConfig as LocalConfig
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
+from sas.qtgui.UI import images_rc
+from sas.qtgui.UI import main_resources_rc
 
 from UI.AboutUI import Ui_AboutUI

src/sas/qtgui/MainWindow/DroppableDataLoadWidget.py

@@ -3 +3 @@
 
 # UI
+from sas.qtgui.UI import main_resources_rc
 from sas.qtgui.MainWindow.UI.DataExplorerUI import Ui_DataLoadWidget
 

src/sas/qtgui/MainWindow/MainWindow.py

@@ -4 +4 @@
 
 # Local UI
+from sas.qtgui.UI import main_resources_rc
 from UI.MainWindowUI import Ui_MainWindow
 

src/sas/qtgui/MainWindow/UI/AboutUI.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>1107</width>
+    <width>827</width>
     <height>449</height>
    </rect>
@@ -243 +243 @@
   </layout>
  </widget>
- <resources>
-  <include location="../../UI/main_resources.qrc"/>
-  <include location="../images/images.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>

src/sas/qtgui/MainWindow/UI/DataExplorerUI.ui

@@ -21 +21 @@
   </property>
   <property name="windowIcon">
-   <iconset resource="../../UI/main_resources.qrc">
+   <iconset>
     <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset>
   </property>
@@ -70 +70 @@
            </property>
            <property name="icon">
-            <iconset resource="../../UI/main_resources.qrc">
+            <iconset>
              <normaloff>:/res/down-grey.png</normaloff>:/res/down-grey.png</iconset>
            </property>
@@ -183 +183 @@
            </property>
            <property name="icon">
-            <iconset resource="../../UI/main_resources.qrc">
+            <iconset>
              <normaloff>:/res/right-grey.png</normaloff>:/res/right-grey.png</iconset>
            </property>
@@ -482 +482 @@
   </action>
  </widget>
- <resources>
-  <include location="../../UI/main_resources.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>

src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

@@ -15 +15 @@
   </property>
   <property name="windowIcon">
-   <iconset resource="../../UI/main_resources.qrc">
+   <iconset>
     <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset>
   </property>
@@ -180 +180 @@
   <action name="actionReset">
    <property name="icon">
-    <iconset resource="../../UI/main_resources.qrc">
+    <iconset>
      <normaloff>:/res/reset.png</normaloff>:/res/reset.png</iconset>
    </property>
@@ -192 +192 @@
   <action name="actionSave">
    <property name="icon">
-    <iconset resource="../../UI/main_resources.qrc">
+    <iconset>
      <normaloff>:/res/save.png</normaloff>:/res/save.png</iconset>
    </property>
@@ -204 +204 @@
   <action name="actionReport">
    <property name="icon">
-    <iconset resource="../../UI/main_resources.qrc">
+    <iconset>
      <normaloff>:/res/report.png</normaloff>:/res/report.png</iconset>
    </property>
@@ -216 +216 @@
   <action name="actionUndo">
    <property name="icon">
-    <iconset resource="../../UI/main_resources.qrc">
+    <iconset>
      <normaloff>:/res/undo.png</normaloff>
      <normalon>res/undo.png</normalon>:/res/undo.png</iconset>
@@ -226 +226 @@
   <action name="actionRedo">
    <property name="icon">
-    <iconset resource="../../UI/main_resources.qrc">
+    <iconset>
      <normaloff>:/res/redo.png</normaloff>:/res/redo.png</iconset>
    </property>
@@ -238 +238 @@
   <action name="actionCopy">
    <property name="icon">
-    <iconset resource="../../UI/main_resources.qrc">
+    <iconset>
      <normaloff>:/res/copy.png</normaloff>:/res/copy.png</iconset>
    </property>
@@ -250 +250 @@
   <action name="actionPaste">
    <property name="icon">
-    <iconset resource="../../UI/main_resources.qrc">
+    <iconset>
      <normaloff>:/res/paste.png</normaloff>:/res/paste.png</iconset>
    </property>
@@ -265 +265 @@
    </property>
    <property name="icon">
-    <iconset resource="../../UI/main_resources.qrc">
+    <iconset>
      <normaloff>:/res/bookmark.png</normaloff>:/res/bookmark.png</iconset>
    </property>
@@ -497 +497 @@
   </action>
  </widget>
- <resources>
-  <include location="../../UI/main_resources.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>

src/sas/qtgui/MainWindow/UI/WelcomePanelUI.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>746</width>
-    <height>947</height>
+    <width>658</width>
+    <height>737</height>
    </rect>
   </property>
@@ -21 +21 @@
      </property>
      <property name="pixmap">
-      <pixmap resource="../../UI/main_resources.qrc">:/res/SVwelcome.png</pixmap>
+      <pixmap>:/res/SVwelcome.png</pixmap>
      </property>
      <property name="alignment">
@@ -79 +79 @@
   </layout>
  </widget>
- <resources>
-  <include location="../../UI/main_resources.qrc"/>
-  <include location="main_resources.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>

src/sas/qtgui/MainWindow/WelcomePanel.py

@@ -8 +8 @@
 import sas.sasview
 import sas.qtgui.Utilities.LocalConfig as LocalConfig
+from sas.qtgui.UI import images_rc
+from sas.qtgui.UI import main_resources_rc
 
 from sas.qtgui.MainWindow.UI.WelcomePanelUI import Ui_WelcomePanelUI