[QGIS Commit] r12819 - trunk/qgis/src/plugins/oracle_raster

[svn_qgis at osgeo.org]

Author: gsherman
Date: 2010-01-22 11:31:00 -0500 (Fri, 22 Jan 2010)
New Revision: 12819

Modified:
   trunk/qgis/src/plugins/oracle_raster/qgsoracleconnect_ui.cpp
   trunk/qgis/src/plugins/oracle_raster/qgsoracleconnect_ui.h
Log:
Fix for bug #2384. Ok and Cancel buttons now work on the add
new oracle raster connection dialog.

Modified: trunk/qgis/src/plugins/oracle_raster/qgsoracleconnect_ui.cpp
===================================================================
--- trunk/qgis/src/plugins/oracle_raster/qgsoracleconnect_ui.cpp	2010-01-22 15:02:07 UTC (rev 12818)
+++ trunk/qgis/src/plugins/oracle_raster/qgsoracleconnect_ui.cpp	2010-01-22 16:31:00 UTC (rev 12819)
@@ -51,12 +51,16 @@
 {
 }
 
-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();
 }

Modified: trunk/qgis/src/plugins/oracle_raster/qgsoracleconnect_ui.h
===================================================================
--- trunk/qgis/src/plugins/oracle_raster/qgsoracleconnect_ui.h	2010-01-22 15:02:07 UTC (rev 12818)
+++ trunk/qgis/src/plugins/oracle_raster/qgsoracleconnect_ui.h	2010-01-22 16:31:00 UTC (rev 12819)
@@ -38,8 +38,8 @@
     void helpInfo();
 
   public slots:
-    void on_btnOk_clicked();
-    void on_btnCancel_clicked();
+    void on_buttonBox_accepted();
+    void on_buttonBox_rejected();
 };
 
 #endif /* _ORACLECONNECTGUI_H */