keynav fixes

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

diff --git a/src/frontends/qt2/Alert_pimpl.C b/src/frontends/qt2/Alert_pimpl.C
index 3739cd3332859bd70dd686ed7f505f548ed0edd2..24c9e8e041c9d4316482ac12d2f10727374d9975 100644 (file)
--- a/src/frontends/qt2/Alert_pimpl.C
+++ b/src/frontends/qt2/Alert_pimpl.C
@@ -52,6 +52,7 @@ pair<bool, string> const askForText_pimpl(string const & msg, string const & dfl
        // less than ideal !
        d.askLA->setText((string("&") + msg).c_str());
        d.askLE->setText(dflt.c_str());
+       d.askLE->setFocus();
        int ret = d.exec();
 
        d.hide();

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 2d63f4355f9fe91dc7a83ac02374ddbbbb2cf52a..f34aad41da30f165ed2e2710151b4a9650eb0b98 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,19 @@
+2002-09-11  John Levon  <levon@movementarian.org>
+
+       * Alert_pimpl.C:
+       * QExternalDialog.h: 
+       * QExternalDialog.C: 
+       * QGraphicsDialog.h: 
+       * QGraphicsDialog.C: 
+       * QIncludeDialog.h: 
+       * QIncludeDialog.C: 
+       * QIndexDialog.h: 
+       * QIndexDialog.C: 
+       * QSearchDialog.h: 
+       * QSearchDialog.C: 
+       * QURLDialog.h:
+       * QURLDialog.C: focus on the first linedit on show() 
+        
 2002-09-11  John Levon  <levon@movementarian.org>
 
        * QSearchDialog.C: fill combo boxes

diff --git a/src/frontends/qt2/QExternalDialog.C b/src/frontends/qt2/QExternalDialog.C
index 33ad376d23c6163acd0538a2430b958b98ce5a6d..35f08ed57e91163ce240a70b1d4131c1c3653dc4 100644 (file)
--- a/src/frontends/qt2/QExternalDialog.C
+++ b/src/frontends/qt2/QExternalDialog.C
@@ -32,6 +32,13 @@ QExternalDialog::QExternalDialog(QExternal * form)
 }
 
 
+void QExternalDialog::show()
+{
+       QExternalDialogBase::show();
+       fileED->setFocus();
+}
+
+ 
 void QExternalDialog::change_adaptor()
 {
        form_->changed();

diff --git a/src/frontends/qt2/QExternalDialog.h b/src/frontends/qt2/QExternalDialog.h
index e2023d94e5c8183d3127f5a8d9af9bd6777af646..b1864db1d5a1707c21e0e80dfa0f268792eb6c5f 100644 (file)
--- a/src/frontends/qt2/QExternalDialog.h
+++ b/src/frontends/qt2/QExternalDialog.h
@@ -21,6 +21,8 @@ class QExternalDialog : public QExternalDialogBase
 public:
        QExternalDialog(QExternal * form);
 
+       virtual void show();
+ 
 protected slots:
        virtual void change_adaptor();
        virtual void editClicked();

diff --git a/src/frontends/qt2/QGraphicsDialog.C b/src/frontends/qt2/QGraphicsDialog.C
index d067effe08bac9e70363e399a4f6bfe19121e47e..190442cd63cf07b32efe60ca4238634a5573dee1 100644 (file)
--- a/src/frontends/qt2/QGraphicsDialog.C
+++ b/src/frontends/qt2/QGraphicsDialog.C
@@ -15,6 +15,7 @@
 
 #include <qwidget.h>
 #include <qpushbutton.h>
+#include <qlineedit.h>
 #include <qcheckbox.h>
 
 #include "QGraphicsDialog.h"
@@ -35,6 +36,13 @@ QGraphicsDialog::QGraphicsDialog(QGraphics * form)
 }
 
 
+void QGraphicsDialog::show()
+{ 
+       QGraphicsDialogBase::show();
+       filename->setFocus();
+}
+
+ 
 void QGraphicsDialog::change_adaptor()
 {
        form_->changed();

diff --git a/src/frontends/qt2/QGraphicsDialog.h b/src/frontends/qt2/QGraphicsDialog.h
index ad71d99807423e15fbba479a72a15c02b81a34fd..b8e949d99849ab23e1f91d09ff9a97bb2cd08f80 100644 (file)
--- a/src/frontends/qt2/QGraphicsDialog.h
+++ b/src/frontends/qt2/QGraphicsDialog.h
@@ -21,6 +21,8 @@ class QGraphicsDialog : public QGraphicsDialogBase
 public:
        QGraphicsDialog(QGraphics * form);
 
+       virtual void show();
+ 
 protected slots:
        virtual void change_adaptor();
        virtual void browse_clicked();

diff --git a/src/frontends/qt2/QIncludeDialog.C b/src/frontends/qt2/QIncludeDialog.C
index ddeb6cf8728b66269be66858a64285e30f2fdcda..05e59ba9e434ced11791ae9ff226245aff2a75cb 100644 (file)
--- a/src/frontends/qt2/QIncludeDialog.C
+++ b/src/frontends/qt2/QIncludeDialog.C
@@ -16,6 +16,7 @@
 #include <qwidget.h>
 #include <qpushbutton.h>
 #include <qcheckbox.h>
+#include <qlineedit.h>
 
 #include "QIncludeDialog.h"
 #include "QInclude.h"
@@ -31,6 +32,13 @@ QIncludeDialog::QIncludeDialog(QInclude * form)
 }
 
 
