correct tab order + layout cleanup

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14855 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/ui/QBoxUi.ui b/src/frontends/qt4/ui/QBoxUi.ui
index e665047009fb47153d21d3ea2340464aef883881..53444570621aa210cfe9c0abf2dfedf5c4273348 100644 (file)
--- a/src/frontends/qt4/ui/QBoxUi.ui
+++ b/src/frontends/qt4/ui/QBoxUi.ui
@@ -8,8 +8,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>298</width>
-    <height>291</height>
+    <width>333</width>
+    <height>274</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -20,229 +20,141 @@
   </property>
   <layout class="QGridLayout" >
    <property name="margin" >
-    <number>11</number>
+    <number>9</number>
    </property>
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="0" column="1" >
+   <item row="3" column="2" >
+    <widget class="LengthCombo" name="heightUnitsLC" />
+   </item>
+   <item row="1" column="1" colspan="2" >
+    <widget class="QComboBox" name="innerBoxCO" >
+     <property name="toolTip" >
+      <string>Inner box -- needed for fixed width &amp; line breaks</string>
+     </property>
+     <item>
+      <property name="text" >
+       <string>None</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>Parbox</string>
+      </property>
+     </item>
+     <item>
+      <property name="text" >
+       <string>Minipage</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="2" >
     <widget class="QComboBox" name="typeCO" >
      <property name="toolTip" >
       <string>Supported box types</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2" >
-    <layout class="QGridLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="innerBoxLA" >
+     <property name="toolTip" >
+      <string>Inner box -- needed for fixed width &amp; line breaks</string>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="text" >
+      <string>Inner Bo&amp;x:</string>
      </property>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="heightLA" >
-       <property name="toolTip" >
-        <string>Height value</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Height:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>heightED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="2" >
-      <widget class="LengthCombo" name="heightUnitsLC" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>3</hsizetype>
-         <vsizetype>0</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize" >
-        <size>
-         <width>40</width>
-         <height>22</height>
-        </size>
-       </property>
-       <property name="focusPolicy" >
-        <enum>Qt::StrongFocus</enum>
-       </property>
-       <property name="toolTip" >
-        <string>Units of height value</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1" >
-      <widget class="QLineEdit" name="heightED" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>1</hsizetype>
-         <vsizetype>0</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="toolTip" >
-        <string>Height value</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="2" >
-      <widget class="LengthCombo" name="widthUnitsLC" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>3</hsizetype>
-         <vsizetype>0</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize" >
-        <size>
-         <width>40</width>
-         <height>22</height>
-        </size>
-       </property>
-       <property name="focusPolicy" >
-        <enum>Qt::StrongFocus</enum>
-       </property>
-       <property name="toolTip" >
-        <string>Units of width value</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0" >
-      <widget class="QLabel" name="widthLA" >
-       <property name="toolTip" >
-        <string>Width value</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Width:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>widthED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1" >
-      <widget class="QLineEdit" name="widthED" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>1</hsizetype>
-         <vsizetype>0</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="toolTip" >
-        <string>Width value</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+     <property name="buddy" >
+      <cstring>innerBoxCO</cstring>
+     </property>
+    </widget>
    </item>
-   <item row="7" column="0" colspan="3" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="typeLA" >
+     <property name="toolTip" >
+      <string>Supported box types</string>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="text" >
+      <string>&amp;Decoration:</string>
      </property>
-     <item>
-      <widget class="QPushButton" name="restorePB" >
-       <property name="toolTip" >
-        <string/>
-       </property>
-       <property name="text" >
-        <string>&amp;Restore</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-       <property name="default" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="okPB" >
-       <property name="toolTip" >
-        <string/>
-       </property>
-       <property name="text" >
-        <string>&amp;OK</string>
-       </property>
-       <property name="default" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="applyPB" >
-       <property name="toolTip" >
-        <string/>
-       </property>
-       <property name="text" >
-        <string>&amp;Apply</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-       <property name="default" >
-        <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>
-       <property name="default" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
+     <property name="buddy" >
+      <cstring>typeCO</cstring>
+     </property>
+    </widget>
    </item>
