correct tab order + layout cleanup

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14855 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Edwin Leuven 2006-08-31 13:07:05 +00:00
parent d64b3a4a0a
commit 27fa8c7d12

View File

@ -8,8 +8,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>298</width> <width>333</width>
<height>291</height> <height>274</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
@ -20,133 +20,263 @@
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="margin" >
<number>11</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </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" > <widget class="QComboBox" name="typeCO" >
<property name="toolTip" > <property name="toolTip" >
<string>Supported box types</string> <string>Supported box types</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="2" > <item row="1" column="0" >
<layout class="QGridLayout" > <widget class="QLabel" name="innerBoxLA" >
<property name="margin" > <property name="toolTip" >
<number>0</number> <string>Inner box -- needed for fixed width &amp; line breaks</string>
</property> </property>
<property name="spacing" > <property name="text" >
<number>6</number> <string>Inner Bo&amp;x:</string>
</property> </property>
<item row="1" column="0" > <property name="buddy" >
<widget class="QLabel" name="heightLA" > <cstring>innerBoxCO</cstring>
<property name="toolTip" > </property>
<string>Height value</string> </widget>
</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>
</item> </item>
<item row="7" column="0" colspan="3" > <item row="0" column="0" >
<widget class="QLabel" name="typeLA" >
<property name="toolTip" >
<string>Supported box types</string>
</property>
<property name="text" >
<string>&amp;Decoration:</string>
</property>
<property name="buddy" >
<cstring>typeCO</cstring>
</property>
</widget>
</item>
<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>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="1" column="2" >
<widget class="QComboBox" name="halignCO" >
<property name="toolTip" >
<string>Horizontal alignment of the content inside the box</string>
</property>
<item>
<property name="text" >
<string>Left</string>
</property>
</item>
<item>
<property name="text" >
<string>Center</string>
</property>
</item>
<item>
<property name="text" >
<string>Right</string>
</property>
</item>
<item>
<property name="text" >
<string>Stretch</string>
</property>
</item>
</widget>
</item>
<item row="0" column="2" >
<widget class="QLabel" name="halignLA" >
<property name="toolTip" >
<string>Horizontal alignment of the content inside the box</string>
</property>
<property name="text" >
<string>Horizontal</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QComboBox" name="valignCO" >
<property name="toolTip" >
<string>Vertical alignment of the box (with regard to baseline)</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>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="valignLA" >
<property name="toolTip" >
<string>Vertical alignment of the box (with regard to baseline)</string>
</property>
<property name="text" >
<string>&amp;Box:</string>
</property>
<property name="buddy" >
<cstring>valignCO</cstring>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>Co&amp;ntent:</string>
</property>
<property name="buddy" >
<cstring>ialignCO</cstring>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QComboBox" name="ialignCO" >
<property name="toolTip" >
<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="1" >
<widget class="QLabel" name="ialignLA" >
<property name="toolTip" >
<string>Vertical alignment of the content inside the box</string>
</property>
<property name="text" >
<string>Vertical</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="5" column="0" colspan="3" >
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="margin" > <property name="margin" >
<number>0</number> <number>0</number>
@ -230,348 +360,32 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="5" column="0" colspan="3" >
<widget class="QGroupBox" name="AlignmentGB" >
<property name="title" >
<string>Alignment</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>11</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="2" column="1" >
<widget class="QComboBox" name="halignCO" >
<property name="toolTip" >
<string>Horizontal alignment of the content inside the box</string>
</property>
<item>
<property name="text" >
<string>Left</string>
</property>
</item>
<item>
<property name="text" >
<string>Center</string>
</property>
</item>
<item>
<property name="text" >
<string>Right</string>
</property>
</item>
<item>
<property name="text" >
<string>Stretch</string>
</property>
</item>
</widget>
</item>
<item row="1" column="1" >
<widget class="QComboBox" name="ialignCO" >
<property name="toolTip" >
<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="1" >
<widget class="QComboBox" name="valignCO" >
<property name="toolTip" >
<string>Vertical alignment of the box (with regard to baseline)</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>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="halignLA" >
<property name="toolTip" >
<string>Horizontal alignment of the content inside the box</string>
</property>
<property name="text" >
<string>Content hori&amp;zontal:</string>
</property>
<property name="buddy" >
<cstring>halignCO</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>
<property name="text" >
<string>Content &amp;vertical:</string>
</property>
<property name="buddy" >
<cstring>ialignCO</cstring>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="valignLA" >
<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>
</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="2" 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>
</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>
</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>
<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="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>
</layout> </layout>
</widget> </widget>
<pixmapfunction></pixmapfunction> <pixmapfunction></pixmapfunction>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>LengthCombo</class> <class>LengthCombo</class>
<extends></extends> <extends>QComboBox</extends>
<header>lengthcombo.h</header> <header>lengthcombo.h</header>
<container>0</container> <container>0</container>
<pixmap></pixmap> <pixmap></pixmap>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>typeCO</tabstop>
<tabstop>innerBoxCO</tabstop>
<tabstop>widthED</tabstop> <tabstop>widthED</tabstop>
<tabstop>widthUnitsLC</tabstop> <tabstop>widthUnitsLC</tabstop>
<tabstop>heightED</tabstop>
<tabstop>heightUnitsLC</tabstop>
<tabstop>ialignCO</tabstop>
<tabstop>halignCO</tabstop>
<tabstop>valignCO</tabstop> <tabstop>valignCO</tabstop>
<tabstop>restorePB</tabstop> <tabstop>restorePB</tabstop>
<tabstop>applyPB</tabstop>
<tabstop>okPB</tabstop> <tabstop>okPB</tabstop>
<tabstop>closePB</tabstop> <tabstop>closePB</tabstop>
<tabstop>applyPB</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>