-rw-r--r-- | noncore/settings/language/language.pro | 4 | ||||
-rw-r--r-- | noncore/settings/language/main.cpp | 13 | ||||
-rw-r--r-- | noncore/settings/language/settings.h | 2 |
3 files changed, 5 insertions, 14 deletions
diff --git a/noncore/settings/language/language.pro b/noncore/settings/language/language.pro index eb9e0b9..f181f7e 100644 --- a/noncore/settings/language/language.pro +++ b/noncore/settings/language/language.pro | |||
@@ -1,27 +1,25 @@ | |||
1 | TEMPLATE= app | 1 | CONFIG += qt warn_on release quick-app |
2 | CONFIG += qt warn_on release | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = settings.h | 2 | HEADERS = settings.h |
5 | SOURCES = language.cpp main.cpp | 3 | SOURCES = language.cpp main.cpp |
6 | INTERFACES= languagesettingsbase.ui | 4 | INTERFACES= languagesettingsbase.ui |
7 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH+= ../$(OPIEDIR)/include | 6 | DEPENDPATH+= ../$(OPIEDIR)/include |
9 | LIBS += -lqpe | 7 | LIBS += -lqpe |
10 | TARGET = language | 8 | TARGET = language |
11 | 9 | ||
12 | TRANSLATIONS = ../../../i18n/de/language.ts \ | 10 | TRANSLATIONS = ../../../i18n/de/language.ts \ |
13 | ../../../i18n/nl/language.ts \ | 11 | ../../../i18n/nl/language.ts \ |
14 | ../../../i18n/xx/language.ts \ | 12 | ../../../i18n/xx/language.ts \ |
15 | ../../../i18n/en/language.ts \ | 13 | ../../../i18n/en/language.ts \ |
16 | ../../../i18n/es/language.ts \ | 14 | ../../../i18n/es/language.ts \ |
17 | ../../../i18n/fr/language.ts \ | 15 | ../../../i18n/fr/language.ts \ |
18 | ../../../i18n/hu/language.ts \ | 16 | ../../../i18n/hu/language.ts \ |
19 | ../../../i18n/ja/language.ts \ | 17 | ../../../i18n/ja/language.ts \ |
20 | ../../../i18n/ko/language.ts \ | 18 | ../../../i18n/ko/language.ts \ |
21 | ../../../i18n/no/language.ts \ | 19 | ../../../i18n/no/language.ts \ |
22 | ../../../i18n/pl/language.ts \ | 20 | ../../../i18n/pl/language.ts \ |
23 | ../../../i18n/pt/language.ts \ | 21 | ../../../i18n/pt/language.ts \ |
24 | ../../../i18n/pt_BR/language.ts \ | 22 | ../../../i18n/pt_BR/language.ts \ |
25 | ../../../i18n/sl/language.ts \ | 23 | ../../../i18n/sl/language.ts \ |
26 | ../../../i18n/zh_CN/language.ts \ | 24 | ../../../i18n/zh_CN/language.ts \ |
27 | ../../../i18n/zh_TW/language.ts \ | 25 | ../../../i18n/zh_TW/language.ts \ |
diff --git a/noncore/settings/language/main.cpp b/noncore/settings/language/main.cpp index a760ff3..8bdf8a5 100644 --- a/noncore/settings/language/main.cpp +++ b/noncore/settings/language/main.cpp | |||
@@ -1,36 +1,27 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "settings.h" | 21 | #include "settings.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <opie/oapplicationfactory.h> | ||
24 | 25 | ||
25 | 26 | ||
26 | int main(int argc, char** argv) | 27 | OPIE_EXPORT_APP( OApplicationFactory<LanguageSettings> ) |
27 | { | ||
28 | QPEApplication a(argc,argv); | ||
29 | |||
30 | LanguageSettings dlg; | ||
31 | |||
32 | a.showMainWidget(&dlg); | ||
33 | |||
34 | return a.exec(); | ||
35 | } | ||
36 | |||
diff --git a/noncore/settings/language/settings.h b/noncore/settings/language/settings.h index 22cc987..a157d26 100644 --- a/noncore/settings/language/settings.h +++ b/noncore/settings/language/settings.h | |||
@@ -14,45 +14,47 @@ | |||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef SETTINGS_H | 20 | #ifndef SETTINGS_H |
21 | #define SETTINGS_H | 21 | #define SETTINGS_H |
22 | 22 | ||
23 | 23 | ||
24 | #include <qstrlist.h> | 24 | #include <qstrlist.h> |
25 | #include <qasciidict.h> | 25 | #include <qasciidict.h> |
26 | #include "languagesettingsbase.h" | 26 | #include "languagesettingsbase.h" |
27 | 27 | ||
28 | class QPEDialogListener; | 28 | class QPEDialogListener; |
29 | 29 | ||
30 | class LanguageSettings : public LanguageSettingsBase | 30 | class LanguageSettings : public LanguageSettingsBase |
31 | { | 31 | { |
32 | Q_OBJECT | 32 | Q_OBJECT |
33 | 33 | ||
34 | public: | 34 | public: |
35 | LanguageSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 35 | LanguageSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
36 | ~LanguageSettings(); | 36 | ~LanguageSettings(); |
37 | 37 | ||
38 | static QString appName() { return QString::fromLatin1("language"); } | ||
39 | |||
38 | protected: | 40 | protected: |
39 | void accept(); | 41 | void accept(); |
40 | void reject(); | 42 | void reject(); |
41 | void done(int); | 43 | void done(int); |
42 | 44 | ||
43 | QStrList langAvail; | 45 | QStrList langAvail; |
44 | 46 | ||
45 | private slots: | 47 | private slots: |
46 | void applyLanguage(); | 48 | void applyLanguage(); |
47 | void reset(); | 49 | void reset(); |
48 | 50 | ||
49 | private: | 51 | private: |
50 | static void setLanguage(const QString&); | 52 | static void setLanguage(const QString&); |
51 | static QString actualLanguage; | 53 | static QString actualLanguage; |
52 | 54 | ||
53 | QPEDialogListener *dl; | 55 | QPEDialogListener *dl; |
54 | }; | 56 | }; |
55 | 57 | ||
56 | 58 | ||
57 | #endif // SETTINGS_H | 59 | #endif // SETTINGS_H |
58 | 60 | ||