Add option to reset to default booktabs lines

[lyx.git] / src / frontends / qt4 / ui / TabularUi.ui

diff --git a/src/frontends/qt4/ui/TabularUi.ui b/src/frontends/qt4/ui/TabularUi.ui
index 6385ac9ea67b9a60db73e9d20cc7293887026deb..4b266804992ee326f0bf33f9647df9cc8664a6bb 100644 (file)
--- a/src/frontends/qt4/ui/TabularUi.ui
+++ b/src/frontends/qt4/ui/TabularUi.ui
@@ -1,120 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>TabularUi</class>
- <widget class="QDialog" name="TabularUi">
+ <widget class="QWidget" name="TabularUi">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>378</width>
-    <height>401</height>
+    <width>726</width>
+    <height>585</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string/>
   </property>
-  <property name="sizeGripEnabled">
-   <bool>true</bool>
+  <property name="sizeGripEnabled" stdset="0">
+   <bool>false</bool>
   </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>9</number>
-   </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <item row="1" column="0">
-    <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QLabel" name="TextLabel1">
-       <property name="text">
-        <string>Current cell:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="tabularRowED">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>40</width>
-         <height>32767</height>
-        </size>
-       </property>
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="toolTip">
-        <string>Current row position</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="tabularColumnED">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>40</width>
-         <height>32767</height>
-        </size>
-       </property>
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="toolTip">
-        <string>Current column position</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Close</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
+  <layout class="QGridLayout" name="gridLayout_11">
    <item row="0" column="0">
     <widget class="QTabWidget" name="TabWidget">
      <property name="toolTip">
@@ -130,122 +32,181 @@
       <attribute name="title">
        <string>&amp;Table Settings</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_6">
-       <item row="0" column="0">
-        <widget class="QGroupBox" name="GroupBox12">
+      <layout class="QGridLayout" name="gridLayout_10">
+       <item row="1" column="0">
+        <widget class="QGroupBox" name="groupBox">
          <property name="title">
-          <string>Column settings</string>
+          <string>Row setting</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_5">
+         <property name="flat">
+          <bool>true</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_6">
           <item row="0" column="0">
-           <widget class="QLabel" name="hAlignCO">
-            <property name="text">
-             <string>&amp;Horizontal alignment:</string>
+           <widget class="QCheckBox" name="multirowCB">
+            <property name="toolTip">
+             <string>Merge cells of different rows</string>
             </property>
-            <property name="buddy">
-             <cstring>hAlignCB</cstring>
+            <property name="text">
+             <string>M&amp;ultirow</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="hAlignCB">
-            <property name="toolTip">
-             <string>Horizontal alignment in column</string>
-            </property>
+          <item row="1" column="0">
+           <layout class="QGridLayout" name="gridLayout_3">
+            <item row="0" column="0">
+             <widget class="QLabel" name="multirowOffsetLA">
+              <property name="toolTip">
+               <string/>
+              </property>
+              <property name="text">
+               <string>&amp;Vertical Offset:</string>
+              </property>
+              <property name="buddy">
+               <cstring>multirowOffsetED</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QLineEdit" name="multirowOffsetED">
+              <property name="enabled">
+               <bool>true</bool>
+              </property>
+              <property name="toolTip">
+               <string>Optional vertical offset</string>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="2">
+             <widget class="lyx::frontend::LengthCombo" name="multirowOffsetUnitLC"/>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QGroupBox" name="groupBox_2">
+         <property name="title">
+          <string>Cell setting</string>
+         </property>
+         <property name="flat">
+          <bool>true</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_5">
+          <item row="0" column="0">
+           <layout class="QHBoxLayout" name="horizontalLayout_3">
             <item>
-             <property name="text">
-              <string>Justified</string>
-             </property>
+             <widget class="QCheckBox" name="rotateCellCB">
+              <property name="toolTip">
+               <string>Rotate this cell by 90 degrees</string>
+              </property>
+              <property name="text">
+               <string>Rotate</string>
+              </property>
+             </widget>
             </item>
             <item>
