Merge pull request #85 from TomographicImaging/Cancel_button_default

 When the Form Dialog's "Cancel" button is clicked, a function can be redefined to add additional functionality on "Cancel" and the dialog is closed by default

eqt/ui/FormDialog.py

@@ -23,6 +23,7 @@ def __init__(self, parent=None, title=None):
             self.setWindowTitle(title)
         # add button box to the UI
         self.formWidget.uiElements['verticalLayout'].addWidget(bb)
+        bb.button(QtWidgets.QDialogButtonBox.Cancel).clicked.connect(self._onCancel)
 
     @property
     def Ok(self):
@@ -34,6 +35,16 @@ def Cancel(self):
         '''returns a reference to the Dialog Cancel button to connect its signals'''
         return self.buttonBox.button(QtWidgets.QDialogButtonBox.Cancel)
 
+    def _onCancel(self):
+        '''calls onCancel and closes the FormDialog'''
+        self.onCancel()
+        self.close()
+
+    def onCancel(self):
+        '''Called when the dialog's "Cancel" button is clicked.
+          Can be redefined to add additional functionality on "Cancel"'''
+        pass
+
     @property
     def widgets(self):
         return self.formWidget.widgets

examples/dialog_example_2.py

@@ -25,9 +25,8 @@ def __init__(self, parent=None):
     def openFormDialog(self):
         dialog = FormDialog(parent=self, title='Example')
         dialog.Ok.clicked.connect(lambda: self.accepted())
-        dialog.Cancel.clicked.connect(lambda: self.rejected())
 
-        # ## Example on how to add elements to the
+        # Example on how to add elements to the FormDialog
         # add input 1 as QLineEdit
         qlabel = QtWidgets.QLabel(dialog.groupBox)
         qlabel.setText("Input 1: ")
@@ -54,19 +53,17 @@ def openFormDialog(self):
 
         # store a reference
         self.dialog = dialog
-
+        self.dialog.onCancel = self.rejected
         dialog.exec()
 
     def accepted(self):
         print("accepted")
         print(self.dialog.widgets['input1_field'].text())
         print(self.dialog.widgets['input2_field'].currentText())
-
         self.dialog.close()
 
     def rejected(self):
         print("rejected")
-        self.dialog.close()
 
 
 if __name__ == "__main__":