summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp9
-rw-r--r--kaddressbook/kabcore.h1
-rw-r--r--kaddressbook/xxportselectdialog.cpp11
-rw-r--r--libkdepim/externalapphandler.cpp4
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
@@ -2514,12 +2514,15 @@ void KABCore::configureResources()
2514 */ 2514 */
2515void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid) 2515void 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...") );
@@ -2535,35 +2538,35 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt
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}
2543void KABCore::resizeAndCallContactdialog() 2546void 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
2549void KABCore::callContactdialog() 2552void 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.
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index d89daee..4cef73a 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -387,12 +387,13 @@ class KABCore : public QWidget, public KSyncInterface
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;
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index e7bc8c0..0127fc0 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -239,14 +239,14 @@ void XXPortSelectDialog::slotHelp()
239} 239}
240 240
241void XXPortSelectDialog::initGUI() 241void 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 );
@@ -274,23 +274,24 @@ void XXPortSelectDialog::initGUI()
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() );
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 0d66a5a..0e9c5e5 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -1158,14 +1158,14 @@ bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceCh
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
1168bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) 1168bool 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