-rw-r--r-- | kaddressbook/kabcore.cpp | 6 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 4964a6c..d1dcb6e 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -273,48 +273,49 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
273 | 273 | ||
274 | connect( mViewManager, SIGNAL( deleteRequest( ) ), | 274 | connect( mViewManager, SIGNAL( deleteRequest( ) ), |
275 | SLOT( deleteContacts( ) ) ); | 275 | SLOT( deleteContacts( ) ) ); |
276 | connect( mViewManager, SIGNAL( modified() ), | 276 | connect( mViewManager, SIGNAL( modified() ), |
277 | SLOT( setModified() ) ); | 277 | SLOT( setModified() ) ); |
278 | 278 | ||
279 | connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) ); | 279 | connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) ); |
280 | connect( mExtensionManager, SIGNAL( changedActiveExtension( int ) ), this, SLOT( extensionChanged( int ) ) ); | 280 | connect( mExtensionManager, SIGNAL( changedActiveExtension( int ) ), this, SLOT( extensionChanged( int ) ) ); |
281 | 281 | ||
282 | connect( mXXPortManager, SIGNAL( modified() ), | 282 | connect( mXXPortManager, SIGNAL( modified() ), |
283 | SLOT( setModified() ) ); | 283 | SLOT( setModified() ) ); |
284 | 284 | ||
285 | connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ), | 285 | connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ), |
286 | SLOT( incrementalSearch( const QString& ) ) ); | 286 | SLOT( incrementalSearch( const QString& ) ) ); |
287 | connect( mIncSearchWidget, SIGNAL( fieldChanged() ), | 287 | connect( mIncSearchWidget, SIGNAL( fieldChanged() ), |
288 | mJumpButtonBar, SLOT( recreateButtons() ) ); | 288 | mJumpButtonBar, SLOT( recreateButtons() ) ); |
289 | 289 | ||
290 | connect( mDetails, SIGNAL( sendEmail( const QString& ) ), | 290 | connect( mDetails, SIGNAL( sendEmail( const QString& ) ), |
291 | SLOT( sendMail( const QString& ) ) ); | 291 | SLOT( sendMail( const QString& ) ) ); |
292 | 292 | ||
293 | 293 | ||
294 | connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&))); | 294 | connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&))); |
295 | connect( ExternalAppHandler::instance(), SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)),this, SLOT(requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&))); | 295 | connect( ExternalAppHandler::instance(), SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)),this, SLOT(requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&))); |
296 | connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&))); | 296 | connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&))); |
297 | connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle())); | ||
297 | 298 | ||
298 | 299 | ||
299 | #ifndef KAB_EMBEDDED | 300 | #ifndef KAB_EMBEDDED |
300 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), | 301 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), |
301 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); | 302 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); |
302 | 303 | ||
303 | connect( mDetails, SIGNAL( browse( const QString& ) ), | 304 | connect( mDetails, SIGNAL( browse( const QString& ) ), |
304 | SLOT( browse( const QString& ) ) ); | 305 | SLOT( browse( const QString& ) ) ); |
305 | 306 | ||
306 | 307 | ||
307 | mAddressBookService = new KAddressBookService( this ); | 308 | mAddressBookService = new KAddressBookService( this ); |
308 | 309 | ||
309 | #endif //KAB_EMBEDDED | 310 | #endif //KAB_EMBEDDED |
310 | 311 | ||
311 | mMessageTimer = new QTimer( this ); | 312 | mMessageTimer = new QTimer( this ); |
312 | connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) ); | 313 | connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) ); |
313 | mEditorDialog = 0; | 314 | mEditorDialog = 0; |
314 | createAddresseeEditorDialog( this ); | 315 | createAddresseeEditorDialog( this ); |
315 | setModified( false ); | 316 | setModified( false ); |
316 | mBRdisabled = false; | 317 | mBRdisabled = false; |
317 | #ifndef DESKTOP_VERSION | 318 | #ifndef DESKTOP_VERSION |
318 | infrared = 0; | 319 | infrared = 0; |
319 | #endif | 320 | #endif |
320 | //toggleBeamReceive( ); | 321 | //toggleBeamReceive( ); |
@@ -1265,48 +1266,53 @@ void KABCore::setJumpButtonBarVisible( bool visible ) | |||
1265 | mJumpButtonBar->hide(); | 1266 | mJumpButtonBar->hide(); |
1266 | } | 1267 | } |
1267 | else | 1268 | else |
1268 | { | 1269 | { |
1269 | // show the jumpbar only if "the details are hidden" == "viewmanager are shown" | 1270 | // show the jumpbar only if "the details are hidden" == "viewmanager are shown" |
1270 | if (mViewManager->isVisible()) | 1271 | if (mViewManager->isVisible()) |
1271 | { | 1272 | { |
1272 | if ( visible ) | 1273 | if ( visible ) |
1273 | mJumpButtonBar->show(); | 1274 | mJumpButtonBar->show(); |
1274 | else | 1275 | else |
1275 | mJumpButtonBar->hide(); | 1276 | mJumpButtonBar->hide(); |
1276 | } | 1277 | } |
1277 | else | 1278 | else |
1278 | { | 1279 | { |
1279 | mJumpButtonBar->hide(); | 1280 | mJumpButtonBar->hide(); |
1280 | } | 1281 | } |
1281 | } | 1282 | } |
1282 | } | 1283 | } |
1283 | 1284 | ||
1284 | 1285 | ||
1285 | void KABCore::setDetailsToState() | 1286 | void KABCore::setDetailsToState() |
1286 | { | 1287 | { |
1287 | setDetailsVisible( mActionDetails->isChecked() ); | 1288 | setDetailsVisible( mActionDetails->isChecked() ); |
1288 | } | 1289 | } |
1290 | void KABCore::setDetailsToggle() | ||
1291 | { | ||
1292 | mActionDetails->setChecked( !mActionDetails->isChecked() ); | ||
1293 | setDetailsToState(); | ||
1294 | } | ||
1289 | 1295 | ||
1290 | 1296 | ||
1291 | 1297 | ||
1292 | void KABCore::setDetailsVisible( bool visible ) | 1298 | void KABCore::setDetailsVisible( bool visible ) |
1293 | { | 1299 | { |
1294 | if (visible && mDetails->isHidden()) | 1300 | if (visible && mDetails->isHidden()) |
1295 | { | 1301 | { |
1296 | KABC::Addressee::List addrList = mViewManager->selectedAddressees(); | 1302 | KABC::Addressee::List addrList = mViewManager->selectedAddressees(); |
1297 | if ( addrList.count() > 0 ) | 1303 | if ( addrList.count() > 0 ) |
1298 | mDetails->setAddressee( addrList[ 0 ] ); | 1304 | mDetails->setAddressee( addrList[ 0 ] ); |
1299 | } | 1305 | } |
1300 | 1306 | ||
1301 | // mMultipleViewsAtOnce=false: mDetails is always visible. But we switch between | 1307 | // mMultipleViewsAtOnce=false: mDetails is always visible. But we switch between |
1302 | // the listview and the detailview. We do that by changing the splitbar size. | 1308 | // the listview and the detailview. We do that by changing the splitbar size. |
1303 | if (mMultipleViewsAtOnce) | 1309 | if (mMultipleViewsAtOnce) |
1304 | { | 1310 | { |
1305 | if ( visible ) | 1311 | if ( visible ) |
1306 | mDetails->show(); | 1312 | mDetails->show(); |
1307 | else | 1313 | else |
1308 | mDetails->hide(); | 1314 | mDetails->hide(); |
1309 | } | 1315 | } |
1310 | else | 1316 | else |
1311 | { | 1317 | { |
1312 | if ( visible ) { | 1318 | if ( visible ) { |
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index a288505..6831ec9 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -125,48 +125,49 @@ class KABCore : public QWidget, public KSyncInterface | |||
125 | Returns the uid list of the currently selected contacts. | 125 | Returns the uid list of the currently selected contacts. |
126 | */ | 126 | */ |
127 | QStringList selectedUIDs() const; | 127 | QStringList selectedUIDs() const; |
128 | 128 | ||
129 | /** | 129 | /** |
130 | Displays the ResourceSelectDialog and returns the selected | 130 | Displays the ResourceSelectDialog and returns the selected |
131 | resource or a null pointer if no resource was selected by | 131 | resource or a null pointer if no resource was selected by |
132 | the user. | 132 | the user. |
133 | */ | 133 | */ |
134 | KABC::Resource *requestResource( QWidget *parent ); | 134 | KABC::Resource *requestResource( QWidget *parent ); |
135 | 135 | ||
136 | #ifndef KAB_EMBEDDED | 136 | #ifndef KAB_EMBEDDED |
137 | static KAboutData *createAboutData(); | 137 | static KAboutData *createAboutData(); |
138 | #endif //KAB_EMBEDDED | 138 | #endif //KAB_EMBEDDED |
139 | 139 | ||
140 | #ifdef KAB_EMBEDDED | 140 | #ifdef KAB_EMBEDDED |
141 | inline QPopupMenu* getImportMenu() { return ImportMenu;} | 141 | inline QPopupMenu* getImportMenu() { return ImportMenu;} |
142 | inline QPopupMenu* getExportMenu() { return ExportMenu;} | 142 | inline QPopupMenu* getExportMenu() { return ExportMenu;} |
143 | #endif //KAB_EMBEDDED | 143 | #endif //KAB_EMBEDDED |
144 | 144 | ||
145 | public slots: | 145 | public slots: |
146 | #ifdef KAB_EMBEDDED | 146 | #ifdef KAB_EMBEDDED |
147 | void createAboutData(); | 147 | void createAboutData(); |
148 | #endif //KAB_EMBEDDED | 148 | #endif //KAB_EMBEDDED |
149 | void setDetailsToggle(); | ||
149 | 150 | ||
150 | void showLicence(); | 151 | void showLicence(); |
151 | void faq(); | 152 | void faq(); |
152 | void whatsnew() ; | 153 | void whatsnew() ; |
153 | void synchowto() ; | 154 | void synchowto() ; |
154 | void writeToPhone(); | 155 | void writeToPhone(); |
155 | 156 | ||
156 | /** | 157 | /** |
157 | Is called whenever a contact is selected in the view. | 158 | Is called whenever a contact is selected in the view. |
158 | */ | 159 | */ |
159 | void setContactSelected( const QString &uid ); | 160 | void setContactSelected( const QString &uid ); |
160 | 161 | ||
161 | /** | 162 | /** |
162 | Opens the preferred mail composer with all selected contacts as | 163 | Opens the preferred mail composer with all selected contacts as |
163 | arguments. | 164 | arguments. |
164 | */ | 165 | */ |
165 | void sendMail(); | 166 | void sendMail(); |
166 | 167 | ||
167 | /** | 168 | /** |
168 | Opens the preferred mail composer with the given contacts as | 169 | Opens the preferred mail composer with the given contacts as |
169 | arguments. | 170 | arguments. |
170 | */ | 171 | */ |
171 | void sendMail( const QString& email ); | 172 | void sendMail( const QString& email ); |
172 | 173 | ||