2 files changed, 96 insertions, 41 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 96603e6..6807bed 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -189,17 +189,8 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
 
   connect( mViewManager, SIGNAL( selected( const QString& ) ),
            SLOT( setContactSelected( const QString& ) ) );
-
-  //small devices show only the details view. bigger devices can edit the entry
-  if (KGlobal::getDesktopSize() > KGlobal::Small ) {
-    connect( mViewManager, SIGNAL( executed( const QString& ) ),
-           SLOT( editContact( const QString& ) ) );
-  }
-  else
-  {
     connect( mViewManager, SIGNAL( executed( const QString& ) ),
-           SLOT( showContact( const QString& ) ) );
-  }
+           SLOT( executeContact( const QString& ) ) );
 
   connect( mViewManager, SIGNAL( deleteRequest( ) ),
            SLOT( deleteContacts( ) ) );
@@ -207,6 +198,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
            SLOT( setModified() ) );
 
   connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) );
+  connect( mExtensionManager, SIGNAL( changedActiveExtension( int ) ), this, SLOT( extensionChanged( int ) ) );
 
   connect( mXXPortManager, SIGNAL( modified() ),
            SLOT( setModified() ) );
@@ -246,10 +238,11 @@ KABCore::~KABCore()
 
 void KABCore::restoreSettings()
 {
+  mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce;
+
   bool state;
 
-  //small devices have at startup the details view disabled
-  if (KGlobal::getDesktopSize() > KGlobal::Small )
+  if (mMultipleViewsAtOnce)
     state = KABPrefs::instance()->mDetailsPageVisible;
   else
     state = false;
@@ -261,7 +254,7 @@ void KABCore::restoreSettings()
 
   mActionJumpBar->setChecked( state );
   setJumpButtonBarVisible( state );
-
+/*US
  QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter;
   if ( splitterSize.count() == 0 ) {
     splitterSize.append( width() / 2 );
@@ -277,28 +270,28 @@ void KABCore::restoreSettings()
   mExtensionBarSplitter->setSizes( splitterSize );
 
   }
-#ifndef KAB_EMBEDDED
-  QValueList<int> splitterSize = KABPrefs::instance()->mExtensionsSplitter;
+*/
+  mViewManager->restoreSettings();
+  mIncSearchWidget->setCurrentItem( KABPrefs::instance()->mCurrentIncSearchField );
+  mExtensionManager->restoreSettings();
+
+ QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter;
   if ( splitterSize.count() == 0 ) {
     splitterSize.append( width() / 2 );
     splitterSize.append( width() / 2 );
   }
-  mExtensionBarSplitter->setSizes( splitterSize );
-
-  splitterSize = KABPrefs::instance()->mDetailsSplitter;
+  mMiniSplitter->setSizes( splitterSize );
+  if (  mExtensionBarSplitter ) {
+  splitterSize = KABPrefs::instance()->mExtensionsSplitter;
   if ( splitterSize.count() == 0 ) {
-    splitterSize.append( height() / 2 );
-    splitterSize.append( height() / 2 );
+    splitterSize.append( width() / 2 );
+    splitterSize.append( width() / 2 );
   }
-  mDetailsSplitter->setSizes( splitterSize );
+  mExtensionBarSplitter->setSizes( splitterSize );
 
-  mExtensionManager->restoreSettings();
+  }
 
-#endif //KAB_EMBEDDED
 
-  mViewManager->restoreSettings();
-  mIncSearchWidget->setCurrentItem( KABPrefs::instance()->mCurrentIncSearchField );
-  mExtensionManager->restoreSettings();
 }
 
 void KABCore::saveSettings()
