author | tille <tille> | 2002-12-14 23:41:39 (UTC) |
---|---|---|
committer | tille <tille> | 2002-12-14 23:41:39 (UTC) |
commit | 3fb7da21aa421afdbdbfd6e02a457d7d55236ef7 (patch) (unidiff) | |
tree | e48be6be2cab6f1f1607dad30aea8b52c7a89500 | |
parent | 11638099db6dd30ff5542f636f5291e2af20c3e1 (diff) | |
download | opie-3fb7da21aa421afdbdbfd6e02a457d7d55236ef7.zip opie-3fb7da21aa421afdbdbfd6e02a457d7d55236ef7.tar.gz opie-3fb7da21aa421afdbdbfd6e02a457d7d55236ef7.tar.bz2 |
fixes bug #548
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 30fa85b..c2cce92 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -688,64 +688,65 @@ void AddressbookWindow::editEntry( EntryMode entryMode ) | |||
688 | 688 | ||
689 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) | 689 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) |
690 | abEditor->showMaximized(); | 690 | abEditor->showMaximized(); |
691 | #endif | 691 | #endif |
692 | // fix the foxus... | 692 | // fix the foxus... |
693 | abEditor->setNameFocus(); | 693 | abEditor->setNameFocus(); |
694 | if ( abEditor->exec() ) { | 694 | if ( abEditor->exec() ) { |
695 | setFocus(); | 695 | setFocus(); |
696 | if ( entryMode == NewEntry ) { | 696 | if ( entryMode == NewEntry ) { |
697 | OContact insertEntry = abEditor->entry(); | 697 | OContact insertEntry = abEditor->entry(); |
698 | insertEntry.assignUid(); | 698 | insertEntry.assignUid(); |
699 | m_abView -> addEntry( insertEntry ); | 699 | m_abView -> addEntry( insertEntry ); |
700 | } else { | 700 | } else { |
701 | OContact replEntry = abEditor->entry(); | 701 | OContact replEntry = abEditor->entry(); |
702 | 702 | ||
703 | if ( !replEntry.isValidUid() ) | 703 | if ( !replEntry.isValidUid() ) |
704 | replEntry.assignUid(); | 704 | replEntry.assignUid(); |
705 | 705 | ||
706 | m_abView -> replaceEntry( replEntry ); | 706 | m_abView -> replaceEntry( replEntry ); |
707 | } | 707 | } |
708 | } | 708 | } |
709 | // populateCategories(); | 709 | // populateCategories(); |
710 | 710 | ||
711 | } | 711 | } |
712 | 712 | ||
713 | void AddressbookWindow::editPersonal() | 713 | void AddressbookWindow::editPersonal() |
714 | { | 714 | { |
715 | OContact entry; | 715 | OContact entry; |
716 | if ( !abEditor ) { | 716 | if ( !abEditor ) { |
717 | abEditor = new ContactEditor( entry, this, "editor" ); | 717 | abEditor = new ContactEditor( entry, this, "editor" ); |
718 | } | 718 | } |
719 | 719 | ||
720 | m_abView->showPersonal( true ); | ||
720 | abEditor->setCaption(tr("Edit My Personal Details")); | 721 | abEditor->setCaption(tr("Edit My Personal Details")); |
721 | abEditor->setPersonalView( true ); | 722 | abEditor->setPersonalView( true ); |
722 | editEntry( EditEntry ); | 723 | editEntry( EditEntry ); |
723 | abEditor->setPersonalView( false ); | 724 | abEditor->setPersonalView( false ); |
724 | 725 | ||
725 | } | 726 | } |
726 | 727 | ||
727 | 728 | ||
728 | void AddressbookWindow::slotPersonalView() | 729 | void AddressbookWindow::slotPersonalView() |
729 | { | 730 | { |
730 | if (!actionPersonal->isOn()) { | 731 | if (!actionPersonal->isOn()) { |
731 | // we just turned it off | 732 | // we just turned it off |
732 | setCaption( tr("Contacts") ); | 733 | setCaption( tr("Contacts") ); |
733 | actionNew->setEnabled(TRUE); | 734 | actionNew->setEnabled(TRUE); |
734 | actionTrash->setEnabled(TRUE); | 735 | actionTrash->setEnabled(TRUE); |
735 | actionFind->setEnabled(TRUE); | 736 | actionFind->setEnabled(TRUE); |
736 | actionMail->setEnabled(TRUE); | 737 | actionMail->setEnabled(TRUE); |
737 | // slotUpdateToolbar(); | 738 | // slotUpdateToolbar(); |
738 | 739 | ||
739 | m_abView->showPersonal( false ); | 740 | m_abView->showPersonal( false ); |
740 | 741 | ||
741 | return; | 742 | return; |
742 | } | 743 | } |
743 | 744 | ||
744 | // XXX need to disable some QActions. | 745 | // XXX need to disable some QActions. |
745 | actionNew->setEnabled(FALSE); | 746 | actionNew->setEnabled(FALSE); |
746 | actionTrash->setEnabled(FALSE); | 747 | actionTrash->setEnabled(FALSE); |
747 | actionFind->setEnabled(FALSE); | 748 | actionFind->setEnabled(FALSE); |
748 | actionMail->setEnabled(FALSE); | 749 | actionMail->setEnabled(FALSE); |
749 | 750 | ||
750 | setCaption( tr("Contacts - My Personal Details") ); | 751 | setCaption( tr("Contacts - My Personal Details") ); |
751 | 752 | ||