GuiBox: fix bug 3242 http://bugzilla.lyx.org/show_bug.cgi?id=3242:

        make minipage optional height argument optional

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

diff --git a/src/frontends/qt4/GuiBox.cpp b/src/frontends/qt4/GuiBox.cpp
index 8e412a9c0843d571bdb3ca4ae7444b0b535a759c..a90238b3cddb829de3ae9966cce66040a29bcd65 100644 (file)
--- a/src/frontends/qt4/GuiBox.cpp
+++ b/src/frontends/qt4/GuiBox.cpp
@@ -63,6 +63,8 @@ GuiBoxDialog::GuiBoxDialog(LyXView & lv)
                this, SLOT(change_adaptor()));
        connect(valignCO, SIGNAL(highlighted(const QString &)),
                this, SLOT(change_adaptor()));
+       connect(heightCB, SIGNAL(stateChanged(int)),
+               this, SLOT(change_adaptor()));
        connect(heightED, SIGNAL(textChanged(const QString &)),
                this, SLOT(change_adaptor()));
        connect(heightUnitsLC, SIGNAL(selectionChanged(lyx::Length::UNIT) ),
@@ -70,6 +72,7 @@ GuiBoxDialog::GuiBoxDialog(LyXView & lv)
        connect(restorePB, SIGNAL(clicked()), this, SLOT(restoreClicked()));
        connect(typeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
        connect(typeCO, SIGNAL(activated(int)), this, SLOT(typeChanged(int)));
+       connect(heightCB, SIGNAL(stateChanged(int)), this, SLOT(heightChecked(int)));
        connect(halignCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
        connect(ialignCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
        connect(innerBoxCO, SIGNAL(activated(const QString&)),
@@ -87,8 +90,9 @@ GuiBoxDialog::GuiBoxDialog(LyXView & lv)
        bc().addReadOnly(ialignCO);
        bc().addReadOnly(halignCO);
        bc().addReadOnly(widthED);
-       bc().addReadOnly(heightED);
        bc().addReadOnly(widthUnitsLC);
+       bc().addReadOnly(heightCB);
+       bc().addReadOnly(heightED);
        bc().addReadOnly(heightUnitsLC);
 
        bc().setRestore(restorePB);
@@ -98,7 +102,7 @@ GuiBoxDialog::GuiBoxDialog(LyXView & lv)
 
        // initialize the length validator
        bc().addCheckedLineEdit(widthED, widthLA);
-       bc().addCheckedLineEdit(heightED, heightLA);
+       bc().addCheckedLineEdit(heightED, heightCB);
 }
 
 
@@ -127,8 +131,11 @@ void GuiBoxDialog::innerBoxChanged(const QString & str)
        valignCO->setEnabled(ibox);
        ialignCO->setEnabled(ibox);
        halignCO->setEnabled(!ibox);
-       heightED->setEnabled(ibox);
-       heightUnitsLC->setEnabled(ibox);
+       heightCB->setEnabled(ibox);
+       if (heightCB->checkState() == Qt::Checked && ibox) {
+               heightED->setEnabled(true);
+               heightUnitsLC->setEnabled(true);
+       }
        setSpecial(ibox);
 }
 
@@ -140,6 +147,7 @@ void GuiBoxDialog::typeChanged(int index)
                valignCO->setEnabled(true);
                ialignCO->setEnabled(true);
                halignCO->setEnabled(false);
+               heightCB->setEnabled(true);
                heightED->setEnabled(true);
                heightUnitsLC->setEnabled(true);
                setSpecial(true);
@@ -149,11 +157,23 @@ void GuiBoxDialog::typeChanged(int index)
 }
 
 
+void GuiBoxDialog::heightChecked(int checkState)
+{
+       if (checkState == Qt::Unchecked) {
+               heightED->setEnabled(false);
+               heightUnitsLC->setEnabled(false);
+       } else { 
+               heightED->setEnabled(true);
+               heightUnitsLC->setEnabled(true);
+       }
+}
+
 void GuiBoxDialog::restoreClicked()
 {
        setInnerType(true, 2);
        widthED->setText("100");
        widthUnitsLC->setCurrentItem(Length::PCW);
+       heightCB->setCheckState(Qt::Checked);
        heightED->setText("1");
        for (int j = 0; j < heightUnitsLC->count(); j++) {
                if (heightUnitsLC->itemText(j) == qt_("Total Height"))
@@ -230,9 +250,7 @@ void GuiBoxDialog::updateContents()
                        }
                }
        }
-
-       heightED->setEnabled(ibox);
-       heightUnitsLC->setEnabled(ibox);
+       heightCB->setEnabled(ibox);
 }
 
 