@@ -430,7 +423,7 @@ void KABCore::createAboutData()
 void KABCore::setContactSelected( const QString &uid )
 {
   KABC::Addressee addr = mAddressBook->findByUid( uid );
-//US  if ( !mDetails->isHidden() )
+  if ( !mDetails->isHidden() )
     mDetails->setAddressee( addr );
 
   if ( !addr.isEmpty() ) {
@@ -1057,16 +1050,23 @@ void KABCore::editContact( const QString &uid )
 }
 
 /**
-  Shows the detail view for the given uid. If the uid is QString::null,
+  Shows or edits the detail view for the given uid. If the uid is QString::null,
   the method will try to find a selected addressee in the view.
-  We call this method only if we use a small device. Bigger devices are calling editContact instead
  */
-void KABCore::showContact( const QString &uid /*US = QString::null*/ )
+void KABCore::executeContact( const QString &uid /*US = QString::null*/ )
+{
+  if ( mMultipleViewsAtOnce )
+  {
+    editContact( uid );
+  }
+  else
 {
   setDetailsVisible( true );
   mActionDetails->setChecked(true);
 }
 
+}
+
 void KABCore::save()
 {
     if ( !mModified )
@@ -1114,7 +1114,8 @@ void KABCore::redo()
 
 void KABCore::setJumpButtonBarVisible( bool visible )
 {
-  if (KGlobal::getDesktopSize() > KGlobal::Small ) {
+  if (mMultipleViewsAtOnce)
+  {
     if ( visible )
       mJumpButtonBar->show();
     else
@@ -1122,7 +1123,7 @@ void KABCore::setJumpButtonBarVisible( bool visible )
   }
   else
   {
-        // for the Z5500, show the jumpbar only if "the details are hidden" == "viewmanager are shown"
+        // show the jumpbar only if "the details are hidden" == "viewmanager are shown"
     if (mViewManager->isVisible())
     {
       if ( visible )
@@ -1136,6 +1137,8 @@ void KABCore::setJumpButtonBarVisible( bool visible )
         }
   }
 }
+
+
 void KABCore::setDetailsToState()
 {
     setDetailsVisible(  mActionDetails->isChecked() );
@@ -1145,12 +1148,17 @@ void KABCore::setDetailsToState()
 
 void KABCore::setDetailsVisible( bool visible )
 {
-  //US "details visible" has two different meanings for small devices like the 5500
-  // compared with large devices like the c series.
+  if (visible && mDetails->isHidden())
+  {
+    KABC::Addressee::List addrList = mViewManager->selectedAddressees();
+    if ( addrList.count() > 0 )
+      mDetails->setAddressee( addrList[ 0 ] );
+  }
 
-  // small devices: mDetails is always visible. But we switch between
+  // mMultipleViewsAtOnce=false: mDetails is always visible. But we switch between
   // the listview and the detailview. We do that by changing the splitbar size.
-  if (KGlobal::getDesktopSize() > KGlobal::Small ) {
+  if (mMultipleViewsAtOnce)
+  {
     if ( visible )
       mDetails->show();
     else
@@ -1161,17 +1169,58 @@ void KABCore::setDetailsVisible( bool visible )
     if ( visible ) {
       mViewManager->hide();
       mDetails->show();
-//      mDetails->show();
     }
     else {
       mViewManager->show();
       mDetails->hide();
     }
     setJumpButtonBarVisible( !visible );
+  }
+
+}
+
+void KABCore::extensionChanged( int id )
+{
+  //change the details view only for non desktop systems
+#ifndef DESKTOP_VERSION
+
+  if (id == 0)
+  {
+    //the user disabled the extension.
+
+    if (mMultipleViewsAtOnce)
+    { // enable detailsview again
+      setDetailsVisible( true );
+      mActionDetails->setChecked( true );
+    }
+    else
+    {  //go back to the listview
+      setDetailsVisible( false );
+      mActionDetails->setChecked( false );
+      mActionDetails->setEnabled(true);
+        }
+
+  }
+  else
+  {
+    //the user enabled the extension.
+    setDetailsVisible( false );
+    mActionDetails->setChecked( false );
 
+    if (!mMultipleViewsAtOnce)
+    {
+      mActionDetails->setEnabled(false);
   }
+
+    mExtensionManager->setSelectionChanged();
+
 }
 
+#endif// DESKTOP_VERSION
+
+}
+
+
 void KABCore::extensionModified( const KABC::Addressee::List &list )
 {
 
@@ -1244,7 +1293,7 @@ void KABCore::openConfigDialog()
     saveSettings();
     ConfigureDialog->showMaximized();
     if ( ConfigureDialog->exec() )
-        KMessageBox::information( this,  i18n("If you configured \nExtensions,\nplease restart!\n") );
+        KMessageBox::information( this,  i18n("Some changes are only\neffective after a restart!\n") );
     delete ConfigureDialog;
 }
 
@@ -1745,7 +1794,10 @@ void KABCore::addActionsManually()
   mActionNewContact->plug( tb );
 
   mActionEditAddressee->plug( fileMenu );
+  if ((KGlobal::getDesktopSize() > KGlobal::Small ) ||
+      (!KABPrefs::instance()->mMultipleViewsAtOnce ))
   mActionEditAddressee->plug( tb );
+
   fileMenu->insertSeparator();
   mActionSave->plug( fileMenu );
   fileMenu->insertItem( "&Import", ImportMenu );
@@ -1793,7 +1845,7 @@ void KABCore::addActionsManually()
 
   mActionJumpBar->plug( settingsMenu );
   mActionDetails->plug( settingsMenu );
-  if (KGlobal::getDesktopSize() == KGlobal::Small )
+  if (!KABPrefs::instance()->mMultipleViewsAtOnce )
     mActionDetails->plug( tb );
   settingsMenu->insertSeparator();
 
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index a45c4c6..d4d28f1 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -302,10 +302,10 @@ class KABCore : public QWidget
     void editContact2();
 
     /**
-      Shows the detail view for the given uid. If the uid is QString::null,
+      Shows or edits the detail view for the given uid. If the uid is QString::null,
       the method will try to find a selected addressee in the view.
      */
-    void showContact( const QString &uid /*US = QString::null*/ );
+    void executeContact( const QString &uid /*US = QString::null*/ );
 
     /**
       Launches the configuration dialog.
@@ -338,6 +338,7 @@ class KABCore : public QWidget
     void setJumpButtonBarVisible( bool visible );
   void importFromOL();
     void extensionModified( const KABC::Addressee::List &list );
+    void extensionChanged( int id );
     void clipboardDataChanged();
     void updateActionMenu();
     void configureKeyBindings();
@@ -381,6 +382,8 @@ class KABCore : public QWidget
     bool mReadWrite;
     bool mModified;
     bool mIsPart;
+    bool mMultipleViewsAtOnce;
+
 
     //US file menu
     KAction *mActionMail;