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 | 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 | |||
@@ -105,49 +105,51 @@ void ExtensionManager::setSelectionChanged() | |||
105 | if ( mCurrentExtensionWidget ) | 105 | if ( mCurrentExtensionWidget ) |
106 | mCurrentExtensionWidget->contactsSelectionChanged(); | 106 | mCurrentExtensionWidget->contactsSelectionChanged(); |
107 | } | 107 | } |
108 | 108 | ||
109 | void ExtensionManager::setActiveExtension( int id ) | 109 | void ExtensionManager::setActiveExtension( int id ) |
110 | { | 110 | { |
111 | //qDebug("+++++++++++++++++++ExtensionManager::setActiveExtension %d ", id); | 111 | //qDebug("+++++++++++++++++++ExtensionManager::setActiveExtension %d ", id); |
112 | if ( id == 0 ) { | 112 | if ( id == 0 ) { |
113 | hide(); | 113 | hide(); |
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 ) { |
120 | if ( mCurrentExtensionWidget ) | 120 | if ( mCurrentExtensionWidget ) |
121 | mCurrentExtensionWidget->hide(); | 121 | mCurrentExtensionWidget->hide(); |
122 | 122 | ||
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(); |
132 | mCurrentExtensionWidget->show(); | 132 | mCurrentExtensionWidget->show(); |
133 | } else { | 133 | } else { |
134 | hide(); | 134 | hide(); |
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 | } |
143 | 145 | ||
144 | void ExtensionManager::createExtensionWidgets() | 146 | void ExtensionManager::createExtensionWidgets() |
145 | { | 147 | { |
146 | // clear extension widget list | 148 | // clear extension widget list |
147 | mExtensionWidgetList.setAutoDelete( true ); | 149 | mExtensionWidgetList.setAutoDelete( true ); |
148 | QPtrListIterator<ExtensionWidget> wdgIt( mExtensionWidgetList ); | 150 | QPtrListIterator<ExtensionWidget> wdgIt( mExtensionWidgetList ); |
149 | ExtensionWidget *wdg = 0; | 151 | ExtensionWidget *wdg = 0; |
150 | while ( ( wdg = wdgIt.current() ) != 0 ) | 152 | while ( ( wdg = wdgIt.current() ) != 0 ) |
151 | mExtensionWidgetList.remove( wdg ); | 153 | mExtensionWidgetList.remove( wdg ); |
152 | 154 | ||
153 | mExtensionWidgetList.setAutoDelete( false ); | 155 | mExtensionWidgetList.setAutoDelete( false ); |
diff --git a/kaddressbook/extensionmanager.h b/kaddressbook/extensionmanager.h index 8f64a50..611a037 100644 --- a/kaddressbook/extensionmanager.h +++ b/kaddressbook/extensionmanager.h | |||
@@ -59,24 +59,25 @@ class ExtensionManager : public QScrollView | |||
59 | void reconfigure(); | 59 | void reconfigure(); |
60 | 60 | ||
61 | /** | 61 | /** |
62 | Returns whether the quickedit extension is currently visible. | 62 | Returns whether the quickedit extension is currently visible. |
63 | */ | 63 | */ |
64 | bool isQuickEditVisible() const; | 64 | bool isQuickEditVisible() const; |
65 | 65 | ||
66 | public slots: | 66 | public slots: |
67 | void setSelectionChanged(); | 67 | void setSelectionChanged(); |
68 | 68 | ||
69 | signals: | 69 | signals: |
70 | void modified( const KABC::Addressee::List& ); | 70 | void modified( const KABC::Addressee::List& ); |
71 | void changedActiveExtension( int id ); | ||
71 | 72 | ||
72 | private slots: | 73 | private slots: |
73 | void setActiveExtension( int id ); | 74 | void setActiveExtension( int id ); |
74 | 75 | ||
75 | private: | 76 | private: |
76 | void createExtensionWidgets(); | 77 | void createExtensionWidgets(); |
77 | 78 | ||
78 | KABCore *mCore; | 79 | KABCore *mCore; |
79 | QWidget *mWidgetBox; | 80 | QWidget *mWidgetBox; |
80 | 81 | ||
81 | ExtensionWidget *mCurrentExtensionWidget; | 82 | ExtensionWidget *mCurrentExtensionWidget; |
82 | QPtrList<ExtensionWidget> mExtensionWidgetList; | 83 | QPtrList<ExtensionWidget> mExtensionWidgetList; |