-             <property name="text">
-              <string>Left</string>
-             </property>
+             <widget class="QSpinBox" name="rotateCellAngleSB">
+              <property name="maximumSize">
+               <size>
+                <width>51</width>
+                <height>20</height>
+               </size>
+              </property>
+              <property name="toolTip">
+               <string>rotation angle</string>
+              </property>
+              <property name="minimum">
+               <number>-180</number>
+              </property>
+              <property name="maximum">
+               <number>180</number>
+              </property>
+              <property name="singleStep">
+               <number>5</number>
+              </property>
+              <property name="value">
+               <number>90</number>
+              </property>
+             </widget>
             </item>
             <item>
-             <property name="text">
-              <string>Center</string>
-             </property>
+             <widget class="QLabel" name="rotateCellLA">
+              <property name="text">
+               <string>de&amp;grees</string>
+              </property>
+              <property name="buddy">
+               <cstring>rotateCellAngleSB</cstring>
+              </property>
+             </widget>
             </item>
             <item>
-             <property name="text">
-              <string>Right</string>
-             </property>
+             <spacer name="horizontalSpacer_3">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>13</width>
+                <height>41</height>
+               </size>
+              </property>
+             </spacer>
             </item>
-           </widget>
+           </layout>
           </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" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="fixedWidthColLA">
+         </layout>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="2">
+        <widget class="QGroupBox" name="tabAlignmentGB">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="title">
+          <string>Table-wide settings</string>
+         </property>
+         <property name="flat">
+          <bool>true</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_4">
+          <item row="0" column="0">
+           <widget class="QLabel" name="tabularWidthLA">
             <property name="text">
-             <string>&amp;Width:</string>
+             <string>W&amp;idth:</string>
             </property>
             <property name="buddy">
-             <cstring>widthED</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="widthED">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="toolTip">
-             <string>Fixed width of the column</string>
-            </property>
-            <property name="text">
-             <string/>
+             <cstring>tabularWidthED</cstring>
             </property>
            </widget>
           </item>
-          <item row="1" column="2">
-           <widget class="LengthCombo" name="widthUnitCB"/>
+          <item row="0" column="1">
+           <widget class="QLineEdit" name="tabularWidthED"/>
           </item>
-          <item row="1" column="3">
-           <spacer name="spacer_3">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Expanding</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>7</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
+          <item row="0" column="2">
+           <widget class="lyx::frontend::LengthCombo" name="tabularWidthUnitLC"/>
           </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="vAlignCO">
+          <item row="1" column="0">
+           <widget class="QLabel" name="TableAlignLA">
             <property name="text">
-             <string>&amp;Vertical alignment in row:</string>
+             <string>Verti&amp;cal alignment:</string>
             </property>
             <property name="buddy">
-             <cstring>vAlignCB</cstring>
+             <cstring>TableAlignCO</cstring>
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QComboBox" name="vAlignCB">
+          <item row="1" column="1">
+           <widget class="QComboBox" name="TableAlignCO">
             <property name="toolTip">
-             <string>Specifies the vertical alignment of this cell in relation to the baseline of the row.</string>
+             <string>Vertical alignment of the table</string>
+            </property>
+            <property name="currentIndex">
+             <number>1</number>
             </property>
             <item>
              <property name="text">
@@ -264,8 +225,8 @@
             </item>
            </widget>
           </item>
-          <item row="2" column="2">
-           <spacer name="spacer">
+          <item row="1" column="2">
+           <spacer name="spacer_2">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
@@ -274,154 +235,330 @@
             </property>
             <property name="sizeHint" stdset="0">
              <size>
-              <width>40</width>
+              <width>153</width>
               <height>20</height>
              </size>
             </property>
            </spacer>
           </item>
