Merge pull request #403 from matthias-kuhn/expression-build-dialog-save-window-geometry

NathanW2 · NathanW2 · commit 1e34b2f331de · 2013-01-28T05:43:38.000-08:00
Save geometry of expression build dialog on close
diff --git a/src/gui/qgsexpressionbuilderdialog.cpp b/src/gui/qgsexpressionbuilderdialog.cpp
@@ -47,11 +47,10 @@ QString QgsExpressionBuilderDialog::expressionText()
   return builder->expressionText();
 }
 
-void QgsExpressionBuilderDialog::closeEvent( QCloseEvent *event )
+void QgsExpressionBuilderDialog::done( int r )
 {
-  QDialog::closeEvent( event );
+  QDialog::done( r );
 
-  // TODO Work out why this is not working yet.
   QSettings settings;
   settings.setValue( "/Windows/ExpressionBuilderDialog/geometry", saveGeometry() );
 }
diff --git a/src/gui/qgsexpressionbuilderdialog.h b/src/gui/qgsexpressionbuilderdialog.h
@@ -42,10 +42,12 @@ class GUI_EXPORT QgsExpressionBuilderDialog : public QDialog, private Ui::QgsExp
 
   protected:
     /**
-     * Handle closing of the window
-     * @param event unused
+     * Is called when the dialog get accepted or rejected
+     * Used to save geometry
+     *
+     * @param r result value (unused)
      */
-    void closeEvent( QCloseEvent * event );
+    virtual void done( int r );
 };
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,10 @@ QString QgsExpressionBuilderDialog::expressionText()`
`47`	`47`	`return builder->expressionText();`
`48`	`48`	`}`
`49`	`49`
`50`		`-void QgsExpressionBuilderDialog::closeEvent( QCloseEvent *event )`
	`50`	`+void QgsExpressionBuilderDialog::done( int r )`
`51`	`51`	`{`
`52`		`- QDialog::closeEvent( event );`
	`52`	`+ QDialog::done( r );`
`53`	`53`
`54`		`- // TODO Work out why this is not working yet.`
`55`	`54`	`QSettings settings;`
`56`	`55`	`settings.setValue( "/Windows/ExpressionBuilderDialog/geometry", saveGeometry() );`
`57`	`56`	`}`