Disable certain UI elements while editing personal details

1 files changed, 36 insertions, 8 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index a4c2c6e..7c52ef2 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -687,82 +687,110 @@ void AddressbookWindow::editPersonal()
 	if ( ! m_actionPersonal->isOn() ){
 		odebug << "*** ++++" << oendl;
 		m_actionPersonal->setOn( true );
 		slotPersonalView();
 	}
 
 	if ( !abEditor ) {
 		abEditor = new ContactEditor( entry, this, "editor" );
 	}
 
  	abEditor->setCaption(tr("Edit My Personal Details"));
  	abEditor->setPersonalView( true );
 	editEntry( EditEntry );
  	abEditor->setPersonalView( false );
 
 }
 
 
 void AddressbookWindow::slotPersonalView()
 {
     odebug << "slotPersonalView()" << oendl;
 
     bool personal = m_actionPersonal->isOn();
 
-    // Disable certain menu items when showing personal details
+    // Disable actions when showing personal details
     setItemNewEnabled( !personal );
     setItemDuplicateEnabled( !personal );
     setItemDeleteEnabled( !personal );
     m_actionMail->setEnabled( !personal );
+    setShowCategories( !personal );
 
     // Display appropriate view
     m_abView->showPersonal( personal );
 
-    // Set application caption
-    personal ? setCaption( tr( "Contacts - My Personal Details") )
-             : setCaption( tr( "Contacts") );
+    if ( personal )
+    {
+        setCaption( tr( "Contacts - My Personal Details") );
+
+        // Set category to 'All' to make sure personal details is visible
+        setViewCategory( "All" );
+        m_abView->setShowByCategory( "All" );
+
+        // Temporarily disable letter picker
+        pLabel->hide();
+    }
+    else
+    {
+        setCaption( tr( "Contacts") );
+
+        // Re-enable letter picker
+        pLabel->show();
+    }
 }
 
 void AddressbookWindow::reload()
 {
 	syncing = false;
 	m_abView->clear();
 	m_abView->reload();
 }
 
 void AddressbookWindow::flush()
 {
 	syncing = true;
 	m_abView->save();
 }
 
 
 void AddressbookWindow::closeEvent( QCloseEvent *e )
 {
-        if(active_view == AbView::CardView){
-	  slotViewSwitched( AbView::TableView );
-	  e->ignore();
-	  return;
+    if ( active_view == AbView::CardView )
+    {
+        if ( !m_actionPersonal->isOn() )
+        {
+            // Switch to table view only if not editing personal details
+            slotViewSwitched( AbView::TableView );
+        }
+        else
+        {
+            // If currently editing personal details, switch off personal view
+            m_actionPersonal->setOn( false );
+            slotPersonalView();
+        }
+
+        e->ignore();
+        return;
 	}
 	if(syncing) {
 		/* shouldn't we save, I hear you say? well its already been set
 		   so that an edit can not occur during a sync, and we flushed
 		   at the start of the sync, so there is no need to save
 		   Saving however itself would cause problems. */
 		e->accept();
 		return;
 	}
 	//################## shouldn't always save
 	// True, but the database handles this automatically ! (se)
 	if ( save() )
 		e->accept();
 	else
 		e->ignore();
 }
 
 /*
   Returns true if it is OK to exit
 */
 
 bool AddressbookWindow::save()
 {
 	if ( !m_abView->save() ) {