-rw-r--r-- | noncore/apps/oxygen/main.cpp | 11 | ||||
-rw-r--r-- | noncore/apps/oxygen/oxygen.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/oxygen/oxygen.h | 15 | ||||
-rw-r--r-- | noncore/apps/oxygen/oxygen.pro | 28 |
4 files changed, 17 insertions, 43 deletions
diff --git a/noncore/apps/oxygen/main.cpp b/noncore/apps/oxygen/main.cpp index c8fcdb4..ac992aa 100644 --- a/noncore/apps/oxygen/main.cpp +++ b/noncore/apps/oxygen/main.cpp | |||
@@ -16,14 +16,9 @@ | |||
16 | **************************************************************************/ | 16 | **************************************************************************/ |
17 | 17 | ||
18 | 18 | ||
19 | #include <qpe/qpeapplication.h> | 19 | #include <qpe/qpeapplication.h> |
20 | #include <opie/oapplicationfactory.h> | ||
20 | #include "oxygen.h" | 21 | #include "oxygen.h" |
21 | 22 | ||
22 | int main(int argc, char **argv) | 23 | |
23 | { | 24 | OPIE_EXPORT_APP( OApplicationFactory<Oxygen> ) |
24 | QPEApplication app(argc, argv); | ||
25 | Oxygen *oxi = new Oxygen(); | ||
26 | app.setMainWidget(oxi); | ||
27 | oxi->showMaximized(); | ||
28 | return app.exec(); | ||
29 | } | ||
diff --git a/noncore/apps/oxygen/oxygen.cpp b/noncore/apps/oxygen/oxygen.cpp index 5999cb0..5bdc2aa 100644 --- a/noncore/apps/oxygen/oxygen.cpp +++ b/noncore/apps/oxygen/oxygen.cpp | |||
@@ -24,17 +24,17 @@ | |||
24 | #include "datawidgetui.h" | 24 | #include "datawidgetui.h" |
25 | #include "psewidget.h" | 25 | #include "psewidget.h" |
26 | 26 | ||
27 | 27 | ||
28 | Oxygen::Oxygen() : QMainWindow() | 28 | Oxygen::Oxygen( QWidget *parent, const char *name, WFlags f) : QMainWindow( parent, name, f ) |
29 | { | 29 | { |
30 | loadNames(); | 30 | loadNames(); |
31 | calcDlgUI *CalcDlgUI = new calcDlgUI(); | 31 | calcDlgUI *CalcDlgUI = new calcDlgUI(); |
32 | PSEWidget *pse = new PSEWidget(names); | 32 | PSEWidget *pse = new PSEWidget(names); |
33 | dataWidgetUI *DataWidgetUI = new dataWidgetUI(names); | 33 | dataWidgetUI *DataWidgetUI = new dataWidgetUI(names); |
34 | 34 | ||
35 | setCaption( tr( "Oxygen" ) ); | 35 | setCaption( tr( "Oxygen" ) ); |
36 | 36 | ||
37 | QTabWidget *tabw = new QTabWidget( this , "qtab" ); | 37 | QTabWidget *tabw = new QTabWidget( this , "qtab" ); |
38 | tabw->addTab( pse, tr( "PSE" )); | 38 | tabw->addTab( pse, tr( "PSE" )); |
39 | tabw->addTab( DataWidgetUI , tr( "Data" ) ); | 39 | tabw->addTab( DataWidgetUI , tr( "Data" ) ); |
40 | tabw->addTab( CalcDlgUI, tr( "Calculations" ) ); | 40 | tabw->addTab( CalcDlgUI, tr( "Calculations" ) ); |
diff --git a/noncore/apps/oxygen/oxygen.h b/noncore/apps/oxygen/oxygen.h index 57fe9fe..c59662d 100644 --- a/noncore/apps/oxygen/oxygen.h +++ b/noncore/apps/oxygen/oxygen.h | |||
@@ -12,13 +12,14 @@ class QStringList; | |||
12 | #include <qmainwindow.h> | 12 | #include <qmainwindow.h> |
13 | 13 | ||
14 | class Oxygen : public QMainWindow | 14 | class Oxygen : public QMainWindow |
15 | { | 15 | { |
16 | Q_OBJECT | 16 | Q_OBJECT |
17 | 17 | ||
18 | public: | 18 | public: |
19 | Oxygen(); | 19 | Oxygen(QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); |
20 | 20 | static QString appName() { return QString::fromLatin1("oxygen"); } | |
21 | private: | 21 | |
22 | void loadNames(); | 22 | private: |
23 | QStringList names; | 23 | void loadNames(); |
24 | QStringList names; | ||
24 | }; | 25 | }; |
diff --git a/noncore/apps/oxygen/oxygen.pro b/noncore/apps/oxygen/oxygen.pro index a41bf7b..71d4dac 100644 --- a/noncore/apps/oxygen/oxygen.pro +++ b/noncore/apps/oxygen/oxygen.pro | |||
@@ -1,6 +1,5 @@ | |||
1 | TEMPLATE= app | 1 | CONFIG = qt warn_on release quick-app |
2 | CONFIG = qt warn_on release | ||
3 | HEADERS = oxygen.h \ | 2 | HEADERS = oxygen.h \ |
4 | kmolcalc.h \ | 3 | kmolcalc.h \ |
5 | kmolelements.h \ | 4 | kmolelements.h \ |
6 | calcdlgui.h \ | 5 | calcdlgui.h \ |
@@ -19,31 +18,10 @@ SOURCES = main.cpp \ | |||
19 | oxyframe.cpp \ | 18 | oxyframe.cpp \ |
20 | datawidgetui.cpp | 19 | datawidgetui.cpp |
21 | INCLUDEPATH += $(OPIEDIR)/include | 20 | INCLUDEPATH += $(OPIEDIR)/include |
22 | DEPENDPATH += $(OPIEDIR)/include | 21 | DEPENDPATH += $(OPIEDIR)/include |
23 | LIBS += -lqpe -lstdc++ | 22 | LIBS += -lqpe |
24 | INTERFACES= calcdlg.ui | 23 | INTERFACES= calcdlg.ui |
25 | TARGET = oxygen | ||
26 | DESTDIR = $(OPIEDIR)/bin | ||
27 | |||
28 | TRANSLATIONS = ../../../i18n/de/oxygen.ts \ | ||
29 | ../../../i18n/nl/oxygen.ts \ | ||
30 | ../../../i18n/xx/oxygen.ts \ | ||
31 | ../../../i18n/en/oxygen.ts \ | ||
32 | ../../../i18n/es/oxygen.ts \ | ||
33 | ../../../i18n/fr/oxygen.ts \ | ||
34 | ../../../i18n/hu/oxygen.ts \ | ||
35 | ../../../i18n/ja/oxygen.ts \ | ||
36 | ../../../i18n/ko/oxygen.ts \ | ||
37 | ../../../i18n/no/oxygen.ts \ | ||
38 | ../../../i18n/pl/oxygen.ts \ | ||
39 | ../../../i18n/pt/oxygen.ts \ | ||
40 | ../../../i18n/pt_BR/oxygen.ts \ | ||
41 | ../../../i18n/sl/oxygen.ts \ | ||
42 | ../../../i18n/zh_CN/oxygen.ts \ | ||
43 | ../../../i18n/zh_TW/oxygen.ts \ | ||
44 | ../../../i18n/it/oxygen.ts \ | ||
45 | ../../../i18n/da/oxygen.ts | ||
46 | |||
47 | 24 | ||
25 | TARGET= oxygen | ||
48 | 26 | ||
49 | include ( $(OPIEDIR)/include.pro ) | 27 | include ( $(OPIEDIR)/include.pro ) |