fix minipage layout

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index b71fdf833ed791f5f0bc15509e5180fdeb9cf75b..ad1e03c786296665d10ef3776740b50a2d6e42e8 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-06  John Levon  <moz@compsoc.man.ac.uk>
+
+       * ui/QMinipageDialog.ui: fix layout, remove old slot
+ 
+       * QRefDialog.C: fix warning
+ 
 2001-09-02  Edwin Leuven  <leuven@fee.uva.nl>
 
        * ui/QSpellcheckerDialog.ui: reworded layout

diff --git a/src/frontends/qt2/QRefDialog.C b/src/frontends/qt2/QRefDialog.C
index 4530a3ea0f55e5c8d217c628b302057248cd080f..32ba84dcbe08de517c5bb8610892a76102083bea 100644 (file)
--- a/src/frontends/qt2/QRefDialog.C
+++ b/src/frontends/qt2/QRefDialog.C
@@ -59,7 +59,7 @@ void QRefDialog::refHighlighted(const QString & sel)
 }
 
  
-void QRefDialog::refSelected(const QString & sel)
+void QRefDialog::refSelected(const QString &)
 {
        form_->gotoRef();
 }

diff --git a/src/frontends/qt2/QSpellchecker.C b/src/frontends/qt2/QSpellchecker.C
index d463f4cb5a63d2899041ac553e9da5c5aafa6a08..f84d2221aad6179ada684eaed697e823511edb0a 100644 (file)
--- a/src/frontends/qt2/QSpellchecker.C
+++ b/src/frontends/qt2/QSpellchecker.C
@@ -7,7 +7,7 @@
  */
 
 #include <config.h>
-
+ 
 #include "ControlSpellchecker.h"
 #include "QSpellcheckerDialog.h"
 #include "QSpellchecker.h"

diff --git a/src/frontends/qt2/ui/QMinipageDialog.ui b/src/frontends/qt2/ui/QMinipageDialog.ui
index aa45ae13053de167441e06a59bbc0b7e28fd7c99..85eb5e31240b909d10b4cf6fd7b9d29da8dcedd4 100644 (file)
--- a/src/frontends/qt2/ui/QMinipageDialog.ui
+++ b/src/frontends/qt2/ui/QMinipageDialog.ui
@@ -15,7 +15,7 @@
             <x>0</x>
             <y>0</y>
             <width>369</width>
-            <height>104</height>
+            <height>111</height>
         </rect>
     </property>
     <property stdset="1">
@@ -28,7 +28,7 @@
     <property>
         <name>layoutSpacing</name>
     </property>
-    <grid>
+    <vbox>
         <property stdset="1">
             <name>margin</name>
             <number>11</number>
@@ -37,13 +37,13 @@
             <name>spacing</name>
             <number>6</number>
         </property>
-        <widget row="1"  column="0" >
+        <widget>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout17</cstring>
+                <cstring>Layout3</cstring>
             </property>
-            <hbox>
+            <grid>
                 <property stdset="1">
                     <name>margin</name>
                     <number>0</number>
@@ -52,108 +52,165 @@
                     <name>spacing</name>
                     <number>6</number>
                 </property>
-                <widget>
-                    <class>QPushButton</class>
+                <widget row="0"  column="0" >
+                    <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>restorePB</cstring>
+                        <cstring>widthLA</cstring>
                     </property>
                     <property stdset="1">
-                        <name>text</name>
-                        <string>&amp;Restore</string>
+                        <name>frameShape</name>
+                        <enum>MShape</enum>
                     </property>
                     <property stdset="1">
-                        <name>default</name>
-                        <bool>false</bool>
+                        <name>frameShadow</name>
+                        <enum>MShadow</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;Width:</string>
                     </property>
                     <property>
-                        <name>toolTip</name>
-                        <string></string>
+                        <name>buddy</name>
+                        <cstring>widthED</cstring>
                     </property>
                 </widget>
