Changeset cd2cc745 in sasview for src/sas/qtgui/Plotting/UI


Ignore:
Timestamp:
Apr 19, 2017 6:51:48 AM (8 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/Plotting/UI
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • 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> 
Note: See TracChangeset for help on using the changeset viewer.