set focus in code editor when showing expression builder

3nids · 3nids · commit 1b170f99e6b6 · 2015-11-03T10:06:54.000+01:00
diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -622,6 +622,12 @@ void QgsExpressionBuilderWidget::loadExpressionContext()
   }
 }
 
+void QgsExpressionBuilderWidget::showEvent( QShowEvent *e )
+{
+  QWidget::showEvent( e );
+  txtExpressionString->setFocus();
+}
+
 void QgsExpressionBuilderWidget::on_txtSearchEdit_textChanged()
 {
   mProxyModel->setFilterWildcard( txtSearchEdit->text() );
diff --git a/src/gui/qgsexpressionbuilderwidget.h b/src/gui/qgsexpressionbuilderwidget.h
@@ -259,6 +259,9 @@ class GUI_EXPORT QgsExpressionBuilderWidget : public QWidget, private Ui::QgsExp
       */
     void expressionParsed( bool isValid );
 
+  protected:
+    void showEvent( QShowEvent *e );
+
   private:
     void runPythonCode( const QString& code );
     void updateFunctionTree();
@@ -288,7 +291,6 @@ class GUI_EXPORT QgsExpressionBuilderWidget : public QWidget, private Ui::QgsExp
     QString mRecentKey;
     QMap<QString, QStringList> mFieldValues;
     QgsExpressionContext mExpressionContext;
-
 };
 
 #endif // QGSEXPRESSIONBUILDER_H

Original file line number	Diff line number	Diff line change
`@@ -622,6 +622,12 @@ void QgsExpressionBuilderWidget::loadExpressionContext()`
`622`	`622`	`}`
`623`	`623`	`}`
`624`	`624`
	`625`	`+void QgsExpressionBuilderWidget::showEvent( QShowEvent *e )`
	`626`	`+{`
	`627`	`+ QWidget::showEvent( e );`
	`628`	`+ txtExpressionString->setFocus();`
	`629`	`+}`
	`630`	`+`
`625`	`631`	`void QgsExpressionBuilderWidget::on_txtSearchEdit_textChanged()`
`626`	`632`	`{`
`627`	`633`	`mProxyModel->setFilterWildcard( txtSearchEdit->text() );`