default button fixes (bug 921)

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 71be8457fbc663ecd5381fe6eb25112ba74796dd..ba0f8d97e483e0b42aed426d5ddc16c5cd57cd98 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,16 @@
+2003-02-25  John Levon  <levon@movementarian.org>
+
+       From Nathan Weston
+
+       * QBibtexDialogBase.ui:
+       * QCharacterDialogBase.ui:
+       * QCitationDialogBase.ui:
+       * QDocumentDialogBase.ui:
+       * QExternalDialogBase.ui:
+       * QFloatDialogBase.ui:
+       * QMinipageDialogBase.ui:
+       * QParagraphDialogBase.ui: fix default button to be OK (bug #921)
+
 2003-02-23  John Levon  <levon@movementarian.org>
 
        * ui/QParagraphDialogBase.ui: fix dupe accelerator (bug #918)

diff --git a/src/frontends/qt2/ui/QBibtexDialogBase.ui b/src/frontends/qt2/ui/QBibtexDialogBase.ui
index d3609c9336dcf10b1da449664c4b3bc15b693843..aa4f09d4b964e458d7c018aed61d5a2d0b2e0415 100644 (file)
--- a/src/frontends/qt2/ui/QBibtexDialogBase.ui
+++ b/src/frontends/qt2/ui/QBibtexDialogBase.ui
@@ -13,8 +13,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>265</width>
-            <height>315</height>
+            <width>330</width>
+            <height>338</height>
         </rect>
     </property>
     <property stdset="1">
@@ -229,6 +229,10 @@
                         <name>text</name>
                         <string>OK</string>
                     </property>
+                    <property stdset="1">
+                        <name>autoDefault</name>
+                        <bool>false</bool>
+                    </property>
                     <property stdset="1">
                         <name>default</name>
                         <bool>true</bool>
@@ -244,6 +248,10 @@
                         <name>text</name>
                         <string>Cancel</string>
                     </property>
+                    <property stdset="1">
+                        <name>autoDefault</name>
+                        <bool>false</bool>
+                    </property>
                 </widget>
             </hbox>
         </widget>

diff --git a/src/frontends/qt2/ui/QCharacterDialogBase.ui b/src/frontends/qt2/ui/QCharacterDialogBase.ui
index 1a2a70fb0e818334209d0beaeed74a5344eccca2..ca81cbb8a64323a8993073d1b04e426ff39d4b4d 100644 (file)
--- a/src/frontends/qt2/ui/QCharacterDialogBase.ui
+++ b/src/frontends/qt2/ui/QCharacterDialogBase.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>449</width>
+            <width>437</width>
             <height>368</height>
         </rect>
     </property>
@@ -485,6 +485,10 @@
                         <name>text</name>
                         <string>&amp;OK</string>
                     </property>
+                    <property stdset="1">
+                        <name>default</name>
+                        <bool>true</bool>
+                    </property>
                 </widget>
                 <widget>
                     <class>QPushButton</class>
@@ -496,6 +500,10 @@
                         <name>text</name>
                         <string>&amp;Apply</string>
                     </property>
+                    <property stdset="1">
+                        <name>autoDefault</name>
+                        <bool>false</bool>
+                    </property>
                 </widget>
                 <widget>
                     <class>QPushButton</class>
@@ -507,9 +515,13 @@
                         <name>text</name>
                         <string>&amp;Close</string>
                     </property>
+                    <property stdset="1">
+                        <name>autoDefault</name>
+                        <bool>false</bool>
+                    </property>
                     <property stdset="1">
                         <name>default</name>
-                        <bool>true</bool>
+                        <bool>false</bool>
                     </property>
                 </widget>
             </hbox>

diff --git a/src/frontends/qt2/ui/QCitationDialogBase.ui b/src/frontends/qt2/ui/QCitationDialogBase.ui
index 09f5e40bcf06aa44825eefca1fdccb6acdf0d3b5..2f01630adbccb35fc1d5fe0a1860509219c1b4aa 100644 (file)
--- a/src/frontends/qt2/ui/QCitationDialogBase.ui
+++ b/src/frontends/qt2/ui/QCitationDialogBase.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>613</width>
+            <width>609</width>
             <height>416</height>
         </rect>
     </property>
@@ -97,7 +97,7 @@
                     </property>
                     <property stdset="1">
                         <name>default</name>
-                        <bool>false</bool>
+                        <bool>true</bool>
                     </property>
                 </widget>
                 <widget>
@@ -121,6 +121,10 @@
                         <name>text</name>
                         <string>Cancel</string>
                     </property>
+                    <property stdset="1">
+                        <name>autoDefault</name>
+                        <bool>false</bool>
+                    </property>
                 </widget>
             </hbox>
         </widget>

diff --git a/src/frontends/qt2/ui/QDocumentDialogBase.ui b/src/frontends/qt2/ui/QDocumentDialogBase.ui
index c3a8ca0621a50ca9f04529b49f6dd0fa4261a33e..232390fb63607f0f3815f17e02dec4065c59db7a 100644 (file)
--- a/src/frontends/qt2/ui/QDocumentDialogBase.ui
+++ b/src/frontends/qt2/ui/QDocumentDialogBase.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>410</width>
+            <width>411</width>
             <height>230</height>
         </rect>
     </property>
@@ -98,6 +98,10 @@
                         <name>text</name>
                         <string>&amp;OK</string>
                     </property>
+                    <property stdset="1">
+                        <name>default</name>
+                        <bool>true</bool>
+                    </property>
                 </widget>
                 <widget>
                     <class>QPushButton</class>
@@ -120,6 +124,10 @@
                         <name>text</name>
                         <string>&amp;Cancel</string>
                     </property>
+                    <property stdset="1">
+                        <name>autoDefault</name>
+                        <bool>false</bool>
+                    </property>
                 </widget>
             </hbox>
         </widget>

diff --git a/src/frontends/qt2/ui/QExternalDialogBase.ui b/src/frontends/qt2/ui/QExternalDialogBase.ui
index cf57f1241a8e0e3cce6a2fccbbdacbb5dca96346..b62b8be4293837c43c753ed1d2bb3b7ea976f043 100644 (file)
--- a/src/frontends/qt2/ui/QExternalDialogBase.ui
+++ b/src/frontends/qt2/ui/QExternalDialogBase.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>365</width>
+            <width>357</width>
             <height>378</height>
         </rect>
     </property>
@@ -127,7 +127,7 @@
                     </property>
                     <property stdset="1">
                         <name>default</name>
-                        <bool>true</bool>
+                        <bool>false</bool>
                     </property>
                 </widget>
                 <widget>
@@ -140,9 +140,13 @@
                         <name>text</name>
                         <string>&amp;Close</string>
                     </property>
+                    <property stdset="1">
+                        <name>autoDefault</name>
+                        <bool>false</bool>
+                    </property>
                     <property stdset="1">
                         <name>default</name>
-                        <bool>true</bool>
+                        <bool>false</bool>
                     </property>
                 </widget>
             </hbox>

diff --git a/src/frontends/qt2/ui/QFloatDialogBase.ui b/src/frontends/qt2/ui/QFloatDialogBase.ui
index 5afbfb90b2592a1c2af8c0106fe71b5dbd9af121..3839f554869454d83e5dab12402b726a5c42e58a 100644 (file)
--- a/src/frontends/qt2/ui/QFloatDialogBase.ui
+++ b/src/frontends/qt2/ui/QFloatDialogBase.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>381</width>
+            <width>376</width>
             <height>259</height>
         </rect>
     </property>
@@ -255,6 +255,10 @@
                         <name>text</name>
                         <string>&amp;Restore</string>
                     </property>
+                    <property stdset="1">
+                        <name>autoDefault</name>
+                        <bool>false</bool>
+                    </property>
                 </widget>
                 <spacer>
                     <property>
@@ -287,6 +291,10 @@
                         <name>text</name>
                         <string>&amp;OK</string>
                     </property>
+                    <property stdset="1">
+                        <name>default</name>
+                        <bool>true</bool>
+                    </property>
                 </widget>
                 <widget>
                     <class>QPushButton</class>

diff --git a/src/frontends/qt2/ui/QMinipageDialogBase.ui b/src/frontends/qt2/ui/QMinipageDialogBase.ui
index 8c6573a77d4edfc403ffbc98966f7921fabde197..1464da0ef973bbae7aea4e7407bfa3a100e2c3f6 100644 (file)
--- a/src/frontends/qt2/ui/QMinipageDialogBase.ui
+++ b/src/frontends/qt2/ui/QMinipageDialogBase.ui
@@ -14,7 +14,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>369</width>
+            <width>364</width>
             <height>111</height>
         </rect>
     </property>
@@ -233,6 +233,10 @@
                         <name>text</name>
                         <string>&amp;Restore</string>
                     </property>
+                    <property stdset="1">
+                        <name>autoDefault</name>
+                        <bool>false</bool>
+                    </property>
                     <property stdset="1">
                         <name>default</name>
                         <bool>false</bool>
@@ -275,7 +279,7 @@
                     </property>
                     <property stdset="1">
                         <name>default</name>
-                        <bool>false</bool>
+                        <bool>true</bool>
                     </property>
                     <property>
                         <name>toolTip</name>
@@ -292,6 +296,10 @@
                         <name>text</name>
                         <string>&amp;Apply</string>
                     </property>
+                    <property stdset="1">
+                        <name>autoDefault</name>
+                        <bool>false</bool>
+                    </property>
                     <property stdset="1">
                         <name>default</name>
                         <bool>false</bool>
@@ -311,9 +319,13 @@
                         <name>text</name>
                         <string>&amp;Close</string>
                     </property>
+                    <property stdset="1">
+                        <name>autoDefault</name>
+                        <bool>false</bool>
+                    </property>
                     <property stdset="1">
                         <name>default</name>
-                        <bool>true</bool>
+                        <bool>false</bool>
                     </property>
                 </widget>
             </hbox>

diff --git a/src/frontends/qt2/ui/QParagraphDialogBase.ui b/src/frontends/qt2/ui/QParagraphDialogBase.ui
index 98e7cb19cec41ddef58f0f4fecf214473bf17e13..b345298cf7f432acac866823d887082cccb2fea1 100644 (file)
--- a/src/frontends/qt2/ui/QParagraphDialogBase.ui
+++ b/src/frontends/qt2/ui/QParagraphDialogBase.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>392</width>
+            <width>388</width>
             <height>326</height>
         </rect>
     </property>
@@ -667,6 +667,10 @@
                         <name>text</name>
                         <string>&amp;Restore</string>
                     </property>
+                    <property stdset="1">
+                        <name>autoDefault</name>
+                        <bool>false</bool>
+                    </property>
                 </widget>
                 <spacer>
                     <property>
@@ -699,6 +703,14 @@
                         <name>text</name>
                         <string>&amp;OK</string>
                     </property>
+                    <property stdset="1">
+                        <name>autoDefault</name>
+                        <bool>false</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>default</name>
+                        <bool>true</bool>
+                    </property>
                 </widget>
                 <widget>
                     <class>QPushButton</class>
@@ -710,6 +722,10 @@
                         <name>text</name>
                         <string>&amp;Apply</string>
                     </property>
+                    <property stdset="1">
+                        <name>autoDefault</name>
+                        <bool>false</bool>
+                    </property>
                 </widget>
                 <widget>
                     <class>QPushButton</class>
@@ -721,6 +737,10 @@
                         <name>text</name>
                         <string>&amp;Close</string>
                     </property>
+                    <property stdset="1">
+                        <name>autoDefault</name>
+                        <bool>false</bool>
+                    </property>
                 </widget>
             </hbox>
         </widget>