-                <spacer>
-                    <property>
+                <widget row="1"  column="2" >
+                    <class>QComboBox</class>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>Top</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>Middle</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>Bottom</string>
+                        </property>
+                    </item>
+                    <property stdset="1">
                         <name>name</name>
-                        <cstring>Spacer1</cstring>
+                        <cstring>valignCO</cstring>
+                    </property>
+                    <property>
+                        <name>toolTip</name>
+                        <string>Vertical alignment</string>
                     </property>
+                </widget>
+                <widget row="0"  column="2" >
+                    <class>QLabel</class>
                     <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Horizontal</enum>
+                        <name>name</name>
+                        <cstring>valignLA</cstring>
                     </property>
                     <property stdset="1">
-                        <name>sizeType</name>
-                        <enum>Expanding</enum>
+                        <name>text</name>
+                        <string>A&amp;lignment:</string>
                     </property>
                     <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
+                        <name>buddy</name>
+                        <cstring>valignCO</cstring>
                     </property>
-                </spacer>
-                <widget>
-                    <class>QPushButton</class>
+                </widget>
+                <widget row="1"  column="1" >
+                    <class>LengthCombo</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>okPB</cstring>
+                        <cstring>unitsLC</cstring>
                     </property>
                     <property stdset="1">
-                        <name>text</name>
-                        <string>&amp;OK</string>
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>3</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
                     </property>
                     <property stdset="1">
-                        <name>default</name>
-                        <bool>false</bool>
+                        <name>minimumSize</name>
+                        <size>
+                            <width>40</width>
+                            <height>22</height>
+                        </size>
+                    </property>
+                    <property stdset="1">
+                        <name>focusPolicy</name>
+                        <enum>StrongFocus</enum>
                     </property>
                     <property>
                         <name>toolTip</name>
-                        <string></string>
+                        <string>Units of width value</string>
                     </property>
                 </widget>
-                <widget>
-                    <class>QPushButton</class>
+                <widget row="1"  column="0" >
+                    <class>QLineEdit</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>applyPB</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>&amp;Apply</string>
+                        <cstring>widthED</cstring>
                     </property>
                     <property stdset="1">
-                        <name>default</name>
-                        <bool>false</bool>
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>1</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
                     </property>
                     <property>
                         <name>toolTip</name>
-                        <string></string>
+                        <string>Width value</string>
                     </property>
                 </widget>
-                <widget>
-                    <class>QPushButton</class>
+                <widget row="0"  column="1" >
+                    <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>closePB</cstring>
+                        <cstring>unitsLA</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>&amp;Close</string>
+                        <string>&amp;Units:</string>
                     </property>
-                    <property stdset="1">
-                        <name>default</name>
-                        <bool>true</bool>
+                    <property>
+                        <name>buddy</name>
+                        <cstring>unitsLC</cstring>
                     </property>
                 </widget>
-            </hbox>
+            </grid>
         </widget>
-        <widget row="0"  column="0" >
+        <spacer>
+            <property>
+                <name>name</name>
+                <cstring>Spacer1_2</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Vertical</enum>
+            </property>
+            <property stdset="1">
+                <name>sizeType</name>
+                <enum>Expanding</enum>
+            </property>
+            <property>
+                <name>sizeHint</name>
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+        <widget>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout3</cstring>
+                <cstring>Layout17</cstring>
             </property>
-            <grid>
+            <hbox>
                 <property stdset="1">
                     <name>margin</name>
                     <number>0</number>
@@ -162,138 +219,102 @@
                     <name>spacing</name>
                     <number>6</number>
                 </property>
-                <widget row="0"  column="2" >
-                    <class>QLabel</class>
+                <widget>
+                    <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>unitsLA</cstring>
+                        <cstring>restorePB</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>&amp;Units:</string>
+                        <string>&amp;Restore</string>
+                    </property>
+                    <property stdset="1">
+                        <name>default</name>
+                        <bool>false</bool>
                     </property>
                     <property>
