X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2Fui%2FHSpaceUi.ui;h=026b1577bfdbaabed5176d12a054453ea76732e5;hb=75c631df7f1124b6bf53f48f8d82ecb42fdb9c52;hp=94a098025453271b9ab96bbf6d551f06f67ccb2c;hpb=f2e8cd3cd990d1314de41e409e93095059546fe7;p=lyx.git

diff --git a/src/frontends/qt4/ui/HSpaceUi.ui b/src/frontends/qt4/ui/HSpaceUi.ui
index 94a0980254..026b1577bf 100644
--- a/src/frontends/qt4/ui/HSpaceUi.ui
+++ b/src/frontends/qt4/ui/HSpaceUi.ui
@@ -1,18 +1,18 @@
 <ui version="4.0" >
  <class>HSpaceUi</class>
- <widget class="QDialog" name="HSpaceUi" >
+ <widget class="QWidget" name="HSpaceUi" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>263</width>
-    <height>198</height>
+    <width>239</width>
+    <height>110</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string/>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled" stdset="0" >
    <bool>true</bool>
   </property>
   <layout class="QGridLayout" >
@@ -22,26 +22,6 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="3" column="1" >
-    <widget class="QCheckBox" name="keepCB" >
-     <property name="toolTip" >
-      <string>Insert the spacing even after a line break</string>
-     </property>
-     <property name="text" >
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" >
-    <widget class="QLabel" name="fillPatternL" >
-     <property name="text" >
-      <string>&amp;Fill Pattern:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>fillPatternCO</cstring>
-     </property>
-    </widget>
-   </item>
    <item row="2" column="1" >
     <widget class="QComboBox" name="fillPatternCO" >
      <property name="toolTip" >
@@ -62,6 +42,26 @@
        <string>________</string>
       </property>
      </item>
+     <item>
+      <property name="text" >
+       <string>&lt;-----------</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>-----------></string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>\-----v-----/</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>/-----^-----\</string>
+      </property>
+     </item>
     </widget>
    </item>
    <item row="0" column="0" >
@@ -74,190 +74,66 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="3" column="0" >
-    <widget class="QLabel" name="keepL" >
+   <item row="0" column="1" colspan="2" >
+    <widget class="QComboBox" name="spacingCO" >
      <property name="toolTip" >
-      <string/>
+      <string>Supported spacing types</string>
      </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="valueL" >
      <property name="text" >
-      <string>&amp;Protect:</string>
+      <string>&amp;Value:</string>
      </property>
      <property name="buddy" >
-      <cstring>keepCB</cstring>
+      <cstring>valueLE</cstring>
      </property>
     </widget>
    </item>
-   <item row="3" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
+   <item row="1" column="1" >
+    <widget class="QLineEdit" name="valueLE" >
+     <property name="enabled" >
+      <bool>false</bool>
      </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
+     <property name="toolTip" >
+      <string>Custom value. Needs spacing type "Custom".</string>
      </property>
-    </spacer>
+    </widget>
    </item>
-   <item row="4" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
+   <item row="1" column="2" >
+    <widget class="lyx::frontend::LengthCombo" name="unitCO" />
    </item>
-   <item row="5" column="0" colspan="3" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="fillPatternL" >
+     <property name="text" >
+      <string>&amp;Fill Pattern:</string>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="buddy" >
+      <cstring>fillPatternCO</cstring>
      </property>
-     <item>
-      <widget class="QPushButton" name="okPB" >
-       <property name="text" >
-        <string>&amp;OK</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-       <property name="default" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="applyPB" >
-       <property name="text" >
-        <string>&amp;Apply</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB" >
-       <property name="text" >
-        <string>&amp;Close</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    </widget>
    </item>
-   <item row="0" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
+   <item row="3" column="0" >
+    <widget class="QLabel" name="keepL" >
+     <property name="toolTip" >
+      <string/>
      </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
+     <property name="text" >
+      <string>&amp;Protect:</string>
      </property>
-    </spacer>
-   </item>
-   <item row="1" column="2" >
-    <widget class="LengthCombo" native="1" name="unitCO" />
-   </item>
-   <item row="0" column="1" >
-    <widget class="QComboBox" name="spacingCO" >
-     <property name="toolTip" >
-      <string>Supported spacing types</string>
+     <property name="buddy" >
+      <cstring>keepCB</cstring>
      </property>
-     <item>
-      <property name="text" >
-       <string>Inter-word space</string>
-      </property>
-     </item>
-     <item>
-      <property name="text" >
-       <string>Thin space</string>
-      </property>
-     </item>
-     <item>
-      <property name="text" >
-       <string>Negative thin space</string>
-      </property>
-     </item>
-     <item>
-      <property name="text" >
-       <string>Enspace (0.5 em)</string>
-      </property>
-     </item>
-     <item>
-      <property name="text" >
-       <string>Quad (1 em)</string>
-      </property>
-     </item>
-     <item>
-      <property name="text" >
-       <string>QQuad (2 em)</string>
-      </property>
-     </item>
-     <item>
-      <property name="text" >
-       <string>Horizontal Fill</string>
-      </property>
-     </item>
-     <item>
-      <property name="text" >
-       <string>Custom</string>
-      </property>
-     </item>
     </widget>
    </item>
-   <item row="1" column="1" >
-    <widget class="QLineEdit" name="valueLE" >
-     <property name="enabled" >
-      <bool>false</bool>
-     </property>
+   <item row="3" column="1" colspan="2" >
+    <widget class="QCheckBox" name="keepCB" >
      <property name="toolTip" >
-      <string>Custom value. Needs spacing type "Custom".</string>
+      <string>Insert the spacing even after a line break</string>
      </property>
-    </widget>
-   </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="valueL" >
      <property name="text" >
-      <string>&amp;Value:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>valueLE</cstring>
+      <string/>
      </property>
     </widget>
    </item>
@@ -265,22 +141,18 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>LengthCombo</class>
-   <extends>QWidget</extends>
+   <class>lyx::frontend::LengthCombo</class>
+   <extends>QComboBox</extends>
    <header>LengthCombo.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>spacingCO</tabstop>
   <tabstop>valueLE</tabstop>
-  <tabstop>unitCO</tabstop>
-  <tabstop>okPB</tabstop>
-  <tabstop>applyPB</tabstop>
-  <tabstop>closePB</tabstop>
   <tabstop>keepCB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_helpers.h</include>
+  <include location="local" >qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>