author | treke <treke> | 2003-11-11 07:14:38 (UTC) |
---|---|---|
committer | treke <treke> | 2003-11-11 07:14:38 (UTC) |
commit | 1eb61020dcba9bafd2926ab701120f5ef94905f7 (patch) (unidiff) | |
tree | 10d128bbf5b5b597aaf9602cb372ccbe46c12558 /core/pim/addressbook | |
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 |
4 files changed, 9 insertions, 19 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, | |||
247 | 247 | ||
248 | 248 | ||
249 | QObject::connect( m_abView, SIGNAL(signalNotFound()), this, SLOT(slotNotFound()) ); | 249 | QObject::connect( m_abView, SIGNAL(signalNotFound()), this, SLOT(slotNotFound()) ); |
250 | 250 | ||
251 | // m_abView->load(); // Already done by c'tor . | 251 | // m_abView->load(); // Already done by c'tor . |
252 | 252 | ||
253 | // Letter Picker | 253 | // Letter Picker |
254 | pLabel = new LetterPicker( listContainer ); | 254 | pLabel = new LetterPicker( listContainer ); |
255 | connect(pLabel, SIGNAL(letterClicked(char)), this, SLOT(slotSetLetter(char))); | 255 | connect(pLabel, SIGNAL(letterClicked(char)), this, SLOT(slotSetLetter(char))); |
256 | connect(m_abView, SIGNAL( signalClearLetterPicker() ), pLabel, SLOT( clear() ) ); | 256 | connect(m_abView, SIGNAL( signalClearLetterPicker() ), pLabel, SLOT( clear() ) ); |
257 | 257 | ||
258 | vb->addWidget( pLabel ); | 258 | vb->addWidget( pLabel ); |
259 | 259 | ||
260 | // All Categories into view-menu.. | 260 | // All Categories into view-menu.. |
261 | populateCategories(); | 261 | populateCategories(); |
262 | 262 | ||
263 | // Fontsize | 263 | // Fontsize |
264 | defaultFont = new QFont( m_abView->font() ); | 264 | defaultFont = new QFont( m_abView->font() ); |
265 | slotSetFont(m_config.fontSize()); | 265 | slotSetFont(m_config.fontSize()); |
266 | m_curFontSize = m_config.fontSize(); | 266 | m_curFontSize = m_config.fontSize(); |
267 | 267 | ||
268 | setCentralWidget(listContainer); | 268 | setCentralWidget(listContainer); |
269 | 269 | ||
270 | // qDebug("adressbook contrsuction: t=%d", t.elapsed() ); | 270 | // qDebug("adressbook contrsuction: t=%d", t.elapsed() ); |
271 | connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) ); | ||
272 | connect( qApp, SIGNAL( reload() ), this, SLOT( reload() ) ); | ||
273 | connect( qApp, SIGNAL( appMessage(const QCString &, const QByteArray &) ), | ||
274 | this, SLOT( appMessage(const QCString &, const QByteArray &) ) ); | ||
271 | 275 | ||
272 | 276 | ||
273 | isLoading = false; | 277 | isLoading = false; |
274 | } | 278 | } |
275 | 279 | ||
276 | 280 | ||
277 | void AddressbookWindow::slotConfig() | 281 | void AddressbookWindow::slotConfig() |
278 | { | 282 | { |
279 | ConfigDlg* dlg = new ConfigDlg( this, "Config" ); | 283 | ConfigDlg* dlg = new ConfigDlg( this, "Config" ); |
280 | dlg -> setConfig( m_config ); | 284 | dlg -> setConfig( m_config ); |
281 | dlg -> showMaximized(); | 285 | dlg -> showMaximized(); |
282 | if ( dlg -> exec() ) { | 286 | if ( dlg -> exec() ) { |
283 | qWarning ("Config Dialog accepted!"); | 287 | qWarning ("Config Dialog accepted!"); |
284 | m_config = dlg -> getConfig(); | 288 | m_config = dlg -> getConfig(); |
285 | if ( m_curFontSize != m_config.fontSize() ){ | 289 | if ( m_curFontSize != m_config.fontSize() ){ |
286 | qWarning("Font was changed!"); | 290 | qWarning("Font was changed!"); |
287 | m_curFontSize = m_config.fontSize(); | 291 | m_curFontSize = m_config.fontSize(); |
288 | emit slotSetFont( m_curFontSize ); | 292 | emit slotSetFont( m_curFontSize ); |
289 | } | 293 | } |
290 | m_abView -> setListOrder( m_config.orderList() ); | 294 | m_abView -> setListOrder( m_config.orderList() ); |
291 | } | 295 | } |
292 | 296 | ||
293 | delete dlg; | 297 | delete dlg; |
294 | } | 298 | } |
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 @@ | |||
27 | #include <qvaluelist.h> | 27 | #include <qvaluelist.h> |
28 | #include <qstringlist.h> | 28 | #include <qstringlist.h> |
29 | #include <qlineedit.h> | 29 | #include <qlineedit.h> |
30 | #include "ofloatbar.h" | 30 | #include "ofloatbar.h" |
31 | #include "abview.h" | 31 | #include "abview.h" |
32 | #include "abconfig.h" | 32 | #include "abconfig.h" |
33 | 33 | ||
34 | class ContactEditor; | 34 | class ContactEditor; |
35 | class AbLabel; | 35 | class AbLabel; |
36 | class AbTable; | 36 | class AbTable; |
37 | class QPEToolBar; | 37 | class QPEToolBar; |
38 | class QPopupMenu; | 38 | class QPopupMenu; |
39 | class QToolButton; | 39 | class QToolButton; |
40 | class QDialog; | 40 | class QDialog; |
41 | class Ir; | 41 | class Ir; |
42 | class QAction; | 42 | class QAction; |
43 | class LetterPicker; | 43 | class LetterPicker; |
44 | 44 | ||
45 | class AddressbookWindow: public QMainWindow | 45 | class AddressbookWindow: public QMainWindow |
46 | { | 46 | { |
47 | Q_OBJECT | 47 | Q_OBJECT |
48 | public: | 48 | public: |
49 | enum EntryMode { NewEntry=0, EditEntry }; | 49 | enum EntryMode { NewEntry=0, EditEntry }; |
50 | 50 | ||
51 | static QString appName() { return QString::fromLatin1("addressbook"); } | ||
51 | AddressbookWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); | 52 | AddressbookWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); |
52 | ~AddressbookWindow(); | 53 | ~AddressbookWindow(); |
53 | 54 | ||
54 | protected: | 55 | protected: |
55 | void resizeEvent( QResizeEvent * e ); | 56 | void resizeEvent( QResizeEvent * e ); |
56 | 57 | ||
57 | void editPersonal(); | 58 | void editPersonal(); |
58 | void editEntry( EntryMode ); | 59 | void editEntry( EntryMode ); |
59 | void closeEvent( QCloseEvent *e ); | 60 | void closeEvent( QCloseEvent *e ); |
60 | bool save(); | 61 | bool save(); |
61 | 62 | ||
62 | public slots: | 63 | public slots: |
63 | void flush(); | 64 | void flush(); |
64 | void reload(); | 65 | void reload(); |
65 | void appMessage(const QCString &, const QByteArray &); | 66 | void appMessage(const QCString &, const QByteArray &); |
66 | void setDocument( const QString & ); | 67 | void setDocument( const QString & ); |
67 | #ifdef __DEBUG_RELEASE | 68 | #ifdef __DEBUG_RELEASE |
68 | // void slotSave(); | 69 | // void slotSave(); |
69 | #endif | 70 | #endif |
70 | 71 | ||
71 | private slots: | 72 | private slots: |
72 | void importvCard(); | 73 | void importvCard(); |
73 | void exportvCard(); | 74 | void exportvCard(); |
74 | void slotListNew(); | 75 | 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 @@ | |||
1 | TEMPLATE= app | 1 | #CONFIG = qt warn_on release quick-app |
2 | #CONFIG = qt warn_on release | 2 | CONFIG = qt warn_on debug quick-app |
3 | CONFIG = qt warn_on debug | ||
4 | DESTDIR = $(OPIEDIR)/bin | ||
5 | HEADERS= addressbook.h \ | 3 | HEADERS= addressbook.h \ |
6 | contacteditor.h \ | 4 | contacteditor.h \ |
7 | ablabel.h \ | 5 | ablabel.h \ |
8 | abtable.h \ | 6 | abtable.h \ |
9 | picker.h \ | 7 | picker.h \ |
10 | ofloatbar.h \ | 8 | ofloatbar.h \ |
11 | configdlg.h \ | 9 | configdlg.h \ |
12 | abconfig.h \ | 10 | abconfig.h \ |
13 | abview.h | 11 | abview.h |
14 | SOURCES= main.cpp \ | 12 | SOURCES= main.cpp \ |
15 | addressbook.cpp \ | 13 | addressbook.cpp \ |
16 | contacteditor.cpp \ | 14 | contacteditor.cpp \ |
17 | ablabel.cpp \ | 15 | ablabel.cpp \ |
18 | abtable.cpp \ | 16 | abtable.cpp \ |
19 | picker.cpp \ | 17 | picker.cpp \ |
20 | configdlg.cpp \ | 18 | configdlg.cpp \ |
21 | abconfig.cpp \ | 19 | abconfig.cpp \ |
22 | abview.cpp | 20 | abview.cpp |
23 | 21 | ||
24 | INTERFACES= configdlg_base.ui | 22 | INTERFACES= configdlg_base.ui |
25 | TARGET = addressbook | 23 | TARGET = addressbook |
26 | INCLUDEPATH += $(OPIEDIR)/include | 24 | INCLUDEPATH += $(OPIEDIR)/include |
27 | DEPENDPATH+= $(OPIEDIR)/include | 25 | DEPENDPATH+= $(OPIEDIR)/include |
28 | LIBS += -lqpe -lopie | 26 | 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 @@ | |||
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 Qt Palmtop Environment. | 4 | ** This file is part of Qt Palmtop 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 "addressbook.h" | 21 | #include "addressbook.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <qpe/qcopenvelope_qws.h> | ||
25 | #include <qstring.h> | ||
26 | 24 | ||
27 | int main( int argc, char ** argv ) | 25 | #include <opie/oapplicationfactory.h> |
28 | { | ||
29 | QPEApplication a( argc, argv ); | ||
30 | 26 | ||
31 | AddressbookWindow mw; | 27 | OPIE_EXPORT_APP( OApplicationFactory<AddressbookWindow> ) |
32 | QObject::connect( &a, SIGNAL( flush() ), &mw, SLOT( flush() ) ); | ||
33 | QObject::connect( &a, SIGNAL( reload() ), &mw, SLOT( reload() ) ); | ||
34 | QObject::connect( &a, SIGNAL( appMessage(const QCString &, const QByteArray &) ), | ||
35 | &mw, SLOT( appMessage(const QCString &, const QByteArray &) ) ); | ||
36 | 28 | ||
37 | mw.setCaption( AddressbookWindow::tr("Contacts") ); | ||
38 | a.showMainDocumentWidget(&mw); | ||
39 | |||
40 | return a.exec(); | ||
41 | } | ||