Fix for bug #2384. Ok and Cancel buttons now work on the add

new oracle raster connection dialog. git-svn-id: http://svn.osgeo.org/qgis/trunk@12819 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 22, 2010 · af0f565 · af0f565
1 parent cec0413
commit af0f565
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/plugins/oracle_raster/qgsoracleconnect_ui.cpp b/src/plugins/oracle_raster/qgsoracleconnect_ui.cpp
@@ -51,12 +51,16 @@ QgsOracleConnect::~QgsOracleConnect()
 {
 }
 
-void QgsOracleConnect::on_btnCancel_clicked()
+void QgsOracleConnect::on_buttonBox_rejected()
 {
-  helpInfo();
+  // cancel button mapped to context help - changed this to close the
+  // dialog instead. If context help is to be added, a Help button
+  // is required. - gsherman 
+  // helpInfo();
+  reject();
 }
 
-void QgsOracleConnect::on_btnOk_clicked()
+void QgsOracleConnect::on_buttonBox_accepted()
 {
   saveConnection();
 }

diff --git a/src/plugins/oracle_raster/qgsoracleconnect_ui.h b/src/plugins/oracle_raster/qgsoracleconnect_ui.h
@@ -38,8 +38,8 @@ class QgsOracleConnect : public QDialog, private Ui::OracleConnectGuiBase
     void helpInfo();
 
   public slots:
-    void on_btnOk_clicked();
-    void on_btnCancel_clicked();
+    void on_buttonBox_accepted();
+    void on_buttonBox_rejected();
 };
 
 #endif /* _ORACLECONNECTGUI_H */