Merge pull request #403 from matthias-kuhn/expression-build-dialog-sa…

…ve-window-geometry Save geometry of expression build dialog on close
qgis · Jan 28, 2013 · 1e34b2f · 1e34b2f
2 parents 958cd2a + 4cd271b
commit 1e34b2f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
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