-   <item row="5" column="0" colspan="3" >
-    <widget class="QGroupBox" name="AlignmentGB" >
+   <item row="3" column="1" >
+    <widget class="QLineEdit" name="heightED" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>1</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="toolTip" >
+      <string>Height value</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QLineEdit" name="widthED" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>1</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="toolTip" >
+      <string>Width value</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" >
+    <widget class="QLabel" name="heightLA" >
+     <property name="toolTip" >
+      <string>Height value</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Height:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>heightED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2" >
+    <widget class="LengthCombo" name="widthUnitsLC" />
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="widthLA" >
+     <property name="toolTip" >
+      <string>Width value</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Width:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>widthED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="3" >
+    <widget class="QGroupBox" name="groupBox_2" >
      <property name="title" >
       <string>Alignment</string>
      </property>
      <layout class="QGridLayout" >
       <property name="margin" >
-       <number>11</number>
+       <number>9</number>
       </property>
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item row="2" column="1" >
+      <item row="1" column="2" >
        <widget class="QComboBox" name="halignCO" >
         <property name="toolTip" >
          <string>Horizontal alignment of the content inside the box</string>
@@ -269,34 +181,17 @@
         </item>
        </widget>
       </item>
-      <item row="1" column="1" >
-       <widget class="QComboBox" name="ialignCO" >
+      <item row="0" column="2" >
+       <widget class="QLabel" name="halignLA" >
         <property name="toolTip" >
-         <string>Vertical alignment of the content inside the box</string>
+         <string>Horizontal alignment of the content inside the box</string>
+        </property>
+        <property name="text" >
+         <string>Horizontal</string>
         </property>
-        <item>
-         <property name="text" >
-          <string>Top</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>Middle</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>Bottom</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>Stretch</string>
-         </property>
-        </item>
        </widget>
       </item>
-      <item row="0" column="1" >
+      <item row="2" column="1" >
        <widget class="QComboBox" name="valignCO" >
         <property name="toolTip" >
          <string>Vertical alignment of the box (with regard to baseline)</string>
@@ -319,238 +214,151 @@
        </widget>
       </item>
       <item row="2" column="0" >
-       <widget class="QLabel" name="halignLA" >
+       <widget class="QLabel" name="valignLA" >
         <property name="toolTip" >
-         <string>Horizontal alignment of the content inside the box</string>
+         <string>Vertical alignment of the box (with regard to baseline)</string>
         </property>
         <property name="text" >
-         <string>Content hori&amp;zontal:</string>
+         <string>&amp;Box:</string>
         </property>
         <property name="buddy" >
-         <cstring>halignCO</cstring>
+         <cstring>valignCO</cstring>
         </property>
        </widget>
       </item>
       <item row="1" column="0" >
-       <widget class="QLabel" name="ialignLA" >
-        <property name="toolTip" >
-         <string>Vertical alignment of the content inside the box</string>
-        </property>
+       <widget class="QLabel" name="label" >
         <property name="text" >
-         <string>Content &amp;vertical:</string>
+         <string>Co&amp;ntent:</string>
         </property>
         <property name="buddy" >
          <cstring>ialignCO</cstring>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="valignLA" >
+      <item row="1" column="1" >
+       <widget class="QComboBox" name="ialignCO" >
         <property name="toolTip" >
-         <string>Vertical alignment of the box (with regard to baseline)</string>
-        </property>
-        <property name="text" >
-         <string>&amp;Box vertical:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>valignCO</cstring>
+         <string>Vertical alignment of the content inside the box</string>
         </property>
+        <item>
+         <property name="text" >
+          <string>Top</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>Middle</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>Bottom</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>Stretch</string>
+         </property>
+        </item>
        </widget>
       </item>
