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

diff --git a/src/frontends/qt4/ui/MarginsUi.ui b/src/frontends/qt4/ui/MarginsUi.ui
index 4b93f355c4..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,6 +171,19 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QLabel" name="columnsepL" >
+         <property name="enabled" >
+          <bool>false</bool>
+         </property>
+         <property name="text" >
+          <string>&amp;Column sep:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>columnsepLE</cstring>
+         </property>
+        </widget>
+       </item>
       </layout>
      </item>
      <item>
@@ -197,7 +210,7 @@
             </widget>
           </item>
           <item>
-            <widget class="LengthCombo" native="1" name="topUnit" >
+            <widget class="lyx::frontend::LengthCombo" native="1" name="topUnit" >
             <property name="enabled" >
               <bool>false</bool>
             </property>
@@ -224,7 +237,7 @@
             </widget>
           </item>
           <item>
-            <widget class="LengthCombo" native="1" name="bottomUnit" >
+            <widget class="lyx::frontend::LengthCombo" native="1" name="bottomUnit" >
             <property name="enabled" >
               <bool>false</bool>
             </property>
@@ -248,7 +261,7 @@
             </widget>
           </item>
           <item>
-            <widget class="LengthCombo" native="1" name="innerUnit" >
+            <widget class="lyx::frontend::LengthCombo" native="1" name="innerUnit" >
             <property name="enabled" >
               <bool>false</bool>
             </property>
@@ -272,7 +285,7 @@
             </widget>
           </item>
           <item>
-            <widget class="LengthCombo" native="1" name="outerUnit" >
+            <widget class="lyx::frontend::LengthCombo" native="1" name="outerUnit" >
             <property name="enabled" >
               <bool>false</bool>
             </property>
@@ -296,7 +309,7 @@
             </widget>
           </item>
           <item>
-            <widget class="LengthCombo" native="1" name="headsepUnit" >
+            <widget class="lyx::frontend::LengthCombo" native="1" name="headsepUnit" >
             <property name="enabled" >
               <bool>false</bool>
             </property>
@@ -320,7 +333,7 @@
             </widget>
           </item>
           <item>
-            <widget class="LengthCombo" native="1" name="headheightUnit" >
+            <widget class="lyx::frontend::LengthCombo" native="1" name="headheightUnit" >
             <property name="enabled" >
               <bool>false</bool>
             </property>
@@ -344,7 +357,31 @@
             </widget>
           </item>
           <item>
-            <widget class="LengthCombo" native="1" name="footskipUnit" >
+            <widget class="lyx::frontend::LengthCombo" native="1" name="footskipUnit" >
+            <property name="enabled" >
+              <bool>false</bool>
+            </property>
+            </widget>
+          </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>
@@ -360,9 +397,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>LengthCombo</class>
+   <class>lyx::frontend::LengthCombo</class>
    <extends>QWidget</extends>
-   <header>lengthcombo.h</header>
+   <header>LengthCombo.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
@@ -375,7 +412,7 @@
   <tabstop>footskipLE</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_helpers.h</include>
+  <include location="local" >qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>