@@ -319,7 +337,16 @@ void GuiBoxDialog::applyView()
        } else
                height = widgetsToLength(heightED, heightUnitsLC);
 
-       controller().params().height = Length(height);
+       // the height parameter is omitted in InsetBox.cpp when the value
+       // is "1in" and "Total Height" is used as unit.
+       // 1in + "Total Height" means "1\height" which is the LaTeX default when
+       // no height is given
+       if (heightCB->checkState() == Qt::Checked)
+               controller().params().height = Length(height);
+       else {
+               controller().params().height = Length("1in");
+               controller().params().height_special = ids_spec_[3];
+       }
 }
 
 

diff --git a/src/frontends/qt4/GuiBox.h b/src/frontends/qt4/GuiBox.h
index 938721a285d744fe5c320898fcd372414f600624..d3513cf7ab5d553cec208256de0f512fbd7f7207 100644 (file)
--- a/src/frontends/qt4/GuiBox.h
+++ b/src/frontends/qt4/GuiBox.h
@@ -33,6 +33,7 @@ private Q_SLOTS:
        void change_adaptor();
        void innerBoxChanged(const QString &);
        void typeChanged(int);
+       void heightChecked(int);
        void restoreClicked();
 
 private:

diff --git a/src/frontends/qt4/ui/BoxUi.ui b/src/frontends/qt4/ui/BoxUi.ui
index 02944c5fefd59d3bc8571ca4f97778f24bc4ddc4..eee1688de5a9c5b8b0e2d25d9ffd6adc4d6a1190 100644 (file)
--- a/src/frontends/qt4/ui/BoxUi.ui
+++ b/src/frontends/qt4/ui/BoxUi.ui
@@ -1,15 +1,12 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>BoxUi</class>
  <widget class="QDialog" name="BoxUi" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>333</width>
-    <height>274</height>
+    <width>348</width>
+    <height>256</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -18,361 +15,400 @@
   <property name="sizeGripEnabled" >
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
+  <widget class="QWidget" name="layoutWidget" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>220</y>
+     <width>328</width>
+     <height>27</height>
+    </rect>
    </property>
-   <property name="spacing" >
-    <number>6</number>
+   <layout class="QHBoxLayout" >
+    <property name="margin" >
+     <number>0</number>
+    </property>
+    <property name="spacing" >
+     <number>6</number>
+    </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>
+  </widget>
+  <widget class="QWidget" name="layoutWidget" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>80</y>
+     <width>321</width>
+     <height>24</height>
+    </rect>
    </property>
-   <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>
+   <layout class="QHBoxLayout" >
+    <property name="margin" >
+     <number>1</number>
+    </property>
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+    <item>
+     <widget class="QCheckBox" name="heightCB" >
+      <property name="toolTip" >
+       <string/>
+      </property>
       <property name="text" >
-       <string>None</string>
+       <string>&amp;Height (optional):</string>
+      </property>
+      <property name="checked" >
+       <bool>true</bool>
+      </property>
+      <property name="tristate" >
+       <bool>false</bool>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <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>
+     <widget class="LengthCombo" name="heightUnitsLC" />
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" name="layoutWidget" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>321</width>
+     <height>70</height>
+    </rect>
+   </property>
+   <layout class="QGridLayout" >
+    <property name="margin" >
+     <number>0</number>
+    </property>
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+    <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="0" column="1" colspan="2" >
+     <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>
-     </item>
-     <item>
       <property name="text" >
-       <string>Parbox</string>
+       <string>Inner Bo&amp;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>
-     </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="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>Inner Bo&amp;x:</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>&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" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <widget class="QPushButton" name="restorePB" >
-       <property name="toolTip" >
-        <string/>
-       </property>
+       <string>&amp;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>&amp;Width:</string>
+      </property>
+      <property name="buddy" >
+       <cstring>widthED</cstring>
+      </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 &amp; line breaks</string>
+      </property>
+      <item>
        <property name="text" >
