author | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
commit | 55ea6367fba8a82fbdca74599422717e4b3c3ec6 (patch) (unidiff) | |
tree | b40bb13a1b4f05b4eda61cf0c4a02e32719a70c4 /core/settings/citytime | |
parent | 56ad1eb7fb39ddc78026a0df096703fcf42f5a94 (diff) | |
download | opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.zip opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.tar.gz opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.tar.bz2 |
merge core/settings/*
- light-and-power and security were a bit ugly, so I recommend someone
who actually dealt with these files looking into if I got it right
(not to tell about the frustratation about the fact that the ones who
dealt with these files didn't do the merge in the first place :(
-rw-r--r-- | core/settings/citytime/citytime.h | 2 | ||||
-rw-r--r-- | core/settings/citytime/citytime.pro | 8 | ||||
-rw-r--r-- | core/settings/citytime/main.cpp | 9 |
3 files changed, 6 insertions, 13 deletions
diff --git a/core/settings/citytime/citytime.h b/core/settings/citytime/citytime.h index 63e3102..cc3d487 100644 --- a/core/settings/citytime/citytime.h +++ b/core/settings/citytime/citytime.h | |||
@@ -1,68 +1,68 @@ | |||
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 | #ifndef TIMEWIDGETIMPL_H | 21 | #ifndef TIMEWIDGETIMPL_H |
22 | #define TIMEWIDGETIMPL_H | 22 | #define TIMEWIDGETIMPL_H |
23 | 23 | ||
24 | #include <qlist.h> | 24 | #include <qlist.h> |
25 | #include <qwidget.h> | 25 | #include <qwidget.h> |
26 | 26 | ||
27 | #include "citytimebase.h" | 27 | #include "citytimebase.h" |
28 | 28 | ||
29 | const int CITIES = 6; // the number of cities... | 29 | const int CITIES = 6; // the number of cities... |
30 | 30 | ||
31 | class ZoneMap; | 31 | class ZoneMap; |
32 | 32 | ||
33 | class CityTime : public CityTimeBase | 33 | class CityTime : public CityTimeBase |
34 | { | 34 | { |
35 | Q_OBJECT | 35 | Q_OBJECT |
36 | public: | 36 | public: |
37 | CityTime(QWidget* parent = 0, const char *name = 0, WFlags fl = 0); | 37 | CityTime(QWidget* parent = 0, const char *name = 0, WFlags fl = 0); |
38 | ~CityTime(); | 38 | ~CityTime(); |
39 | 39 | static QString appName() { return QString::fromLatin1("citytime"); } | |
40 | public slots: | 40 | public slots: |
41 | void beginNewTz(); | 41 | void beginNewTz(); |
42 | void slotNewTz( const QString& strNewCountry, const QString& strNewCity ); | 42 | void slotNewTz( const QString& strNewCountry, const QString& strNewCity ); |
43 | void changeClock( bool newClock ); | 43 | void changeClock( bool newClock ); |
44 | 44 | ||
45 | protected: | 45 | protected: |
46 | void timerEvent( QTimerEvent* ); | 46 | void timerEvent( QTimerEvent* ); |
47 | void mousePressEvent( QMouseEvent* event ); | 47 | void mousePressEvent( QMouseEvent* event ); |
48 | 48 | ||
49 | private: | 49 | private: |
50 | void showTime( void ); // get and show the time for various places... | 50 | void showTime( void ); // get and show the time for various places... |
51 | void readInTimes( void ); // a method to get information from the config | 51 | void readInTimes( void ); // a method to get information from the config |
52 | QString strRealTz; // save the TZ var | 52 | QString strRealTz; // save the TZ var |
53 | QString nameRealTz; // and what it is called | 53 | QString nameRealTz; // and what it is called |
54 | QString strHome; // the home variable... | 54 | QString strHome; // the home variable... |
55 | bool bAdded; // a flag to indicate things have been added... | 55 | bool bAdded; // a flag to indicate things have been added... |
56 | bool bWhichClock; | 56 | bool bWhichClock; |
57 | int timerId; | 57 | int timerId; |
58 | 58 | ||
59 | 59 | ||
60 | QWidget* selWidget; | 60 | QWidget* selWidget; |
61 | // a spot to hold the time zone for each city | 61 | // a spot to hold the time zone for each city |
62 | QString strCityTz[CITIES]; | 62 | QString strCityTz[CITIES]; |
63 | QList<QToolButton> listCities; | 63 | QList<QToolButton> listCities; |
64 | QList<QLabel> listTimes; | 64 | QList<QLabel> listTimes; |
65 | bool changed; | 65 | bool changed; |
66 | }; | 66 | }; |
67 | 67 | ||
68 | #endif | 68 | #endif |
diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro index c7f4d08..402bcf6 100644 --- a/core/settings/citytime/citytime.pro +++ b/core/settings/citytime/citytime.pro | |||
@@ -1,32 +1,30 @@ | |||
1 | CONFIG += qt warn_on release | 1 | CONFIG += qt warn_on release quick-app |
2 | TEMPLATE = app | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | #INTERFACES = citytimebase.ui | ||
5 | HEADERS = citytime.h citytimebase.h zonemap.h sun.h stylusnormalizer.h | 2 | HEADERS = citytime.h citytimebase.h zonemap.h sun.h stylusnormalizer.h |
6 | SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp | 3 | SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp |
7 | TARGET = citytime | ||
8 | INCLUDEPATH += $(OPIEDIR)/include | 4 | INCLUDEPATH += $(OPIEDIR)/include |
9 | DEPENDPATH += $(OPIEDIR)/include | 5 | DEPENDPATH += $(OPIEDIR)/include |
10 | LIBS += -lqpe | 6 | LIBS += -lqpe |
11 | 7 | ||
8 | TARGET= citytime | ||
9 | |||
12 | TRANSLATIONS = ../../../i18n/de/citytime.ts \ | 10 | TRANSLATIONS = ../../../i18n/de/citytime.ts \ |
13 | ../../../i18n/nl/citytime.ts \ | 11 | ../../../i18n/nl/citytime.ts \ |
14 | ../../../i18n/xx/citytime.ts \ | 12 | ../../../i18n/xx/citytime.ts \ |
15 | ../../../i18n/en/citytime.ts \ | 13 | ../../../i18n/en/citytime.ts \ |
16 | ../../../i18n/es/citytime.ts \ | 14 | ../../../i18n/es/citytime.ts \ |
17 | ../../../i18n/fr/citytime.ts \ | 15 | ../../../i18n/fr/citytime.ts \ |
18 | ../../../i18n/hu/citytime.ts \ | 16 | ../../../i18n/hu/citytime.ts \ |
19 | ../../../i18n/ja/citytime.ts \ | 17 | ../../../i18n/ja/citytime.ts \ |
20 | ../../../i18n/ko/citytime.ts \ | 18 | ../../../i18n/ko/citytime.ts \ |
21 | ../../../i18n/no/citytime.ts \ | 19 | ../../../i18n/no/citytime.ts \ |
22 | ../../../i18n/pl/citytime.ts \ | 20 | ../../../i18n/pl/citytime.ts \ |
23 | ../../../i18n/pt/citytime.ts \ | 21 | ../../../i18n/pt/citytime.ts \ |
24 | ../../../i18n/pt_BR/citytime.ts \ | 22 | ../../../i18n/pt_BR/citytime.ts \ |
25 | ../../../i18n/sl/citytime.ts \ | 23 | ../../../i18n/sl/citytime.ts \ |
26 | ../../../i18n/zh_CN/citytime.ts \ | 24 | ../../../i18n/zh_CN/citytime.ts \ |
27 | ../../../i18n/zh_TW/citytime.ts \ | 25 | ../../../i18n/zh_TW/citytime.ts \ |
28 | ../../../i18n/da/citytime.ts | 26 | ../../../i18n/da/citytime.ts |
29 | 27 | ||
30 | 28 | ||
31 | 29 | ||
32 | include ( $(OPIEDIR)/include.pro ) | 30 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/core/settings/citytime/main.cpp b/core/settings/citytime/main.cpp index e8664c6..69bfe44 100644 --- a/core/settings/citytime/main.cpp +++ b/core/settings/citytime/main.cpp | |||
@@ -1,30 +1,25 @@ | |||
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 "citytime.h" | 21 | #include "citytime.h" |
22 | #include <qpe/qpeapplication.h> | 22 | #include <qpe/qpeapplication.h> |
23 | #include <opie/oapplicationfactory.h> | ||
23 | 24 | ||
24 | int main( int argc, char** argv ) | 25 | OPIE_EXPORT_APP( OApplicationFactory<CityTime> ) |
25 | { | ||
26 | QPEApplication a( argc, argv ); | ||
27 | CityTime main; | ||
28 | a.showMainWidget( &main ); | ||
29 | return a.exec(); | ||
30 | } | ||