author | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
commit | 55ea6367fba8a82fbdca74599422717e4b3c3ec6 (patch) (side-by-side diff) | |
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 @@ -15,49 +15,49 @@ ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #ifndef TIMEWIDGETIMPL_H #define TIMEWIDGETIMPL_H #include <qlist.h> #include <qwidget.h> #include "citytimebase.h" const int CITIES = 6; // the number of cities... class ZoneMap; class CityTime : public CityTimeBase { Q_OBJECT public: CityTime(QWidget* parent = 0, const char *name = 0, WFlags fl = 0); ~CityTime(); - + static QString appName() { return QString::fromLatin1("citytime"); } public slots: void beginNewTz(); void slotNewTz( const QString& strNewCountry, const QString& strNewCity ); void changeClock( bool newClock ); protected: void timerEvent( QTimerEvent* ); void mousePressEvent( QMouseEvent* event ); private: void showTime( void ); // get and show the time for various places... void readInTimes( void ); // a method to get information from the config QString strRealTz; // save the TZ var QString nameRealTz; // and what it is called QString strHome; // the home variable... bool bAdded; // a flag to indicate things have been added... bool bWhichClock; int timerId; QWidget* selWidget; // a spot to hold the time zone for each city QString strCityTz[CITIES]; QList<QToolButton> listCities; 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 @@ -CONFIG += qt warn_on release -TEMPLATE = app -DESTDIR = $(OPIEDIR)/bin -#INTERFACES = citytimebase.ui +CONFIG += qt warn_on release quick-app HEADERS = citytime.h citytimebase.h zonemap.h sun.h stylusnormalizer.h SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp -TARGET = citytime INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe +TARGET = citytime + TRANSLATIONS = ../../../i18n/de/citytime.ts \ ../../../i18n/nl/citytime.ts \ ../../../i18n/xx/citytime.ts \ ../../../i18n/en/citytime.ts \ ../../../i18n/es/citytime.ts \ ../../../i18n/fr/citytime.ts \ ../../../i18n/hu/citytime.ts \ ../../../i18n/ja/citytime.ts \ ../../../i18n/ko/citytime.ts \ ../../../i18n/no/citytime.ts \ ../../../i18n/pl/citytime.ts \ ../../../i18n/pt/citytime.ts \ ../../../i18n/pt_BR/citytime.ts \ ../../../i18n/sl/citytime.ts \ ../../../i18n/zh_CN/citytime.ts \ ../../../i18n/zh_TW/citytime.ts \ ../../../i18n/da/citytime.ts 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 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "citytime.h" #include <qpe/qpeapplication.h> +#include <opie/oapplicationfactory.h> -int main( int argc, char** argv ) -{ - QPEApplication a( argc, argv ); - CityTime main; - a.showMainWidget( &main ); - return a.exec(); -} +OPIE_EXPORT_APP( OApplicationFactory<CityTime> ) |