Ignore:
Timestamp:
Mar 26, 2019 9:44:01 AM (6 years ago)
Author:
awashington
Branches:
ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl
Children:
3beadede
Parents:
f7e6b30 (diff), 60e20d8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'ESS_GUI' into Sasview-1079

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Corfunc/UI/CorfuncPanel.ui

    rcb4d219 rf6c3f01  
    322322          </item> 
    323323          <item row="0" column="1"> 
    324            <widget class="QLineEdit" name="txtLongPeriod"/> 
     324           <widget class="QLineEdit" name="txtLongPeriod" width="50"> 
     325             <property name="minimumSize" stdset="0"> 
     326               <size> 
     327                 <width>60</width> 
     328                 <height>20</height> 
     329               </size> 
     330             </property> 
     331           </widget> 
    325332          </item> 
    326333          <item row="0" column="2"> 
     
    332339          </item> 
    333340          <item row="0" column="3"> 
    334            <widget class="QLineEdit" name="txtAvgIntThick"/> 
     341           <widget class="QLineEdit" name="txtAvgIntThick"> 
     342             <property name="minimumSize" stdset="0"> 
     343               <size> 
     344                 <width>60</width> 
     345                 <height>20</height> 
     346               </size> 
     347             </property> 
     348           </widget> 
    335349          </item> 
    336350          <item row="1" column="0"> 
     
    419433    </layout> 
    420434   </item> 
     435   <item row="0" column="1"> 
     436    <layout class="QVBoxLayout" name="plotLayout"> 
     437    </layout> 
     438   </item> 
    421439  </layout> 
    422440 </widget> 
Note: See TracChangeset for help on using the changeset viewer.