-rw-r--r-- | kaddressbook/extensionmanager.cpp | 8 | ||||
-rw-r--r-- | kaddressbook/extensionmanager.h | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index 9114cdc..98561dc 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp @@ -69,121 +69,123 @@ ExtensionManager::~ExtensionManager() } void ExtensionManager::restoreSettings() { mActionExtensions->setCurrentItem( KABPrefs::instance()->mCurrentExtension ); int i = 1; mCurrentExtensionWidget = mExtensionWidgetList.at( i-1 ); while ( mCurrentExtensionWidget ) { if( i != KABPrefs::instance()->mCurrentExtension ) mCurrentExtensionWidget->hide(); mCurrentExtensionWidget = mExtensionWidgetList.at( ++i-1 ); } setActiveExtension( mActionExtensions->currentItem() ); } void ExtensionManager::saveSettings() { KABPrefs::instance()->mCurrentExtension = mActionExtensions->currentItem(); } void ExtensionManager::reconfigure() { saveSettings(); createExtensionWidgets(); restoreSettings(); } bool ExtensionManager::isQuickEditVisible() const { return ( mCurrentExtensionWidget && mCurrentExtensionWidget->identifier() == "contact_editor" ); } void ExtensionManager::setSelectionChanged() { if ( mCurrentExtensionWidget ) mCurrentExtensionWidget->contactsSelectionChanged(); } void ExtensionManager::setActiveExtension( int id ) { //qDebug("+++++++++++++++++++ExtensionManager::setActiveExtension %d ", 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( ); +//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 ); +//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( ); +//US mCore->setDetailsToState( ); #endif //KAB_EMBEDDED } } + + emit changedActiveExtension( id ); } void ExtensionManager::createExtensionWidgets() { // clear extension widget list mExtensionWidgetList.setAutoDelete( true ); QPtrListIterator<ExtensionWidget> wdgIt( mExtensionWidgetList ); ExtensionWidget *wdg = 0; while ( ( wdg = wdgIt.current() ) != 0 ) mExtensionWidgetList.remove( wdg ); mExtensionWidgetList.setAutoDelete( false ); QStringList extensionNames( i18n( "None" ) ); // add addressee editor as default QHBoxLayout *hbl = new QHBoxLayout (mWidgetBox ); wdg = new AddresseeEditorWidget( mCore, true, mWidgetBox ); hbl->addWidget( wdg ); //wdg->hide(); connect( wdg, SIGNAL( modified( const KABC::Addressee::List& ) ), SIGNAL( modified( const KABC::Addressee::List& ) ) ); mExtensionWidgetList.append( wdg ); extensionNames.append( wdg->title() ); // load the other extensions QStringList activeExtensions = KABPrefs::instance()->mActiveExtensions; #ifndef KAB_EMBEDDED KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/Extension" ); KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { if ( !(*it)->hasServiceType( "KAddressBook/Extension" ) ) continue; KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().latin1() ); if ( !factory ) { kdDebug(5720) << "ExtensionManager::loadExtensions(): Factory creation failed" << endl; continue; } ExtensionFactory *extensionFactory = static_cast<ExtensionFactory*>( factory ); if ( !extensionFactory ) { kdDebug(5720) << "ExtensionManager::loadExtensions(): Cast failed" << endl; continue; diff --git a/kaddressbook/extensionmanager.h b/kaddressbook/extensionmanager.h index 8f64a50..611a037 100644 --- a/kaddressbook/extensionmanager.h +++ b/kaddressbook/extensionmanager.h @@ -23,66 +23,67 @@ #ifndef EXTENSIONMANAGER_H #define EXTENSIONMANAGER_H #include <qhbox.h> #include <qscrollview.h> #include <qptrlist.h> #include <extensionwidget.h> class KABCore; class KSelectAction; class ExtensionManager : public QScrollView { Q_OBJECT public: ExtensionManager( KABCore *core, QWidget *parent, const char *name = 0 ); ~ExtensionManager(); /** Restores the extension manager specific settings. */ void restoreSettings(); /** Saves the extension manager specific settings. */ void saveSettings(); /** Rereads the extension manager specific settings with some additional initialization stuff. */ void reconfigure(); /** Returns whether the quickedit extension is currently visible. */ bool isQuickEditVisible() const; public slots: void setSelectionChanged(); signals: void modified( const KABC::Addressee::List& ); + void changedActiveExtension( int id ); private slots: void setActiveExtension( int id ); private: void createExtensionWidgets(); KABCore *mCore; QWidget *mWidgetBox; ExtensionWidget *mCurrentExtensionWidget; QPtrList<ExtensionWidget> mExtensionWidgetList; KSelectAction *mActionExtensions; }; #endif |