Changeset 040529d in sasview for src/sas/qtgui/UI


Ignore:
Timestamp:
Dec 2, 2016 8:27:17 AM (8 years ago)
Author:
trnielsen
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:
fca1f50
Parents:
363fbfa
Message:

Update SasView?-249 with code review from PR

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r363fbfa r040529d  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>416</width> 
     9    <width>354</width> 
    1010    <height>193</height> 
    1111   </rect> 
    … …  
    1313  <property name="windowTitle"> 
    1414   <string>Dialog</string> 
     15  </property> 
     16  <property name="windowIcon"> 
     17   <iconset resource="main_resources.qrc"> 
     18    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 
     19  </property> 
     20  <property name="toolTip"> 
     21   <string/> 
    1522  </property> 
    1623  <layout class="QGridLayout" name="gridLayout_3"> 
    … …  
    6269        </item> 
    6370        <item> 
    64          <widget class="QLineEdit" name="lengthscale_out"/> 
     71         <widget class="QLineEdit" name="lengthscale_out"> 
     72          <property name="readOnly"> 
     73           <bool>true</bool> 
     74          </property> 
     75         </widget> 
    6576        </item> 
    6677        <item> 
    … …  
    90101    </spacer> 
    91102   </item> 
    92    <item row="3" column="0"> 
     103   <item row="3" column="1"> 
     104    <widget class="QPushButton" name="closeButton"> 
     105     <property name="toolTip"> 
     106      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Close this window.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> 
     107     </property> 
     108     <property name="text"> 
     109      <string>Close</string> 
     110     </property> 
     111    </widget> 
     112   </item> 
     113   <item row="3" column="2"> 
    93114    <widget class="QPushButton" name="helpButton"> 
    94115     <property name="toolTip"> 
    … …  
    100121    </widget> 
    101122   </item> 
    102    <item row="3" column="1"> 
     123   <item row="3" column="0"> 
    103124    <widget class="QPushButton" name="computeButton"> 
    104125     <property name="toolTip"> 
    … …  
    110131    </widget> 
    111132   </item> 
    112    <item row="3" column="2"> 
    113     <widget class="QPushButton" name="closeButton"> 
    114      <property name="toolTip"> 
    115       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Close this window.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> 
    116      </property> 
    117      <property name="text"> 
    118       <string>Close</string> 
    119      </property> 
    120     </widget> 
    121    </item> 
    122133  </layout> 
    123134 </widget> 
    124  <resources/> 
     135 <resources> 
     136  <include location="main_resources.qrc"/> 
     137 </resources> 
    125138 <connections/> 
    126139</ui> 
Note: See TracChangeset for help on using the changeset viewer.