-        <string>&amp;Restore</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
+        <string>None</string>
        </property>
-       <property name="default" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
+      </item>
+      <item>
+       <property name="text" >
+        <string>Parbox</string>
        </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
+      </item>
+      <item>
+       <property name="text" >
+        <string>Minipage</string>
        </property>
-       <property name="sizeHint" >
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
+      </item>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QGroupBox" name="groupBox_2" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>110</y>
+     <width>321</width>
+     <height>104</height>
+    </rect>
+   </property>
+   <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>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="okPB" >
-       <property name="toolTip" >
-        <string/>
+      </item>
+      <item>
+       <property name="text" >
+        <string>Center</string>
        </property>
+      </item>
+      <item>
        <property name="text" >
-        <string>&amp;OK</string>
+        <string>Right</string>
        </property>
-       <property name="default" >
-        <bool>true</bool>
+      </item>
+      <item>
+       <property name="text" >
+        <string>Stretch</string>
        </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="applyPB" >
-       <property name="toolTip" >
-        <string/>
+      </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>&amp;Apply</string>
+        <string>Middle</string>
        </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
+      </item>
+      <item>
+       <property name="text" >
+        <string>Bottom</string>
        </property>
-       <property name="default" >
-        <bool>false</bool>
+      </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>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB" >
+      </item>
+      <item>
        <property name="text" >
-        <string>&amp;Close</string>
+        <string>Middle</string>
        </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
+      </item>
+      <item>
+       <property name="text" >
+        <string>Bottom</string>
        </property>
-       <property name="default" >
-        <bool>false</bool>
+      </item>
+      <item>
+       <property name="text" >
+        <string>Stretch</string>
        </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
+      </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>
  </widget>
- <pixmapfunction></pixmapfunction>
- <includes>
-  <include location="local" >qt_helpers.h</include>
- </includes>
  <customwidgets>
   <customwidget>
    <class>LengthCombo</class>
    <extends>QComboBox</extends>
    <header>LengthCombo.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
  </customwidgets>
  <tabstops>
@@ -380,6 +416,7 @@
   <tabstop>innerBoxCO</tabstop>
   <tabstop>widthED</tabstop>
   <tabstop>widthUnitsLC</tabstop>
+  <tabstop>heightCB</tabstop>
   <tabstop>heightED</tabstop>
   <tabstop>heightUnitsLC</tabstop>
   <tabstop>ialignCO</tabstop>
@@ -390,6 +427,9 @@
   <tabstop>closePB</tabstop>
   <tabstop>applyPB</tabstop>
  </tabstops>
+ <includes>
+  <include location="local" >qt_helpers.h</include>
+ </includes>
  <resources/>
  <connections/>
 </ui>

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 22c40260541585b2ab2ad5e9a45ea27a1ca418ed..4d52aec2e98ec674395e1b355bc019eb19aac32a 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -333,14 +333,16 @@ int InsetBox::latex(Buffer const & buf, odocstream & os,
                os << "[" << params_.pos << "]";
                if (params_.height_special == "none") {
                        // FIXME UNICODE
-                       os << '[' << from_ascii(params_.height.asLatexString())
-                          << ']';
+                       os << "[" << from_ascii(params_.height.asLatexString()) << "]";
                } else {
                        // Special heights
-                       // FIXME UNICODE
-                       os << "[" << params_.height.value()
-                          << '\\' << from_utf8(params_.height_special)
-                          << ']';
+                       // set no optional argument when the value is the default "1\height"
+                       // (special units like \height are handled as "in")
+                       if (params_.height != Length("1in")) {
+                               // FIXME UNICODE
+                               os << "[" << params_.height.value()
+                                       << "\\" << from_utf8(params_.height_special) << "]";
+                       }
                }
                if (params_.inner_pos != params_.pos)
                        os << "[" << params_.inner_pos << "]";

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 7ced6e3c2a8695fe91f135abbacd208990c29c13..7a86b240f0ad37c5f7fa72a1f981d3337570125c 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -430,7 +430,7 @@ bool getTokenValue(string const & str, char const * token, bool & flag)
 
 bool getTokenValue(string const & str, char const * token, Length & len)
 {
-       // set the lenght to be zero() as default as this it should be if not
+       // set the length to be zero() as default as this it should be if not
        // in the file format.
        len = Length();
        string tmp;