-          <item row="3" column="0">
-           <widget class="QCheckBox" name="multicolumnCB">
-            <property name="toolTip">
-             <string>Merge cells</string>
-            </property>
-            <property name="text">
-             <string>&amp;Multicolumn</string>
-            </property>
-           </widget>
+          <item row="1" column="3">
+           <layout class="QHBoxLayout" name="horizontalLayout_4">
+            <item>
+             <widget class="QCheckBox" name="rotateTabularCB">
+              <property name="enabled">
+               <bool>true</bool>
+              </property>
+              <property name="toolTip">
+               <string>Rotate the table by 90 degrees</string>
+              </property>
+              <property name="text">
+               <string>&amp;Rotate</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="rotateTabularAngleSB">
+              <property name="maximumSize">
+               <size>
+                <width>51</width>
+                <height>20</height>
+               </size>
+              </property>
+              <property name="toolTip">
+               <string>rotation angle</string>
+              </property>
+              <property name="minimum">
+               <number>-180</number>
+              </property>
+              <property name="maximum">
+               <number>180</number>
+              </property>
+              <property name="singleStep">
+               <number>5</number>
+              </property>
+              <property name="value">
+               <number>90</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="rotateTabularLA">
+              <property name="text">
+               <string>degrees</string>
+              </property>
+              <property name="buddy">
+               <cstring>rotateTabularAngleSB</cstring>
+              </property>
+             </widget>
+            </item>
+           </layout>
           </item>
          </layout>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QGroupBox" name="groupBox">
+       <item row="0" column="0" colspan="2">
+        <widget class="QGroupBox" name="GroupBox12">
          <property name="title">
-          <string>Cell setting</string>
+          <string>Column settings</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_3">
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="rotateCellCB">
-            <property name="toolTip">
-             <string>Rotate this cell by 90 degrees</string>
-            </property>
-            <property name="text">
-             <string>Rotate &amp;cell 90 degrees</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QGroupBox" name="tabAlignmentGB">
-         <property name="enabled">
+         <property name="flat">
           <bool>true</bool>
          </property>
-         <property name="title">
-          <string>Table-wide settings</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_4">
+         <layout class="QGridLayout" name="gridLayout_9">
           <item row="0" column="0">
-           <widget class="QLabel" name="TableAlignCO">
-            <property name="text">
-             <string>Verti&amp;cal alignment:</string>
-            </property>
-            <property name="buddy">
-             <cstring>vAlignCB</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="TableAlignCB">
-            <property name="toolTip">
-             <string>Vertical alignment of the table</string>
-            </property>
-            <property name="currentIndex">
-             <number>1</number>
-            </property>
-            <item>
-             <property name="text">
-              <string>Top</string>
-             </property>
+           <layout class="QGridLayout" name="gridLayout">
+            <item row="1" column="1">
+             <widget class="QComboBox" name="columnTypeCO">
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Column width type:&lt;/p&gt;&lt;p&gt;* Text Length: Stretch to text width&lt;/p&gt;&lt;p&gt;* Variable: Adjust to match table width&lt;/p&gt;&lt;p&gt;* Custom: Fixed custom width&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
+              <item>
+               <property name="text">
+                <string>Text length</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Variable[[Width]]</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Custom[[Width]]</string>
+               </property>
+              </item>
+             </widget>
             </item>
-            <item>
-             <property name="text">
-              <string>Middle</string>
-             </property>
+            <item row="0" column="1">
+             <widget class="QComboBox" name="hAlignCO">
+              <property name="toolTip">
+               <string>Horizontal alignment in column</string>
+              </property>
+              <item>
+               <property name="text">
+                <string>Justified</string>
+               </property>
+              </item>
+              <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>At Decimal Separator</string>
+               </property>
+              </item>
+             </widget>
             </item>
-            <item>
-             <property name="text">
-              <string>Bottom</string>
-             </property>
+            <item row="1" column="0">
+             <widget class="QLabel" name="columnWidthLA">
+              <property name="text">
+               <string>&amp;Width:</string>
+              </property>
+              <property name="buddy">
+               <cstring>columnTypeCO</cstring>
+              </property>
+             </widget>
             </item>
