summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opierdesktop/qtwin.cpp21
-rw-r--r--noncore/net/opierdesktop/qtwin.h6
2 files changed, 5 insertions, 22 deletions
diff --git a/noncore/net/opierdesktop/qtwin.cpp b/noncore/net/opierdesktop/qtwin.cpp
index 181d275..54a5a03 100644
--- a/noncore/net/opierdesktop/qtwin.cpp
+++ b/noncore/net/opierdesktop/qtwin.cpp
@@ -180,17 +180,6 @@ QMyDialog::QMyDialog(QWidget* parent) : QDialog(parent, "Settings", true)
FullScreenCheckBox->setText("Full Screen");
FullScreenCheckBox->move(10, 230);
// ok button
- OKButton = new QPushButton(this);
- OKButton->setText("OK");
- OKButton->move(100, 240);
- OKButton->resize(50, 20);
- connect(OKButton, SIGNAL(clicked()), this, SLOT(OKClicked()));
- // cancel button
- CancelButton = new QPushButton(this);
- CancelButton->setText("Cancel");
- CancelButton->move(160, 240);
- CancelButton->resize(50, 20);
- connect(CancelButton, SIGNAL(clicked()), this, SLOT(CancelClicked()));
for (i = 0; i < 10; i++)
{
@@ -277,7 +266,7 @@ void QMyDialog::ComboChanged(int index)
}
//*****************************************************************************
-void QMyDialog::OKClicked()
+void QMyDialog::accept()
{
ServerName = ServerNameEdit->text();
UserName = UserNameEdit->text();
@@ -285,15 +274,11 @@ void QMyDialog::OKClicked()
Height = HeightEdit->text().toInt();
ServerIP = IPEdit->text();
FullScreen = FullScreenCheckBox->isChecked();
- done(1);
-}
-//*****************************************************************************
-void QMyDialog::CancelClicked()
-{
- done(0);
+ QDialog::accept();
}
+
//*****************************************************************************
void QMyDialog::AddClicked()
{
diff --git a/noncore/net/opierdesktop/qtwin.h b/noncore/net/opierdesktop/qtwin.h
index 38ad190..7a2110b 100644
--- a/noncore/net/opierdesktop/qtwin.h
+++ b/noncore/net/opierdesktop/qtwin.h
@@ -28,8 +28,6 @@ class QMyDialog: public QDialog
~QMyDialog();
public:
QListBox* ListBox;
- QPushButton* OKButton;
- QPushButton* CancelButton;
QLabel* Label1;
QLineEdit* ServerNameEdit;
QLabel* Label2;
@@ -46,8 +44,6 @@ class QMyDialog: public QDialog
QCheckBox* FullScreenCheckBox;
public slots:
void ComboChanged(int);
- void OKClicked();
- void CancelClicked();
void AddClicked();
void EditClicked();
void SaveClicked();
@@ -62,6 +58,8 @@ class QMyDialog: public QDialog
int Height;
int FullScreen;
QMyConnectionItem* ConnectionList[10];
+ protected slots:
+ void accept();
};
class QMyScrollView: public QScrollView