-rw-r--r-- | noncore/apps/keyz-cfg/cfgdlg.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/keyz-cfg/cfgdlg.h | 2 | ||||
-rw-r--r-- | noncore/apps/keyz-cfg/main.cpp | 12 |
3 files changed, 10 insertions, 8 deletions
diff --git a/noncore/apps/keyz-cfg/cfgdlg.cpp b/noncore/apps/keyz-cfg/cfgdlg.cpp index 863f21e..3965198 100644 --- a/noncore/apps/keyz-cfg/cfgdlg.cpp +++ b/noncore/apps/keyz-cfg/cfgdlg.cpp | |||
@@ -5,7 +5,9 @@ | |||
5 | #include <unistd.h> | 5 | #include <unistd.h> |
6 | #include "cfgdlg.h" | 6 | #include "cfgdlg.h" |
7 | 7 | ||
8 | CfgDlg::CfgDlg(QWidget* parent, CfgFile* cf, QApplication* app):QDialog(parent), cfile(cf), application(app) { | 8 | CfgDlg::CfgDlg(QWidget* parent, CfgFile* cf, QApplication* app, bool mod): |
9 | QDialog(parent, "CfgDlg", mod), cfile(cf), application(app) { | ||
10 | |||
9 | setCaption(tr("keyz configurator")); | 11 | setCaption(tr("keyz configurator")); |
10 | 12 | ||
11 | QGridLayout* gl = new QGridLayout(this, 7, 5, 5, 5); | 13 | QGridLayout* gl = new QGridLayout(this, 7, 5, 5, 5); |
diff --git a/noncore/apps/keyz-cfg/cfgdlg.h b/noncore/apps/keyz-cfg/cfgdlg.h index 16732ee..cbefdf1 100644 --- a/noncore/apps/keyz-cfg/cfgdlg.h +++ b/noncore/apps/keyz-cfg/cfgdlg.h | |||
@@ -14,7 +14,7 @@ class CfgDlg : public QDialog { | |||
14 | Q_OBJECT | 14 | Q_OBJECT |
15 | 15 | ||
16 | public: | 16 | public: |
17 | CfgDlg(QWidget* parent, CfgFile* cfile, QApplication *); | 17 | CfgDlg(QWidget* parent, CfgFile* cfile, QApplication *, bool b = false); |
18 | virtual ~CfgDlg(); | 18 | virtual ~CfgDlg(); |
19 | 19 | ||
20 | protected: | 20 | protected: |
diff --git a/noncore/apps/keyz-cfg/main.cpp b/noncore/apps/keyz-cfg/main.cpp index 55cc23e..4615562 100644 --- a/noncore/apps/keyz-cfg/main.cpp +++ b/noncore/apps/keyz-cfg/main.cpp | |||
@@ -1,5 +1,6 @@ | |||
1 | #include <stdio.h> | 1 | #include <stdio.h> |
2 | #include <qpe/qpeapplication.h> | 2 | #include <qpe/qpeapplication.h> |
3 | #include <qlayout.h> | ||
3 | #include <qmainwindow.h> | 4 | #include <qmainwindow.h> |
4 | 5 | ||
5 | #include "cfgdlg.h" | 6 | #include "cfgdlg.h" |
@@ -10,13 +11,12 @@ int main( int argc, char **argv ) { | |||
10 | CfgParser cp; | 11 | CfgParser cp; |
11 | cp.load(QPEApplication::qpeDir()+"/share/zkb/zkb.xml", cfile); | 12 | cp.load(QPEApplication::qpeDir()+"/share/zkb/zkb.xml", cfile); |
12 | 13 | ||
13 | QMainWindow m; | ||
14 | CfgDlg c(&m, &cfile, &app); | ||
15 | app.showMainWidget(&m); | ||
16 | m.hide(); | ||
17 | c.showMaximized(); | ||
18 | 14 | ||
19 | int ret = app.exec(); | 15 | CfgDlg c(0, &cfile, &app, true); |
16 | |||
17 | |||
18 | app.showMainWidget(&c); | ||
19 | int ret = QPEApplication::execDialog(&c); | ||
20 | 20 | ||
21 | return ret; | 21 | return ret; |
22 | } | 22 | } |