summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/extensionmanager.cpp54
-rw-r--r--kaddressbook/extensionmanager.h3
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
@@ -29,5 +29,5 @@
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED
#include <ktrader.h>
-#else //KAB_EMBEDDED
+#else //KAB_EMBEDDED
#include <features/mergewidget.h>
@@ -56,3 +56,3 @@ ExtensionManager::ExtensionManager( KABCore *core, QWidget *parent,
mActionExtensions->plug( settingsmenu );
-
+
connect( mActionExtensions, SIGNAL( activated( int ) ),
@@ -76,6 +76,6 @@ void ExtensionManager::restoreSettings()
while ( mCurrentExtensionWidget ) {
- if( i != KABPrefs::instance()->mCurrentExtension )
+ if( i != KABPrefs::instance()->mCurrentExtension )
mCurrentExtensionWidget->hide();
mCurrentExtensionWidget = mExtensionWidgetList.at( ++i-1 );
-
+
}
@@ -93,3 +93,3 @@ void ExtensionManager::reconfigure()
createExtensionWidgets();
- restoreSettings();
+ restoreSettings();
}
@@ -114,6 +114,6 @@ void ExtensionManager::setActiveExtension( int id )
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 ) {
@@ -123,9 +123,9 @@ void ExtensionManager::setActiveExtension( int id )
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();
@@ -135,8 +135,10 @@ void ExtensionManager::setActiveExtension( int id )
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 );
}
@@ -171,3 +173,3 @@ void ExtensionManager::createExtensionWidgets()
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED
KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/Extension" );
@@ -218,3 +220,3 @@ void ExtensionManager::createExtensionWidgets()
}
-
+
//load DistributionListfactory/extension
@@ -233,3 +235,3 @@ void ExtensionManager::createExtensionWidgets()
}
-
+
hbl->addStretch();
@@ -237,4 +239,4 @@ void ExtensionManager::createExtensionWidgets()
#endif //KAB_EMBEDDED
-
-
+
+
mActionExtensions->setItems( extensionNames );
@@ -243,3 +245,3 @@ void ExtensionManager::createExtensionWidgets()
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED
#include "extensionmanager.moc"
diff --git a/kaddressbook/extensionmanager.h b/kaddressbook/extensionmanager.h
index 8f64a50..611a037 100644
--- a/kaddressbook/extensionmanager.h
+++ b/kaddressbook/extensionmanager.h
@@ -70,2 +70,3 @@ class ExtensionManager : public QScrollView
void modified( const KABC::Addressee::List& );
+ void changedActiveExtension( int id );
@@ -84,3 +85,3 @@ class ExtensionManager : public QScrollView
KSelectAction *mActionExtensions;
-
+
};