-           </widget>
+            <item row="2" column="2">
+             <spacer name="horizontalSpacer_2">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>109</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item row="0" column="0">
+             <widget class="QLabel" name="hAlignLA">
+              <property name="text">
+               <string>Hori&amp;zontal alignment:</string>
+              </property>
+              <property name="buddy">
+               <cstring>hAlignCO</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1">
+             <widget class="QComboBox" name="vAlignCO">
+              <property name="toolTip">
+               <string>Specifies the vertical alignment of this cell in relation to the baseline of the row.</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="text">
+               <string>&amp;Vertical alignment in row:</string>
+              </property>
+              <property name="buddy">
+               <cstring>vAlignCO</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="2">
+             <layout class="QHBoxLayout" name="horizontalLayout_2">
+              <item>
+               <widget class="QLineEdit" name="columnWidthED">
+                <property name="enabled">
+                 <bool>true</bool>
+                </property>
+                <property name="toolTip">
+                 <string>Custom width of the column</string>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="lyx::frontend::LengthCombo" name="columnWidthUnitLC"/>
+              </item>
+             </layout>
+            </item>
+            <item row="0" column="2">
+             <layout class="QHBoxLayout" name="horizontalLayout">
+              <item>
+               <widget class="QLabel" name="decimalLA">
+                <property name="enabled">
+                 <bool>false</bool>
+                </property>
+                <property name="text">
+                 <string>&amp;Decimal separator:</string>
+                </property>
+                <property name="buddy">
+                 <cstring>decimalPointED</cstring>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLineEdit" name="decimalPointED">
+                <property name="enabled">
+                 <bool>false</bool>
+                </property>
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="maximumSize">
+                 <size>
+                  <width>20</width>
+                  <height>16777215</height>
+                 </size>
+                </property>
+                <property name="inputMask">
+                 <string/>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+                <property name="maxLength">
+                 <number>32767</number>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignCenter</set>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>78</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </item>
+           </layout>
           </item>
-          <item row="0" column="2">
-           <spacer name="spacer_2">
+          <item row="0" column="1">
+           <spacer name="horizontalSpacer_5">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Expanding</enum>
-            </property>
             <property name="sizeHint" stdset="0">
              <size>
-              <width>153</width>
+              <width>31</width>
               <height>20</height>
              </size>
             </property>
            </spacer>
           </item>
-          <item row="1" column="0" colspan="2">
-           <widget class="QCheckBox" name="rotateTabularCB">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="multicolumnCB">
             <property name="toolTip">
-             <string>Rotate the table by 90 degrees</string>
+             <string>Merge cells of different columns</string>
             </property>
             <property name="text">
-             <string>&amp;Rotate table 90 degrees</string>
+             <string>Mu&amp;lticolumn</string>
             </property>
            </widget>
           </item>
+          <item row="2" column="0">
+           <layout class="QHBoxLayout" name="horizontalLayout_5">
+            <item>
+             <widget class="QLabel" name="specialAlignmentLA">
+              <property name="text">
+               <string>LaTe&amp;X argument:</string>
+              </property>
+              <property name="buddy">
+               <cstring>specialAlignmentED</cstring>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="specialAlignmentED">
+              <property name="toolTip">
+               <string>Custom column format (LaTeX)</string>
+              </property>
+              <property name="whatsThis">
+               <string/>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
          </layout>
         </widget>
        </item>
-       <item row="3" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <widget class="QLabel" name="specialAlignmentLA">
-           <property name="text">
-            <string>LaTe&amp;X argument:</string>
-           </property>
-           <property name="buddy">
-            <cstring>specialAlignmentED</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="specialAlignmentED">
-           <property name="toolTip">
-            <string>Custom column format (LaTeX)</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="4" column="0">
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>68</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="Borders">
@@ -434,13 +571,10 @@
          <property name="title">
           <string>Set Borders</string>
          </property>