+void QIncludeDialog::show()
+{
+       QIncludeDialogBase::show();
+       filenameED->setFocus();
+} 
+ 
+
 void QIncludeDialog::change_adaptor()
 {
        form_->changed();

diff --git a/src/frontends/qt2/QIncludeDialog.h b/src/frontends/qt2/QIncludeDialog.h
index 3ce7bc4685e5de6900d1cef376756f4bd5d8567a..02a8e5deec7a17939e5d1639e55908a0b062f6d9 100644 (file)
--- a/src/frontends/qt2/QIncludeDialog.h
+++ b/src/frontends/qt2/QIncludeDialog.h
@@ -23,6 +23,8 @@ public:
 
        void updateLists();
 
+       virtual void show();
+ 
 protected slots:
        virtual void change_adaptor();
        virtual void loadClicked();

diff --git a/src/frontends/qt2/QIndexDialog.C b/src/frontends/qt2/QIndexDialog.C
index 17d573184740ec72413796f8622363b5ae9fd9a7..fc16285dfdae9656d8067d69744a33037c443502 100644 (file)
--- a/src/frontends/qt2/QIndexDialog.C
+++ b/src/frontends/qt2/QIndexDialog.C
@@ -43,6 +43,13 @@ QIndexDialog::QIndexDialog(QIndex * form)
 }
 
 
