Skip to content

Commit af0f565

Browse files
author
gsherman
committed
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
1 parent cec0413 commit af0f565

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/plugins/oracle_raster/qgsoracleconnect_ui.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,16 @@ QgsOracleConnect::~QgsOracleConnect()
5151
{
5252
}
5353

54-
void QgsOracleConnect::on_btnCancel_clicked()
54+
void QgsOracleConnect::on_buttonBox_rejected()
5555
{
56-
helpInfo();
56+
// cancel button mapped to context help - changed this to close the
57+
// dialog instead. If context help is to be added, a Help button
58+
// is required. - gsherman
59+
// helpInfo();
60+
reject();
5761
}
5862

59-
void QgsOracleConnect::on_btnOk_clicked()
63+
void QgsOracleConnect::on_buttonBox_accepted()
6064
{
6165
saveConnection();
6266
}

src/plugins/oracle_raster/qgsoracleconnect_ui.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ class QgsOracleConnect : public QDialog, private Ui::OracleConnectGuiBase
3838
void helpInfo();
3939

4040
public slots:
41-
void on_btnOk_clicked();
42-
void on_btnCancel_clicked();
41+
void on_buttonBox_accepted();
42+
void on_buttonBox_rejected();
4343
};
4444

4545
#endif /* _ORACLECONNECTGUI_H */

0 commit comments

Comments
 (0)