summaryrefslogtreecommitdiff
authortux_mike <tux_mike>2002-03-26 17:39:54 (UTC)
committer tux_mike <tux_mike>2002-03-26 17:39:54 (UTC)
commite91f77a9ebf359c0fbf4f8d1a0de50bf0dcf81d8 (patch) (unidiff)
treef3214c3c9dac147f43e127371e3f547f30c97dbf
parent7c55845eb070ce39eb0673be191130be64e96cfb (diff)
downloadopie-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/abeditor.cpp2
-rw-r--r--core/pim/addressbook/addressbook.cpp8
-rw-r--r--core/pim/addressbook/addressbook.h4
-rw-r--r--core/pim/addressbook/addressbook.pro4
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
@@ -53,7 +53,7 @@ void parseEmailTo( const QString &strDefaultEmail,
53 53
54AbEditor::AbEditor( const Contact &entry, const QValueList<int> *newOrdered, 54AbEditor::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 )
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
@@ -20,7 +20,7 @@
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"
@@ -429,7 +429,7 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
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 {
@@ -480,7 +480,7 @@ void AddressbookWindow::editPersonal()
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;
@@ -540,7 +540,7 @@ 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 )
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
@@ -22,7 +22,7 @@
22 22
23#include <qmainwindow.h> 23#include <qmainwindow.h>
24 24
25class AbEditor; 25class ContactEditor;
26class AbLabel; 26class AbLabel;
27class AbTable; 27class AbTable;
28class QPEToolBar; 28class QPEToolBar;
@@ -83,7 +83,7 @@ private:
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
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
@@ -2,13 +2,13 @@ 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