From 9313c6c39a4a24e237a4b2aaf8f0a197d923994e Mon Sep 17 00:00:00 2001
From: Abdelrazak Younes <younes@lyx.org>
Date: Tue, 13 Feb 2007 18:20:07 +0000
Subject: [PATCH] Fix bug 3225 and maybe others as well.

 http://bugzilla.lyx.org/show_bug.cgi?id=3225

* QIndexDialog:
  - QIndexDialog(): setFocusProxy() to the QLineEdit
  - show(): deleted.

* QDialogView::show(): also setFocus() when raising or showing a window.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17166 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/QDialogView.C  | 2 ++
 src/frontends/qt4/QIndexDialog.C | 9 ++-------
 src/frontends/qt4/QIndexDialog.h | 1 -
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/frontends/qt4/QDialogView.C b/src/frontends/qt4/QDialogView.C
index 60dadaf3ed..8097965494 100644
--- a/src/frontends/qt4/QDialogView.C
+++ b/src/frontends/qt4/QDialogView.C
@@ -61,8 +61,10 @@ void QDialogView::show()
 	if (form()->isVisible()) {
 		form()->raise();
 		form()->activateWindow();
+		form()->setFocus();
 	} else {
 		form()->show();
+		form()->setFocus();
 	}
 }
 
diff --git a/src/frontends/qt4/QIndexDialog.C b/src/frontends/qt4/QIndexDialog.C
index 1ab740cda1..52037df8bb 100644
--- a/src/frontends/qt4/QIndexDialog.C
+++ b/src/frontends/qt4/QIndexDialog.C
@@ -35,6 +35,8 @@ QIndexDialog::QIndexDialog(QIndex * form)
 	connect( keywordED, SIGNAL( textChanged(const QString&) ), 
 		this, SLOT( change_adaptor() ) );
 
+	setFocusProxy(keywordED);
+
 	keywordED->setWhatsThis( qt_(
 		"The format of the entry in the index.\n"
 		"\n"
@@ -53,13 +55,6 @@ QIndexDialog::QIndexDialog(QIndex * form)
 }
 
 
-void QIndexDialog::show()
-{
-	QDialog::show();
-	keywordED->setFocus();
-}
-
-
 void QIndexDialog::change_adaptor()
 {
 	form_->changed();
diff --git a/src/frontends/qt4/QIndexDialog.h b/src/frontends/qt4/QIndexDialog.h
index 93754e1501..bb286c4de4 100644
--- a/src/frontends/qt4/QIndexDialog.h
+++ b/src/frontends/qt4/QIndexDialog.h
@@ -27,7 +27,6 @@ class QIndexDialog : public QDialog, public Ui::QIndexUi {
 public:
 	QIndexDialog(QIndex * form);
 
-	virtual void show();
 protected Q_SLOTS:
 	virtual void change_adaptor();
 	virtual void reject();
-- 
2.39.5