The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 4ab764c845e54cd88024d80f83cc5d923ef01b12 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Tue Jun 26 22:46:06 2012 +0200 BoxUi.ui: revert unintended commit [a6e42e50/lyxgit] diff --git a/src/frontends/qt4/ui/BoxUi.ui b/src/frontends/qt4/ui/BoxUi.ui index 867aa71..9a6fd9a 100644 --- a/src/frontends/qt4/ui/BoxUi.ui +++ b/src/frontends/qt4/ui/BoxUi.ui @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> <class>BoxUi</class> <widget class="QWidget" name="BoxUi"> @@ -16,121 +15,13 @@ <property name="sizeGripEnabled" stdset="0"> <bool>true</bool> </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="typeLA"> - <property name="toolTip"> - <string/> - </property> - <property name="text"> - <string>&Decoration:</string> - </property> - <property name="buddy"> - <cstring>typeCO</cstring> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QComboBox" name="typeCO"> - <property name="toolTip"> - <string>Supported box types</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="innerBoxLA"> - <property name="toolTip"> - <string/> - </property> - <property name="text"> - <string>Inner Bo&x:</string> - </property> - <property name="buddy"> - <cstring>innerBoxCO</cstring> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QComboBox" name="innerBoxCO"> - <property name="toolTip"> - <string>Inner box -- needed for fixed width & 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="2" column="0"> - <widget class="QCheckBox" name="widthCB"> - <property name="toolTip"> - <string/> - </property> - <property name="text"> - <string>&Width:</string> - </property> - <property name="checked"> - <bool>false</bool> - </property> - <property name="tristate"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QLineEdit" name="widthED"> - <property name="toolTip"> - <string>Width value</string> - </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="LengthCombo" name="widthUnitsLC"/> - </item> - <item row="3" column="0"> - <widget class="QCheckBox" name="heightCB"> - <property name="toolTip"> - <string/> - </property> - <property name="text"> - <string>&Height:</string> - </property> - <property name="checked"> - <bool>false</bool> - </property> - <property name="tristate"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QLineEdit" name="heightED"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Height value</string> - </property> - </widget> - </item> - <item row="3" column="2"> - <widget class="LengthCombo" name="heightUnitsLC"> - <property name="enabled"> - <bool>false</bool> - </property> - </widget> - </item> + <layout class="QGridLayout"> + <property name="margin"> + <number>9</number> + </property> + <property name="spacing"> + <number>6</number> + </property> <item row="4" column="0" colspan="2"> <widget class="QCheckBox" name="pagebreakCB"> <property name="toolTip"> @@ -290,6 +181,117 @@ </layout> </widget> </item> + <item row="3" column="2"> + <widget class="LengthCombo" name="heightUnitsLC"> + <property name="enabled"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QCheckBox" name="heightCB"> + <property name="toolTip"> + <string/> + </property> + <property name="text"> + <string>&Height:</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + <property name="tristate"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="innerBoxLA"> + <property name="toolTip"> + <string/> + </property> + <property name="text"> + <string>Inner Bo&x:</string> + </property> + <property name="buddy"> + <cstring>innerBoxCO</cstring> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="LengthCombo" name="widthUnitsLC"/> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="typeLA"> + <property name="toolTip"> + <string/> + </property> + <property name="text"> + <string>&Decoration:</string> + </property> + <property name="buddy"> + <cstring>typeCO</cstring> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="widthLA"> + <property name="toolTip"> + <string/> + </property> + <property name="text"> + <string>&Width:</string> + </property> + <property name="buddy"> + <cstring>widthED</cstring> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QLineEdit" name="heightED"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Height value</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLineEdit" name="widthED"> + <property name="toolTip"> + <string>Width value</string> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="QComboBox" name="innerBoxCO"> + <property name="toolTip"> + <string>Inner box -- needed for fixed width & 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> </layout> </widget> <customwidgets> @@ -348,37 +350,5 @@ </hint> </hints> </connection> - <connection> - <sender>widthCB</sender> - <signal>toggled(bool)</signal> - <receiver>widthED</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>37</x> - <y>70</y> - </hint> - <hint type="destinationlabel"> - <x>124</x> - <y>70</y> - </hint> - </hints> - </connection> - <connection> - <sender>widthCB</sender> - <signal>toggled(bool)</signal> - <receiver>widthUnitsLC</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>37</x> - <y>70</y> - </hint> - <hint type="destinationlabel"> - <x>217</x> - <y>70</y> - </hint> - </hints> - </connection> </connections> </ui> ----------------------------------------------------------------------- Summary of changes: src/frontends/qt4/ui/BoxUi.ui | 266 ++++++++++++++++++----------------------- 1 files changed, 118 insertions(+), 148 deletions(-) hooks/post-receive -- The LyX Source Repository