Changeset ecc5d043 in sasview for src/sas/qtgui/MainWindow


Ignore:
Timestamp:
Nov 16, 2018 5:05:20 AM (5 years ago)
Author:
Piotr Rozyczko <piotr.rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
Children:
09e0c32
Parents:
baeac95
Message:

Reworked the complex constraint functionality SASVIEW-1019

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r7385fec recc5d043  
    1010    <x>0</x> 
    1111    <y>0</y> 
    12     <width>508</width> 
    13     <height>283</height> 
     12    <width>468</width> 
     13    <height>316</height> 
    1414   </rect> 
    1515  </property> 
    … …  
    2727    <widget class="QLabel" name="label"> 
    2828     <property name="sizePolicy"> 
    29       <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> 
     29      <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding"> 
    3030       <horstretch>0</horstretch> 
    3131       <verstretch>0</verstretch> 
    … …  
    3535      <size> 
    3636       <width>16777215</width> 
    37        <height>41</height> 
     37       <height>50</height> 
    3838      </size> 
    3939     </property> 
    … …  
    4646    <widget class="QTextBrowser" name="textBrowser"> 
    4747     <property name="sizePolicy"> 
    48       <sizepolicy hsizetype="Expanding" vsizetype="Minimum"> 
     48      <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding"> 
    4949       <horstretch>0</horstretch> 
    5050       <verstretch>0</verstretch> 
    5151      </sizepolicy> 
    5252     </property> 
     53     <property name="minimumSize"> 
     54      <size> 
     55       <width>0</width> 
     56       <height>85</height> 
     57      </size> 
     58     </property> 
    5359     <property name="maximumSize"> 
    5460      <size> 
    5561       <width>16777215</width> 
    56        <height>61</height> 
     62       <height>85</height> 
    5763      </size> 
    5864     </property> 
    … …  
    6167&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; 
    6268p, li { white-space: pre-wrap; } 
    63 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt; 
    64 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;This work benefited from the use of the SasView application, originally developed under NSF Award DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project Grant No 654000.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> 
     69&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt; 
     70&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8.25pt;&quot;&gt;This work benefited from the use of the SasView application, originally developed under NSF Award DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project Grant No 654000.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> 
    6571     </property> 
    6672    </widget> 
    … …  
    103109&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; 
    104110p, li { white-space: pre-wrap; } 
    105 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt; 
    106 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;M. Doucet et al. SasView Version 4.2, Zenodo, 10.5281/zenodo.1412041&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> 
     111&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt; 
     112&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8.25pt;&quot;&gt;M. Doucet et al. SasView Version 4.2, Zenodo, 10.5281/zenodo.1412041&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> 
    107113     </property> 
    108114    </widget> 
    … …  
    111117    <widget class="QLabel" name="label_3"> 
    112118     <property name="sizePolicy"> 
    113       <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> 
     119      <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding"> 
    114120       <horstretch>0</horstretch> 
    115121       <verstretch>0</verstretch> 
    … …  
    119125      <size> 
    120126       <width>16777215</width> 
    121        <height>38</height> 
     127       <height>50</height> 
    122128      </size> 
    123129     </property> 
Note: See TracChangeset for help on using the changeset viewer.