X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2Fui%2FMarginsUi.ui;h=406b322051f0c6fbde4e3598be40d3d6db48432d;hb=cb899b3fa2c733e21b832e3d217ecd2c254d68c8;hp=a7279c90196939abc2f3afd8313640a1273e14d2;hpb=87c311f815e65298a1a543661d2ad2c22c80a191;p=lyx.git

diff --git a/src/frontends/qt4/ui/MarginsUi.ui b/src/frontends/qt4/ui/MarginsUi.ui
index a7279c9019..406b322051 100644
--- a/src/frontends/qt4/ui/MarginsUi.ui
+++ b/src/frontends/qt4/ui/MarginsUi.ui
@@ -28,7 +28,7 @@
       <string>Use the margin settings provided by the document class</string>
      </property>
      <property name="text" >
-      <string>&amp;Default Margins</string>
+      <string>&amp;Default margins</string>
      </property>
     </widget>
    </item>
@@ -171,65 +171,16 @@
          </property>
         </widget>
        </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" >
-       <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="QLineEdit" name="bottomLE" >
+        <widget class="QLabel" name="columnsepL" >
          <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>
+          <string>&amp;Column sep:</string>
          </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="footskipLE" >
-         <property name="enabled" >
-          <bool>false</bool>
+         <property name="buddy" >
+          <cstring>columnsepLE</cstring>
          </property>
         </widget>
        </item>
@@ -244,68 +195,211 @@
         <number>6</number>
        </property>
        <item>
-        <widget class="LengthCombo" name="topUnit" >
-         <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="lyx::frontend::LengthCombo" native="1" name="topUnit" >
+            <property name="enabled" >
+              <bool>false</bool>
+            </property>
+            </widget>
+          </item>
+          </layout>
        </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="lyx::frontend::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="lyx::frontend::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="lyx::frontend::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="lyx::frontend::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="lyx::frontend::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="lyx::frontend::LengthCombo" native="1" name="footskipUnit" >
+            <property name="enabled" >
+              <bool>false</bool>
+            </property>
+            </widget>
+          </item>
+          </layout>
        </item>
-      </layout>
-     </item>
+       <item>
+          <layout class="QHBoxLayout" >
+          <property name="margin" >
+            <number>0</number>
+          </property>
+          <property name="spacing" >
+            <number>6</number>
+          </property>
+          <item>
+            <widget class="QLineEdit" name="columnsepLE" >
+            <property name="enabled" >
+              <bool>false</bool>
+            </property>
+            </widget>
+          </item>
+          <item>
+            <widget class="lyx::frontend::LengthCombo" native="1" name="columnsepUnit" >
+            <property name="enabled" >
+              <bool>false</bool>
+            </property>
+            </widget>
+          </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>
+   <class>lyx::frontend::LengthCombo</class>
+   <extends>QWidget</extends>
+   <header>LengthCombo.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
@@ -317,6 +411,9 @@
   <tabstop>headheightLE</tabstop>
   <tabstop>footskipLE</tabstop>
  </tabstops>
+ <includes>
+  <include location="local" >qt_i18n.h</include>
+ </includes>
  <resources/>
  <connections/>
 </ui>