summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-27 20:33:47 (UTC)
committer zautrix <zautrix>2005-06-27 20:33:47 (UTC)
commitbf664c505e66f54dd03c3518386fdeab43108e56 (patch) (side-by-side diff)
tree2e41ba8c43b8126f643c94ceecd1bcf83800cd43
parentd730e4b5cd81965f224b69efcc91dd58253f0b98 (diff)
downloadkdepimpi-bf664c505e66f54dd03c3518386fdeab43108e56.zip
kdepimpi-bf664c505e66f54dd03c3518386fdeab43108e56.tar.gz
kdepimpi-bf664c505e66f54dd03c3518386fdeab43108e56.tar.bz2
fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt2
-rw-r--r--kabc/addresseedialog.cpp7
-rw-r--r--kaddressbook/kabcore.cpp14
3 files changed, 17 insertions, 6 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 21664de..b6472d7 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -4,9 +4,11 @@ Info about the changes in new versions of KDE-Pim/Pi
KO/Pi:
Importing Birthdays will now create another file resource "Birthdays" and import the birthday data from KA/Pi into that file.
+When a multidayevent is selected in monthview all occurences of this event in the monthview are now hightlighted.
KA/Pi:
Fixed two problems in csv export.
+Fixed problems when calling the contact selection dialog from KO/Pi or OM/Pi.
********** VERSION 2.1.9 ************
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 9197850..0cf75a0 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -63,6 +63,7 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
Ok|Cancel, No, parent ), mMultiple( multiple )
{
qDebug("NEW AddresseeDialog ");
+
QWidget *topWidget = plainPage();
QBoxLayout *topLayout = new QHBoxLayout( topWidget );
@@ -324,8 +325,11 @@ Addressee AddresseeDialog::getAddressee( QWidget *parent )
Addressee::List AddresseeDialog::getAddressees( QWidget *parent )
{
- AddresseeDialog *dlg = new AddresseeDialog( parent, true );
Addressee::List addressees;
+ static bool running = false;
+ if ( running ) return addressees;
+ running = true;
+ AddresseeDialog *dlg = new AddresseeDialog( parent, true );
static int geoX = 0;
static int geoY = 0;
static int geoW = 0;
@@ -354,6 +358,7 @@ Addressee::List AddresseeDialog::getAddressees( QWidget *parent )
}
delete dlg;
+ running = false;
return addressees;
}
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index b107e2d..3715786 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2544,11 +2544,12 @@ void KABCore::configureResources()
*/
void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid)
{
-
+ qDebug("KABCore::requestForNameEmailUidList ");
bool ok = false;
mEmailSourceChannel = sourceChannel;
mEmailSourceUID = uid;
- callContactdialog();
+ QTimer::singleShot( 10,this, SLOT ( callContactdialog() ) );
+ //callContactdialog();
#if 0
int wid = uid.toInt( &ok );
qDebug("UID %s ", uid.latin1());
@@ -2576,12 +2577,15 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt
void KABCore::resizeAndCallContactdialog()
{
updateMainWindow();
- QTimer::singleShot( 100,this, SLOT ( callContactdialog() ) );
+ QTimer::singleShot( 10,this, SLOT ( callContactdialog() ) );
}
void KABCore::callContactdialog()
{
- QStringList nameList;
+ static bool running = false;
+ if (running) return;
+ running = true;
+ QStringList nameList;
QStringList emailList;
QStringList uidList;
qDebug(" KABCore::callContactdialog:DESKTOP WIDTH %d ", QApplication::desktop()->width() );
@@ -2596,7 +2600,7 @@ void KABCore::callContactdialog()
QString uid = mEmailSourceUID;
//qDebug("%s %s ", sourceChannel.latin1(), uid.latin1());
bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(mEmailSourceChannel, uid, nameList, emailList, uidList);
-
+ running = false;
}
/* this method will be called through the QCop interface from Ko/Pi to select birthdays
* to put them into the calendar.