+         <property name="flat">
+          <bool>true</bool>
+         </property>
          <layout class="QGridLayout">
-          <property name="margin">
-           <number>9</number>
-          </property>
-          <property name="spacing">
-           <number>6</number>
-          </property>
           <item row="0" column="0">
            <widget class="QFrame" name="bordersF">
             <property name="sizePolicy">
@@ -605,6 +739,15 @@
                  </color>
                 </brush>
                </colorrole>
+               <colorrole role="PlaceholderText">
+                <brush brushstyle="NoBrush">
+                 <color alpha="128">
+                  <red>0</red>
+                  <green>0</green>
+                  <blue>0</blue>
+                 </color>
+                </brush>
+               </colorrole>
               </active>
               <inactive>
                <colorrole role="WindowText">
@@ -760,6 +903,15 @@
                  </color>
                 </brush>
                </colorrole>
+               <colorrole role="PlaceholderText">
+                <brush brushstyle="NoBrush">
+                 <color alpha="128">
+                  <red>0</red>
+                  <green>0</green>
+                  <blue>0</blue>
+                 </color>
+                </brush>
+               </colorrole>
               </inactive>
               <disabled>
                <colorrole role="WindowText">
@@ -915,6 +1067,15 @@
                  </color>
                 </brush>
                </colorrole>
+               <colorrole role="PlaceholderText">
+                <brush brushstyle="NoBrush">
+                 <color alpha="128">
+                  <red>0</red>
+                  <green>0</green>
+                  <blue>0</blue>
+                 </color>
+                </brush>
+               </colorrole>
               </disabled>
              </palette>
             </property>
@@ -925,12 +1086,6 @@
              <enum>QFrame::Sunken</enum>
             </property>
             <layout class="QGridLayout">
-             <property name="margin">
-              <number>9</number>
-             </property>
-             <property name="spacing">
-              <number>6</number>
-             </property>
              <item row="0" column="0">
               <widget class="GuiSetBorder" name="borders" native="true">
                <property name="sizePolicy">
@@ -955,13 +1110,10 @@
          <property name="title">
           <string>All Borders</string>
          </property>
+         <property name="flat">
+          <bool>true</bool>
+         </property>
          <layout class="QGridLayout">
-          <property name="margin">
-           <number>9</number>
-          </property>
-          <property name="spacing">
-           <number>6</number>
-          </property>
           <item row="0" column="0">
            <widget class="QPushButton" name="borderSetPB">
             <property name="toolTip">
@@ -990,33 +1142,40 @@
          <property name="title">
           <string>Style</string>
          </property>
+         <property name="flat">
+          <bool>true</bool>
+         </property>
          <layout class="QGridLayout">
-          <property name="margin">
-           <number>9</number>
-          </property>
-          <property name="spacing">
-           <number>6</number>
-          </property>
-          <item row="1" column="0">
-           <widget class="QRadioButton" name="booktabsRB">
+          <item row="0" column="0">
+           <widget class="QRadioButton" name="borderDefaultRB">
             <property name="toolTip">
-             <string>Use formal (a.k.a. booktabs) border style (no vertical borders)</string>
+             <string>Use default (grid-like) border style</string>
             </property>
             <property name="text">
-             <string>Fo&amp;rmal</string>
+             <string>De&amp;fault</string>
             </property>
-            <property name="checked">
-             <bool>true</bool>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QCheckBox" name="resetFormalCB">
+            <property name="toolTip">
+             <string>If this is checked, the table will be reset to the formal default style (only top and bottom row have vertical lines)</string>
+            </property>
+            <property name="text">
+             <string>Use Default &amp;Formal Style</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="0">
-           <widget class="QRadioButton" name="borderDefaultRB">
+          <item row="1" column="0">
+           <widget class="QRadioButton" name="booktabsRB">
             <property name="toolTip">
