author | treke <treke> | 2003-11-11 07:14:38 (UTC) |
---|---|---|
committer | treke <treke> | 2003-11-11 07:14:38 (UTC) |
commit | 1eb61020dcba9bafd2926ab701120f5ef94905f7 (patch) (side-by-side diff) | |
tree | 10d128bbf5b5b597aaf9602cb372ccbe46c12558 /core | |
parent | f3326a60ba002b420f33b6132dc1740c0fc4ffef (diff) | |
download | opie-1eb61020dcba9bafd2926ab701120f5ef94905f7.zip opie-1eb61020dcba9bafd2926ab701120f5ef94905f7.tar.gz opie-1eb61020dcba9bafd2926ab701120f5ef94905f7.tar.bz2 |
Updating apps to use quickexec. Ipks are now generated properly.
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 4 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.h | 1 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.pro | 6 | ||||
-rw-r--r-- | core/pim/addressbook/main.cpp | 17 | ||||
-rw-r--r-- | core/pim/datebook/datebook.h | 1 | ||||
-rw-r--r-- | core/pim/datebook/datebook.pro | 4 | ||||
-rw-r--r-- | core/pim/datebook/main.cpp | 17 | ||||
-rw-r--r-- | core/pim/osearch/main.cpp | 11 | ||||
-rw-r--r-- | core/pim/osearch/osearch.pro | 17 | ||||
-rw-r--r-- | core/pim/today/today.pro | 18 |
10 files changed, 24 insertions, 72 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 0ba024e..438c270 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp @@ -247,48 +247,52 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, QObject::connect( m_abView, SIGNAL(signalNotFound()), this, SLOT(slotNotFound()) ); // m_abView->load(); // Already done by c'tor . // Letter Picker pLabel = new LetterPicker( listContainer ); connect(pLabel, SIGNAL(letterClicked(char)), this, SLOT(slotSetLetter(char))); connect(m_abView, SIGNAL( signalClearLetterPicker() ), pLabel, SLOT( clear() ) ); vb->addWidget( pLabel ); // All Categories into view-menu.. populateCategories(); // Fontsize defaultFont = new QFont( m_abView->font() ); slotSetFont(m_config.fontSize()); m_curFontSize = m_config.fontSize(); setCentralWidget(listContainer); // qDebug("adressbook contrsuction: t=%d", t.elapsed() ); + connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) ); + connect( qApp, SIGNAL( reload() ), this, SLOT( reload() ) ); + connect( qApp, SIGNAL( appMessage(const QCString &, const QByteArray &) ), + this, SLOT( appMessage(const QCString &, const QByteArray &) ) ); isLoading = false; } void AddressbookWindow::slotConfig() { ConfigDlg* dlg = new ConfigDlg( this, "Config" ); dlg -> setConfig( m_config ); dlg -> showMaximized(); if ( dlg -> exec() ) { qWarning ("Config Dialog accepted!"); m_config = dlg -> getConfig(); if ( m_curFontSize != m_config.fontSize() ){ qWarning("Font was changed!"); m_curFontSize = m_config.fontSize(); emit slotSetFont( m_curFontSize ); } m_abView -> setListOrder( m_config.orderList() ); } delete dlg; } diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h index f7a560a..34bcb2a 100644 --- a/core/pim/addressbook/addressbook.h +++ b/core/pim/addressbook/addressbook.h @@ -27,48 +27,49 @@ #include <qvaluelist.h> #include <qstringlist.h> #include <qlineedit.h> #include "ofloatbar.h" #include "abview.h" #include "abconfig.h" class ContactEditor; class AbLabel; class AbTable; class QPEToolBar; class QPopupMenu; class QToolButton; class QDialog; class Ir; class QAction; class LetterPicker; class AddressbookWindow: public QMainWindow { Q_OBJECT public: enum EntryMode { NewEntry=0, EditEntry }; + static QString appName() { return QString::fromLatin1("addressbook"); } AddressbookWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); ~AddressbookWindow(); protected: void resizeEvent( QResizeEvent * e ); void editPersonal(); void editEntry( EntryMode ); void closeEvent( QCloseEvent *e ); bool save(); public slots: void flush(); void reload(); void appMessage(const QCString &, const QByteArray &); void setDocument( const QString & ); #ifdef __DEBUG_RELEASE // void slotSave(); #endif private slots: void importvCard(); void exportvCard(); void slotListNew(); diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro index c90568a..6a04e22 100644 --- a/core/pim/addressbook/addressbook.pro +++ b/core/pim/addressbook/addressbook.pro @@ -1,28 +1,26 @@ -TEMPLATE = app -#CONFIG = qt warn_on release -CONFIG = qt warn_on debug -DESTDIR = $(OPIEDIR)/bin +#CONFIG = qt warn_on release quick-app +CONFIG = qt warn_on debug quick-app HEADERS = addressbook.h \ contacteditor.h \ ablabel.h \ abtable.h \ picker.h \ ofloatbar.h \ configdlg.h \ abconfig.h \ abview.h SOURCES = main.cpp \ addressbook.cpp \ contacteditor.cpp \ ablabel.cpp \ abtable.cpp \ picker.cpp \ configdlg.cpp \ abconfig.cpp \ abview.cpp INTERFACES = configdlg_base.ui TARGET = addressbook INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lopie diff --git a/core/pim/addressbook/main.cpp b/core/pim/addressbook/main.cpp index 2ea1819..97bfa6d 100644 --- a/core/pim/addressbook/main.cpp +++ b/core/pim/addressbook/main.cpp @@ -1,41 +1,28 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of Qt Palmtop 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 "addressbook.h" #include <qpe/qpeapplication.h> -#include <qpe/qcopenvelope_qws.h> -#include <qstring.h> -int main( int argc, char ** argv ) -{ - QPEApplication a( argc, argv ); +#include <opie/oapplicationfactory.h> - AddressbookWindow mw; - QObject::connect( &a, SIGNAL( flush() ), &mw, SLOT( flush() ) ); - QObject::connect( &a, SIGNAL( reload() ), &mw, SLOT( reload() ) ); - QObject::connect( &a, SIGNAL( appMessage(const QCString &, const QByteArray &) ), - &mw, SLOT( appMessage(const QCString &, const QByteArray &) ) ); +OPIE_EXPORT_APP( OApplicationFactory<AddressbookWindow> ) - mw.setCaption( AddressbookWindow::tr("Contacts") ); - a.showMainDocumentWidget(&mw); - - return a.exec(); -} diff --git a/core/pim/datebook/datebook.h b/core/pim/datebook/datebook.h index eeb8666..d7cfb33 100644 --- a/core/pim/datebook/datebook.h +++ b/core/pim/datebook/datebook.h @@ -26,48 +26,49 @@ enum { DAY=1,WEEK,WEEKLST,MONTH }; // defaultView values enum { NONE=0,NORMAL,EXTENDED }; // WeekLstView's modes. class QAction; class QWidgetStack; class DateBookDay; class DateBookWeek; class DateBookWeekLst; class DateBookMonth; class Event; class QDate; class Ir; class DateBookDBHack : public DateBookDB { public: Event eventByUID(int id); }; class DateBook : public QMainWindow { Q_OBJECT public: + static QString appName() { return QString::fromLatin1("datebook"); } DateBook( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); ~DateBook(); signals: void newEvent(); void signalNotFound(); void signalWrapAround(); protected: QDate currentDate(); void timerEvent( QTimerEvent *e ); void closeEvent( QCloseEvent *e ); void view(int v, const QDate &d); public slots: void flush(); void reload(); private slots: void fileNew(); void slotNewEntry(const QDateTime &start, const QDateTime &end, const QString &str, const QString &location=0); void slotSettings(); void slotToday(); // view today diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro index ae30c8d..6f2d775 100644 --- a/core/pim/datebook/datebook.pro +++ b/core/pim/datebook/datebook.pro @@ -1,27 +1,25 @@ -TEMPLATE = app -CONFIG += qt warn_on release -DESTDIR = $(OPIEDIR)/bin +CONFIG += qt warn_on release quick-app HEADERS = datebookday.h \ datebook.h \ dateentryimpl.h \ datebookdayheaderimpl.h \ datebooksettings.h \ datebookweek.h \ datebookweeklst.h \ datebookweekheaderimpl.h \ repeatentry.h \ noteentryimpl.h \ onoteedit.h \ datebookdayallday.h SOURCES = main.cpp \ datebookday.cpp \ datebook.cpp \ dateentryimpl.cpp \ datebookdayheaderimpl.cpp \ datebooksettings.cpp \ datebookweek.cpp \ datebookweeklst.cpp \ datebookweekheaderimpl.cpp \ repeatentry.cpp \ noteentryimpl.cpp \ onoteedit.cpp \ diff --git a/core/pim/datebook/main.cpp b/core/pim/datebook/main.cpp index caa5fb6..8004690 100644 --- a/core/pim/datebook/main.cpp +++ b/core/pim/datebook/main.cpp @@ -1,38 +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 "datebook.h" #include <qpe/qpeapplication.h> +#include <opie/oapplicationfactory.h> - -int main( int argc, char **argv ) -{ - QPEApplication a( argc, argv ); - - DateBook e; - QObject::connect( &a, SIGNAL( flush() ), &e, SLOT( flush() ) ); - QObject::connect( &a, SIGNAL( reload() ), &e, SLOT( reload() ) ); - - - e.setCaption( DateBook::tr("Calendar") ); - a.showMainWidget(&e); - - return a.exec(); -} +OPIE_EXPORT_APP( OApplicationFactory<DateBook> ) diff --git a/core/pim/osearch/main.cpp b/core/pim/osearch/main.cpp index 6c18adb..9a03818 100644 --- a/core/pim/osearch/main.cpp +++ b/core/pim/osearch/main.cpp @@ -1,14 +1,7 @@ #include "mainwindow.h" #include <qpe/qpeapplication.h> +#include <opie/oapplicationfactory.h> -int main( int argc, char ** argv ) -{ - - QPEApplication a( argc, argv ); - MainWindow mw; - mw.showMaximized(); - a.showMainDocumentWidget( &mw ); - return a.exec(); -} +OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) diff --git a/core/pim/osearch/osearch.pro b/core/pim/osearch/osearch.pro index 2e571e3..c988f48 100644 --- a/core/pim/osearch/osearch.pro +++ b/core/pim/osearch/osearch.pro @@ -1,40 +1,39 @@ -DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie -INTERFACES = -include ( $(OPIEDIR)/include.pro ) -TEMPLATE = app -CONFIG += debug warn_on qt -DESTDIR = $(OPIEDIR)/bin -TARGET = osearch -INCLUDEPATH = $(OPIEDIR)/include +CONFIG += qt release warn_on quick-app SOURCES += main.cpp \ mainwindow.cpp \ olistview.cpp \ olistviewitem.cpp \ adresssearch.cpp \ todosearch.cpp \ datebooksearch.cpp \ searchgroup.cpp \ resultitem.cpp \ todoitem.cpp \ contactitem.cpp \ eventitem.cpp \ applnksearch.cpp \ applnkitem.cpp \ doclnkitem.cpp \ doclnksearch.cpp HEADERS += mainwindow.h \ olistview.h \ olistviewitem.h \ adresssearch.h \ todosearch.h \ datebooksearch.h \ searchgroup.h \ resultitem.h \ todoitem.h \ contactitem.h \ eventitem.h \ applnksearch.h \ applnkitem.h \ doclnkitem.h \ doclnksearch.h + +TARGET = osearch + +INCLUDEPATH = $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include +LIBS += -lqpe -lopie +include ( $(OPIEDIR)/include.pro ) diff --git a/core/pim/today/today.pro b/core/pim/today/today.pro index 218cab8..26692cc 100644 --- a/core/pim/today/today.pro +++ b/core/pim/today/today.pro @@ -1,46 +1,30 @@ -CONFIG = qt warn_on -#CONFIG = qt warn_on release +CONFIG += qt warn on release quick-app HEADERS = today.h todaybase.h todayconfig.h SOURCES = today.cpp todaybase.cpp todayconfig.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lopie INTERFACES = TARGET = today TRANSLATIONS = ../../../i18n/de/today.ts \ ../../../i18n/nl/today.ts \ ../../../i18n/xx/today.ts \ ../../../i18n/en/today.ts \ ../../../i18n/es/today.ts \ ../../../i18n/fr/today.ts \ ../../../i18n/hu/today.ts \ ../../../i18n/ja/today.ts \ ../../../i18n/ko/today.ts \ ../../../i18n/no/today.ts \ ../../../i18n/pl/today.ts \ ../../../i18n/pt/today.ts \ ../../../i18n/pt_BR/today.ts \ ../../../i18n/sl/today.ts \ ../../../i18n/zh_CN/today.ts \ ../../../i18n/zh_TW/today.ts \ ../../../i18n/it/today.ts \ ../../../i18n/da/today.ts include ( $(OPIEDIR)/include.pro ) - -oapp { - TEMPLATE = lib - SOURCES += plugin.cpp - LIBS += -loapp - - DESTDIR = $(OPIEDIR)/plugins/app - INCLUDEPATH += $(OPIEDIR)/core/apps/oapp - DEPENDPATH += $(OPIEDIR)/core/apps/oapp -} -else { - TEMPLATE = app - SOURCES += main.cpp - DESTDIR = $(OPIEDIR)/bin -} |