Embedding: add embedCB checkboxes to IncludeUi and ExternalUi

[lyx.git] / src / frontends / qt4 / ui / MarginsUi.ui

diff --git a/src/frontends/qt4/ui/MarginsUi.ui b/src/frontends/qt4/ui/MarginsUi.ui
index a7279c90196939abc2f3afd8313640a1273e14d2..7d822fb628457aec4a9e1bc0993d4cc470c6ea34 100644 (file)
--- a/src/frontends/qt4/ui/MarginsUi.ui
+++ b/src/frontends/qt4/ui/MarginsUi.ui
@@ -182,130 +182,187 @@
         <number>6</number>
        </property>
        <item>
-        <widget class="QLineEdit" name="topLE" >
-         <property name="enabled" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="bottomLE" >
-         <property name="enabled" >
-          <bool>false</bool>
-         </property>
-         <property name="text" >
-          <string/>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="innerLE" >
-         <property name="enabled" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="outerLE" >
-         <property name="enabled" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="headsepLE" >
-         <property name="enabled" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="headheightLE" >
-         <property name="enabled" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="footskipLE" >
-         <property name="enabled" >
-          <bool>false</bool>
-         </property>
-        </widget>
+          <layout class="QHBoxLayout" >
+          <property name="margin" >
+            <number>0</number>
+          </property>
+          <property name="spacing" >
+            <number>6</number>
+          </property>
+          <item>
+            <widget class="QLineEdit" name="topLE" >
+            <property name="enabled" >
+              <bool>false</bool>
+            </property>
+            </widget>
+          </item>
+          <item>
+            <widget class="LengthCombo" native="1" name="topUnit" >
+            <property name="enabled" >
+              <bool>false</bool>
+            </property>
+            </widget>
+          </item>
+          </layout>
        </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
        <item>
-        <widget class="LengthCombo" name="topUnit" >
-         <property name="enabled" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="LengthCombo" name="bottomUnit" >
-         <property name="enabled" >
-          <bool>false</bool>
-         </property>
-        </widget>
+          <layout class="QHBoxLayout" >
+          <property name="margin" >
+            <number>0</number>
+          </property>
+          <property name="spacing" >
+            <number>6</number>
+          </property>
+          <item>
+            <widget class="QLineEdit" name="bottomLE" >
+            <property name="enabled" >
+              <bool>false</bool>
+            </property>
+            <property name="text" >
+              <string/>
+            </property>
+            </widget>
+          </item>
+          <item>
+            <widget class="LengthCombo" native="1" name="bottomUnit" >
+            <property name="enabled" >
+              <bool>false</bool>
+            </property>
+            </widget>
+          </item>
+          </layout>
        </item>
        <item>
-        <widget class="LengthCombo" name="innerUnit" >
-         <property name="enabled" >
-          <bool>false</bool>
-         </property>
-        </widget>
+          <layout class="QHBoxLayout" >
+          <property name="margin" >
+            <number>0</number>
+          </property>
+          <property name="spacing" >
+            <number>6</number>
+          </property>
+          <item>
+            <widget class="QLineEdit" name="innerLE" >
+            <property name="enabled" >
+              <bool>false</bool>
+            </property>
+            </widget>
+          </item>
+          <item>
+            <widget class="LengthCombo" native="1" name="innerUnit" >
+            <property name="enabled" >
+              <bool>false</bool>
+            </property>
+            </widget>
+          </item>
+          </layout>
        </item>
        <item>
-        <widget class="LengthCombo" name="outerUnit" >
-         <property name="enabled" >
-          <bool>false</bool>
-         </property>
-        </widget>
+          <layout class="QHBoxLayout" >
+          <property name="margin" >
+            <number>0</number>
+          </property>
+          <property name="spacing" >
+            <number>6</number>
+          </property>
+          <item>
+            <widget class="QLineEdit" name="outerLE" >
+            <property name="enabled" >
+              <bool>false</bool>
+            </property>
+            </widget>
+          </item>
+          <item>
+            <widget class="LengthCombo" native="1" name="outerUnit" >
+            <property name="enabled" >
+              <bool>false</bool>
+            </property>
+            </widget>
+          </item>
+          </layout>
        </item>
        <item>
-        <widget class="LengthCombo" name="headsepUnit" >
-         <property name="enabled" >
-          <bool>false</bool>
-         </property>
-        </widget>
+          <layout class="QHBoxLayout" >
+          <property name="margin" >
+            <number>0</number>
+          </property>
+          <property name="spacing" >
+            <number>6</number>
+          </property>
+          <item>
+            <widget class="QLineEdit" name="headsepLE" >
+            <property name="enabled" >
+              <bool>false</bool>
+            </property>
+            </widget>
+          </item>
+          <item>
+            <widget class="LengthCombo" native="1" name="headsepUnit" >
+            <property name="enabled" >
+              <bool>false</bool>
+            </property>
+            </widget>
+          </item>
+          </layout>
        </item>
        <item>
-        <widget class="LengthCombo" name="headheightUnit" >
-         <property name="enabled" >
-          <bool>false</bool>
-         </property>
-        </widget>
+          <layout class="QHBoxLayout" >
+          <property name="margin" >
+            <number>0</number>
+          </property>
+          <property name="spacing" >
+            <number>6</number>
+          </property>
+          <item>
+            <widget class="QLineEdit" name="headheightLE" >
+            <property name="enabled" >
+              <bool>false</bool>
+            </property>
+            </widget>
+          </item>
+          <item>
+            <widget class="LengthCombo" native="1" name="headheightUnit" >
+            <property name="enabled" >
+              <bool>false</bool>
+            </property>
+            </widget>
+          </item>
+          </layout>
        </item>
        <item>
-        <widget class="LengthCombo" name="footskipUnit" >
-         <property name="enabled" >
-          <bool>false</bool>
-         </property>
-        </widget>
+          <layout class="QHBoxLayout" >
+          <property name="margin" >
+            <number>0</number>
+          </property>
+          <property name="spacing" >
+            <number>6</number>
+          </property>
+          <item>
+            <widget class="QLineEdit" name="footskipLE" >
+            <property name="enabled" >
+              <bool>false</bool>
+            </property>
+            </widget>
+          </item>
+          <item>
+            <widget class="LengthCombo" native="1" name="footskipUnit" >
+            <property name="enabled" >
+              <bool>false</bool>
+            </property>
+            </widget>
+          </item>
+          </layout>
        </item>
-      </layout>
-     </item>
+      </layout> 
+    </item>
     </layout>
    </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <customwidgets>
   <customwidget>
    <class>LengthCombo</class>
-   <extends></extends>
-   <header>lengthcombo.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
+   <extends>QWidget</extends>
+   <header>LengthCombo.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
@@ -317,6 +374,9 @@
   <tabstop>headheightLE</tabstop>
   <tabstop>footskipLE</tabstop>
  </tabstops>
+ <includes>
+  <include location="local" >qt_helpers.h</include>
+ </includes>
  <resources/>
  <connections/>
 </ui>