Diffstat (limited to 'core/pim/addressbook/addressbook.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 39d8321..108e66d 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -91,13 +91,13 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | |||
91 | Config cfg("AddressBook"); | 91 | Config cfg("AddressBook"); |
92 | cfg.setGroup("Search"); | 92 | cfg.setGroup("Search"); |
93 | useRegExp = cfg.readBoolEntry( "useRegExp" ); | 93 | useRegExp = cfg.readBoolEntry( "useRegExp" ); |
94 | caseSensitive = cfg.readBoolEntry( "caseSensitive" ); | 94 | caseSensitive = cfg.readBoolEntry( "caseSensitive" ); |
95 | doNotifyWrapAround = cfg.readBoolEntry( "doNotifyWrapAround" ); | 95 | doNotifyWrapAround = cfg.readBoolEntry( "doNotifyWrapAround" ); |
96 | cfg.setGroup("Mail"); | 96 | cfg.setGroup("Mail"); |
97 | m_useQtMail = cfg.readBoolEntry( "useQtMail" ); | 97 | m_useQtMail = cfg.readBoolEntry( "useQtMail", true ); |
98 | m_useOpieMail=cfg.readBoolEntry( "useOpieMail" ); | 98 | m_useOpieMail=cfg.readBoolEntry( "useOpieMail" ); |
99 | 99 | ||
100 | 100 | ||
101 | initFields(); | 101 | initFields(); |
102 | 102 | ||
103 | setCaption( tr("Contacts") ); | 103 | setCaption( tr("Contacts") ); |
@@ -670,18 +670,22 @@ void AddressbookWindow::editPersonal() | |||
670 | { | 670 | { |
671 | QString filename = addressbookPersonalVCardName(); | 671 | QString filename = addressbookPersonalVCardName(); |
672 | OContact me; | 672 | OContact me; |
673 | if (QFile::exists(filename)) | 673 | if (QFile::exists(filename)) |
674 | me = OContact::readVCard( filename )[0]; | 674 | me = OContact::readVCard( filename )[0]; |
675 | if (bAbEditFirstTime) { | 675 | if (bAbEditFirstTime) { |
676 | qWarning("Editing personal data"); | ||
676 | abEditor = new ContactEditor( me, &orderedFields, &slOrderedFields, | 677 | abEditor = new ContactEditor( me, &orderedFields, &slOrderedFields, |
677 | this, "editor" ); | 678 | this, "editor" ); |
678 | // don't create a new editor every time | 679 | // don't create a new editor every time |
679 | bAbEditFirstTime = FALSE; | 680 | bAbEditFirstTime = FALSE; |
680 | } else | 681 | } else{ |
681 | abEditor->setEntry( me ); | 682 | abEditor->setEntry( me ); |
683 | } | ||
684 | |||
685 | abEditor->setPersonalView( true ); | ||
682 | 686 | ||
683 | abEditor->setCaption(tr("Edit My Personal Details")); | 687 | abEditor->setCaption(tr("Edit My Personal Details")); |
684 | abEditor->showMaximized(); | 688 | abEditor->showMaximized(); |
685 | 689 | ||
686 | // fix the foxus... | 690 | // fix the foxus... |
687 | abEditor->setNameFocus(); | 691 | abEditor->setNameFocus(); |
@@ -691,12 +695,13 @@ void AddressbookWindow::editPersonal() | |||
691 | QString fname = addressbookPersonalVCardName(); | 695 | QString fname = addressbookPersonalVCardName(); |
692 | OContact::writeVCard( fname, new_personal ); | 696 | OContact::writeVCard( fname, new_personal ); |
693 | abView()->init(new_personal); | 697 | abView()->init(new_personal); |
694 | abView()->sync(); | 698 | abView()->sync(); |
695 | } | 699 | } |
696 | abEditor->setCaption( tr("Edit Address") ); | 700 | abEditor->setCaption( tr("Edit Address") ); |
701 | abEditor->setPersonalView( false ); | ||
697 | } | 702 | } |
698 | 703 | ||
699 | void AddressbookWindow::slotPersonalView() | 704 | void AddressbookWindow::slotPersonalView() |
700 | { | 705 | { |
701 | if (!actionPersonal->isOn()) { | 706 | if (!actionPersonal->isOn()) { |
702 | // we just turned it off | 707 | // we just turned it off |