author | eilers <eilers> | 2002-12-16 14:24:22 (UTC) |
---|---|---|
committer | eilers <eilers> | 2002-12-16 14:24:22 (UTC) |
commit | e555812af7b4183a9b6d276d0b9ac7f01b62eb2f (patch) (side-by-side diff) | |
tree | 471979f5d8c35c9eddc89479f223da14140c0f14 /core/pim/addressbook | |
parent | d1d849bab2d54b1e9144bca1f30786882be9a464 (diff) | |
download | opie-e555812af7b4183a9b6d276d0b9ac7f01b62eb2f.zip opie-e555812af7b4183a9b6d276d0b9ac7f01b62eb2f.tar.gz opie-e555812af7b4183a9b6d276d0b9ac7f01b62eb2f.tar.bz2 |
Improvement of previous bugfix
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 13 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.h | 4 |
2 files changed, 12 insertions, 5 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index c2cce92..12dc24e 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp @@ -710,41 +710,52 @@ void AddressbookWindow::editEntry( EntryMode entryMode ) } void AddressbookWindow::editPersonal() { OContact entry; + + // Switch to personal view if not selected + // but take care of the menu, too + if ( ! actionPersonal->isOn() ){ + qWarning("*** ++++"); + actionPersonal->setOn( true ); + slotPersonalView(); + } + if ( !abEditor ) { abEditor = new ContactEditor( entry, this, "editor" ); } - m_abView->showPersonal( true ); abEditor->setCaption(tr("Edit My Personal Details")); abEditor->setPersonalView( true ); editEntry( EditEntry ); abEditor->setPersonalView( false ); } void AddressbookWindow::slotPersonalView() { + qWarning("slotPersonalView()"); if (!actionPersonal->isOn()) { // we just turned it off + qWarning("slotPersonalView()-> OFF"); setCaption( tr("Contacts") ); actionNew->setEnabled(TRUE); actionTrash->setEnabled(TRUE); actionFind->setEnabled(TRUE); actionMail->setEnabled(TRUE); // slotUpdateToolbar(); m_abView->showPersonal( false ); return; } + qWarning("slotPersonalView()-> ON"); // XXX need to disable some QActions. actionNew->setEnabled(FALSE); actionTrash->setEnabled(FALSE); actionFind->setEnabled(FALSE); actionMail->setEnabled(FALSE); diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h index 2bedc0b..69fe2f8 100644 --- a/core/pim/addressbook/addressbook.h +++ b/core/pim/addressbook/addressbook.h @@ -96,21 +96,17 @@ private slots: void slotListView(); void slotCardView(); void slotConfig(); private: - // void initFields(); // inititialize our fields... - // AbLabel *abView(); void populateCategories(); QPopupMenu *catMenu; QPEToolBar *listTools; QToolButton *deleteButton; - // QValueList<int> allFields, orderedFields; - // QStringList slOrderedFields; enum Panes { paneList=0, paneView, paneEdit }; ContactEditor *abEditor; LetterPicker *pLabel; AbView* m_abView; QWidget *listContainer; |