summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore 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
@@ -2516,8 +2516,11 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt
{
bool ok = false;
mEmailSourceChannel = sourceChannel;
+ mEmailSourceUID = uid;
+ callContactdialog();
+#if 0
int wid = uid.toInt( &ok );
qDebug("UID %s ", uid.latin1());
if ( ok ) {
if ( wid != QApplication::desktop()->width() ) {
@@ -2537,9 +2540,9 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt
qDebug("KABCore::requestForNameEmailUidList:: Got invalid uid ");
}
callContactdialog();
//QCopEnvelope e("QPE/Application/kapi", "callContactdialog()");
-
+#endif
}
void KABCore::resizeAndCallContactdialog()
{
updateMainWindow();
@@ -2550,18 +2553,18 @@ void KABCore::callContactdialog()
{
QStringList nameList;
QStringList emailList;
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);
uint i=0;
for (i=0; i < list.count(); i++)
{
nameList.append(list[i].realName());
emailList.append(list[i].preferredEmail());
uidList.append(list[i].uid());
}
- QString uid = "unnamed";
+ QString uid = mEmailSourceUID;
//qDebug("%s %s ", sourceChannel.latin1(), uid.latin1());
bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(mEmailSourceChannel, uid, nameList, emailList, uidList);
}
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index d89daee..4cef73a 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -389,8 +389,9 @@ class KABCore : public QWidget, public KSyncInterface
void addressBookChanged();
private:
QString mEmailSourceChannel;
+ QString mEmailSourceUID;
void resizeEvent(QResizeEvent* e );
bool mBRdisabled;
#ifndef DESKTOP_VERSION
QCopChannel* infrared;
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index e7bc8c0..0127fc0 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -241,10 +241,10 @@ void XXPortSelectDialog::slotHelp()
void XXPortSelectDialog::initGUI()
{
QFrame *page = plainPage();
- QVBoxLayout *topLayout = new QVBoxLayout( page, KDialog::marginHint(),
- KDialog::spacingHint() );
+ QVBoxLayout *topLayout = new QVBoxLayout( page, KDialog::marginHintSmall(),
+ KDialog::spacingHintSmall() );
QLabel *label = new QLabel( i18n( "Which contacts do you want to select?" ), page );
topLayout->addWidget( label );
@@ -276,19 +276,20 @@ void XXPortSelectDialog::initGUI()
"This option is disabled if you have no categories." ) );
groupLayout->addWidget( mUseCategories, 3, 0 );
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." ) );
groupLayout->addWidget( mFiltersCombo, 2, 1 );
mCategoriesView = new QListView( mButtonGroup );
mCategoriesView->addColumn( "" );
mCategoriesView->header()->hide();
QWhatsThis::add( mCategoriesView, i18n( "Check the categories whose members you want to select." ) );
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 );
QButtonGroup *sortingGroup = new QButtonGroup( i18n( "Sorting" ), page );
sortingGroup->setColumnLayout( 0, Qt::Vertical );
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 0d66a5a..0e9c5e5 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -1160,10 +1160,10 @@ bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceCh
// maybe we are sending to KA/Pi fom a different worldd...
// it may be that the QAplication::desktop()->width() values in KA/Pi are not the same as in our application
// for that reason we send the current QApplication::desktop()->width() to KA/Pi
//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);
}
bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3)
{