author | eilers <eilers> | 2002-10-08 12:33:52 (UTC) |
---|---|---|
committer | eilers <eilers> | 2002-10-08 12:33:52 (UTC) |
commit | a194611bf645fe7e2e9e83733ababc587fd42f1d (patch) (unidiff) | |
tree | 2c21a5576bce48dba2fe83f6c849c0d16025a848 /core/pim/addressbook/abeditor.cpp | |
parent | 333fec32d47ea32de9fb4c8cd378a519785a1ff8 (diff) | |
download | opie-a194611bf645fe7e2e9e83733ababc587fd42f1d.zip opie-a194611bf645fe7e2e9e83733ababc587fd42f1d.tar.gz opie-a194611bf645fe7e2e9e83733ababc587fd42f1d.tar.bz2 |
Joined development branch: It uses the new PIM API
Some features in "View" added by Darwin Zins, but they are
not finished..
Diffstat (limited to 'core/pim/addressbook/abeditor.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/addressbook/abeditor.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/core/pim/addressbook/abeditor.cpp b/core/pim/addressbook/abeditor.cpp index 6354db9..91e8722 100644 --- a/core/pim/addressbook/abeditor.cpp +++ b/core/pim/addressbook/abeditor.cpp | |||
@@ -48,13 +48,13 @@ void parseEmailFrom( const QString &txt, QString &strDefaultEmail, | |||
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 OContact &entry, const QValueList<int> *newOrdered, |
55 | QStringList *slNewOrdered, | 55 | QStringList *slNewOrdered, |
56 | QWidget *parent = 0, const char *name = 0, WFlags fl = 0 ) | 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 | { |
@@ -179,13 +179,13 @@ void AbEditor::loadFields() | |||
179 | QListIterator<QLabel> lit( listName ); | 179 | QListIterator<QLabel> lit( listName ); |
180 | for ( it = slOrdered->begin(); *lit; ++lit, ++it ) { | 180 | for ( it = slOrdered->begin(); *lit; ++lit, ++it ) { |
181 | (*lit)->setText( *it ); | 181 | (*lit)->setText( *it ); |
182 | } | 182 | } |
183 | } | 183 | } |
184 | 184 | ||
185 | void AbEditor::setEntry( const Contact &entry ) | 185 | void AbEditor::setEntry( const OContact &entry ) |
186 | { | 186 | { |
187 | ent = entry; | 187 | ent = entry; |
188 | QListIterator<QLineEdit> it( listValue ); | 188 | QListIterator<QLineEdit> it( listValue ); |
189 | firstEdit->setText( ent.firstName() ); | 189 | firstEdit->setText( ent.firstName() ); |
190 | lastEdit->setText( ent.lastName() ); | 190 | lastEdit->setText( ent.lastName() ); |
191 | cmbCat->setCategories( ent.categories(), "Contacts", tr("Contacts") ); | 191 | cmbCat->setCategories( ent.categories(), "Contacts", tr("Contacts") ); |
@@ -407,18 +407,18 @@ void AbEditor::saveEntry() | |||
407 | // } | 407 | // } |
408 | // break; | 408 | // break; |
409 | 409 | ||
410 | 410 | ||
411 | case Qtopia::DefaultEmail: | 411 | case Qtopia::DefaultEmail: |
412 | case Qtopia::Emails: | 412 | case Qtopia::Emails: |
413 | parseEmailFrom( it.current()->text(), strDefaultEmail, | 413 | parseEmailFrom( it.current()->text(), strDefaultEmail, |
414 | strOtherEmail ); | 414 | strOtherEmail ); |
415 | ent.setDefaultEmail( strDefaultEmail ); | 415 | ent.setDefaultEmail( strDefaultEmail ); |
416 | ent.setEmails( strOtherEmail ); | 416 | ent.setEmails( strOtherEmail ); |
417 | break; | 417 | break; |
418 | 418 | ||
419 | // home | 419 | // home |
420 | case Qtopia::HomeStreet: | 420 | case Qtopia::HomeStreet: |
421 | ent.setHomeStreet( it.current()->text() ); | 421 | ent.setHomeStreet( it.current()->text() ); |
422 | break; | 422 | break; |
423 | case Qtopia::HomeCity: | 423 | case Qtopia::HomeCity: |
424 | ent.setHomeCity( it.current()->text() ); | 424 | ent.setHomeCity( it.current()->text() ); |
@@ -546,12 +546,13 @@ void parseEmailFrom( const QString &txt, QString &strDefaultEmail, | |||
546 | QString &strAll ) | 546 | QString &strAll ) |
547 | { | 547 | { |
548 | int where, | 548 | int where, |
549 | start; | 549 | start; |
550 | if ( txt.isEmpty() ) | 550 | if ( txt.isEmpty() ) |
551 | return; | 551 | return; |
552 | |||
552 | // find the first | 553 | // find the first |
553 | where = txt.find( ',' ); | 554 | where = txt.find( ',' ); |
554 | if ( where < 0 ) { | 555 | if ( where < 0 ) { |
555 | strDefaultEmail = txt; | 556 | strDefaultEmail = txt; |
556 | strAll = txt; | 557 | strAll = txt; |
557 | } else { | 558 | } else { |