-rw-r--r-- | noncore/net/opierdesktop/qtwin.cpp | 21 | ||||
-rw-r--r-- | noncore/net/opierdesktop/qtwin.h | 6 |
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 | |||
@@ -182,13 +182,2 @@ QMyDialog::QMyDialog(QWidget* parent) : QDialog(parent, "Settings", true) | |||
182 | // ok button | 182 | // ok button |
183 | OKButton = new QPushButton(this); | ||
184 | OKButton->setText("OK"); | ||
185 | OKButton->move(100, 240); | ||
186 | OKButton->resize(50, 20); | ||
187 | connect(OKButton, SIGNAL(clicked()), this, SLOT(OKClicked())); | ||
188 | // cancel button | ||
189 | CancelButton = new QPushButton(this); | ||
190 | CancelButton->setText("Cancel"); | ||
191 | CancelButton->move(160, 240); | ||
192 | CancelButton->resize(50, 20); | ||
193 | connect(CancelButton, SIGNAL(clicked()), this, SLOT(CancelClicked())); | ||
194 | 183 | ||
@@ -279,3 +268,3 @@ void QMyDialog::ComboChanged(int index) | |||
279 | //***************************************************************************** | 268 | //***************************************************************************** |
280 | void QMyDialog::OKClicked() | 269 | void QMyDialog::accept() |
281 | { | 270 | { |
@@ -287,11 +276,7 @@ void QMyDialog::OKClicked() | |||
287 | FullScreen = FullScreenCheckBox->isChecked(); | 276 | FullScreen = FullScreenCheckBox->isChecked(); |
288 | done(1); | ||
289 | } | ||
290 | 277 | ||
291 | //***************************************************************************** | 278 | QDialog::accept(); |
292 | void QMyDialog::CancelClicked() | ||
293 | { | ||
294 | done(0); | ||
295 | } | 279 | } |
296 | 280 | ||
281 | |||
297 | //***************************************************************************** | 282 | //***************************************************************************** |
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 | |||
@@ -30,4 +30,2 @@ class QMyDialog: public QDialog | |||
30 | QListBox* ListBox; | 30 | QListBox* ListBox; |
31 | QPushButton* OKButton; | ||
32 | QPushButton* CancelButton; | ||
33 | QLabel* Label1; | 31 | QLabel* Label1; |
@@ -48,4 +46,2 @@ class QMyDialog: public QDialog | |||
48 | void ComboChanged(int); | 46 | void ComboChanged(int); |
49 | void OKClicked(); | ||
50 | void CancelClicked(); | ||
51 | void AddClicked(); | 47 | void AddClicked(); |
@@ -64,2 +60,4 @@ class QMyDialog: public QDialog | |||
64 | QMyConnectionItem* ConnectionList[10]; | 60 | QMyConnectionItem* ConnectionList[10]; |
61 | protected slots: | ||
62 | void accept(); | ||
65 | }; | 63 | }; |