author | zautrix <zautrix> | 2005-06-27 20:33:47 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-27 20:33:47 (UTC) |
commit | bf664c505e66f54dd03c3518386fdeab43108e56 (patch) (side-by-side diff) | |
tree | 2e41ba8c43b8126f643c94ceecd1bcf83800cd43 | |
parent | d730e4b5cd81965f224b69efcc91dd58253f0b98 (diff) | |
download | kdepimpi-bf664c505e66f54dd03c3518386fdeab43108e56.zip kdepimpi-bf664c505e66f54dd03c3518386fdeab43108e56.tar.gz kdepimpi-bf664c505e66f54dd03c3518386fdeab43108e56.tar.bz2 |
fixes
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 2 | ||||
-rw-r--r-- | kabc/addresseedialog.cpp | 7 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 14 |
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 @@ -1,17 +1,19 @@ Info about the changes in new versions of KDE-Pim/Pi ********** VERSION 2.1.10 ************ 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 ************ KO/Pi: Fixed some problems of the new search options in the search dialog. Fixed some problems in the new resource config options. Changed the recurrence edit of events and todos such that the recurrence edit page now is notified about a change of the start date on the first page. Fixed a problem creating new events in the agenda view if at the day/time is already an agenda item shown: diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp index 9197850..0cf75a0 100644 --- a/kabc/addresseedialog.cpp +++ b/kabc/addresseedialog.cpp @@ -58,16 +58,17 @@ QString AddresseeItem::key( int column, bool ) const return text(column).lower(); } AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) : KDialogBase( KDialogBase::Plain, i18n("Select Addressee"), Ok|Cancel, No, parent ), mMultiple( multiple ) { qDebug("NEW AddresseeDialog "); + QWidget *topWidget = plainPage(); QBoxLayout *topLayout = new QHBoxLayout( topWidget ); KDGanttMinimizeSplitter* mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, topWidget); mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); @@ -319,18 +320,21 @@ Addressee AddresseeDialog::getAddressee( QWidget *parent ) } delete dlg; return addressee; } 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; static int geoH = 0; if ( QApplication::desktop()->width() <= 640 ) dlg->showMaximized(); else { if ( !geoX && ! geoY && !geoW &&!geoH ) { @@ -349,15 +353,16 @@ Addressee::List AddresseeDialog::getAddressees( QWidget *parent ) geoY = dlg->geometry().y(); geoW = dlg->width(); geoH = dlg->height(); if ( result == QDialog::Accepted ) { addressees = dlg->addressees(); } delete dlg; + running = false; return addressees; } void AddresseeDialog::addressBookChanged() { loadAddressBook(); } diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index b107e2d..3715786 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -2539,21 +2539,22 @@ void KABCore::configureResources() #endif //KAB_EMBEDDED /* this method will be called through the QCop interface from Ko/Pi to select addresses * for the attendees list of an event. */ 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()); if ( ok ) { if ( wid != QApplication::desktop()->width() ) { qDebug("KA/Pi: Request from different desktop geometry. Resizing ..."); message( i18n("Resizing, please wait...") ); mMainWindow->showMinimized(); @@ -2571,37 +2572,40 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt } callContactdialog(); //QCopEnvelope e("QPE/Application/kapi", "callContactdialog()"); #endif } 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() ); 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 = 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. */ void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString& uid) { // qDebug("KABCore::requestForBirthdayList"); QStringList birthdayList; |