Improvement of previous bugfix

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
@@ -704,53 +704,64 @@ void AddressbookWindow::editEntry( EntryMode entryMode )
 				replEntry.assignUid();
 
 			m_abView -> replaceEntry( replEntry );
 		}
 	}
 	// populateCategories();
 
 }
 
 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);
 	
 	setCaption( tr("Contacts - My Personal Details") );
 
 	m_abView->showPersonal( true );
 	
 }
 
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
@@ -90,33 +90,29 @@ private slots:
 	void slotFindClose();
 	void slotFind();
 	void slotNotFound();
 	void slotWrapAround();
 
 	void slotViewSwitched( int );
 	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;
 
 	// Searching stuff
 	OFloatBar* searchBar;
 	QLineEdit* searchEdit;
 
 	QAction *actionNew, *actionEdit, *actionTrash, *actionFind, *actionBeam, *actionPersonal, *actionMail;