author | ulf69 <ulf69> | 2004-08-11 19:26:46 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-08-11 19:26:46 (UTC) |
commit | 945f620dd57338d5b920f4ada3ff8e9e8d1cfe74 (patch) (unidiff) | |
tree | 897a41d4b51bc3991985cde2ed9848c8280f0dd3 | |
parent | 4ef6049f88713da6e691949dc4ca127855958665 (diff) | |
download | kdepimpi-945f620dd57338d5b920f4ada3ff8e9e8d1cfe74.zip kdepimpi-945f620dd57338d5b920f4ada3ff8e9e8d1cfe74.tar.gz kdepimpi-945f620dd57338d5b920f4ada3ff8e9e8d1cfe74.tar.bz2 |
transfered the displayhandling back to kabcore.
-rw-r--r-- | kaddressbook/extensionmanager.cpp | 54 | ||||
-rw-r--r-- | kaddressbook/extensionmanager.h | 3 |
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 @@ | |||
29 | 29 | ||
30 | #ifndef KAB_EMBEDDED | 30 | #ifndef KAB_EMBEDDED |
31 | #include <ktrader.h> | 31 | #include <ktrader.h> |
32 | #else //KAB_EMBEDDED | 32 | #else //KAB_EMBEDDED |
33 | #include <features/mergewidget.h> | 33 | #include <features/mergewidget.h> |
@@ -56,3 +56,3 @@ ExtensionManager::ExtensionManager( KABCore *core, QWidget *parent, | |||
56 | mActionExtensions->plug( settingsmenu ); | 56 | mActionExtensions->plug( settingsmenu ); |
57 | 57 | ||
58 | connect( mActionExtensions, SIGNAL( activated( int ) ), | 58 | connect( mActionExtensions, SIGNAL( activated( int ) ), |
@@ -76,6 +76,6 @@ void ExtensionManager::restoreSettings() | |||
76 | while ( mCurrentExtensionWidget ) { | 76 | while ( mCurrentExtensionWidget ) { |
77 | if( i != KABPrefs::instance()->mCurrentExtension ) | 77 | if( i != KABPrefs::instance()->mCurrentExtension ) |
78 | mCurrentExtensionWidget->hide(); | 78 | mCurrentExtensionWidget->hide(); |
79 | mCurrentExtensionWidget = mExtensionWidgetList.at( ++i-1 ); | 79 | mCurrentExtensionWidget = mExtensionWidgetList.at( ++i-1 ); |
80 | 80 | ||
81 | } | 81 | } |
@@ -93,3 +93,3 @@ void ExtensionManager::reconfigure() | |||
93 | createExtensionWidgets(); | 93 | createExtensionWidgets(); |
94 | restoreSettings(); | 94 | restoreSettings(); |
95 | } | 95 | } |
@@ -114,6 +114,6 @@ void ExtensionManager::setActiveExtension( int id ) | |||
114 | mCurrentExtensionWidget = 0; | 114 | mCurrentExtensionWidget = 0; |
115 | #ifndef DESKTOP_VERSION | 115 | #ifndef DESKTOP_VERSION |
116 | //US our screen is so small, that we better hide the detailscreen, just in case. | 116 | //US our screen is so small, that we better hide the detailscreen, just in case. |
117 | mCore->setDetailsToState( ); | 117 | //US mCore->setDetailsToState( ); |
118 | #endif //KAB_EMBEDDED | 118 | #endif //KAB_EMBEDDED |
119 | } else if ( id > 0 ) { | 119 | } else if ( id > 0 ) { |
@@ -123,9 +123,9 @@ void ExtensionManager::setActiveExtension( int id ) | |||
123 | mCurrentExtensionWidget = mExtensionWidgetList.at( id - 1 ); | 123 | mCurrentExtensionWidget = mExtensionWidgetList.at( id - 1 ); |
124 | 124 | ||
125 | if ( mCurrentExtensionWidget ) { | 125 | if ( mCurrentExtensionWidget ) { |
126 | #ifndef DESKTOP_VERSION | 126 | #ifndef DESKTOP_VERSION |
127 | //US our screen is so small, that we better hide the detailscreen, just in case. | 127 | //US our screen is so small, that we better hide the detailscreen, just in case. |
128 | mCore->setDetailsVisible( false ); | 128 | //US mCore->setDetailsVisible( false ); |
129 | #endif //KAB_EMBEDDED | 129 | #endif //KAB_EMBEDDED |
130 | show(); | 130 | show(); |
131 | mWidgetBox->show(); | 131 | mWidgetBox->show(); |
@@ -135,8 +135,10 @@ void ExtensionManager::setActiveExtension( int id ) | |||
135 | mCurrentExtensionWidget = 0; | 135 | mCurrentExtensionWidget = 0; |
136 | #ifndef DESKTOP_VERSION | 136 | #ifndef DESKTOP_VERSION |
137 | //US our screen is so small, that we better hide the detailscreen, just in case. | 137 | //US our screen is so small, that we better hide the detailscreen, just in case. |
138 | mCore->setDetailsToState( ); | 138 | //US mCore->setDetailsToState( ); |
139 | #endif //KAB_EMBEDDED | 139 | #endif //KAB_EMBEDDED |
140 | } | 140 | } |
141 | } | 141 | } |
142 | |||
143 | emit changedActiveExtension( id ); | ||
142 | } | 144 | } |
@@ -171,3 +173,3 @@ void ExtensionManager::createExtensionWidgets() | |||
171 | 173 | ||
172 | #ifndef KAB_EMBEDDED | 174 | #ifndef KAB_EMBEDDED |
173 | KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/Extension" ); | 175 | KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/Extension" ); |
@@ -218,3 +220,3 @@ void ExtensionManager::createExtensionWidgets() | |||
218 | } | 220 | } |
219 | 221 | ||
220 | //load DistributionListfactory/extension | 222 | //load DistributionListfactory/extension |
@@ -233,3 +235,3 @@ void ExtensionManager::createExtensionWidgets() | |||
233 | } | 235 | } |
234 | 236 | ||
235 | hbl->addStretch(); | 237 | hbl->addStretch(); |
@@ -237,4 +239,4 @@ void ExtensionManager::createExtensionWidgets() | |||
237 | #endif //KAB_EMBEDDED | 239 | #endif //KAB_EMBEDDED |
238 | 240 | ||
239 | 241 | ||
240 | mActionExtensions->setItems( extensionNames ); | 242 | mActionExtensions->setItems( extensionNames ); |
@@ -243,3 +245,3 @@ void ExtensionManager::createExtensionWidgets() | |||
243 | 245 | ||
244 | #ifndef KAB_EMBEDDED | 246 | #ifndef KAB_EMBEDDED |
245 | #include "extensionmanager.moc" | 247 | #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 | |||
70 | void modified( const KABC::Addressee::List& ); | 70 | void modified( const KABC::Addressee::List& ); |
71 | void changedActiveExtension( int id ); | ||
71 | 72 | ||
@@ -84,3 +85,3 @@ class ExtensionManager : public QScrollView | |||
84 | KSelectAction *mActionExtensions; | 85 | KSelectAction *mActionExtensions; |
85 | 86 | ||
86 | }; | 87 | }; |