Use EmptyTable widget in TabularCreate dialog.

Fixes #3155.

diff --git a/src/frontends/qt4/GuiTabularCreate.cpp b/src/frontends/qt4/GuiTabularCreate.cpp
index 12641443a2468e58126da12a26954eac33cbf8fd..96bbe1a790314f9d34093e5b23f9feb16e363203 100644 (file)
--- a/src/frontends/qt4/GuiTabularCreate.cpp
+++ b/src/frontends/qt4/GuiTabularCreate.cpp
@@ -32,6 +32,16 @@ GuiTabularCreate::GuiTabularCreate(GuiView & lv)
 
        rowsSB->setValue(5);
        columnsSB->setValue(5);
+       table->setMinimumSize(100, 100);
+
+       connect(table, SIGNAL(rowsChanged(int)),
+               rowsSB, SLOT(setValue(int)));
+       connect(table, SIGNAL(colsChanged(int)),
+               columnsSB, SLOT(setValue(int)));
+       connect(rowsSB, SIGNAL(valueChanged(int)),
+               table, SLOT(setNumberRows(int)));
+       connect(columnsSB, SIGNAL(valueChanged(int)),
+               table, SLOT(setNumberColumns(int)));
 
        connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
        connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));

diff --git a/src/frontends/qt4/ui/TabularCreateUi.ui b/src/frontends/qt4/ui/TabularCreateUi.ui
index 49613d26dd45923f64c16f9d0c44fca81b4ee1a7..63c75e84166a3a56e05e9407b0f36d652839a235 100644 (file)
--- a/src/frontends/qt4/ui/TabularCreateUi.ui
+++ b/src/frontends/qt4/ui/TabularCreateUi.ui
@@ -1,57 +1,132 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>TabularCreateUi</class>
- <widget class="QDialog" name="TabularCreateUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="TabularCreateUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>198</width>
-    <height>125</height>
+    <width>349</width>
+    <height>298</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="2" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="QLabel" name="rowsL">
+         <property name="toolTip">
+          <string>Number of rows</string>
+         </property>
+         <property name="text">
+          <string>&amp;Rows:</string>
+         </property>
+         <property name="buddy">
+          <cstring>rowsSB</cstring>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="rowsSB">
+         <property name="toolTip">
+          <string>Number of rows</string>
+         </property>
+         <property name="buttonSymbols">
+          <enum>QAbstractSpinBox::PlusMinus</enum>
+         </property>
+         <property name="minimum">
+          <number>1</number>
+         </property>
+         <property name="maximum">
+          <number>511</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="QLabel" name="columnsL">
+         <property name="toolTip">
+          <string>Number of columns</string>
+         </property>
+         <property name="text">
+          <string>&amp;Columns:</string>
+         </property>
+         <property name="buddy">
+          <cstring>columnsSB</cstring>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="columnsSB">
+         <property name="toolTip">
+          <string>Number of columns</string>
+         </property>
+         <property name="buttonSymbols">
+          <enum>QAbstractSpinBox::PlusMinus</enum>
+         </property>
+         <property name="minimum">
+          <number>1</number>
+         </property>
+         <property name="maximum">
+          <number>511</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item row="0" column="1">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>69</width>
+       <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="3" column="0" colspan="3" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="1" column="0" colspan="2">
+    <widget class="EmptyTable" name="table" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="toolTip">
+      <string>Resize this to the correct table dimensions</string>
      </property>
-     <item>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <layout class="QGridLayout" name="gridLayout">
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item row="0" column="0">
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Expanding</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>20</height>
@@ -59,108 +134,44 @@
        </property>
       </spacer>
      </item>
-     <item>
-      <widget class="QPushButton" name="okPB" >
-       <property name="text" >
+     <item row="0" column="1">
+      <widget class="QPushButton" name="okPB">
+       <property name="text">
         <string>&amp;OK</string>
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="closePB" >
-       <property name="text" >
+     <item row="0" column="2">
+      <widget class="QPushButton" name="closePB">
+       <property name="text">
         <string>Close</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="rowsL" >
-     <property name="toolTip" >
-      <string>Number of rows</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Rows:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>rowsSB</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>58</width>
-       <height>22</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="columnsL" >
-     <property name="toolTip" >
-      <string>Number of columns</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Columns:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>columnsSB</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" >
-    <widget class="QSpinBox" name="rowsSB" >
-     <property name="toolTip" >
-      <string>Number of rows</string>
-     </property>
-     <property name="buttonSymbols" >
-      <enum>QAbstractSpinBox::PlusMinus</enum>
-     </property>
-     <property name="maximum" >
-      <number>511</number>
-     </property>
-     <property name="minimum" >
-      <number>1</number>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" >
-    <widget class="QSpinBox" name="columnsSB" >
-     <property name="toolTip" >
-      <string>Number of columns</string>
-     </property>
-     <property name="buttonSymbols" >
-      <enum>QAbstractSpinBox::PlusMinus</enum>
-     </property>
-     <property name="maximum" >
-      <number>511</number>
-     </property>
-     <property name="minimum" >
-      <number>1</number>
-     </property>
-    </widget>
-   </item>
   </layout>
+  <zorder>layoutWidget</zorder>
+  <zorder>layoutWidget</zorder>
+  <zorder>table</zorder>
+  <zorder>horizontalSpacer</zorder>
  </widget>
- <pixmapfunction></pixmapfunction>
- <includes>
-  <include location="local" >qt_i18n.h</include>
- </includes>
+ <customwidgets>
+  <customwidget>
+   <class>EmptyTable</class>
+   <extends>QWidget</extends>
+   <header>EmptyTable.h</header>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>rowsSB</tabstop>
   <tabstop>columnsSB</tabstop>
   <tabstop>okPB</tabstop>
   <tabstop>closePB</tabstop>
  </tabstops>
+ <includes>
+  <include location="local">qt_i18n.h</include>
+ </includes>
  <resources/>
  <connections/>
 </ui>