Changeset cd2cc745 in sasview


Ignore:
Timestamp:
Apr 19, 2017 4: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
Files:
33 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> 

  • src/sas/qtgui/MainWindow/AboutBox.py

    r83eb5208 rcd2cc745  
    55import sas.qtgui.Utilities.LocalConfig as LocalConfig 
    66import sas.qtgui.Utilities.GuiUtils as GuiUtils 
     7from sas.qtgui.UI import images_rc 
     8from sas.qtgui.UI import main_resources_rc 
    79 
    810from UI.AboutUI import Ui_AboutUI 

  • src/sas/qtgui/MainWindow/DroppableDataLoadWidget.py

    r83eb5208 rcd2cc745  
    33 
    44# UI 
     5from sas.qtgui.UI import main_resources_rc 
    56from sas.qtgui.MainWindow.UI.DataExplorerUI import Ui_DataLoadWidget 
    67 

  • src/sas/qtgui/MainWindow/MainWindow.py

    r83eb5208 rcd2cc745  
    44 
    55# Local UI 
     6from sas.qtgui.UI import main_resources_rc 
    67from UI.MainWindowUI import Ui_MainWindow 
    78 

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

    r83eb5208 rcd2cc745  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>1107</width> 
     9    <width>827</width> 
    1010    <height>449</height> 
    1111   </rect> 
    … …  
    243243  </layout> 
    244244 </widget> 
    245  <resources> 
    246   <include location="../../UI/main_resources.qrc"/> 
    247   <include location="../images/images.qrc"/> 
    248  </resources> 
     245 <resources/> 
    249246 <connections/> 
    250247</ui> 

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

    r83eb5208 rcd2cc745  
    2121  </property> 
    2222  <property name="windowIcon"> 
    23    <iconset resource="../../UI/main_resources.qrc"> 
     23   <iconset> 
    2424    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 
    2525  </property> 
    … …  
    7070           </property> 
    7171           <property name="icon"> 
    72             <iconset resource="../../UI/main_resources.qrc"> 
     72            <iconset> 
    7373             <normaloff>:/res/down-grey.png</normaloff>:/res/down-grey.png</iconset> 
    7474           </property> 
    … …  
    183183           </property> 
    184184           <property name="icon"> 
    185             <iconset resource="../../UI/main_resources.qrc"> 
     185            <iconset> 
    186186             <normaloff>:/res/right-grey.png</normaloff>:/res/right-grey.png</iconset> 
    187187           </property> 
    … …  
    482482  </action> 
    483483 </widget> 
    484  <resources> 
    485   <include location="../../UI/main_resources.qrc"/> 
    486  </resources> 
     484 <resources/> 
    487485 <connections/> 
    488486</ui> 

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

    r83eb5208 rcd2cc745  
    1515  </property> 
    1616  <property name="windowIcon"> 
    17    <iconset resource="../../UI/main_resources.qrc"> 
     17   <iconset> 
    1818    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 
    1919  </property> 
    … …  
    180180  <action name="actionReset"> 
    181181   <property name="icon"> 
    182     <iconset resource="../../UI/main_resources.qrc"> 
     182    <iconset> 
    183183     <normaloff>:/res/reset.png</normaloff>:/res/reset.png</iconset> 
    184184   </property> 
    … …  
    192192  <action name="actionSave"> 
    193193   <property name="icon"> 
    194     <iconset resource="../../UI/main_resources.qrc"> 
     194    <iconset> 
    195195     <normaloff>:/res/save.png</normaloff>:/res/save.png</iconset> 
    196196   </property> 
    … …  
    204204  <action name="actionReport"> 
    205205   <property name="icon"> 
    206     <iconset resource="../../UI/main_resources.qrc"> 
     206    <iconset> 
    207207     <normaloff>:/res/report.png</normaloff>:/res/report.png</iconset> 
    208208   </property> 
    … …  
    216216  <action name="actionUndo"> 
    217217   <property name="icon"> 
    218     <iconset resource="../../UI/main_resources.qrc"> 
     218    <iconset> 
    219219     <normaloff>:/res/undo.png</normaloff> 
    220220     <normalon>res/undo.png</normalon>:/res/undo.png</iconset> 
    … …  
    226226  <action name="actionRedo"> 
    227227   <property name="icon"> 
    228     <iconset resource="../../UI/main_resources.qrc"> 
     228    <iconset> 
    229229     <normaloff>:/res/redo.png</normaloff>:/res/redo.png</iconset> 
    230230   </property> 
    … …  
    238238  <action name="actionCopy"> 
    239239   <property name="icon"> 
    240     <iconset resource="../../UI/main_resources.qrc"> 
     240    <iconset> 
    241241     <normaloff>:/res/copy.png</normaloff>:/res/copy.png</iconset> 
    242242   </property> 
    … …  
    250250  <action name="actionPaste"> 
    251251   <property name="icon"> 
    252     <iconset resource="../../UI/main_resources.qrc"> 
     252    <iconset> 
    253253     <normaloff>:/res/paste.png</normaloff>:/res/paste.png</iconset> 
    254254   </property> 
    … …  
    265265   </property> 
    266266   <property name="icon"> 
    267     <iconset resource="../../UI/main_resources.qrc"> 
     267    <iconset> 
    268268     <normaloff>:/res/bookmark.png</normaloff>:/res/bookmark.png</iconset> 
    269269   </property> 
    … …  
    497497  </action> 
    498498 </widget> 
    499  <resources> 
    500   <include location="../../UI/main_resources.qrc"/> 
    501  </resources> 
     499 <resources/> 
    502500 <connections/> 
    503501</ui> 

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

    r83eb5208 rcd2cc745  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>746</width> 
    10     <height>947</height> 
     9    <width>658</width> 
     10    <height>737</height> 
    1111   </rect> 
    1212  </property> 
    … …  
    2121     </property> 
    2222     <property name="pixmap"> 
    23       <pixmap resource="../../UI/main_resources.qrc">:/res/SVwelcome.png</pixmap> 
     23      <pixmap>:/res/SVwelcome.png</pixmap> 
    2424     </property> 
    2525     <property name="alignment"> 
    … …  
    7979  </layout> 
    8080 </widget> 
    81  <resources> 
    82   <include location="../../UI/main_resources.qrc"/> 
    83   <include location="main_resources.qrc"/> 
    84  </resources> 
     81 <resources/> 
    8582 <connections/> 
    8683</ui> 

  • src/sas/qtgui/MainWindow/WelcomePanel.py

    r83eb5208 rcd2cc745  
    88import sas.sasview 
    99import sas.qtgui.Utilities.LocalConfig as LocalConfig 
     10from sas.qtgui.UI import images_rc 
     11from sas.qtgui.UI import main_resources_rc 
    1012 
    1113from sas.qtgui.MainWindow.UI.WelcomePanelUI import Ui_WelcomePanelUI 

  • src/sas/qtgui/Plotting/BoxSum.py

    r83eb5208 rcd2cc745  
    66 
    77# Local UI 
     8from sas.qtgui.UI import main_resources_rc 
    89from sas.qtgui.Plotting.UI.BoxSumUI import Ui_BoxSumUI 
    910 

  • src/sas/qtgui/Plotting/ColorMap.py

    r83eb5208 rcd2cc745  
    1818 
    1919# Local UI 
     20from sas.qtgui.UI import main_resources_rc 
    2021from sas.qtgui.Plotting.UI.ColorMapUI import Ui_ColorMapUI 
    2122 

  • src/sas/qtgui/Plotting/LinearFit.py

    r83eb5208 rcd2cc745  
    1515 
    1616# Local UI 
     17from sas.qtgui.UI import main_resources_rc 
    1718from sas.qtgui.Plotting.UI.LinearFitUI import Ui_LinearFitUI 
    1819 

  • src/sas/qtgui/Plotting/MaskEditor.py

    r83eb5208 rcd2cc745  
    44 
    55# Local UI 
     6from sas.qtgui.UI import main_resources_rc 
    67from sas.qtgui.Plotting.UI.MaskEditorUI import Ui_MaskEditorUI 
    78from sas.qtgui.Plotting.Plotter2D import Plotter2DWidget 

  • src/sas/qtgui/Plotting/PlotProperties.py

    r83eb5208 rcd2cc745  
    33from sas.qtgui.Plotting.PlotUtilities import COLORS, SHAPES 
    44 
     5from sas.qtgui.UI import main_resources_rc 
    56from sas.qtgui.Plotting.UI.PlotPropertiesUI import Ui_PlotPropertiesUI 
    67 

  • src/sas/qtgui/Plotting/ScaleProperties.py

    r83eb5208 rcd2cc745  
    22 
    33import sas.sasview 
     4from sas.qtgui.UI import main_resources_rc 
    45 
     6from sas.qtgui.UI import main_resources_rc 
    57from sas.qtgui.Plotting.UI.ScalePropertiesUI import Ui_scalePropertiesUI 
    68 

  • src/sas/qtgui/Plotting/SetGraphRange.py

    r83eb5208 rcd2cc745  
    55 
    66# Local UI 
     7from sas.qtgui.UI import main_resources_rc 
    78from sas.qtgui.Plotting.UI.SetGraphRangeUI import Ui_setGraphRangeUI 
    89 

  • src/sas/qtgui/Plotting/SlicerParameters.py

    r83eb5208 rcd2cc745  
    99 
    1010# Local UI 
     11from sas.qtgui.UI import main_resources_rc 
    1112from sas.qtgui.Plotting.UI.SlicerParametersUI import Ui_SlicerParametersUI 
    1213 

  • src/sas/qtgui/Plotting/UI/BoxSumUI.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> 
    … …  
    413413  </layout> 
    414414 </widget> 
    415  <resources> 
    416   <include location="main_resources.qrc"/> 
    417  </resources> 
     415 <resources/> 
    418416 <connections> 
    419417  <connection> 

  • src/sas/qtgui/Plotting/UI/ColorMapUI.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> 
    … …  
    234234  <zorder>verticalSpacer</zorder> 
    235235 </widget> 
    236  <resources> 
    237   <include location="main_resources.qrc"/> 
    238  </resources> 
     236 <resources/> 
    239237 <connections> 
    240238  <connection> 

  • src/sas/qtgui/Plotting/UI/LinearFitUI.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> 
    … …  
    272272  </layout> 
    273273 </widget> 
    274  <resources> 
    275   <include location="main_resources.qrc"/> 
    276  </resources> 
     274 <resources/> 
    277275 <connections> 
    278276  <connection> 

  • src/sas/qtgui/Plotting/UI/MaskEditorUI.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> 
    … …  
    137137  </layout> 
    138138 </widget> 
    139  <resources> 
    140   <include location="main_resources.qrc"/> 
    141  </resources> 
     139 <resources/> 
    142140 <connections/> 
    143141</ui> 

  • src/sas/qtgui/Plotting/UI/PlotPropertiesUI.ui

    r83eb5208 rcd2cc745  
    88    <y>0</y> 
    99    <width>319</width> 
    10     <height>172</height> 
     10    <height>285</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> 
    … …  
    121121  </layout> 
    122122 </widget> 
    123  <resources> 
    124   <include location="main_resources.qrc"/> 
    125  </resources> 
     123 <resources/> 
    126124 <connections> 
    127125  <connection> 

  • src/sas/qtgui/Plotting/UI/ScalePropertiesUI.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> 
    … …  
    8484  </layout> 
    8585 </widget> 
    86  <resources> 
    87   <include location="main_resources.qrc"/> 
    88  </resources> 
     86 <resources/> 
    8987 <connections> 
    9088  <connection> 

  • src/sas/qtgui/Plotting/UI/SetGraphRangeUI.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> 
    … …  
    9797  </layout> 
    9898 </widget> 
    99  <resources> 
    100   <include location="main_resources.qrc"/> 
    101  </resources> 
     99 <resources/> 
    102100 <connections> 
    103101  <connection> 

  • src/sas/qtgui/Plotting/UI/SlicerParametersUI.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> 
    … …  
    4040  </layout> 
    4141 </widget> 
    42  <resources> 
    43   <include location="main_resources.qrc"/> 
    44  </resources> 
     42 <resources/> 
    4543 <connections> 
    4644  <connection> 

  • src/sas/qtgui/convertUI.py

    r83eb5208 rcd2cc745  
    2727 
    2828# Images 
    29 ui_root = 'images' 
     29images_root = 'images' 
    3030rc_file = 'images.qrc' 
    3131out_file = 'images_rc.py' 
    32 pyrrc(os.path.join(ui_root, rc_file), os.path.join(ui_root, out_file)) 
     32pyrrc(os.path.join(images_root, rc_file), os.path.join(ui_root, out_file)) 
Note: See TracChangeset for help on using the changeset viewer.