Diffstat (limited to 'core/pim/addressbook/abeditor.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/addressbook/abeditor.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/pim/addressbook/abeditor.cpp b/core/pim/addressbook/abeditor.cpp index 91e8722..75e7ede 100644 --- a/core/pim/addressbook/abeditor.cpp +++ b/core/pim/addressbook/abeditor.cpp | |||
@@ -509,50 +509,49 @@ void AbEditor::saveEntry() | |||
509 | ent.setBirthday( it.current()->text() ); | 509 | ent.setBirthday( it.current()->text() ); |
510 | break; | 510 | break; |
511 | case Qtopia::Anniversary: | 511 | case Qtopia::Anniversary: |
512 | ent.setAnniversary( it.current()->text() ); | 512 | ent.setAnniversary( it.current()->text() ); |
513 | break; | 513 | break; |
514 | case Qtopia::Nickname: | 514 | case Qtopia::Nickname: |
515 | ent.setNickname( it.current()->text() ); | 515 | ent.setNickname( it.current()->text() ); |
516 | break; | 516 | break; |
517 | default: | 517 | default: |
518 | break; | 518 | break; |
519 | 519 | ||
520 | } | 520 | } |
521 | } | 521 | } |
522 | 522 | ||
523 | int gender = genderCombo->currentItem(); | 523 | int gender = genderCombo->currentItem(); |
524 | ent.setGender( QString::number( gender ) ); | 524 | ent.setGender( QString::number( gender ) ); |
525 | 525 | ||
526 | QString str = txtNote->text(); | 526 | QString str = txtNote->text(); |
527 | if ( !str.isNull() ) | 527 | if ( !str.isNull() ) |
528 | ent.setNotes( str ); | 528 | ent.setNotes( str ); |
529 | } | 529 | } |
530 | 530 | ||
531 | void AbEditor::slotNote() | 531 | void AbEditor::slotNote() |
532 | { | 532 | { |
533 | dlgNote->showMaximized(); | 533 | if ( ! QPEApplication::execDialog( &dlgNote ) ) { |
534 | if ( !dlgNote->exec() ) { | ||
535 | // reset the note... | 534 | // reset the note... |
536 | txtNote->setText( ent.notes() ); | 535 | txtNote->setText( ent.notes() ); |
537 | } | 536 | } |
538 | } | 537 | } |
539 | 538 | ||
540 | void AbEditor::setNameFocus() | 539 | void AbEditor::setNameFocus() |
541 | { | 540 | { |
542 | firstEdit->setFocus(); | 541 | firstEdit->setFocus(); |
543 | } | 542 | } |
544 | 543 | ||
545 | void parseEmailFrom( const QString &txt, QString &strDefaultEmail, | 544 | void parseEmailFrom( const QString &txt, QString &strDefaultEmail, |
546 | QString &strAll ) | 545 | QString &strAll ) |
547 | { | 546 | { |
548 | int where, | 547 | int where, |
549 | start; | 548 | start; |
550 | if ( txt.isEmpty() ) | 549 | if ( txt.isEmpty() ) |
551 | return; | 550 | return; |
552 | 551 | ||
553 | // find the first | 552 | // find the first |
554 | where = txt.find( ',' ); | 553 | where = txt.find( ',' ); |
555 | if ( where < 0 ) { | 554 | if ( where < 0 ) { |
556 | strDefaultEmail = txt; | 555 | strDefaultEmail = txt; |
557 | strAll = txt; | 556 | strAll = txt; |
558 | } else { | 557 | } else { |