author | zautrix <zautrix> | 2005-03-29 17:05:50 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-29 17:05:50 (UTC) |
commit | a7c827aa0e555206b60dec3bc07f7afab4352883 (patch) (unidiff) | |
tree | 56dbda15314f27ffabd143d09ea036b092444198 /kaddressbook | |
parent | 3116f249fc6ccd0e067213e826d3d924f6986972 (diff) | |
download | kdepimpi-a7c827aa0e555206b60dec3bc07f7afab4352883.zip kdepimpi-a7c827aa0e555206b60dec3bc07f7afab4352883.tar.gz kdepimpi-a7c827aa0e555206b60dec3bc07f7afab4352883.tar.bz2 |
fixes
-rw-r--r-- | kaddressbook/kabcore.cpp | 38 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 4 |
2 files changed, 35 insertions, 7 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 27aca2d..3f9b546 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -365,24 +365,25 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
365 | SLOT( incrementalSearch( const QString& ) ) ); | 365 | SLOT( incrementalSearch( const QString& ) ) ); |
366 | connect( mIncSearchWidget, SIGNAL( fieldChanged() ), | 366 | connect( mIncSearchWidget, SIGNAL( fieldChanged() ), |
367 | mJumpButtonBar, SLOT( recreateButtons() ) ); | 367 | mJumpButtonBar, SLOT( recreateButtons() ) ); |
368 | 368 | ||
369 | connect( mDetails, SIGNAL( sendEmail( const QString& ) ), | 369 | connect( mDetails, SIGNAL( sendEmail( const QString& ) ), |
370 | SLOT( sendMail( const QString& ) ) ); | 370 | SLOT( sendMail( const QString& ) ) ); |
371 | 371 | ||
372 | 372 | ||
373 | connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&))); | 373 | connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&))); |
374 | 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&))); | 374 | 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&))); |
375 | connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&))); | 375 | connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&))); |
376 | connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle())); | 376 | connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle())); |
377 | connect( ExternalAppHandler::instance(), SIGNAL (callContactdialog()),this, SLOT(callContactdialog())); | ||
377 | 378 | ||
378 | 379 | ||
379 | #ifndef KAB_EMBEDDED | 380 | #ifndef KAB_EMBEDDED |
380 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), | 381 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), |
381 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); | 382 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); |
382 | 383 | ||
383 | connect( mDetails, SIGNAL( browse( const QString& ) ), | 384 | connect( mDetails, SIGNAL( browse( const QString& ) ), |
384 | SLOT( browse( const QString& ) ) ); | 385 | SLOT( browse( const QString& ) ) ); |
385 | 386 | ||
386 | 387 | ||
387 | mAddressBookService = new KAddressBookService( this ); | 388 | mAddressBookService = new KAddressBookService( this ); |
388 | 389 | ||
@@ -826,24 +827,25 @@ void KABCore::updateMainWindow() | |||
826 | void KABCore::resizeEvent(QResizeEvent* e ) | 827 | void KABCore::resizeEvent(QResizeEvent* e ) |
827 | { | 828 | { |
828 | if ( !mMiniSplitter ) | 829 | if ( !mMiniSplitter ) |
829 | return; | 830 | return; |
830 | //qDebug("KABCore::resizeEvent(QResizeEvent* e ) "); | 831 | //qDebug("KABCore::resizeEvent(QResizeEvent* e ) "); |
831 | if ( QApplication::desktop()->width() >= 480 ) { | 832 | if ( QApplication::desktop()->width() >= 480 ) { |
832 | if (QApplication::desktop()->width() == 640 ) { // e.g. 640x480 | 833 | if (QApplication::desktop()->width() == 640 ) { // e.g. 640x480 |
833 | if ( mMiniSplitter->orientation() == Qt::Vertical ) { | 834 | if ( mMiniSplitter->orientation() == Qt::Vertical ) { |
834 | mMiniSplitter->setOrientation( Qt::Horizontal); | 835 | mMiniSplitter->setOrientation( Qt::Horizontal); |
835 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 836 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); |
836 | } | 837 | } |
837 | if ( QApplication::desktop()->width() <= 640 ) { | 838 | if ( QApplication::desktop()->width() <= 640 ) { |
839 | mMainWindow->showMinimized(); | ||
838 | //mMainWindow->setMaximumSize( QApplication::desktop()->size() ); | 840 | //mMainWindow->setMaximumSize( QApplication::desktop()->size() ); |
839 | mViewManager->getFilterAction()->setComboWidth( 150 ); | 841 | mViewManager->getFilterAction()->setComboWidth( 150 ); |
840 | if ( mIncSearchWidget ) | 842 | if ( mIncSearchWidget ) |
841 | mIncSearchWidget->setSize(); | 843 | mIncSearchWidget->setSize(); |
842 | QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); | 844 | QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); |
843 | } | 845 | } |
844 | 846 | ||
845 | } else if (QApplication::desktop()->width() == 480 ){// e.g. 480x640 | 847 | } else if (QApplication::desktop()->width() == 480 ){// e.g. 480x640 |
846 | if ( mMiniSplitter->orientation() == Qt::Horizontal ) { | 848 | if ( mMiniSplitter->orientation() == Qt::Horizontal ) { |
847 | mMiniSplitter->setOrientation( Qt::Vertical ); | 849 | mMiniSplitter->setOrientation( Qt::Vertical ); |
848 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); | 850 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); |
849 | } | 851 | } |
@@ -852,24 +854,25 @@ void KABCore::resizeEvent(QResizeEvent* e ) | |||
852 | mMainWindow->showMinimized(); | 854 | mMainWindow->showMinimized(); |
853 | if ( KABPrefs::instance()->mHideSearchOnSwitch ) { | 855 | if ( KABPrefs::instance()->mHideSearchOnSwitch ) { |
854 | if ( mIncSearchWidget ) { | 856 | if ( mIncSearchWidget ) { |
855 | mIncSearchWidget->setSize(); | 857 | mIncSearchWidget->setSize(); |
856 | } | 858 | } |
857 | } else { | 859 | } else { |
858 | mViewManager->getFilterAction()->setComboWidth( 0 ); | 860 | mViewManager->getFilterAction()->setComboWidth( 0 ); |
859 | } | 861 | } |
860 | QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); | 862 | QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); |
861 | } | 863 | } |
862 | } | 864 | } |
863 | } | 865 | } |
866 | QWidget::resizeEvent( e ); | ||
864 | 867 | ||
865 | } | 868 | } |
866 | void KABCore::export2phone() | 869 | void KABCore::export2phone() |
867 | { | 870 | { |
868 | 871 | ||
869 | QStringList uids; | 872 | QStringList uids; |
870 | XXPortSelectDialog dlg( this, false, this ); | 873 | XXPortSelectDialog dlg( this, false, this ); |
871 | if ( dlg.exec() ) | 874 | if ( dlg.exec() ) |
872 | uids = dlg.uids(); | 875 | uids = dlg.uids(); |
873 | else | 876 | else |
874 | return; | 877 | return; |
875 | if ( uids.isEmpty() ) | 878 | if ( uids.isEmpty() ) |
@@ -2496,54 +2499,75 @@ void KABCore::configureResources() | |||
2496 | if ( !dlg.exec() ) | 2499 | if ( !dlg.exec() ) |
2497 | return; | 2500 | return; |
2498 | KMessageBox::information( this, i18n("Please restart to get the \nchanged resources (re)loaded!\n") ); | 2501 | KMessageBox::information( this, i18n("Please restart to get the \nchanged resources (re)loaded!\n") ); |
2499 | } | 2502 | } |
2500 | #endif //KAB_EMBEDDED | 2503 | #endif //KAB_EMBEDDED |
2501 | 2504 | ||
2502 | 2505 | ||
2503 | /* this method will be called through the QCop interface from Ko/Pi to select addresses | 2506 | /* this method will be called through the QCop interface from Ko/Pi to select addresses |
2504 | * for the attendees list of an event. | 2507 | * for the attendees list of an event. |
2505 | */ | 2508 | */ |
2506 | void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid) | 2509 | void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid) |
2507 | { | 2510 | { |
2508 | QStringList nameList; | 2511 | |
2509 | QStringList emailList; | ||
2510 | QStringList uidList; | ||
2511 | bool ok = false; | 2512 | bool ok = false; |
2513 | mEmailSourceChannel = sourceChannel; | ||
2512 | int wid = uid.toInt( &ok ); | 2514 | int wid = uid.toInt( &ok ); |
2515 | qDebug("UID %s ", uid.latin1()); | ||
2513 | if ( ok ) { | 2516 | if ( ok ) { |
2514 | if ( wid != QApplication::desktop()->width() ) { | 2517 | if ( wid != QApplication::desktop()->width() ) { |
2515 | qDebug("KA/Pi: Request from different desktop geometry. Resizing ..."); | 2518 | qDebug("KA/Pi: Request from different desktop geometry. Resizing ..."); |
2516 | message( i18n("Resizing, please wait...") ); | 2519 | message( i18n("Resizing, please wait...") ); |
2517 | raise(); | 2520 | mMainWindow->showMinimized(); |
2518 | qApp->processEvents(); | 2521 | /* |
2522 | { | ||
2523 | QCopEnvelope e("QPE/Application/kapi", "callContactdialog()"); | ||
2524 | } | ||
2525 | */ | ||
2526 | QTimer::singleShot( 1,this, SLOT ( resizeAndCallContactdialog() ) ); | ||
2527 | return; | ||
2519 | } | 2528 | } |
2520 | 2529 | ||
2521 | } else { | 2530 | } else { |
2522 | qDebug("KABCore::requestForNameEmailUidList:: Got invalid uid "); | 2531 | qDebug("KABCore::requestForNameEmailUidList:: Got invalid uid "); |
2523 | } | 2532 | } |
2533 | callContactdialog(); | ||
2534 | //QCopEnvelope e("QPE/Application/kapi", "callContactdialog()"); | ||
2535 | |||
2536 | } | ||
2537 | void KABCore::resizeAndCallContactdialog() | ||
2538 | { | ||
2539 | updateMainWindow(); | ||
2540 | QTimer::singleShot( 100,this, SLOT ( callContactdialog() ) ); | ||
2541 | } | ||
2524 | 2542 | ||
2543 | void KABCore::callContactdialog() | ||
2544 | { | ||
2545 | QStringList nameList; | ||
2546 | QStringList emailList; | ||
2547 | QStringList uidList; | ||
2548 | qDebug("WIDTH %d ", QApplication::desktop()->width() ); | ||
2525 | KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this); | 2549 | KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this); |
2526 | uint i=0; | 2550 | uint i=0; |
2527 | for (i=0; i < list.count(); i++) | 2551 | for (i=0; i < list.count(); i++) |
2528 | { | 2552 | { |
2529 | nameList.append(list[i].realName()); | 2553 | nameList.append(list[i].realName()); |
2530 | emailList.append(list[i].preferredEmail()); | 2554 | emailList.append(list[i].preferredEmail()); |
2531 | uidList.append(list[i].uid()); | 2555 | uidList.append(list[i].uid()); |
2532 | } | 2556 | } |
2557 | QString uid = "unnamed"; | ||
2533 | //qDebug("%s %s ", sourceChannel.latin1(), uid.latin1()); | 2558 | //qDebug("%s %s ", sourceChannel.latin1(), uid.latin1()); |
2534 | bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(sourceChannel, uid, nameList, emailList, uidList); | 2559 | bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(mEmailSourceChannel, uid, nameList, emailList, uidList); |
2535 | 2560 | ||
2536 | } | 2561 | } |
2537 | |||
2538 | /* this method will be called through the QCop interface from Ko/Pi to select birthdays | 2562 | /* this method will be called through the QCop interface from Ko/Pi to select birthdays |
2539 | * to put them into the calendar. | 2563 | * to put them into the calendar. |
2540 | */ | 2564 | */ |
2541 | void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString& uid) | 2565 | void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString& uid) |
2542 | { | 2566 | { |
2543 | // qDebug("KABCore::requestForBirthdayList"); | 2567 | // qDebug("KABCore::requestForBirthdayList"); |
2544 | QStringList birthdayList; | 2568 | QStringList birthdayList; |
2545 | QStringList anniversaryList; | 2569 | QStringList anniversaryList; |
2546 | QStringList realNameList; | 2570 | QStringList realNameList; |
2547 | QStringList preferredEmailList; | 2571 | QStringList preferredEmailList; |
2548 | QStringList assembledNameList; | 2572 | QStringList assembledNameList; |
2549 | QStringList uidList; | 2573 | QStringList uidList; |
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index c185117..47ea152 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -359,41 +359,45 @@ class KABCore : public QWidget, public KSyncInterface | |||
359 | 359 | ||
360 | void saveSettings(); | 360 | void saveSettings(); |
361 | 361 | ||
362 | private slots: | 362 | private slots: |
363 | void updateToolBar(); | 363 | void updateToolBar(); |
364 | void updateMainWindow(); | 364 | void updateMainWindow(); |
365 | void receive( const QCString& cmsg, const QByteArray& data ); | 365 | void receive( const QCString& cmsg, const QByteArray& data ); |
366 | void toggleBeamReceive( ); | 366 | void toggleBeamReceive( ); |
367 | void disableBR(bool); | 367 | void disableBR(bool); |
368 | void setJumpButtonBarVisible( bool visible ); | 368 | void setJumpButtonBarVisible( bool visible ); |
369 | void setJumpButtonBar( bool visible ); | 369 | void setJumpButtonBar( bool visible ); |
370 | void setCaptionBack(); | 370 | void setCaptionBack(); |
371 | void resizeAndCallContactdialog(); | ||
372 | void callContactdialog(); | ||
373 | |||
371 | void importFromOL(); | 374 | void importFromOL(); |
372 | void extensionModified( const KABC::Addressee::List &list ); | 375 | void extensionModified( const KABC::Addressee::List &list ); |
373 | void extensionChanged( int id ); | 376 | void extensionChanged( int id ); |
374 | void clipboardDataChanged(); | 377 | void clipboardDataChanged(); |
375 | void updateActionMenu(); | 378 | void updateActionMenu(); |
376 | void configureKeyBindings(); | 379 | void configureKeyBindings(); |
377 | void removeVoice(); | 380 | void removeVoice(); |
378 | void setFormattedName(); | 381 | void setFormattedName(); |
379 | #ifdef KAB_EMBEDDED | 382 | #ifdef KAB_EMBEDDED |
380 | void configureResources(); | 383 | void configureResources(); |
381 | #endif //KAB_EMBEDDED | 384 | #endif //KAB_EMBEDDED |
382 | 385 | ||
383 | void slotEditorDestroyed( const QString &uid ); | 386 | void slotEditorDestroyed( const QString &uid ); |
384 | void configurationChanged(); | 387 | void configurationChanged(); |
385 | void addressBookChanged(); | 388 | void addressBookChanged(); |
386 | 389 | ||
387 | private: | 390 | private: |
391 | QString mEmailSourceChannel; | ||
388 | void resizeEvent(QResizeEvent* e ); | 392 | void resizeEvent(QResizeEvent* e ); |
389 | bool mBRdisabled; | 393 | bool mBRdisabled; |
390 | #ifndef DESKTOP_VERSION | 394 | #ifndef DESKTOP_VERSION |
391 | QCopChannel* infrared; | 395 | QCopChannel* infrared; |
392 | #endif | 396 | #endif |
393 | QTimer *mMessageTimer; | 397 | QTimer *mMessageTimer; |
394 | void initGUI(); | 398 | void initGUI(); |
395 | void initActions(); | 399 | void initActions(); |
396 | QString getPhoneFile(); | 400 | QString getPhoneFile(); |
397 | 401 | ||
398 | AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent, | 402 | AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent, |
399 | const char *name = 0 ); | 403 | const char *name = 0 ); |