author | tux_mike <tux_mike> | 2002-03-26 17:39:54 (UTC) |
---|---|---|
committer | tux_mike <tux_mike> | 2002-03-26 17:39:54 (UTC) |
commit | e91f77a9ebf359c0fbf4f8d1a0de50bf0dcf81d8 (patch) (unidiff) | |
tree | f3214c3c9dac147f43e127371e3f547f30c97dbf /core/pim | |
parent | 7c55845eb070ce39eb0673be191130be64e96cfb (diff) | |
download | opie-e91f77a9ebf359c0fbf4f8d1a0de50bf0dcf81d8.zip opie-e91f77a9ebf359c0fbf4f8d1a0de50bf0dcf81d8.tar.gz opie-e91f77a9ebf359c0fbf4f8d1a0de50bf0dcf81d8.tar.bz2 |
Mike Crawford <mike@tuxnami.org>
Changed addressbook input screen to be a little more user friendly,
divided all the options into 3 tabs.
-rw-r--r-- | core/pim/addressbook/abeditor.cpp | 2 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 8 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.h | 4 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.pro | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/core/pim/addressbook/abeditor.cpp b/core/pim/addressbook/abeditor.cpp index 94baa71..6354db9 100644 --- a/core/pim/addressbook/abeditor.cpp +++ b/core/pim/addressbook/abeditor.cpp | |||
@@ -44,25 +44,25 @@ static inline bool constainsWhiteSpace( const QString &str ); | |||
44 | // file format... | 44 | // file format... |
45 | void parseEmailFrom( const QString &txt, QString &strDefaultEmail, | 45 | void parseEmailFrom( const QString &txt, QString &strDefaultEmail, |
46 | QString &strAll ); | 46 | QString &strAll ); |
47 | 47 | ||
48 | // helper convert from file format to comma delimited... | 48 | // helper convert from file format to comma delimited... |
49 | void parseEmailTo( const QString &strDefaultEmail, | 49 | void parseEmailTo( const QString &strDefaultEmail, |
50 | const QString &strOtherEmail, QString &strBack ); | 50 | const QString &strOtherEmail, QString &strBack ); |
51 | 51 | ||
52 | 52 | ||
53 | 53 | ||
54 | AbEditor::AbEditor( const Contact &entry, const QValueList<int> *newOrdered, | 54 | AbEditor::AbEditor( const Contact &entry, const QValueList<int> *newOrdered, |
55 | QStringList *slNewOrdered, | 55 | QStringList *slNewOrdered, |
56 | QWidget *parent, const char *name, WFlags fl ) | 56 | QWidget *parent = 0, const char *name = 0, WFlags fl = 0 ) |
57 | : QDialog( parent, name, TRUE, fl ), | 57 | : QDialog( parent, name, TRUE, fl ), |
58 | orderedValues( newOrdered ), | 58 | orderedValues( newOrdered ), |
59 | slOrdered( slNewOrdered ) | 59 | slOrdered( slNewOrdered ) |
60 | { | 60 | { |
61 | init(); | 61 | init(); |
62 | initMap(); | 62 | initMap(); |
63 | setEntry( entry ); | 63 | setEntry( entry ); |
64 | } | 64 | } |
65 | 65 | ||
66 | AbEditor::~AbEditor() | 66 | AbEditor::~AbEditor() |
67 | { | 67 | { |
68 | } | 68 | } |
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index a2b8276..e8fa37c 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -11,25 +11,25 @@ | |||
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 | #define QTOPIA_INTERNAL_FD | 21 | #define QTOPIA_INTERNAL_FD |
22 | 22 | ||
23 | #include "abeditor.h" | 23 | #include "contacteditor.h" |
24 | #include "ablabel.h" | 24 | #include "ablabel.h" |
25 | #include "abtable.h" | 25 | #include "abtable.h" |
26 | #include "addresssettings.h" | 26 | #include "addresssettings.h" |
27 | #include "addressbook.h" | 27 | #include "addressbook.h" |
28 | 28 | ||
29 | #include <qpe/qpeapplication.h> | 29 | #include <qpe/qpeapplication.h> |
30 | #include <qpe/config.h> | 30 | #include <qpe/config.h> |
31 | #include <qpe/contact.h> | 31 | #include <qpe/contact.h> |
32 | #include <qpe/finddialog.h> | 32 | #include <qpe/finddialog.h> |
33 | #include <qpe/global.h> | 33 | #include <qpe/global.h> |
34 | #include <qpe/resource.h> | 34 | #include <qpe/resource.h> |
35 | #include <qpe/ir.h> | 35 | #include <qpe/ir.h> |
@@ -420,25 +420,25 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) | |||
420 | Contact cnt; | 420 | Contact cnt; |
421 | QString fn, mn, ln; | 421 | QString fn, mn, ln; |
422 | parseName( name, &fn, &mn, &ln ); | 422 | parseName( name, &fn, &mn, &ln ); |
423 | //qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() ); | 423 | //qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() ); |
424 | cnt.setFirstName( fn ); | 424 | cnt.setFirstName( fn ); |
425 | cnt.setMiddleName( mn ); | 425 | cnt.setMiddleName( mn ); |
426 | cnt.setLastName( ln ); | 426 | cnt.setLastName( ln ); |
427 | cnt.setEmails( email ); | 427 | cnt.setEmails( email ); |
428 | cnt.setDefaultEmail( email ); | 428 | cnt.setDefaultEmail( email ); |
429 | cnt.setFileAs(); | 429 | cnt.setFileAs(); |
430 | 430 | ||
431 | if ( bAbEditFirstTime ) { | 431 | if ( bAbEditFirstTime ) { |
432 | abEditor = new AbEditor( cnt, &orderedFields, &slOrderedFields, | 432 | abEditor = new ContactEditor( cnt, &orderedFields, &slOrderedFields, |
433 | this, "editor" ); | 433 | this, "editor" ); |
434 | bAbEditFirstTime = FALSE; | 434 | bAbEditFirstTime = FALSE; |
435 | } else { | 435 | } else { |
436 | abEditor->setEntry( cnt ); | 436 | abEditor->setEntry( cnt ); |
437 | } | 437 | } |
438 | abView()->init( cnt ); | 438 | abView()->init( cnt ); |
439 | editEntry( NewEntry ); | 439 | editEntry( NewEntry ); |
440 | 440 | ||
441 | 441 | ||
442 | 442 | ||
443 | } | 443 | } |
444 | #if 0 | 444 | #if 0 |
@@ -471,25 +471,25 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) | |||
471 | } | 471 | } |
472 | #endif | 472 | #endif |
473 | 473 | ||
474 | } | 474 | } |
475 | 475 | ||
476 | void AddressbookWindow::editPersonal() | 476 | void AddressbookWindow::editPersonal() |
477 | { | 477 | { |
478 | QString filename = addressbookPersonalVCardName(); | 478 | QString filename = addressbookPersonalVCardName(); |
479 | Contact me; | 479 | Contact me; |
480 | if (QFile::exists(filename)) | 480 | if (QFile::exists(filename)) |
481 | me = Contact::readVCard( filename )[0]; | 481 | me = Contact::readVCard( filename )[0]; |
482 | if (bAbEditFirstTime) { | 482 | if (bAbEditFirstTime) { |
483 | abEditor = new AbEditor( me, &orderedFields, &slOrderedFields, | 483 | abEditor = new ContactEditor( me, &orderedFields, &slOrderedFields, |
484 | this, "editor" ); | 484 | this, "editor" ); |
485 | // don't create a new editor every time | 485 | // don't create a new editor every time |
486 | bAbEditFirstTime = FALSE; | 486 | bAbEditFirstTime = FALSE; |
487 | } else | 487 | } else |
488 | abEditor->setEntry( me ); | 488 | abEditor->setEntry( me ); |
489 | 489 | ||
490 | abEditor->setCaption(tr("Edit My Personal Details")); | 490 | abEditor->setCaption(tr("Edit My Personal Details")); |
491 | abEditor->showMaximized(); | 491 | abEditor->showMaximized(); |
492 | 492 | ||
493 | // fix the foxus... | 493 | // fix the foxus... |
494 | abEditor->setNameFocus(); | 494 | abEditor->setNameFocus(); |
495 | if ( abEditor->exec() ) { | 495 | if ( abEditor->exec() ) { |
@@ -531,25 +531,25 @@ void AddressbookWindow::slotPersonalView() | |||
531 | abView()->init( me ); | 531 | abView()->init( me ); |
532 | abView()->sync(); | 532 | abView()->sync(); |
533 | abList->hide(); | 533 | abList->hide(); |
534 | setCentralWidget( abView() ); | 534 | setCentralWidget( abView() ); |
535 | mView->show(); | 535 | mView->show(); |
536 | mView->setFocus(); | 536 | mView->setFocus(); |
537 | } | 537 | } |
538 | 538 | ||
539 | void AddressbookWindow::editEntry( EntryMode entryMode ) | 539 | void AddressbookWindow::editEntry( EntryMode entryMode ) |
540 | { | 540 | { |
541 | Contact entry; | 541 | Contact entry; |
542 | if ( bAbEditFirstTime ) { | 542 | if ( bAbEditFirstTime ) { |
543 | abEditor = new AbEditor( entry, &orderedFields, &slOrderedFields, | 543 | abEditor = new ContactEditor( entry, &orderedFields, &slOrderedFields, |
544 | this, "editor" ); | 544 | this, "editor" ); |
545 | bAbEditFirstTime = FALSE; | 545 | bAbEditFirstTime = FALSE; |
546 | if ( entryMode == EditEntry ) | 546 | if ( entryMode == EditEntry ) |
547 | abEditor->setEntry( abList->currentEntry() ); | 547 | abEditor->setEntry( abList->currentEntry() ); |
548 | } | 548 | } |
549 | // other things may chane the caption. | 549 | // other things may chane the caption. |
550 | abEditor->setCaption( tr("Edit Address") ); | 550 | abEditor->setCaption( tr("Edit Address") ); |
551 | 551 | ||
552 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) | 552 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) |
553 | abEditor->showMaximized(); | 553 | abEditor->showMaximized(); |
554 | #endif | 554 | #endif |
555 | // fix the foxus... | 555 | // fix the foxus... |
diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h index 9694465..342077f 100644 --- a/core/pim/addressbook/addressbook.h +++ b/core/pim/addressbook/addressbook.h | |||
@@ -13,25 +13,25 @@ | |||
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 | #ifndef Addressbook_H | 20 | #ifndef Addressbook_H |
21 | #define Addressbook_H | 21 | #define Addressbook_H |
22 | 22 | ||
23 | #include <qmainwindow.h> | 23 | #include <qmainwindow.h> |
24 | 24 | ||
25 | class AbEditor; | 25 | class ContactEditor; |
26 | class AbLabel; | 26 | class AbLabel; |
27 | class AbTable; | 27 | class AbTable; |
28 | class QPEToolBar; | 28 | class QPEToolBar; |
29 | class QPopupMenu; | 29 | class QPopupMenu; |
30 | class QToolButton; | 30 | class QToolButton; |
31 | class QDialog; | 31 | class QDialog; |
32 | class Ir; | 32 | class Ir; |
33 | class QAction; | 33 | class QAction; |
34 | 34 | ||
35 | class AddressbookWindow: public QMainWindow | 35 | class AddressbookWindow: public QMainWindow |
36 | { | 36 | { |
37 | Q_OBJECT | 37 | Q_OBJECT |
@@ -74,25 +74,25 @@ private slots: | |||
74 | private: | 74 | private: |
75 | void initFields();// inititialize our fields... | 75 | void initFields();// inititialize our fields... |
76 | AbLabel *abView(); | 76 | AbLabel *abView(); |
77 | void populateCategories(); | 77 | void populateCategories(); |
78 | 78 | ||
79 | QPopupMenu *catMenu; | 79 | QPopupMenu *catMenu; |
80 | QPEToolBar *listTools; | 80 | QPEToolBar *listTools; |
81 | QToolButton *deleteButton; | 81 | QToolButton *deleteButton; |
82 | QValueList<int> allFields, | 82 | QValueList<int> allFields, |
83 | orderedFields; | 83 | orderedFields; |
84 | QStringList slOrderedFields; | 84 | QStringList slOrderedFields; |
85 | enum Panes { paneList=0, paneView, paneEdit }; | 85 | enum Panes { paneList=0, paneView, paneEdit }; |
86 | AbEditor *abEditor; | 86 | ContactEditor *abEditor; |
87 | AbLabel *mView; | 87 | AbLabel *mView; |
88 | AbTable *abList; | 88 | AbTable *abList; |
89 | 89 | ||
90 | QAction *actionNew, *actionEdit, *actionTrash, *actionFind, *actionBeam, | 90 | QAction *actionNew, *actionEdit, *actionTrash, *actionFind, *actionBeam, |
91 | *actionPersonal, *actionMail; | 91 | *actionPersonal, *actionMail; |
92 | 92 | ||
93 | bool bAbEditFirstTime; | 93 | bool bAbEditFirstTime; |
94 | int viewMargin; | 94 | int viewMargin; |
95 | 95 | ||
96 | bool syncing; | 96 | bool syncing; |
97 | }; | 97 | }; |
98 | 98 | ||
diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro index 31de2a3..180b401 100644 --- a/core/pim/addressbook/addressbook.pro +++ b/core/pim/addressbook/addressbook.pro | |||
@@ -1,23 +1,23 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG = qt warn_on release | 2 | CONFIG = qt warn_on release |
3 | DESTDIR = $(OPIEDIR)/bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | HEADERS= addressbook.h \ | 4 | HEADERS= addressbook.h \ |
5 | abeditor.h \ | 5 | contacteditor.h \ |
6 | ablabel.h \ | 6 | ablabel.h \ |
7 | abtable.h \ | 7 | abtable.h \ |
8 | addresssettings.h | 8 | addresssettings.h |
9 | SOURCES= main.cpp \ | 9 | SOURCES= main.cpp \ |
10 | addressbook.cpp \ | 10 | addressbook.cpp \ |
11 | abeditor.cpp \ | 11 | contacteditor.cpp \ |
12 | ablabel.cpp \ | 12 | ablabel.cpp \ |
13 | abtable.cpp \ | 13 | abtable.cpp \ |
14 | addresssettings.cpp | 14 | addresssettings.cpp |
15 | INTERFACES= addresssettingsbase.ui | 15 | INTERFACES= addresssettingsbase.ui |
16 | 16 | ||
17 | TARGET = addressbook | 17 | TARGET = addressbook |
18 | INCLUDEPATH += $(OPIEDIR)/include | 18 | INCLUDEPATH += $(OPIEDIR)/include |
19 | DEPENDPATH+= $(OPIEDIR)/include | 19 | DEPENDPATH+= $(OPIEDIR)/include |
20 | LIBS += -lqpe | 20 | LIBS += -lqpe |
21 | 21 | ||
22 | TRANSLATIONS = ../i18n/de/addressbook.ts | 22 | TRANSLATIONS = ../i18n/de/addressbook.ts |
23 | TRANSLATIONS += ../i18n/pt_BR/addressbook.ts | 23 | TRANSLATIONS += ../i18n/pt_BR/addressbook.ts |