Save dialog geometry on attribute form reject

NathanW2 · NathanW2 · commit 2e8ba8b13c45 · 2014-05-21T13:18:21.000+10:00
diff --git a/src/gui/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp
@@ -444,7 +444,7 @@ void QgsAttributeDialog::init()
         buttonBox->setStandardButtons( QDialogButtonBox::Cancel );
       }
 
-      connect( buttonBox, SIGNAL( rejected() ), mDialog, SLOT( reject() ) );
+      connect( buttonBox, SIGNAL( rejected() ), this, SLOT( reject() ) );
     }
   }
   else
@@ -557,6 +557,16 @@ QgsAttributeDialog::~QgsAttributeDialog()
   }
 }
 
+void QgsAttributeDialog::reject()
+{
+  // Only save the geometry of the dialog if it's not a custom one.
+  if ( mLayer->editorLayout() != QgsVectorLayer::UiFileLayout )
+  {
+    saveGeometry();
+  }
+  mDialog->reject();
+}
+
 void QgsAttributeDialog::accept()
 {
   if ( !mLayer->isEditable() || !mFeature )
diff --git a/src/gui/qgsattributedialog.h b/src/gui/qgsattributedialog.h
@@ -88,6 +88,7 @@ class GUI_EXPORT QgsAttributeDialog : public QObject
     bool editable() { return mEditable; }
 
   public slots:
+    void reject();
     void accept();
 
     int exec();

Original file line number	Diff line number	Diff line change
`@@ -444,7 +444,7 @@ void QgsAttributeDialog::init()`
`444`	`444`	`buttonBox->setStandardButtons( QDialogButtonBox::Cancel );`
`445`	`445`	`}`
`446`	`446`
`447`		`- connect( buttonBox, SIGNAL( rejected() ), mDialog, SLOT( reject() ) );`
	`447`	`+ connect( buttonBox, SIGNAL( rejected() ), this, SLOT( reject() ) );`
`448`	`448`	`}`
`449`	`449`	`}`
`450`	`450`	`else`
`@@ -557,6 +557,16 @@ QgsAttributeDialog::~QgsAttributeDialog()`
`557`	`557`	`}`
`558`	`558`	`}`
`559`	`559`
	`560`	`+void QgsAttributeDialog::reject()`
	`561`	`+{`
	`562`	`+ // Only save the geometry of the dialog if it's not a custom one.`
	`563`	`+ if ( mLayer->editorLayout() != QgsVectorLayer::UiFileLayout )`
	`564`	`+ {`
	`565`	`+ saveGeometry();`
	`566`	`+ }`
	`567`	`+ mDialog->reject();`
	`568`	`+}`
	`569`	`+`
`560`	`570`	`void QgsAttributeDialog::accept()`
`561`	`571`	`{`
`562`	`572`	`if ( !mLayer->isEditable() \|\| !mFeature )`