-             <string>Use default (grid-like) border style</string>
+             <string>Use formal (a.k.a. booktabs) border style (no vertical borders)</string>
             </property>
             <property name="text">
-             <string>De&amp;fault</string>
+             <string>Fo&amp;rmal</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
             </property>
            </widget>
           </item>
@@ -1039,31 +1198,12 @@
          </property>
         </spacer>
        </item>
-       <item row="1" column="1">
-        <spacer name="spacer_4">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>44</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="2" column="0" colspan="4">
+       <item row="1" column="0" colspan="4">
         <widget class="QGroupBox" name="SpaceGB">
          <property name="title">
           <string>Additional Space</string>
          </property>
          <layout class="QGridLayout">
-          <property name="margin">
-           <number>9</number>
-          </property>
-          <property name="spacing">
-           <number>6</number>
-          </property>
           <item row="0" column="0">
            <widget class="QLabel" name="topspaceLA">
             <property name="text">
@@ -1078,7 +1218,7 @@
            <widget class="QLineEdit" name="topspaceED"/>
           </item>
           <item row="0" column="3">
-           <widget class="LengthCombo" name="topspaceUnit"/>
+           <widget class="lyx::frontend::LengthCombo" name="topspaceUnitLC"/>
           </item>
           <item row="0" column="1">
            <widget class="QComboBox" name="topspaceCO">
@@ -1119,7 +1259,7 @@
            </widget>
           </item>
           <item row="1" column="3">
-           <widget class="LengthCombo" name="bottomspaceUnit"/>
+           <widget class="lyx::frontend::LengthCombo" name="bottomspaceUnitLC"/>
           </item>
           <item row="1" column="2">
            <widget class="QLineEdit" name="bottomspaceED"/>
@@ -1167,20 +1307,20 @@
            </widget>
           </item>
           <item row="2" column="3">
-           <widget class="LengthCombo" name="interlinespaceUnit"/>
+           <widget class="lyx::frontend::LengthCombo" name="interlinespaceUnitLC"/>
           </item>
          </layout>
         </widget>
        </item>
-       <item row="3" column="1">
-        <spacer>
+       <item row="2" column="1">
+        <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
-           <height>43</height>
+           <height>90</height>
           </size>
          </property>
         </spacer>
@@ -1189,7 +1329,7 @@
      </widget>
      <widget class="QWidget" name="Longtables">
       <attribute name="title">
-       <string>&amp;Longtable</string>
+       <string>&amp;Multi-Page Table</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_7">
        <item row="0" column="0">
@@ -1198,7 +1338,7 @@
           <string>Select for tables that span multiple pages</string>
          </property>
          <property name="text">
-          <string>&amp;Use long table</string>
+          <string>&amp;Use multi-page table</string>
          </property>
         </widget>
        </item>
@@ -1425,10 +1565,13 @@
           <bool>false</bool>
          </property>
          <property name="toolTip">
-          <string>Horizontal alignment of the longtable</string>
+          <string>Horizontal alignment of the multi-page table</string>
          </property>
          <property name="title">
-          <string>Longtable alignment</string>
+          <string>Multi-page table alignment</string>
+         </property>
+         <property name="flat">
+          <bool>true</bool>
          </property>
          <layout class="QGridLayout" name="gridLayout9">
           <item row="0" column="0">
@@ -1441,7 +1584,7 @@
           <item row="0" column="1">
            <widget class="QRadioButton" name="centerRB">
             <property name="text">
-             <string>Center</string>
+             <string>&amp;Center</string>
             </property>
             <property name="checked">
              <bool>true</bool>
@@ -1451,7 +1594,7 @@
           <item row="0" column="2">
            <widget class="QRadioButton" name="rightRB">
             <property name="text">
-             <string>Right</string>
+             <string>Ri&amp;ght</string>
             </property>
            </widget>
           </item>
