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


Ignore:
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/Calculators
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • src/sas/qtgui/Calculators/DensityPanel.py

    r83eb5208 rcd2cc745  
    77 
    88from sas.qtgui.Utilities.GuiUtils import FormulaValidator 
     9from sas.qtgui.UI import main_resources_rc 
    910 
    1011# Local UI 

  • src/sas/qtgui/Calculators/KiessigPanel.py

    r83eb5208 rcd2cc745  
    11from PyQt4 import QtGui 
    22from PyQt4 import QtCore 
     3 
     4from sas.qtgui.UI import main_resources_rc 
    35from UI.KiessigPanel import Ui_KiessigPanel 
    46 

  • src/sas/qtgui/Calculators/SldPanel.py

    r83eb5208 rcd2cc745  
    88 
    99from sas.qtgui.Utilities.GuiUtils import FormulaValidator 
     10from sas.qtgui.UI import main_resources_rc 
    1011 
    1112# Local UI 

  • src/sas/qtgui/Calculators/SlitSizeCalculator.py

    r83eb5208 rcd2cc745  
    77from PyQt4 import QtGui 
    88from PyQt4 import QtCore 
     9 
     10from sas.qtgui.UI import main_resources_rc 
     11 
    912from UI.SlitSizeCalculator import Ui_SlitSizeCalculator 
    1013from sas.sascalc.dataloader.loader import Loader 

  • src/sas/qtgui/Calculators/UI/DensityPanel.ui

    r83eb5208 rcd2cc745  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>290</width> 
    10     <height>178</height> 
     9    <width>295</width> 
     10    <height>204</height> 
    1111   </rect> 
    1212  </property> 
    … …  
    2121  </property> 
    2222  <property name="windowIcon"> 
    23    <iconset resource="main_resources.qrc"> 
     23   <iconset> 
    2424    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 
    2525  </property> 
    … …  
    170170  <tabstop>buttonBox</tabstop> 
    171171 </tabstops> 
    172  <resources> 
    173   <include location="main_resources.qrc"/> 
    174  </resources> 
     172 <resources/> 
    175173 <connections> 
    176174  <connection> 

  • src/sas/qtgui/Calculators/UI/KiessigPanel.ui

    r83eb5208 rcd2cc745  
    1515  </property> 
    1616  <property name="windowIcon"> 
    17    <iconset resource="main_resources.qrc"> 
     17   <iconset> 
    1818    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 
    1919  </property> 
    … …  
    133133  </layout> 
    134134 </widget> 
    135  <resources> 
    136   <include location="main_resources.qrc"/> 
    137  </resources> 
     135 <resources/> 
    138136 <connections/> 
    139137</ui> 

  • src/sas/qtgui/Calculators/UI/SldPanel.ui

    r83eb5208 rcd2cc745  
    2121  </property> 
    2222  <property name="windowIcon"> 
    23    <iconset resource="main_resources.qrc"> 
     23   <iconset> 
    2424    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 
    2525  </property> 
    … …  
    341341  <tabstop>buttonBox</tabstop> 
    342342 </tabstops> 
    343  <resources> 
    344   <include location="main_resources.qrc"/> 
    345  </resources> 
     343 <resources/> 
    346344 <connections> 
    347345  <connection> 

  • src/sas/qtgui/Calculators/UI/SlitSizeCalculator.ui

    r83eb5208 rcd2cc745  
    1515  </property> 
    1616  <property name="windowIcon"> 
    17    <iconset resource="main_resources.qrc"> 
     17   <iconset> 
    1818    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 
    1919  </property> 
    … …  
    183183  </layout> 
    184184 </widget> 
    185  <resources> 
    186   <include location="main_resources.qrc"/> 
    187  </resources> 
     185 <resources/> 
    188186 <connections/> 
    189187</ui> 
Note: See TracChangeset for help on using the changeset viewer.