-      <item row="0" column="2" >
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType" >
-         <enum>QSizePolicy::Expanding</enum>
-        </property>
-        <property name="sizeHint" >
-         <size>
-          <width>20</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="1" column="2" >
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType" >
-         <enum>QSizePolicy::Expanding</enum>
-        </property>
-        <property name="sizeHint" >
-         <size>
-          <width>20</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="2" column="2" >
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType" >
-         <enum>QSizePolicy::Expanding</enum>
+      <item row="0" column="1" >
+       <widget class="QLabel" name="ialignLA" >
+        <property name="toolTip" >
+         <string>Vertical alignment of the content inside the box</string>
         </property>
-        <property name="sizeHint" >
-         <size>
-          <width>20</width>
-          <height>20</height>
-         </size>
+        <property name="text" >
+         <string>Vertical</string>
         </property>
-       </spacer>
+       </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="6" 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>
-   <item row="2" 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>
-   <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>
+   <item row="5" column="0" colspan="3" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
      </property>
-    </spacer>
-   </item>
-   <item row="1" column="1" >
-    <widget class="QComboBox" name="innerBoxCO" >
-     <property name="toolTip" >
-      <string>Inner box -- needed for fixed width &amp; line breaks</string>
+     <property name="spacing" >
+      <number>6</number>
      </property>
      <item>
-      <property name="text" >
-       <string>None</string>
-      </property>
+      <widget class="QPushButton" name="restorePB" >
+       <property name="toolTip" >
+        <string/>
+       </property>
+       <property name="text" >
+        <string>&amp;Restore</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>false</bool>
+       </property>
+       <property name="default" >
+        <bool>false</bool>
+       </property>
+      </widget>
      </item>
      <item>
-      <property name="text" >
-       <string>Parbox</string>
-      </property>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
      </item>
      <item>
-      <property name="text" >
-       <string>Minipage</string>
-      </property>
+      <widget class="QPushButton" name="okPB" >
+       <property name="toolTip" >
+        <string/>
+       </property>
+       <property name="text" >
+        <string>&amp;OK</string>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
-    </widget>
-   </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="innerBoxLA" >
-     <property name="toolTip" >
-      <string>Inner box -- needed for fixed width &amp; line breaks</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Inner Box:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>innerBoxCO</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="typeLA" >
-     <property name="toolTip" >
-      <string>Supported box types</string>
-     </property>
-     <property name="text" >
-      <string>T&amp;ype:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>typeCO</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="3" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
+     <item>
+      <widget class="QPushButton" name="applyPB" >
+       <property name="toolTip" >
+        <string/>
+       </property>
+       <property name="text" >
+        <string>&amp;Apply</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>false</bool>
+       </property>
+       <property name="default" >
+        <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>
+       <property name="default" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
@@ -558,20 +366,26 @@
  <customwidgets>
   <customwidget>
    <class>LengthCombo</class>
-   <extends></extends>
+   <extends>QComboBox</extends>
    <header>lengthcombo.h</header>
    <container>0</container>
    <pixmap></pixmap>
   </customwidget>
  </customwidgets>
  <tabstops>
+  <tabstop>typeCO</tabstop>
+  <tabstop>innerBoxCO</tabstop>
   <tabstop>widthED</tabstop>
   <tabstop>widthUnitsLC</tabstop>
+  <tabstop>heightED</tabstop>
+  <tabstop>heightUnitsLC</tabstop>
+  <tabstop>ialignCO</tabstop>
+  <tabstop>halignCO</tabstop>
   <tabstop>valignCO</tabstop>
   <tabstop>restorePB</tabstop>
-  <tabstop>applyPB</tabstop>
   <tabstop>okPB</tabstop>
   <tabstop>closePB</tabstop>
+  <tabstop>applyPB</tabstop>
  </tabstops>
  <resources/>
  <connections/>