-                        <name>buddy</name>
-                        <cstring>unitsLC</cstring>
+                        <name>toolTip</name>
+                        <string></string>
                     </property>
                 </widget>
-                <widget row="0"  column="0"  rowspan="1"  colspan="2" >
-                    <class>QLabel</class>
-                    <property stdset="1">
+                <spacer>
+                    <property>
                         <name>name</name>
-                        <cstring>widthLA</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>frameShape</name>
-                        <enum>MShape</enum>
+                        <cstring>Spacer1</cstring>
                     </property>
                     <property stdset="1">
-                        <name>frameShadow</name>
-                        <enum>MShadow</enum>
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
                     </property>
                     <property stdset="1">
-                        <name>text</name>
-                        <string>&amp;Width:</string>
+                        <name>sizeType</name>
+                        <enum>Expanding</enum>
                     </property>
                     <property>
-                        <name>buddy</name>
-                        <cstring>widthED</cstring>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
                     </property>
-                </widget>
-                <widget row="1"  column="1"  rowspan="1"  colspan="2" >
-                    <class>LengthCombo</class>
+                </spacer>
+                <widget>
+                    <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>unitsLC</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>3</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
+                        <cstring>okPB</cstring>
                     </property>
                     <property stdset="1">
-                        <name>minimumSize</name>
-                        <size>
-                            <width>40</width>
-                            <height>22</height>
-                        </size>
+                        <name>text</name>
+                        <string>&amp;OK</string>
                     </property>
                     <property stdset="1">
-                        <name>focusPolicy</name>
-                        <enum>StrongFocus</enum>
+                        <name>default</name>
+                        <bool>false</bool>
                     </property>
                     <property>
                         <name>toolTip</name>
-                        <string>Units of width value</string>
+                        <string></string>
                     </property>
                 </widget>
-                <widget row="0"  column="3" >
-                    <class>QLabel</class>
+                <widget>
+                    <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>valignLA</cstring>
+                        <cstring>applyPB</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>A&amp;lignment:</string>
-                    </property>
-                    <property>
-                        <name>buddy</name>
-                        <cstring>valignCO</cstring>
-                    </property>
-                </widget>
-                <widget row="1"  column="0" >
-                    <class>QLineEdit</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>widthED</cstring>
+                        <string>&amp;Apply</string>
                     </property>
                     <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>1</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
+                        <name>default</name>
+                        <bool>false</bool>
                     </property>
                     <property>
                         <name>toolTip</name>
-                        <string>Width value</string>
+                        <string></string>
                     </property>
                 </widget>
-                <widget row="1"  column="3" >
-                    <class>QComboBox</class>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Top</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Middle</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Bottom</string>
-                        </property>
-                    </item>
+                <widget>
+                    <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>valignCO</cstring>
+                        <cstring>closePB</cstring>
                     </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Vertical alignment</string>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;Close</string>
+                    </property>
+                    <property stdset="1">
+                        <name>default</name>
+                        <bool>true</bool>
                     </property>
                 </widget>
-            </grid>
+            </hbox>
         </widget>
-    </grid>
+    </vbox>
 </widget>
 <customwidgets>
     <customwidget>
@@ -319,12 +340,6 @@
     </image>
 </images>
 <connections>
-    <connection>
-        <sender>applyPB</sender>
-        <signal>clicked()</signal>
-        <receiver>QMinipageDialogBase</receiver>
-        <slot>updateClicked()</slot>
-    </connection>
     <connection>
         <sender>widthED</sender>
         <signal>textChanged(const QString&amp;)</signal>
@@ -344,7 +359,6 @@
         <slot>change_adaptor()</slot>
     </connection>
     <slot access="public">change_adaptor()</slot>
-    <slot access="public">updateClicked()</slot>
 </connections>
 <tabstops>
     <tabstop>widthED</tabstop>