Changeset 1d85b5e in sasview for src/sas/qtgui/UI


Ignore:
Timestamp:
Oct 20, 2016 9:11:19 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:
9968d6a
Parents:
ef36eb2
Message:

Linked two new calculators to the Gui Manager.

Location:
src/sas/qtgui/UI
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r6083d6e r1d85b5e  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>633</width> 
    10     <height>293</height> 
     9    <width>290</width> 
     10    <height>178</height> 
    1111   </rect> 
     12  </property> 
     13  <property name="sizePolicy"> 
     14   <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> 
     15    <horstretch>0</horstretch> 
     16    <verstretch>0</verstretch> 
     17   </sizepolicy> 
    1218  </property> 
    1319  <property name="windowTitle"> 
    1420   <string>Density/Volume Calculator</string> 
     21  </property> 
     22  <property name="windowIcon"> 
     23   <iconset resource="main_resources.qrc"> 
     24    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 
    1525  </property> 
    1626  <layout class="QGridLayout" name="gridLayout_2"> 
    … …  
    134144   <item row="2" column="0"> 
    135145    <widget class="QDialogButtonBox" name="buttonBox"> 
     146     <property name="sizePolicy"> 
     147      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> 
     148       <horstretch>0</horstretch> 
     149       <verstretch>0</verstretch> 
     150      </sizepolicy> 
     151     </property> 
    136152     <property name="orientation"> 
    137153      <enum>Qt::Horizontal</enum> 
    138154     </property> 
    139155     <property name="standardButtons"> 
    140       <set>QDialogButtonBox::Close|QDialogButtonBox::Reset</set> 
     156      <set>QDialogButtonBox::Close|QDialogButtonBox::Help|QDialogButtonBox::Reset</set> 
    141157     </property> 
    142158     <property name="centerButtons"> 
    … …  
    154170  <tabstop>buttonBox</tabstop> 
    155171 </tabstops> 
    156  <resources/> 
     172 <resources> 
     173  <include location="main_resources.qrc"/> 
     174 </resources> 
    157175 <connections> 
    158176  <connection> 

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

    ref36eb2 r1d85b5e  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>632</width> 
    10     <height>651</height> 
     9    <width>447</width> 
     10    <height>403</height> 
    1111   </rect> 
     12  </property> 
     13  <property name="sizePolicy"> 
     14   <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> 
     15    <horstretch>0</horstretch> 
     16    <verstretch>0</verstretch> 
     17   </sizepolicy> 
    1218  </property> 
    1319  <property name="windowTitle"> 
    1420   <string>SLD Calculator</string> 
     21  </property> 
     22  <property name="windowIcon"> 
     23   <iconset resource="main_resources.qrc"> 
     24    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 
    1525  </property> 
    1626  <layout class="QGridLayout" name="gridLayout_2"> 
    … …  
    307317     </property> 
    308318     <property name="standardButtons"> 
    309       <set>QDialogButtonBox::Close|QDialogButtonBox::Reset</set> 
     319      <set>QDialogButtonBox::Close|QDialogButtonBox::Help|QDialogButtonBox::Reset</set> 
    310320     </property> 
    311321     <property name="centerButtons"> 
    … …  
    331341  <tabstop>buttonBox</tabstop> 
    332342 </tabstops> 
    333  <resources/> 
     343 <resources> 
     344  <include location="main_resources.qrc"/> 
     345 </resources> 
    334346 <connections> 
    335347  <connection> 

  • src/sas/qtgui/UI/convert_all.sh

    rfac2619 r1d85b5e  
    11# UI -> PY 
    22for filename in *.ui; do 
    3   pyuic4 $filename > "`basename "$filename" .ui`.py" 
     3  pyuic4.bat $filename > "`basename "$filename" .ui`.py" 
    44done 
    55 
Note: See TracChangeset for help on using the changeset viewer.