summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt5
-rw-r--r--bin/kdepim/kaddressbook/germantranslation.txt4
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt2
-rw-r--r--kaddressbook/addresseeeditorwidget.cpp6
-rw-r--r--kaddressbook/kabcore.cpp5
-rw-r--r--kaddressbook/kabcore.h1
-rw-r--r--korganizer/mainwindow.cpp23
-rw-r--r--korganizer/mainwindow.h1
-rw-r--r--libkdepim/externalapphandler.cpp12
-rw-r--r--libkdepim/externalapphandler.h1
-rw-r--r--libkdepim/ksyncmanager.cpp18
11 files changed, 55 insertions, 23 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 54376a0..10778ac 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -11,2 +11,7 @@ Added info about the calendar, the item belongs to, to the event/todo/journal vi
+
+Fixed some problems when calling KO/Pi or KA/Pi from the alarm applet.
+
+Added KA/Pi multi sync to the multi sync called from the alarm applet.
+
********** VERSION 2.1.10 ************
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index 515161f..c18a241 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -259,3 +259,3 @@
{ "Disable Pi-Sync","Schalte Pi-Sync aus" },
-{ "Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!","Wollen Sie wirklich\nmit allen selektierten\nProfilen \"Multi-Syncen\"?\nDas Syncen dauert einige Zeit -\nalle Profile werden zweimal gesynct!" },
+{ "Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!","Wollen Sie wirklich\nmit allen selektierten\nProfilen "Multi-Syncen"?\nDas Syncen dauert einige Zeit -\nalle Profile werden zweimal gesynct!" },
{ "KDE-Pim Sync","KDE-Pim Sync" },
@@ -264,3 +264,3 @@
{ "Multiple sync started.","Multi-Sync gestartet." },
-{ "Nothing synced! No profiles defined for multisync!","Nichts gesynct! Keine Profile\nselektiert für Multi-Sync" },
+{ "Nothing synced! No profiles defined for multisync!","Nichts gesynct! Keine Profile selektiert für Multi-Sync" },
{ "KDE-Pim sync config","KDE-Pim Sync Konfig" },
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 510f4bf..792cb91 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -970,3 +970,3 @@
{ "Disable Pi-Sync","Schalte Pi-Sync aus" },
-{ "Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!","Wollen Sie wirklich\nmit allen selektierten\nProfilen \"Multi-Syncen\"?\nDas Syncen dauert einige Zeit -\nalle Profile werden zweimal gesynct!" },
+{ "Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!","Wollen Sie wirklich\nmit allen selektierten\nProfilen "Multi-Syncen"?\nDas Syncen dauert einige Zeit -\nalle Profile werden zweimal gesynct!" },
{ "KDE-Pim Sync","KDE-Pim Sync" },
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index bd32859..5334a0e 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -661,3 +661,3 @@ void AddresseeEditorWidget::setupTab2()
mBirthdayPicker = new KDateEdit( nbox );
- mBirthdayPicker->toggleDateFormat();
+ //mBirthdayPicker->toggleDateFormat();
mBirthdayPicker->setHandleInvalid( true );
@@ -683,3 +683,3 @@ void AddresseeEditorWidget::setupTab2()
mBirthdayPicker = new KDateEdit( tab2 );
- mBirthdayPicker->toggleDateFormat();
+ //mBirthdayPicker->toggleDateFormat();
mBirthdayPicker->setHandleInvalid( true );
@@ -1081,4 +1081,2 @@ void AddresseeEditorWidget::save()
QDate da = mBirthdayPicker->date();
- if ( da > QDate::currentDate() )
- da.setYMD(da.year()-100, da.month(), da.day() );
mAddressee.setBirthday( QDateTime( da ) );
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 3715786..046cb63 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -377,2 +377,3 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle()));
+ connect( ExternalAppHandler::instance(), SIGNAL (doRingSync()),this, SLOT( doRingSync()));
connect( ExternalAppHandler::instance(), SIGNAL (callContactdialog()),this, SLOT(callContactdialog()));
@@ -2582,2 +2583,6 @@ void KABCore::resizeAndCallContactdialog()
+void KABCore::doRingSync()
+{
+ syncManager->multiSync( false );
+}
void KABCore::callContactdialog()
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 6479a58..ceeeda7 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -375,2 +375,3 @@ class KABCore : public QWidget, public KSyncInterface
void callContactdialog();
+ void doRingSync();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 68233e8..d8373a6 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -567,7 +567,6 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
if ( msg == "-newEvent" ) {
- mView->newEvent();
+ QTimer::singleShot( 0, mView, SLOT ( newEvent()));
}
if ( msg == "-newTodo" ) {
- mView->newTodo();
-
+ QTimer::singleShot( 0, mView, SLOT ( newTodo()));
}
@@ -589,3 +588,3 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
else if ( msg == "-ringSync" ) {
- mSyncManager->multiSync( false );
+ QTimer::singleShot( 0, this, SLOT (startMultiSync()));
}
@@ -621,3 +620,17 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
}
-
+void MainWindow::startMultiSync()
+{
+ QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!");
+ if ( QMessageBox::information( this, i18n("KDE-Pim Sync"),
+ question,
+ i18n("Yes"), i18n("No"),
+ 0, 0 ) != 0 ) {
+ setCaption(i18n("Aborted! Nothing synced!"));
+ return;
+ }
+ mSyncManager->multiSync( false );
+#ifndef DESKTOP_VERSION
+ QCopEnvelope e("QPE/Application/kapi", "doRingSync");
+#endif
+}
QPixmap MainWindow::loadPixmap( QString name )
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index c9817c3..a4d0523 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -54,2 +54,3 @@ class MainWindow : public QMainWindow
protected slots:
+ void startMultiSync();
void setCaptionToDates();
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 0e9c5e5..2ce6926 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -32,2 +32,3 @@ $Id$
#include <qfile.h>
+#include <qtimer.h>
#include <qmap.h>
@@ -1131,6 +1132,6 @@ void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& dat
{
-
+ qDebug("ExternalAppHandler::appMessage %s %x", cmsg.data(), this);
if ( cmsg == "nextView()" ) {
qDebug("nextView()");
- emit nextView();
+ QTimer::singleShot( 0, this, SIGNAL ( nextView() ));
return;
@@ -1139,3 +1140,8 @@ void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& dat
qDebug("callContactdialog()");
- emit callContactdialog();
+ QTimer::singleShot( 0, this, SIGNAL ( callContactdialog() ));
+ return;
+ }
+ if ( cmsg == "doRingSync" ) {
+ qDebug("doRingSync");
+ QTimer::singleShot( 0, this, SIGNAL ( doRingSync() ));
return;
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h
index 097f306..b899ad7 100644
--- a/libkdepim/externalapphandler.h
+++ b/libkdepim/externalapphandler.h
@@ -237,2 +237,3 @@ class ExternalAppHandler : public QObject
void nextView();
+ void doRingSync();
// Emmitted when the target app receives a request from the source app
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index db815d6..038e032 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -523,10 +523,12 @@ void KSyncManager::multiSync( bool askforPrefs )
setBlockSave(true);
- QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!");
- if ( QMessageBox::information( mParent, i18n("KDE-Pim Sync"),
- question,
- i18n("Yes"), i18n("No"),
- 0, 0 ) != 0 ) {
- setBlockSave(false);
- mParent->topLevelWidget()->setCaption(i18n("Aborted! Nothing synced!"));
- return;
+ if ( askforPrefs ) {
+ QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!");
+ if ( QMessageBox::information( mParent, i18n("KDE-Pim Sync"),
+ question,
+ i18n("Yes"), i18n("No"),
+ 0, 0 ) != 0 ) {
+ setBlockSave(false);
+ mParent->topLevelWidget()->setCaption(i18n("Aborted! Nothing synced!"));
+ return;
+ }
}