author | zautrix <zautrix> | 2005-04-03 05:23:33 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-03 05:23:33 (UTC) |
commit | 4017b5fccc188c74e971c573dbb6154ce877807b (patch) (unidiff) | |
tree | 5a16af82fade8b5c3698f5d83a3248565ef8b3ff | |
parent | f6c8249db564c1276d4c7ed5ad88c6fbac361b8d (diff) | |
download | kdepimpi-4017b5fccc188c74e971c573dbb6154ce877807b.zip kdepimpi-4017b5fccc188c74e971c573dbb6154ce877807b.tar.gz kdepimpi-4017b5fccc188c74e971c573dbb6154ce877807b.tar.bz2 |
fixes
-rw-r--r-- | kaddressbook/kabcore.cpp | 9 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 1 | ||||
-rw-r--r-- | kaddressbook/xxportselectdialog.cpp | 11 | ||||
-rw-r--r-- | libkdepim/externalapphandler.cpp | 4 |
4 files changed, 15 insertions, 10 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index e34951a..ce5c755 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2472,140 +2472,143 @@ void KABCore::updateActionMenu() | |||
2472 | { | 2472 | { |
2473 | UndoStack *undo = UndoStack::instance(); | 2473 | UndoStack *undo = UndoStack::instance(); |
2474 | RedoStack *redo = RedoStack::instance(); | 2474 | RedoStack *redo = RedoStack::instance(); |
2475 | 2475 | ||
2476 | if ( undo->isEmpty() ) | 2476 | if ( undo->isEmpty() ) |
2477 | mActionUndo->setText( i18n( "Undo" ) ); | 2477 | mActionUndo->setText( i18n( "Undo" ) ); |
2478 | else | 2478 | else |
2479 | mActionUndo->setText( i18n( "Undo %1" ).arg( undo->top()->name() ) ); | 2479 | mActionUndo->setText( i18n( "Undo %1" ).arg( undo->top()->name() ) ); |
2480 | 2480 | ||
2481 | mActionUndo->setEnabled( !undo->isEmpty() ); | 2481 | mActionUndo->setEnabled( !undo->isEmpty() ); |
2482 | 2482 | ||
2483 | if ( !redo->top() ) | 2483 | if ( !redo->top() ) |
2484 | mActionRedo->setText( i18n( "Redo" ) ); | 2484 | mActionRedo->setText( i18n( "Redo" ) ); |
2485 | else | 2485 | else |
2486 | mActionRedo->setText( i18n( "Redo %1" ).arg( redo->top()->name() ) ); | 2486 | mActionRedo->setText( i18n( "Redo %1" ).arg( redo->top()->name() ) ); |
2487 | 2487 | ||
2488 | mActionRedo->setEnabled( !redo->isEmpty() ); | 2488 | mActionRedo->setEnabled( !redo->isEmpty() ); |
2489 | } | 2489 | } |
2490 | 2490 | ||
2491 | void KABCore::configureKeyBindings() | 2491 | void KABCore::configureKeyBindings() |
2492 | { | 2492 | { |
2493 | #ifndef KAB_EMBEDDED | 2493 | #ifndef KAB_EMBEDDED |
2494 | KKeyDialog::configure( actionCollection(), true ); | 2494 | KKeyDialog::configure( actionCollection(), true ); |
2495 | #else //KAB_EMBEDDED | 2495 | #else //KAB_EMBEDDED |
2496 | qDebug("KABCore::configureKeyBindings() not implemented"); | 2496 | qDebug("KABCore::configureKeyBindings() not implemented"); |
2497 | #endif //KAB_EMBEDDED | 2497 | #endif //KAB_EMBEDDED |
2498 | } | 2498 | } |
2499 | 2499 | ||
2500 | #ifdef KAB_EMBEDDED | 2500 | #ifdef KAB_EMBEDDED |
2501 | void KABCore::configureResources() | 2501 | void KABCore::configureResources() |
2502 | { | 2502 | { |
2503 | KRES::KCMKResources dlg( this, "" , 0 ); | 2503 | KRES::KCMKResources dlg( this, "" , 0 ); |
2504 | 2504 | ||
2505 | if ( !dlg.exec() ) | 2505 | if ( !dlg.exec() ) |
2506 | return; | 2506 | return; |
2507 | KMessageBox::information( this, i18n("Please restart to get the \nchanged resources (re)loaded!\n") ); | 2507 | KMessageBox::information( this, i18n("Please restart to get the \nchanged resources (re)loaded!\n") ); |
2508 | } | 2508 | } |
2509 | #endif //KAB_EMBEDDED | 2509 | #endif //KAB_EMBEDDED |
2510 | 2510 | ||
2511 | 2511 | ||
2512 | /* this method will be called through the QCop interface from Ko/Pi to select addresses | 2512 | /* this method will be called through the QCop interface from Ko/Pi to select addresses |
2513 | * for the attendees list of an event. | 2513 | * for the attendees list of an event. |
2514 | */ | 2514 | */ |
2515 | void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid) | 2515 | void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid) |
2516 | { | 2516 | { |
2517 | 2517 | ||
2518 | bool ok = false; | 2518 | bool ok = false; |
2519 | mEmailSourceChannel = sourceChannel; | 2519 | mEmailSourceChannel = sourceChannel; |
2520 | mEmailSourceUID = uid; | ||
2521 | callContactdialog(); | ||
2522 | #if 0 | ||
2520 | int wid = uid.toInt( &ok ); | 2523 | int wid = uid.toInt( &ok ); |
2521 | qDebug("UID %s ", uid.latin1()); | 2524 | qDebug("UID %s ", uid.latin1()); |
2522 | if ( ok ) { | 2525 | if ( ok ) { |
2523 | if ( wid != QApplication::desktop()->width() ) { | 2526 | if ( wid != QApplication::desktop()->width() ) { |
2524 | qDebug("KA/Pi: Request from different desktop geometry. Resizing ..."); | 2527 | qDebug("KA/Pi: Request from different desktop geometry. Resizing ..."); |
2525 | message( i18n("Resizing, please wait...") ); | 2528 | message( i18n("Resizing, please wait...") ); |
2526 | mMainWindow->showMinimized(); | 2529 | mMainWindow->showMinimized(); |
2527 | /* | 2530 | /* |
2528 | { | 2531 | { |
2529 | QCopEnvelope e("QPE/Application/kapi", "callContactdialog()"); | 2532 | QCopEnvelope e("QPE/Application/kapi", "callContactdialog()"); |
2530 | } | 2533 | } |
2531 | */ | 2534 | */ |
2532 | QTimer::singleShot( 1,this, SLOT ( resizeAndCallContactdialog() ) ); | 2535 | QTimer::singleShot( 1,this, SLOT ( resizeAndCallContactdialog() ) ); |
2533 | return; | 2536 | return; |
2534 | } | 2537 | } |
2535 | 2538 | ||
2536 | } else { | 2539 | } else { |
2537 | qDebug("KABCore::requestForNameEmailUidList:: Got invalid uid "); | 2540 | qDebug("KABCore::requestForNameEmailUidList:: Got invalid uid "); |
2538 | } | 2541 | } |
2539 | callContactdialog(); | 2542 | callContactdialog(); |
2540 | //QCopEnvelope e("QPE/Application/kapi", "callContactdialog()"); | 2543 | //QCopEnvelope e("QPE/Application/kapi", "callContactdialog()"); |
2541 | 2544 | #endif | |
2542 | } | 2545 | } |
2543 | void KABCore::resizeAndCallContactdialog() | 2546 | void KABCore::resizeAndCallContactdialog() |
2544 | { | 2547 | { |
2545 | updateMainWindow(); | 2548 | updateMainWindow(); |
2546 | QTimer::singleShot( 100,this, SLOT ( callContactdialog() ) ); | 2549 | QTimer::singleShot( 100,this, SLOT ( callContactdialog() ) ); |
2547 | } | 2550 | } |
2548 | 2551 | ||
2549 | void KABCore::callContactdialog() | 2552 | void KABCore::callContactdialog() |
2550 | { | 2553 | { |
2551 | QStringList nameList; | 2554 | QStringList nameList; |
2552 | QStringList emailList; | 2555 | QStringList emailList; |
2553 | QStringList uidList; | 2556 | QStringList uidList; |
2554 | qDebug("WIDTH %d ", QApplication::desktop()->width() ); | 2557 | qDebug(" KABCore::callContactdialog:DESKTOP WIDTH %d ", QApplication::desktop()->width() ); |
2555 | KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this); | 2558 | KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this); |
2556 | uint i=0; | 2559 | uint i=0; |
2557 | for (i=0; i < list.count(); i++) | 2560 | for (i=0; i < list.count(); i++) |
2558 | { | 2561 | { |
2559 | nameList.append(list[i].realName()); | 2562 | nameList.append(list[i].realName()); |
2560 | emailList.append(list[i].preferredEmail()); | 2563 | emailList.append(list[i].preferredEmail()); |
2561 | uidList.append(list[i].uid()); | 2564 | uidList.append(list[i].uid()); |
2562 | } | 2565 | } |
2563 | QString uid = "unnamed"; | 2566 | QString uid = mEmailSourceUID; |
2564 | //qDebug("%s %s ", sourceChannel.latin1(), uid.latin1()); | 2567 | //qDebug("%s %s ", sourceChannel.latin1(), uid.latin1()); |
2565 | bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(mEmailSourceChannel, uid, nameList, emailList, uidList); | 2568 | bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(mEmailSourceChannel, uid, nameList, emailList, uidList); |
2566 | 2569 | ||
2567 | } | 2570 | } |
2568 | /* this method will be called through the QCop interface from Ko/Pi to select birthdays | 2571 | /* this method will be called through the QCop interface from Ko/Pi to select birthdays |
2569 | * to put them into the calendar. | 2572 | * to put them into the calendar. |
2570 | */ | 2573 | */ |
2571 | void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString& uid) | 2574 | void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString& uid) |
2572 | { | 2575 | { |
2573 | // qDebug("KABCore::requestForBirthdayList"); | 2576 | // qDebug("KABCore::requestForBirthdayList"); |
2574 | QStringList birthdayList; | 2577 | QStringList birthdayList; |
2575 | QStringList anniversaryList; | 2578 | QStringList anniversaryList; |
2576 | QStringList realNameList; | 2579 | QStringList realNameList; |
2577 | QStringList preferredEmailList; | 2580 | QStringList preferredEmailList; |
2578 | QStringList assembledNameList; | 2581 | QStringList assembledNameList; |
2579 | QStringList uidList; | 2582 | QStringList uidList; |
2580 | 2583 | ||
2581 | KABC::AddressBook::Iterator it; | 2584 | KABC::AddressBook::Iterator it; |
2582 | 2585 | ||
2583 | int count = 0; | 2586 | int count = 0; |
2584 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { | 2587 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { |
2585 | ++count; | 2588 | ++count; |
2586 | } | 2589 | } |
2587 | QProgressBar bar(count,0 ); | 2590 | QProgressBar bar(count,0 ); |
2588 | int w = 300; | 2591 | int w = 300; |
2589 | if ( QApplication::desktop()->width() < 320 ) | 2592 | if ( QApplication::desktop()->width() < 320 ) |
2590 | w = 220; | 2593 | w = 220; |
2591 | int h = bar.sizeHint().height() ; | 2594 | int h = bar.sizeHint().height() ; |
2592 | int dw = QApplication::desktop()->width(); | 2595 | int dw = QApplication::desktop()->width(); |
2593 | int dh = QApplication::desktop()->height(); | 2596 | int dh = QApplication::desktop()->height(); |
2594 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 2597 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
2595 | bar.show(); | 2598 | bar.show(); |
2596 | bar.setCaption (i18n("Collecting birthdays - close to abort!") ); | 2599 | bar.setCaption (i18n("Collecting birthdays - close to abort!") ); |
2597 | qApp->processEvents(); | 2600 | qApp->processEvents(); |
2598 | 2601 | ||
2599 | QDate bday; | 2602 | QDate bday; |
2600 | QString anni; | 2603 | QString anni; |
2601 | QString formattedbday; | 2604 | QString formattedbday; |
2602 | 2605 | ||
2603 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) | 2606 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) |
2604 | { | 2607 | { |
2605 | if ( ! bar.isVisible() ) | 2608 | if ( ! bar.isVisible() ) |
2606 | return; | 2609 | return; |
2607 | bar.setProgress( count++ ); | 2610 | bar.setProgress( count++ ); |
2608 | qApp->processEvents(); | 2611 | qApp->processEvents(); |
2609 | bday = (*it).birthday().date(); | 2612 | bday = (*it).birthday().date(); |
2610 | anni = (*it).custom("KADDRESSBOOK", "X-Anniversary" ); | 2613 | anni = (*it).custom("KADDRESSBOOK", "X-Anniversary" ); |
2611 | 2614 | ||
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index d89daee..4cef73a 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -345,96 +345,97 @@ class KABCore : public QWidget, public KSyncInterface | |||
345 | 345 | ||
346 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid); | 346 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid); |
347 | void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); | 347 | void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); |
348 | void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid); | 348 | void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid); |
349 | 349 | ||
350 | 350 | ||
351 | signals: | 351 | signals: |
352 | void contactSelected( const QString &name ); | 352 | void contactSelected( const QString &name ); |
353 | void contactSelected( const QPixmap &pixmap ); | 353 | void contactSelected( const QPixmap &pixmap ); |
354 | public slots: | 354 | public slots: |
355 | void recieve(QString cmsg ); | 355 | void recieve(QString cmsg ); |
356 | void getFile( bool success ); | 356 | void getFile( bool success ); |
357 | void syncFileRequest(); | 357 | void syncFileRequest(); |
358 | void setDetailsVisible( bool visible ); | 358 | void setDetailsVisible( bool visible ); |
359 | void setDetailsToState(); | 359 | void setDetailsToState(); |
360 | 360 | ||
361 | void saveSettings(); | 361 | void saveSettings(); |
362 | 362 | ||
363 | private slots: | 363 | private slots: |
364 | void updateToolBar(); | 364 | void updateToolBar(); |
365 | void updateMainWindow(); | 365 | void updateMainWindow(); |
366 | void receive( const QCString& cmsg, const QByteArray& data ); | 366 | void receive( const QCString& cmsg, const QByteArray& data ); |
367 | void toggleBeamReceive( ); | 367 | void toggleBeamReceive( ); |
368 | void disableBR(bool); | 368 | void disableBR(bool); |
369 | void setJumpButtonBarVisible( bool visible ); | 369 | void setJumpButtonBarVisible( bool visible ); |
370 | void setJumpButtonBar( bool visible ); | 370 | void setJumpButtonBar( bool visible ); |
371 | void setCaptionBack(); | 371 | void setCaptionBack(); |
372 | void resizeAndCallContactdialog(); | 372 | void resizeAndCallContactdialog(); |
373 | void callContactdialog(); | 373 | void callContactdialog(); |
374 | 374 | ||
375 | void importFromOL(); | 375 | void importFromOL(); |
376 | void extensionModified( const KABC::Addressee::List &list ); | 376 | void extensionModified( const KABC::Addressee::List &list ); |
377 | void extensionChanged( int id ); | 377 | void extensionChanged( int id ); |
378 | void clipboardDataChanged(); | 378 | void clipboardDataChanged(); |
379 | void updateActionMenu(); | 379 | void updateActionMenu(); |
380 | void configureKeyBindings(); | 380 | void configureKeyBindings(); |
381 | void removeVoice(); | 381 | void removeVoice(); |
382 | void setFormattedName(); | 382 | void setFormattedName(); |
383 | #ifdef KAB_EMBEDDED | 383 | #ifdef KAB_EMBEDDED |
384 | void configureResources(); | 384 | void configureResources(); |
385 | #endif //KAB_EMBEDDED | 385 | #endif //KAB_EMBEDDED |
386 | 386 | ||
387 | void slotEditorDestroyed( const QString &uid ); | 387 | void slotEditorDestroyed( const QString &uid ); |
388 | void configurationChanged(); | 388 | void configurationChanged(); |
389 | void addressBookChanged(); | 389 | void addressBookChanged(); |
390 | 390 | ||
391 | private: | 391 | private: |
392 | QString mEmailSourceChannel; | 392 | QString mEmailSourceChannel; |
393 | QString mEmailSourceUID; | ||
393 | void resizeEvent(QResizeEvent* e ); | 394 | void resizeEvent(QResizeEvent* e ); |
394 | bool mBRdisabled; | 395 | bool mBRdisabled; |
395 | #ifndef DESKTOP_VERSION | 396 | #ifndef DESKTOP_VERSION |
396 | QCopChannel* infrared; | 397 | QCopChannel* infrared; |
397 | #endif | 398 | #endif |
398 | QTimer *mMessageTimer; | 399 | QTimer *mMessageTimer; |
399 | void initGUI(); | 400 | void initGUI(); |
400 | void initActions(); | 401 | void initActions(); |
401 | QString getPhoneFile(); | 402 | QString getPhoneFile(); |
402 | 403 | ||
403 | AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent, | 404 | AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent, |
404 | const char *name = 0 ); | 405 | const char *name = 0 ); |
405 | 406 | ||
406 | KXMLGUIClient *mGUIClient; | 407 | KXMLGUIClient *mGUIClient; |
407 | 408 | ||
408 | KABC::AddressBook *mAddressBook; | 409 | KABC::AddressBook *mAddressBook; |
409 | 410 | ||
410 | ViewManager *mViewManager; | 411 | ViewManager *mViewManager; |
411 | // QSplitter *mDetailsSplitter; | 412 | // QSplitter *mDetailsSplitter; |
412 | KDGanttMinimizeSplitter *mExtensionBarSplitter; | 413 | KDGanttMinimizeSplitter *mExtensionBarSplitter; |
413 | ViewContainer *mDetails; | 414 | ViewContainer *mDetails; |
414 | KDGanttMinimizeSplitter* mMiniSplitter; | 415 | KDGanttMinimizeSplitter* mMiniSplitter; |
415 | XXPortManager *mXXPortManager; | 416 | XXPortManager *mXXPortManager; |
416 | JumpButtonBar *mJumpButtonBar; | 417 | JumpButtonBar *mJumpButtonBar; |
417 | IncSearchWidget *mIncSearchWidget; | 418 | IncSearchWidget *mIncSearchWidget; |
418 | ExtensionManager *mExtensionManager; | 419 | ExtensionManager *mExtensionManager; |
419 | 420 | ||
420 | KCMultiDialog *mConfigureDialog; | 421 | KCMultiDialog *mConfigureDialog; |
421 | 422 | ||
422 | #ifndef KAB_EMBEDDED | 423 | #ifndef KAB_EMBEDDED |
423 | LDAPSearchDialog *mLdapSearchDialog; | 424 | LDAPSearchDialog *mLdapSearchDialog; |
424 | #endif //KAB_EMBEDDED | 425 | #endif //KAB_EMBEDDED |
425 | // QDict<AddresseeEditorDialog> mEditorDict; | 426 | // QDict<AddresseeEditorDialog> mEditorDict; |
426 | AddresseeEditorDialog *mEditorDialog; | 427 | AddresseeEditorDialog *mEditorDialog; |
427 | bool mReadWrite; | 428 | bool mReadWrite; |
428 | bool mModified; | 429 | bool mModified; |
429 | bool mIsPart; | 430 | bool mIsPart; |
430 | bool mMultipleViewsAtOnce; | 431 | bool mMultipleViewsAtOnce; |
431 | 432 | ||
432 | 433 | ||
433 | //US file menu | 434 | //US file menu |
434 | KAction *mActionMail; | 435 | KAction *mActionMail; |
435 | KAction *mActionBeam; | 436 | KAction *mActionBeam; |
436 | KToggleAction *mActionBR; | 437 | KToggleAction *mActionBR; |
437 | KAction *mActionExport2phone; | 438 | KAction *mActionExport2phone; |
438 | KAction* mActionPrint; | 439 | KAction* mActionPrint; |
439 | KAction* mActionPrintDetails; | 440 | KAction* mActionPrintDetails; |
440 | KAction* mActionNewContact; | 441 | KAction* mActionNewContact; |
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp index e7bc8c0..0127fc0 100644 --- a/kaddressbook/xxportselectdialog.cpp +++ b/kaddressbook/xxportselectdialog.cpp | |||
@@ -197,138 +197,139 @@ KABC::AddresseeList XXPortSelectDialog::contacts() | |||
197 | uint pos = mFieldCombo->currentItem(); | 197 | uint pos = mFieldCombo->currentItem(); |
198 | if ( pos < mFields.count() ) | 198 | if ( pos < mFields.count() ) |
199 | list.sortByField( mFields[ pos ] ); | 199 | list.sortByField( mFields[ pos ] ); |
200 | } | 200 | } |
201 | 201 | ||
202 | return list; | 202 | return list; |
203 | } | 203 | } |
204 | 204 | ||
205 | QStringList XXPortSelectDialog::categories() const | 205 | QStringList XXPortSelectDialog::categories() const |
206 | { | 206 | { |
207 | QStringList list; | 207 | QStringList list; |
208 | 208 | ||
209 | QListViewItemIterator it( mCategoriesView ); | 209 | QListViewItemIterator it( mCategoriesView ); |
210 | for ( ; it.current(); ++it ) { | 210 | for ( ; it.current(); ++it ) { |
211 | QCheckListItem* qcli = static_cast<QCheckListItem*>(it.current()); | 211 | QCheckListItem* qcli = static_cast<QCheckListItem*>(it.current()); |
212 | if ( qcli->isOn() ) | 212 | if ( qcli->isOn() ) |
213 | list.append( it.current()->text( 0 ) ); | 213 | list.append( it.current()->text( 0 ) ); |
214 | } | 214 | } |
215 | 215 | ||
216 | return list; | 216 | return list; |
217 | } | 217 | } |
218 | 218 | ||
219 | void XXPortSelectDialog::filterChanged( int ) | 219 | void XXPortSelectDialog::filterChanged( int ) |
220 | { | 220 | { |
221 | mUseFilters->setChecked( true ); | 221 | mUseFilters->setChecked( true ); |
222 | } | 222 | } |
223 | 223 | ||
224 | void XXPortSelectDialog::categoryClicked( QListViewItem *i ) | 224 | void XXPortSelectDialog::categoryClicked( QListViewItem *i ) |
225 | { | 225 | { |
226 | QCheckListItem *qcli = static_cast<QCheckListItem*>( i ); | 226 | QCheckListItem *qcli = static_cast<QCheckListItem*>( i ); |
227 | if ( qcli->isOn() ) | 227 | if ( qcli->isOn() ) |
228 | mUseCategories->setChecked( true ); | 228 | mUseCategories->setChecked( true ); |
229 | } | 229 | } |
230 | 230 | ||
231 | void XXPortSelectDialog::slotHelp() | 231 | void XXPortSelectDialog::slotHelp() |
232 | { | 232 | { |
233 | #ifndef KAB_EMBEDDED | 233 | #ifndef KAB_EMBEDDED |
234 | kapp->invokeHelp( "import-and-export" ); | 234 | kapp->invokeHelp( "import-and-export" ); |
235 | #else //KAB_EMBEDDED | 235 | #else //KAB_EMBEDDED |
236 | qDebug("XXPortSelectDialog::slotHelp is not implemented yet"); | 236 | qDebug("XXPortSelectDialog::slotHelp is not implemented yet"); |
237 | #endif //KAB_EMBEDDED | 237 | #endif //KAB_EMBEDDED |
238 | 238 | ||
239 | } | 239 | } |
240 | 240 | ||
241 | void XXPortSelectDialog::initGUI() | 241 | void XXPortSelectDialog::initGUI() |
242 | { | 242 | { |
243 | QFrame *page = plainPage(); | 243 | QFrame *page = plainPage(); |
244 | 244 | ||
245 | QVBoxLayout *topLayout = new QVBoxLayout( page, KDialog::marginHint(), | 245 | QVBoxLayout *topLayout = new QVBoxLayout( page, KDialog::marginHintSmall(), |
246 | KDialog::spacingHint() ); | 246 | KDialog::spacingHintSmall() ); |
247 | 247 | ||
248 | QLabel *label = new QLabel( i18n( "Which contacts do you want to select?" ), page ); | 248 | QLabel *label = new QLabel( i18n( "Which contacts do you want to select?" ), page ); |
249 | topLayout->addWidget( label ); | 249 | topLayout->addWidget( label ); |
250 | 250 | ||
251 | mButtonGroup = new QButtonGroup( i18n( "Contact Selection" ), page ); | 251 | mButtonGroup = new QButtonGroup( i18n( "Contact Selection" ), page ); |
252 | mButtonGroup->setColumnLayout( 0, Qt::Vertical ); | 252 | mButtonGroup->setColumnLayout( 0, Qt::Vertical ); |
253 | mButtonGroup->layout()->setSpacing( KDialog::spacingHint() ); | 253 | mButtonGroup->layout()->setSpacing( KDialog::spacingHint() ); |
254 | mButtonGroup->layout()->setMargin( KDialog::marginHint() ); | 254 | mButtonGroup->layout()->setMargin( KDialog::marginHint() ); |
255 | 255 | ||
256 | QGridLayout *groupLayout = new QGridLayout( mButtonGroup->layout() ); | 256 | QGridLayout *groupLayout = new QGridLayout( mButtonGroup->layout() ); |
257 | groupLayout->setAlignment( Qt::AlignTop ); | 257 | groupLayout->setAlignment( Qt::AlignTop ); |
258 | 258 | ||
259 | mUseWholeBook = new QRadioButton( i18n( "&All" ), mButtonGroup ); | 259 | mUseWholeBook = new QRadioButton( i18n( "&All" ), mButtonGroup ); |
260 | mUseWholeBook->setChecked( true ); | 260 | mUseWholeBook->setChecked( true ); |
261 | QWhatsThis::add( mUseWholeBook, i18n( "Select the entire address book" ) ); | 261 | QWhatsThis::add( mUseWholeBook, i18n( "Select the entire address book" ) ); |
262 | groupLayout->addWidget( mUseWholeBook, 0, 0 ); | 262 | groupLayout->addWidget( mUseWholeBook, 0, 0 ); |
263 | 263 | ||
264 | mUseSelection = new QRadioButton( i18n( "&Selected" ), mButtonGroup ); | 264 | mUseSelection = new QRadioButton( i18n( "&Selected" ), mButtonGroup ); |
265 | QWhatsThis::add( mUseSelection, i18n( "Only contacts selected in KAddressBook.\n" | 265 | QWhatsThis::add( mUseSelection, i18n( "Only contacts selected in KAddressBook.\n" |
266 | "This option is disabled if no contacts are selected." ) ); | 266 | "This option is disabled if no contacts are selected." ) ); |
267 | groupLayout->addWidget( mUseSelection, 1, 0 ); | 267 | groupLayout->addWidget( mUseSelection, 1, 0 ); |
268 | 268 | ||
269 | mUseFilters = new QRadioButton( i18n( "By matching &filter" ), mButtonGroup ); | 269 | mUseFilters = new QRadioButton( i18n( "By matching &filter" ), mButtonGroup ); |
270 | QWhatsThis::add( mUseFilters, i18n( "Only contacts matching the selected filter.\n" | 270 | QWhatsThis::add( mUseFilters, i18n( "Only contacts matching the selected filter.\n" |
271 | "This option is disabled if you haven't defined any filters" ) ); | 271 | "This option is disabled if you haven't defined any filters" ) ); |
272 | groupLayout->addWidget( mUseFilters, 2, 0 ); | 272 | groupLayout->addWidget( mUseFilters, 2, 0 ); |
273 | 273 | ||
274 | mUseCategories = new QRadioButton( i18n( "By Cate&gories" ), mButtonGroup ); | 274 | mUseCategories = new QRadioButton( i18n( "By Cate&gories" ), mButtonGroup ); |
275 | QWhatsThis::add( mUseCategories, i18n( "Only contacts who are members of a category that is checked on the list to the left.\n" | 275 | QWhatsThis::add( mUseCategories, i18n( "Only contacts who are members of a category that is checked on the list to the left.\n" |
276 | "This option is disabled if you have no categories." ) ); | 276 | "This option is disabled if you have no categories." ) ); |
277 | groupLayout->addWidget( mUseCategories, 3, 0 ); | 277 | groupLayout->addWidget( mUseCategories, 3, 0 ); |
278 | 278 | ||
279 | mFiltersCombo = new QComboBox( false, mButtonGroup ); | 279 | mFiltersCombo = new QComboBox( false, mButtonGroup ); |
280 | mFiltersCombo->setSizePolicy(QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); | ||
280 | QWhatsThis::add( mFiltersCombo, i18n( "Select a filter to decide which contacts to select." ) ); | 281 | QWhatsThis::add( mFiltersCombo, i18n( "Select a filter to decide which contacts to select." ) ); |
281 | groupLayout->addWidget( mFiltersCombo, 2, 1 ); | 282 | groupLayout->addWidget( mFiltersCombo, 2, 1 ); |
282 | 283 | ||
283 | mCategoriesView = new QListView( mButtonGroup ); | 284 | mCategoriesView = new QListView( mButtonGroup ); |
284 | mCategoriesView->addColumn( "" ); | 285 | mCategoriesView->addColumn( "" ); |
285 | mCategoriesView->header()->hide(); | 286 | mCategoriesView->header()->hide(); |
286 | QWhatsThis::add( mCategoriesView, i18n( "Check the categories whose members you want to select." ) ); | 287 | QWhatsThis::add( mCategoriesView, i18n( "Check the categories whose members you want to select." ) ); |
287 | groupLayout->addWidget( mCategoriesView, 3, 1 ); | 288 | groupLayout->addWidget( mCategoriesView, 3, 1 ); |
288 | 289 | mCategoriesView->setSizePolicy(QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); | |
289 | if (QApplication::desktop()->height() == 480 ) | 290 | //if (QApplication::desktop()->height() == 480 ) |
290 | mCategoriesView->setMaximumHeight( 240 ); | 291 | // mCategoriesView->setMaximumHeight( 240 ); |
291 | topLayout->addWidget( mButtonGroup ); | 292 | topLayout->addWidget( mButtonGroup ); |
292 | 293 | ||
293 | QButtonGroup *sortingGroup = new QButtonGroup( i18n( "Sorting" ), page ); | 294 | QButtonGroup *sortingGroup = new QButtonGroup( i18n( "Sorting" ), page ); |
294 | sortingGroup->setColumnLayout( 0, Qt::Vertical ); | 295 | sortingGroup->setColumnLayout( 0, Qt::Vertical ); |
295 | QGridLayout *sortLayout = new QGridLayout( sortingGroup->layout(), 2, 2, | 296 | QGridLayout *sortLayout = new QGridLayout( sortingGroup->layout(), 2, 2, |
296 | KDialog::spacingHint() ); | 297 | KDialog::spacingHint() ); |
297 | sortLayout->setAlignment( Qt::AlignTop ); | 298 | sortLayout->setAlignment( Qt::AlignTop ); |
298 | 299 | ||
299 | label = new QLabel( i18n( "Criterion:" ), sortingGroup ); | 300 | label = new QLabel( i18n( "Criterion:" ), sortingGroup ); |
300 | sortLayout->addWidget( label, 0, 0 ); | 301 | sortLayout->addWidget( label, 0, 0 ); |
301 | 302 | ||
302 | #ifndef KAB_EMBEDDED | 303 | #ifndef KAB_EMBEDDED |
303 | mFieldCombo = new KComboBox( false, sortingGroup ); | 304 | mFieldCombo = new KComboBox( false, sortingGroup ); |
304 | #else //KAB_EMBEDDED | 305 | #else //KAB_EMBEDDED |
305 | //US Combobox is not editable anyway | 306 | //US Combobox is not editable anyway |
306 | mFieldCombo = new KComboBox( sortingGroup ); | 307 | mFieldCombo = new KComboBox( sortingGroup ); |
307 | #endif //KAB_EMBEDDED | 308 | #endif //KAB_EMBEDDED |
308 | sortLayout->addWidget( mFieldCombo, 0, 1 ); | 309 | sortLayout->addWidget( mFieldCombo, 0, 1 ); |
309 | 310 | ||
310 | label = new QLabel( i18n( "Order:" ), sortingGroup ); | 311 | label = new QLabel( i18n( "Order:" ), sortingGroup ); |
311 | sortLayout->addWidget( label, 1, 0 ); | 312 | sortLayout->addWidget( label, 1, 0 ); |
312 | 313 | ||
313 | #ifndef KAB_EMBEDDED | 314 | #ifndef KAB_EMBEDDED |
314 | mSortTypeCombo = new KComboBox( false, sortingGroup ); | 315 | mSortTypeCombo = new KComboBox( false, sortingGroup ); |
315 | #else //KAB_EMBEDDED | 316 | #else //KAB_EMBEDDED |
316 | //US Combobox is not editable anyway | 317 | //US Combobox is not editable anyway |
317 | mSortTypeCombo = new KComboBox( sortingGroup ); | 318 | mSortTypeCombo = new KComboBox( sortingGroup ); |
318 | #endif //KAB_EMBEDDED | 319 | #endif //KAB_EMBEDDED |
319 | sortLayout->addWidget( mSortTypeCombo, 1, 1 ); | 320 | sortLayout->addWidget( mSortTypeCombo, 1, 1 ); |
320 | 321 | ||
321 | topLayout->addWidget( sortingGroup ); | 322 | topLayout->addWidget( sortingGroup ); |
322 | 323 | ||
323 | if ( !mUseSorting ) | 324 | if ( !mUseSorting ) |
324 | sortingGroup->hide(); | 325 | sortingGroup->hide(); |
325 | #ifndef DESKTOP_VERSION | 326 | #ifndef DESKTOP_VERSION |
326 | hideButtons(); | 327 | hideButtons(); |
327 | #endif | 328 | #endif |
328 | } | 329 | } |
329 | 330 | ||
330 | #ifndef KAB_EMBEDDED | 331 | #ifndef KAB_EMBEDDED |
331 | #include "xxportselectdialog.moc" | 332 | #include "xxportselectdialog.moc" |
332 | #endif //KAB_EMBEDDED | 333 | #endif //KAB_EMBEDDED |
333 | 334 | ||
334 | 335 | ||
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index 0d66a5a..0e9c5e5 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp | |||
@@ -1116,96 +1116,96 @@ void ExternalAppHandler::passParameters(QCopEnvelope* e, const QString& paramete | |||
1116 | 1116 | ||
1117 | if (useValMap == true) | 1117 | if (useValMap == true) |
1118 | (*e) << valmap; | 1118 | (*e) << valmap; |
1119 | 1119 | ||
1120 | #endif | 1120 | #endif |
1121 | 1121 | ||
1122 | } | 1122 | } |
1123 | 1123 | ||
1124 | 1124 | ||
1125 | 1125 | ||
1126 | /************************************************************************** | 1126 | /************************************************************************** |
1127 | * | 1127 | * |
1128 | **************************************************************************/ | 1128 | **************************************************************************/ |
1129 | 1129 | ||
1130 | void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data ) | 1130 | void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data ) |
1131 | { | 1131 | { |
1132 | 1132 | ||
1133 | if ( cmsg == "nextView()" ) { | 1133 | if ( cmsg == "nextView()" ) { |
1134 | qDebug("nextView()"); | 1134 | qDebug("nextView()"); |
1135 | emit nextView(); | 1135 | emit nextView(); |
1136 | return; | 1136 | return; |
1137 | } | 1137 | } |
1138 | if ( cmsg == "callContactdialog()" ) { | 1138 | if ( cmsg == "callContactdialog()" ) { |
1139 | qDebug("callContactdialog()"); | 1139 | qDebug("callContactdialog()"); |
1140 | emit callContactdialog(); | 1140 | emit callContactdialog(); |
1141 | return; | 1141 | return; |
1142 | } | 1142 | } |
1143 | 1143 | ||
1144 | bool res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); | 1144 | bool res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); |
1145 | if (!res) | 1145 | if (!res) |
1146 | res = mBirthdayListFromKAPITransfer->appMessage( cmsg, data ); | 1146 | res = mBirthdayListFromKAPITransfer->appMessage( cmsg, data ); |
1147 | 1147 | ||
1148 | if (!res) | 1148 | if (!res) |
1149 | res = mDisplayDetails->appMessage( cmsg, data ); | 1149 | res = mDisplayDetails->appMessage( cmsg, data ); |
1150 | 1150 | ||
1151 | // if (!res) | 1151 | // if (!res) |
1152 | // res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); | 1152 | // res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); |
1153 | } | 1153 | } |
1154 | 1154 | ||
1155 | 1155 | ||
1156 | 1156 | ||
1157 | bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid) | 1157 | bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid) |
1158 | { | 1158 | { |
1159 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); | 1159 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); |
1160 | // maybe we are sending to KA/Pi fom a different worldd... | 1160 | // maybe we are sending to KA/Pi fom a different worldd... |
1161 | // it may be that the QAplication::desktop()->width() values in KA/Pi are not the same as in our application | 1161 | // it may be that the QAplication::desktop()->width() values in KA/Pi are not the same as in our application |
1162 | // for that reason we send the current QApplication::desktop()->width() to KA/Pi | 1162 | // for that reason we send the current QApplication::desktop()->width() to KA/Pi |
1163 | //qDebug("UID %s ", sessionuid.latin1()); | 1163 | //qDebug("UID %s ", sessionuid.latin1()); |
1164 | return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(QString::number ( QApplication::desktop()->width() )); | 1164 | //return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(QString::number ( QApplication::desktop()->width() )); |
1165 | //return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(sessionuid); | 1165 | return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(sessionuid); |
1166 | } | 1166 | } |
1167 | 1167 | ||
1168 | bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) | 1168 | bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) |
1169 | { | 1169 | { |
1170 | QStringList list4, list5, list6; | 1170 | QStringList list4, list5, list6; |
1171 | 1171 | ||
1172 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); | 1172 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); |
1173 | return mNameEmailUidListFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6); | 1173 | return mNameEmailUidListFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6); |
1174 | } | 1174 | } |
1175 | 1175 | ||
1176 | bool ExternalAppHandler::requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email) | 1176 | bool ExternalAppHandler::requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email) |
1177 | { | 1177 | { |
1178 | mFindByEmailFromKAPITransfer->setSourceChannel(sourceChannel); | 1178 | mFindByEmailFromKAPITransfer->setSourceChannel(sourceChannel); |
1179 | return mFindByEmailFromKAPITransfer->sendMessageToTarget(sessionuid, email); | 1179 | return mFindByEmailFromKAPITransfer->sendMessageToTarget(sessionuid, email); |
1180 | } | 1180 | } |
1181 | 1181 | ||
1182 | bool ExternalAppHandler::returnFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) | 1182 | bool ExternalAppHandler::returnFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) |
1183 | { | 1183 | { |
1184 | QStringList list4, list5, list6; | 1184 | QStringList list4, list5, list6; |
1185 | 1185 | ||
1186 | mFindByEmailFromKAPITransfer->setSourceChannel(sourceChannel); | 1186 | mFindByEmailFromKAPITransfer->setSourceChannel(sourceChannel); |
1187 | return mFindByEmailFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6); | 1187 | return mFindByEmailFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6); |
1188 | } | 1188 | } |
1189 | 1189 | ||
1190 | bool ExternalAppHandler::requestDetailsFromKAPI(const QString& name, const QString& email, const QString& uid) | 1190 | bool ExternalAppHandler::requestDetailsFromKAPI(const QString& name, const QString& email, const QString& uid) |
1191 | { | 1191 | { |
1192 | mDisplayDetails->setSourceChannel(""); | 1192 | mDisplayDetails->setSourceChannel(""); |
1193 | return mDisplayDetails->sendMessageToTarget("", name, email, uid); | 1193 | return mDisplayDetails->sendMessageToTarget("", name, email, uid); |
1194 | } | 1194 | } |
1195 | 1195 | ||
1196 | bool ExternalAppHandler::requestBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid) | 1196 | bool ExternalAppHandler::requestBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid) |
1197 | { | 1197 | { |
1198 | mBirthdayListFromKAPITransfer->setSourceChannel(sourceChannel); | 1198 | mBirthdayListFromKAPITransfer->setSourceChannel(sourceChannel); |
1199 | return mBirthdayListFromKAPITransfer->sendMessageToTarget(sessionuid); | 1199 | return mBirthdayListFromKAPITransfer->sendMessageToTarget(sessionuid); |
1200 | } | 1200 | } |
1201 | 1201 | ||
1202 | bool ExternalAppHandler::returnBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4, const QStringList& list5, const QStringList& list6) | 1202 | bool ExternalAppHandler::returnBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4, const QStringList& list5, const QStringList& list6) |
1203 | { | 1203 | { |
1204 | mBirthdayListFromKAPITransfer->setSourceChannel(sourceChannel); | 1204 | mBirthdayListFromKAPITransfer->setSourceChannel(sourceChannel); |
1205 | return mBirthdayListFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6); | 1205 | return mBirthdayListFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6); |
1206 | } | 1206 | } |
1207 | 1207 | ||
1208 | 1208 | ||
1209 | 1209 | ||
1210 | 1210 | ||
1211 | 1211 | ||