@@ -1475,11 +1618,82 @@
      </widget>
     </widget>
    </item>
+   <item row="1" column="0">
+    <layout class="QHBoxLayout" name="_3">
+     <item>
+      <widget class="QLabel" name="TextLabel1">
+       <property name="text">
+        <string>Current cell:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="tabularRowED">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>40</width>
+         <height>32767</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="toolTip">
+        <string>Current row position</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="tabularColumnED">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>40</width>
+         <height>32767</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="toolTip">
+        <string>Current column position</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>LengthCombo</class>
+   <class>lyx::frontend::LengthCombo</class>
    <extends>QComboBox</extends>
    <header>LengthCombo.h</header>
   </customwidget>
@@ -1490,29 +1704,35 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>TabWidget</tabstop>
-  <tabstop>hAlignCB</tabstop>
-  <tabstop>widthED</tabstop>
-  <tabstop>widthUnitCB</tabstop>
-  <tabstop>vAlignCB</tabstop>
+  <tabstop>hAlignCO</tabstop>
+  <tabstop>decimalPointED</tabstop>
+  <tabstop>columnWidthED</tabstop>
+  <tabstop>columnWidthUnitLC</tabstop>
+  <tabstop>vAlignCO</tabstop>
   <tabstop>multicolumnCB</tabstop>
-  <tabstop>rotateTabularCB</tabstop>
-  <tabstop>rotateCellCB</tabstop>
   <tabstop>specialAlignmentED</tabstop>
-  <tabstop>closePB</tabstop>
-  <tabstop>borderSetPB</tabstop>
-  <tabstop>borderUnsetPB</tabstop>
+  <tabstop>multirowCB</tabstop>
+  <tabstop>multirowOffsetED</tabstop>
+  <tabstop>multirowOffsetUnitLC</tabstop>
+  <tabstop>rotateCellCB</tabstop>
+  <tabstop>rotateCellAngleSB</tabstop>
+  <tabstop>tabularWidthED</tabstop>
+  <tabstop>tabularWidthUnitLC</tabstop>
+  <tabstop>TableAlignCO</tabstop>
+  <tabstop>rotateTabularCB</tabstop>
+  <tabstop>rotateTabularAngleSB</tabstop>
   <tabstop>borderDefaultRB</tabstop>
+  <tabstop>borderUnsetPB</tabstop>
   <tabstop>booktabsRB</tabstop>
   <tabstop>topspaceCO</tabstop>
-  <tabstop>bottomspaceCO</tabstop>
-  <tabstop>interlinespaceCO</tabstop>
   <tabstop>topspaceED</tabstop>
+  <tabstop>topspaceUnitLC</tabstop>
+  <tabstop>bottomspaceCO</tabstop>
   <tabstop>bottomspaceED</tabstop>
+  <tabstop>bottomspaceUnitLC</tabstop>
+  <tabstop>interlinespaceCO</tabstop>
   <tabstop>interlinespaceED</tabstop>
-  <tabstop>topspaceUnit</tabstop>
-  <tabstop>bottomspaceUnit</tabstop>
-  <tabstop>interlinespaceUnit</tabstop>
+  <tabstop>interlinespaceUnitLC</tabstop>
   <tabstop>longTabularCB</tabstop>
   <tabstop>headerStatusCB</tabstop>
   <tabstop>headerBorderAboveCB</tabstop>
@@ -1528,7 +1748,13 @@
   <tabstop>lastfooterBorderAboveCB</tabstop>
   <tabstop>lastfooterBorderBelowCB</tabstop>
   <tabstop>lastfooterNoContentsCB</tabstop>
+  <tabstop>captionStatusCB</tabstop>
   <tabstop>newpageCB</tabstop>
+  <tabstop>leftRB</tabstop>
+  <tabstop>centerRB</tabstop>
+  <tabstop>rightRB</tabstop>
+  <tabstop>borderSetPB</tabstop>
+  <tabstop>TabWidget</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>