+void QIndexDialog::show()
+{
+       QIndexDialogBase::show(); 
+       keywordED->setFocus();
+}
+
+ 
 void QIndexDialog::change_adaptor()
 {
        form_->changed();

diff --git a/src/frontends/qt2/QIndexDialog.h b/src/frontends/qt2/QIndexDialog.h
index 5cf64868e80ee3a26ec63f8597e6fd0ae403f946..f360262bbf92b6a6815f4b4641e1e3aaec9489b2 100644 (file)
--- a/src/frontends/qt2/QIndexDialog.h
+++ b/src/frontends/qt2/QIndexDialog.h
@@ -21,6 +21,8 @@ class QIndexDialog : public QIndexDialogBase
 public:
        QIndexDialog(QIndex * form);
 
+       virtual void show();
+ 
 protected slots:
        virtual void change_adaptor();
 

diff --git a/src/frontends/qt2/QSearchDialog.C b/src/frontends/qt2/QSearchDialog.C
index 8a2ef204e684f46bbd3b7254cbfd06882d81f73f..ff97c056c07cd917f1d1d48538ab1b09152f0532 100644 (file)
--- a/src/frontends/qt2/QSearchDialog.C
+++ b/src/frontends/qt2/QSearchDialog.C
@@ -15,6 +15,7 @@
 #include <qpushbutton.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
+#include <qlineedit.h>
 #include <qlabel.h>
 
 QSearchDialog::QSearchDialog(QSearch * form)
@@ -23,13 +24,17 @@ QSearchDialog::QSearchDialog(QSearch * form)
 {
        connect(closePB, SIGNAL(clicked()),
                form_, SLOT(slotClose()));
-       findCO->setDuplicatesEnabled(false); 
-       findCO->setInsertionPolicy(QComboBox::AtTop); 
-       replaceCO->setDuplicatesEnabled(false); 
-       replaceCO->setInsertionPolicy(QComboBox::AtTop); 
 }
 
 
+void QSearchDialog::show()
+{
+       QSearchDialogBase::show();
+       findCO->setFocus();
+       findCO->lineEdit()->setSelection(0, findCO->lineEdit()->text().length());
+}
+
+ 
 void QSearchDialog::closeEvent(QCloseEvent * e)
 {
        form_->slotWMHide();

diff --git a/src/frontends/qt2/QSearchDialog.h b/src/frontends/qt2/QSearchDialog.h
index 4cecb8d6cdbf9618585ba258aafca3906e57810b..691a41ae71ed49aa3917cf1b17c2092c80ac7b1d 100644 (file)
--- a/src/frontends/qt2/QSearchDialog.h
+++ b/src/frontends/qt2/QSearchDialog.h
@@ -23,6 +23,8 @@ class QSearchDialog : public QSearchDialogBase
 public:
        QSearchDialog(QSearch * form);
 
+       virtual void show();
+
 protected slots:
        void findChanged();
        void findClicked();
@@ -30,7 +32,7 @@ protected slots:
        void replaceallClicked();
 
 protected:
-       void closeEvent(QCloseEvent * e);
+       virtual void closeEvent(QCloseEvent * e);
 
 private:
        // add a string to the combo if needed

diff --git a/src/frontends/qt2/QURLDialog.C b/src/frontends/qt2/QURLDialog.C
index 00f5f0c9e49b84590968c04b7de7e77adb20c3c2..178c7e2fff0f571bbe69ab95b50a91a8f7b74029 100644 (file)
--- a/src/frontends/qt2/QURLDialog.C
+++ b/src/frontends/qt2/QURLDialog.C
@@ -12,6 +12,7 @@
 #include "QURLDialog.h"
 
 #include <qpushbutton.h>
+#include <qlineedit.h>
  
 QURLDialog::QURLDialog(QURL * form)
        : QURLDialogBase(0, 0, false, 0),
@@ -29,6 +30,13 @@ QURLDialog::~QURLDialog()
 }
 
 
+void QURLDialog::show()
+{
+       QURLDialogBase::show();
+       urlED->setFocus();
+}
+
+ 
 void QURLDialog::changed_adaptor()
 {
        form_->changed();

diff --git a/src/frontends/qt2/QURLDialog.h b/src/frontends/qt2/QURLDialog.h
index 59bc0e567a5ed43388c929f1aced0bc5eaf73d9d..518dea9cc7d41657088b11f78b0454b5d6db5061 100644 (file)
--- a/src/frontends/qt2/QURLDialog.h
+++ b/src/frontends/qt2/QURLDialog.h
@@ -20,6 +20,8 @@ public:
        QURLDialog(QURL * form);
        ~QURLDialog();
 
+       virtual void show();
+ 
 public slots:
        void changed_adaptor();
 

diff --git a/src/frontends/qt2/ui/QSearchDialog.ui b/src/frontends/qt2/ui/QSearchDialog.ui
index 22ce1c201d51b122e14a5d35e81caba4cf8a0e12..fdace5674941cab6d5891460a33e139ec1044ea1 100644 (file)
--- a/src/frontends/qt2/ui/QSearchDialog.ui
+++ b/src/frontends/qt2/ui/QSearchDialog.ui
@@ -77,8 +77,12 @@
                 <bool>true</bool>
             </property>
             <property stdset="1">
-                <name>duplicatesEnabled</name>
-                <bool>false</bool>
+                <name>sizeLimit</name>
+                <number>10</number>
+            </property>
+            <property stdset="1">
+                <name>maxCount</name>
+                <number>666</number>
             </property>
             <property stdset="1">
                 <name>insertionPolicy</name>
@@ -89,8 +93,8 @@
                 <bool>true</bool>
             </property>
             <property stdset="1">
-                <name>maxCount</name>
-                <number>10</number>
+                <name>duplicatesEnabled</name>
+                <bool>false</bool>
             </property>
         </widget>
         <widget row="1"  column="0" >
@@ -126,20 +130,24 @@
                 <bool>true</bool>
             </property>
             <property stdset="1">
-                <name>insertionPolicy</name>
-                <enum>AtTop</enum>
+                <name>sizeLimit</name>
+                <number>10</number>
             </property>
             <property stdset="1">
-                <name>duplicatesEnabled</name>
-                <bool>false</bool>
+                <name>maxCount</name>
+                <number>666</number>
+            </property>
+            <property stdset="1">
+                <name>insertionPolicy</name>
+                <enum>AtTop</enum>
             </property>
             <property stdset="1">
                 <name>autoCompletion</name>
                 <bool>true</bool>
             </property>
             <property stdset="1">
-                <name>maxCount</name>
-                <number>10</number>
+                <name>duplicatesEnabled</name>
+                <bool>false</bool>
             </property>
         </widget>
         <widget row="2"  column="0"  rowspan="1"  colspan="2" >
@@ -233,6 +241,10 @@
                 <name>name</name>
                 <cstring>findPB</cstring>
             </property>
+            <property stdset="1">
+                <name>enabled</name>
+                <bool>false</bool>
+            </property>
             <property stdset="1">
                 <name>text</name>
                 <string>Find &amp;Next</string>
@@ -241,10 +253,6 @@
                 <name>default</name>
                 <bool>true</bool>
             </property>
-            <property stdset="1">
-                <name>enabled</name>
-                <bool>false</bool>
-            </property>
         </widget>
         <widget row="1"  column="3" >
             <class>QPushButton</class>
@@ -252,14 +260,14 @@
                 <name>name</name>
                 <cstring>replacePB</cstring>
             </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>&amp;Replace</string>
-            </property>
             <property stdset="1">
                 <name>enabled</name>
                 <bool>false</bool>
             </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>&amp;Replace</string>
+            </property>
         </widget>
         <widget row="2"  column="3"  rowspan="2"  colspan="1" >
             <class>QPushButton</class>
@@ -267,14 +275,14 @@
                 <name>name</name>
                 <cstring>replaceallPB</cstring>
             </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Replace &amp;All </string>
-            </property>
             <property stdset="1">
                 <name>enabled</name>
                 <bool>false</bool>
             </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Replace &amp;All </string>
+            </property>
         </widget>
         <widget row="5"  column="0"  rowspan="1"  colspan="2" >
             <class>QCheckBox</class>