transfered the displayhandling back to kabcore.

2 files changed, 30 insertions, 27 deletions

diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp
index 9114cdc..98561dc 100644
--- a/kaddressbook/extensionmanager.cpp
+++ b/kaddressbook/extensionmanager.cpp
@@ -27,9 +27,9 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-#ifndef KAB_EMBEDDED  
+#ifndef KAB_EMBEDDED
 #include <ktrader.h>
-#else //KAB_EMBEDDED  
+#else //KAB_EMBEDDED
 #include <features/mergewidget.h>
 #include <features/distributionlistwidget.h>
 #endif //KAB_EMBEDDED
@@ -54,7 +54,7 @@ ExtensionManager::ExtensionManager( KABCore *core, QWidget *parent,
                                          "options_show_extensions" );
 
   mActionExtensions->plug( settingsmenu );
-  
+
   connect( mActionExtensions, SIGNAL( activated( int ) ),
            SLOT( setActiveExtension( int ) ) );
   mWidgetBox = new QWidget( viewport() );
@@ -74,10 +74,10 @@ void ExtensionManager::restoreSettings()
   int i = 1;
   mCurrentExtensionWidget = mExtensionWidgetList.at( i-1 );
   while ( mCurrentExtensionWidget ) {
-      if( i != KABPrefs::instance()->mCurrentExtension ) 
+      if( i != KABPrefs::instance()->mCurrentExtension )
           mCurrentExtensionWidget->hide();
       mCurrentExtensionWidget  = mExtensionWidgetList.at( ++i-1 );
-      
+
   }
   setActiveExtension( mActionExtensions->currentItem() );
 }
@@ -91,7 +91,7 @@ void ExtensionManager::reconfigure()
 {
   saveSettings();
   createExtensionWidgets();
-  restoreSettings();  
+  restoreSettings();
 }
 
 bool ExtensionManager::isQuickEditVisible() const
@@ -112,33 +112,35 @@ void ExtensionManager::setActiveExtension( int id )
   if ( id == 0 ) {
     hide();
     mCurrentExtensionWidget = 0;
-#ifndef DESKTOP_VERSION 
-//US  our screen is so small, that we better hide the detailscreen, just in case.      
-    mCore->setDetailsToState( );
-#endif //KAB_EMBEDDED    
+#ifndef DESKTOP_VERSION
+//US  our screen is so small, that we better hide the detailscreen, just in case.
+//US    mCore->setDetailsToState( );
+#endif //KAB_EMBEDDED
   } else if ( id > 0 ) {
     if ( mCurrentExtensionWidget )
       mCurrentExtensionWidget->hide();
 
     mCurrentExtensionWidget = mExtensionWidgetList.at( id - 1 );
-    
+
     if ( mCurrentExtensionWidget ) {
-#ifndef DESKTOP_VERSION 
-//US  our screen is so small, that we better hide the detailscreen, just in case.      
-      mCore->setDetailsVisible( false );
-#endif //KAB_EMBEDDED    
-      show();  
+#ifndef DESKTOP_VERSION
+//US  our screen is so small, that we better hide the detailscreen, just in case.
+//US      mCore->setDetailsVisible( false );
+#endif //KAB_EMBEDDED
+      show();
       mWidgetBox->show();
       mCurrentExtensionWidget->show();
     } else {
       hide();
       mCurrentExtensionWidget = 0;
-#ifndef DESKTOP_VERSION 
-//US  our screen is so small, that we better hide the detailscreen, just in case.      
-    mCore->setDetailsToState( );
-#endif //KAB_EMBEDDED    
+#ifndef DESKTOP_VERSION
+//US  our screen is so small, that we better hide the detailscreen, just in case.
+//US    mCore->setDetailsToState( );
+#endif //KAB_EMBEDDED
     }
   }
+
+  emit changedActiveExtension( id );
 }
 
 void ExtensionManager::createExtensionWidgets()
@@ -169,7 +171,7 @@ void ExtensionManager::createExtensionWidgets()
   // load the other extensions
   QStringList activeExtensions = KABPrefs::instance()->mActiveExtensions;
 
-#ifndef KAB_EMBEDDED  
+#ifndef KAB_EMBEDDED
   KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/Extension" );
   KTrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
@@ -216,7 +218,7 @@ void ExtensionManager::createExtensionWidgets()
         extensionNames.append( wdg->title() );
       }
     }
-    
+
     //load DistributionListfactory/extension
     extensionFactory = new DistributionListFactory();
     if (activeExtensions.contains( extensionFactory->identifier() ) )
@@ -231,16 +233,16 @@ void ExtensionManager::createExtensionWidgets()
         extensionNames.append( wdg->title() );
       }
     }
-    
+
     hbl->addStretch();
 
 #endif //KAB_EMBEDDED
-  
-  
+
+
   mActionExtensions->setItems( extensionNames );
   mCurrentExtensionWidget = 0;
 }
 
-#ifndef KAB_EMBEDDED  
+#ifndef KAB_EMBEDDED
 #include "extensionmanager.moc"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/extensionmanager.h b/kaddressbook/extensionmanager.h
index 8f64a50..611a037 100644
--- a/kaddressbook/extensionmanager.h
+++ b/kaddressbook/extensionmanager.h
@@ -68,6 +68,7 @@ class ExtensionManager : public QScrollView
 
   signals:
     void modified( const KABC::Addressee::List& );
+    void changedActiveExtension( int id );
 
   private slots:
     void setActiveExtension( int id );
@@ -82,7 +83,7 @@ class ExtensionManager : public QScrollView
     QPtrList<ExtensionWidget> mExtensionWidgetList;
 
     KSelectAction *mActionExtensions;
-    
+
 };
 
 #endif