| -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 @@ -2519,2 +2519,5 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt mEmailSourceChannel = sourceChannel; + mEmailSourceUID = uid; + callContactdialog(); +#if 0 int wid = uid.toInt( &ok ); @@ -2540,3 +2543,3 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt //QCopEnvelope e("QPE/Application/kapi", "callContactdialog()"); - +#endif } @@ -2553,3 +2556,3 @@ void KABCore::callContactdialog() QStringList uidList; - qDebug("WIDTH %d ", QApplication::desktop()->width() ); + qDebug(" KABCore::callContactdialog:DESKTOP WIDTH %d ", QApplication::desktop()->width() ); KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this); @@ -2562,3 +2565,3 @@ void KABCore::callContactdialog() } - QString uid = "unnamed"; + QString uid = mEmailSourceUID; //qDebug("%s %s ", sourceChannel.latin1(), uid.latin1()); diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index d89daee..4cef73a 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -392,2 +392,3 @@ class KABCore : public QWidget, public KSyncInterface QString mEmailSourceChannel; + QString mEmailSourceUID; void resizeEvent(QResizeEvent* e ); diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp index e7bc8c0..0127fc0 100644 --- a/kaddressbook/xxportselectdialog.cpp +++ b/kaddressbook/xxportselectdialog.cpp @@ -244,4 +244,4 @@ void XXPortSelectDialog::initGUI() - QVBoxLayout *topLayout = new QVBoxLayout( page, KDialog::marginHint(), - KDialog::spacingHint() ); + QVBoxLayout *topLayout = new QVBoxLayout( page, KDialog::marginHintSmall(), + KDialog::spacingHintSmall() ); @@ -279,2 +279,3 @@ void XXPortSelectDialog::initGUI() mFiltersCombo = new QComboBox( false, mButtonGroup ); + mFiltersCombo->setSizePolicy(QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); QWhatsThis::add( mFiltersCombo, i18n( "Select a filter to decide which contacts to select." ) ); @@ -287,5 +288,5 @@ void XXPortSelectDialog::initGUI() groupLayout->addWidget( mCategoriesView, 3, 1 ); - - if (QApplication::desktop()->height() == 480 ) - mCategoriesView->setMaximumHeight( 240 ); + mCategoriesView->setSizePolicy(QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); + //if (QApplication::desktop()->height() == 480 ) + // mCategoriesView->setMaximumHeight( 240 ); topLayout->addWidget( mButtonGroup ); diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index 0d66a5a..0e9c5e5 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp @@ -1163,4 +1163,4 @@ bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceCh //qDebug("UID %s ", sessionuid.latin1()); - return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(QString::number ( QApplication::desktop()->width() )); - //return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(sessionuid); + //return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(QString::number ( QApplication::desktop()->width() )); + return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(sessionuid); } |