From: John Levon Date: Wed, 11 Sep 2002 17:42:45 +0000 (+0000) Subject: keynav fixes X-Git-Tag: 1.6.10~18305 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c25a3c200cad7fafdb58d8d184cd93c0bcc68962;p=lyx.git 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 3739cd3332..24c9e8e041 100644 --- a/src/frontends/qt2/Alert_pimpl.C +++ b/src/frontends/qt2/Alert_pimpl.C @@ -52,6 +52,7 @@ pair 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 2d63f4355f..f34aad41da 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,19 @@ +2002-09-11 John Levon + + * 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 * QSearchDialog.C: fill combo boxes diff --git a/src/frontends/qt2/QExternalDialog.C b/src/frontends/qt2/QExternalDialog.C index 33ad376d23..35f08ed57e 100644 --- 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 e2023d94e5..b1864db1d5 100644 --- 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 d067effe08..190442cd63 100644 --- a/src/frontends/qt2/QGraphicsDialog.C +++ b/src/frontends/qt2/QGraphicsDialog.C @@ -15,6 +15,7 @@ #include #include +#include #include #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 ad71d99807..b8e949d998 100644 --- 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 ddeb6cf872..05e59ba9e4 100644 --- a/src/frontends/qt2/QIncludeDialog.C +++ b/src/frontends/qt2/QIncludeDialog.C @@ -16,6 +16,7 @@ #include #include #include +#include #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 3ce7bc4685..02a8e5deec 100644 --- 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 17d5731847..fc16285dfd 100644 --- 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 5cf64868e8..f360262bbf 100644 --- 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 8a2ef204e6..ff97c056c0 100644 --- a/src/frontends/qt2/QSearchDialog.C +++ b/src/frontends/qt2/QSearchDialog.C @@ -15,6 +15,7 @@ #include #include #include +#include #include 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 4cecb8d6cd..691a41ae71 100644 --- 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 00f5f0c9e4..178c7e2fff 100644 --- a/src/frontends/qt2/QURLDialog.C +++ b/src/frontends/qt2/QURLDialog.C @@ -12,6 +12,7 @@ #include "QURLDialog.h" #include +#include 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 59bc0e567a..518dea9cc7 100644 --- 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 22ce1c201d..fdace56749 100644 --- a/src/frontends/qt2/ui/QSearchDialog.ui +++ b/src/frontends/qt2/ui/QSearchDialog.ui @@ -77,8 +77,12 @@ true - duplicatesEnabled - false + sizeLimit + 10 + + + maxCount + 666 insertionPolicy @@ -89,8 +93,8 @@ true - maxCount - 10 + duplicatesEnabled + false @@ -126,20 +130,24 @@ true - insertionPolicy - AtTop + sizeLimit + 10 - duplicatesEnabled - false + maxCount + 666 + + + insertionPolicy + AtTop autoCompletion true - maxCount - 10 + duplicatesEnabled + false @@ -233,6 +241,10 @@ name findPB + + enabled + false + text Find &Next @@ -241,10 +253,6 @@ default true - - enabled - false - QPushButton @@ -252,14 +260,14 @@ name replacePB - - text - &Replace - enabled false + + text + &Replace + QPushButton @@ -267,14 +275,14 @@ name replaceallPB - - text - Replace &All - enabled false + + text + Replace &All + QCheckBox