author | zautrix <zautrix> | 2005-06-29 16:14:46 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-29 16:14:46 (UTC) |
commit | 77aa480c9891a90c9b492618ebfd2b20f2d0727a (patch) (unidiff) | |
tree | 4f2c278d016fe21f280f8ee6abbca34685aada96 | |
parent | e0fa858c284dddf0d47146e666c4ece7158487be (diff) | |
download | kdepimpi-77aa480c9891a90c9b492618ebfd2b20f2d0727a.zip kdepimpi-77aa480c9891a90c9b492618ebfd2b20f2d0727a.tar.gz kdepimpi-77aa480c9891a90c9b492618ebfd2b20f2d0727a.tar.bz2 |
many sync fixes
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 5 | ||||
-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 4 | ||||
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 2 | ||||
-rw-r--r-- | kaddressbook/addresseeeditorwidget.cpp | 6 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 5 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 1 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 23 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 1 | ||||
-rw-r--r-- | libkdepim/externalapphandler.cpp | 12 | ||||
-rw-r--r-- | libkdepim/externalapphandler.h | 1 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 18 |
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 | |||
@@ -9,6 +9,11 @@ Added option for a journal title. | |||
9 | 9 | ||
10 | Added info about the calendar, the item belongs to, to the event/todo/journal viewer. | 10 | Added info about the calendar, the item belongs to, to the event/todo/journal viewer. |
11 | 11 | ||
12 | |||
13 | Fixed some problems when calling KO/Pi or KA/Pi from the alarm applet. | ||
14 | |||
15 | Added KA/Pi multi sync to the multi sync called from the alarm applet. | ||
16 | |||
12 | ********** VERSION 2.1.10 ************ | 17 | ********** VERSION 2.1.10 ************ |
13 | 18 | ||
14 | KO/Pi: | 19 | KO/Pi: |
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 | |||
@@ -257,12 +257,12 @@ | |||
257 | { "Automatically sync\nwith KDE-Desktop","Automatischer Sync\nmit dem KDE-Desktop" }, | 257 | { "Automatically sync\nwith KDE-Desktop","Automatischer Sync\nmit dem KDE-Desktop" }, |
258 | { "Enter port for Pi-Sync","Port Nummer für Pi-Sync" }, | 258 | { "Enter port for Pi-Sync","Port Nummer für Pi-Sync" }, |
259 | { "Disable Pi-Sync","Schalte Pi-Sync aus" }, | 259 | { "Disable Pi-Sync","Schalte Pi-Sync aus" }, |
260 | { "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!" }, | 260 | { "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!" }, |
261 | { "KDE-Pim Sync","KDE-Pim Sync" }, | 261 | { "KDE-Pim Sync","KDE-Pim Sync" }, |
262 | { "Multiple profiles","Multi-Sync Profile" }, | 262 | { "Multiple profiles","Multi-Sync Profile" }, |
263 | { "Device: ","Gerät: " }, | 263 | { "Device: ","Gerät: " }, |
264 | { "Multiple sync started.","Multi-Sync gestartet." }, | 264 | { "Multiple sync started.","Multi-Sync gestartet." }, |
265 | { "Nothing synced! No profiles defined for multisync!","Nichts gesynct! Keine Profile\nselektiert für Multi-Sync" }, | 265 | { "Nothing synced! No profiles defined for multisync!","Nichts gesynct! Keine Profile selektiert für Multi-Sync" }, |
266 | { "KDE-Pim sync config","KDE-Pim Sync Konfig" }, | 266 | { "KDE-Pim sync config","KDE-Pim Sync Konfig" }, |
267 | { "Insert kind of connection,e.g.:\n","Füge Art der Verbindung ein, z.B.:\n" }, | 267 | { "Insert kind of connection,e.g.:\n","Füge Art der Verbindung ein, z.B.:\n" }, |
268 | { "Recommended: Leave empty!\n(Such that model can\nbe auto detected)\nOr insert name of model:\n","Empfohlen: Leer lassen!\n(So dass das Modell\nautomatisch\erkannt\nwerden kann)\nOder füge Model Name ein:\n" }, | 268 | { "Recommended: Leave empty!\n(Such that model can\nbe auto detected)\nOr insert name of model:\n","Empfohlen: Leer lassen!\n(So dass das Modell\nautomatisch\erkannt\nwerden kann)\nOder füge Model Name ein:\n" }, |
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 | |||
@@ -968,7 +968,7 @@ | |||
968 | { "Automatically sync\nwith KDE-Desktop","Automatischer Sync\nmit dem KDE-Desktop" }, | 968 | { "Automatically sync\nwith KDE-Desktop","Automatischer Sync\nmit dem KDE-Desktop" }, |
969 | { "Enter port for Pi-Sync","Port Nummer für Pi-Sync" }, | 969 | { "Enter port for Pi-Sync","Port Nummer für Pi-Sync" }, |
970 | { "Disable Pi-Sync","Schalte Pi-Sync aus" }, | 970 | { "Disable Pi-Sync","Schalte Pi-Sync aus" }, |
971 | { "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!" }, | 971 | { "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!" }, |
972 | { "KDE-Pim Sync","KDE-Pim Sync" }, | 972 | { "KDE-Pim Sync","KDE-Pim Sync" }, |
973 | { "Multiple profiles","Multi-Sync Profile" }, | 973 | { "Multiple profiles","Multi-Sync Profile" }, |
974 | { "Device: ","Gerät: " }, | 974 | { "Device: ","Gerät: " }, |
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index bd32859..5334a0e 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp | |||
@@ -659,7 +659,7 @@ void AddresseeEditorWidget::setupTab2() | |||
659 | QHBox * nbox = new QHBox ( tab2 ); | 659 | QHBox * nbox = new QHBox ( tab2 ); |
660 | label = new QLabel( i18n( "Birthday:" )+" ", nbox ); | 660 | label = new QLabel( i18n( "Birthday:" )+" ", nbox ); |
661 | mBirthdayPicker = new KDateEdit( nbox ); | 661 | mBirthdayPicker = new KDateEdit( nbox ); |
662 | mBirthdayPicker->toggleDateFormat(); | 662 | //mBirthdayPicker->toggleDateFormat(); |
663 | mBirthdayPicker->setHandleInvalid( true ); | 663 | mBirthdayPicker->setHandleInvalid( true ); |
664 | connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ), | 664 | connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ), |
665 | SLOT( dateChanged( QDate ) ) ); | 665 | SLOT( dateChanged( QDate ) ) ); |
@@ -681,7 +681,7 @@ void AddresseeEditorWidget::setupTab2() | |||
681 | label = new QLabel( i18n( "Birthday:" ), tab2 ); | 681 | label = new QLabel( i18n( "Birthday:" ), tab2 ); |
682 | layout->addWidget( label, iii, 1 ); | 682 | layout->addWidget( label, iii, 1 ); |
683 | mBirthdayPicker = new KDateEdit( tab2 ); | 683 | mBirthdayPicker = new KDateEdit( tab2 ); |
684 | mBirthdayPicker->toggleDateFormat(); | 684 | //mBirthdayPicker->toggleDateFormat(); |
685 | mBirthdayPicker->setHandleInvalid( true ); | 685 | mBirthdayPicker->setHandleInvalid( true ); |
686 | connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ), | 686 | connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ), |
687 | SLOT( dateChanged( QDate ) ) ); | 687 | SLOT( dateChanged( QDate ) ) ); |
@@ -1079,8 +1079,6 @@ void AddresseeEditorWidget::save() | |||
1079 | mAddressee.setNote( mNoteEdit->text() ); | 1079 | mAddressee.setNote( mNoteEdit->text() ); |
1080 | if ( mBirthdayPicker->inputIsValid() ) { | 1080 | if ( mBirthdayPicker->inputIsValid() ) { |
1081 | QDate da = mBirthdayPicker->date(); | 1081 | QDate da = mBirthdayPicker->date(); |
1082 | if ( da > QDate::currentDate() ) | ||
1083 | da.setYMD(da.year()-100, da.month(), da.day() ); | ||
1084 | mAddressee.setBirthday( QDateTime( da ) ); | 1082 | mAddressee.setBirthday( QDateTime( da ) ); |
1085 | //qDebug("bday %s ",da.toString().latin1()); | 1083 | //qDebug("bday %s ",da.toString().latin1()); |
1086 | } | 1084 | } |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 3715786..046cb63 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -375,6 +375,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
375 | connect( ExternalAppHandler::instance(), SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)),this, SLOT(requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&))); | 375 | connect( ExternalAppHandler::instance(), SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)),this, SLOT(requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&))); |
376 | connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&))); | 376 | connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&))); |
377 | connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle())); | 377 | connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle())); |
378 | connect( ExternalAppHandler::instance(), SIGNAL (doRingSync()),this, SLOT( doRingSync())); | ||
378 | connect( ExternalAppHandler::instance(), SIGNAL (callContactdialog()),this, SLOT(callContactdialog())); | 379 | connect( ExternalAppHandler::instance(), SIGNAL (callContactdialog()),this, SLOT(callContactdialog())); |
379 | 380 | ||
380 | 381 | ||
@@ -2580,6 +2581,10 @@ void KABCore::resizeAndCallContactdialog() | |||
2580 | QTimer::singleShot( 10,this, SLOT ( callContactdialog() ) ); | 2581 | QTimer::singleShot( 10,this, SLOT ( callContactdialog() ) ); |
2581 | } | 2582 | } |
2582 | 2583 | ||
2584 | void KABCore::doRingSync() | ||
2585 | { | ||
2586 | syncManager->multiSync( false ); | ||
2587 | } | ||
2583 | void KABCore::callContactdialog() | 2588 | void KABCore::callContactdialog() |
2584 | { | 2589 | { |
2585 | static bool running = false; | 2590 | static bool running = false; |
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 6479a58..ceeeda7 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -373,6 +373,7 @@ class KABCore : public QWidget, public KSyncInterface | |||
373 | void setCaptionBack(); | 373 | void setCaptionBack(); |
374 | void resizeAndCallContactdialog(); | 374 | void resizeAndCallContactdialog(); |
375 | void callContactdialog(); | 375 | void callContactdialog(); |
376 | void doRingSync(); | ||
376 | 377 | ||
377 | void importFromOL(); | 378 | void importFromOL(); |
378 | void extensionModified( const KABC::Addressee::List &list ); | 379 | void extensionModified( const KABC::Addressee::List &list ); |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 68233e8..d8373a6 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -565,11 +565,10 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data ) | |||
565 | } | 565 | } |
566 | //qDebug("msg: %s all: %s ", msg.latin1(), allmsg.latin1() ); | 566 | //qDebug("msg: %s all: %s ", msg.latin1(), allmsg.latin1() ); |
567 | if ( msg == "-newEvent" ) { | 567 | if ( msg == "-newEvent" ) { |
568 | mView->newEvent(); | 568 | QTimer::singleShot( 0, mView, SLOT ( newEvent())); |
569 | } | 569 | } |
570 | if ( msg == "-newTodo" ) { | 570 | if ( msg == "-newTodo" ) { |
571 | mView->newTodo(); | 571 | QTimer::singleShot( 0, mView, SLOT ( newTodo())); |
572 | |||
573 | } | 572 | } |
574 | if ( msg == "-showWN" ) { | 573 | if ( msg == "-showWN" ) { |
575 | mView->viewManager()->showWhatsNextView(); | 574 | mView->viewManager()->showWhatsNextView(); |
@@ -587,7 +586,7 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data ) | |||
587 | mView->viewManager()->showWorkWeekView(); | 586 | mView->viewManager()->showWorkWeekView(); |
588 | } | 587 | } |
589 | else if ( msg == "-ringSync" ) { | 588 | else if ( msg == "-ringSync" ) { |
590 | mSyncManager->multiSync( false ); | 589 | QTimer::singleShot( 0, this, SLOT (startMultiSync())); |
591 | } | 590 | } |
592 | else if ( msg == "-showWeek" ) { | 591 | else if ( msg == "-showWeek" ) { |
593 | mView->viewManager()->showWeekView(); | 592 | mView->viewManager()->showWeekView(); |
@@ -619,7 +618,21 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data ) | |||
619 | showMaximized(); | 618 | showMaximized(); |
620 | raise(); | 619 | raise(); |
621 | } | 620 | } |
622 | 621 | void MainWindow::startMultiSync() | |
622 | { | ||
623 | QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!"); | ||
624 | if ( QMessageBox::information( this, i18n("KDE-Pim Sync"), | ||
625 | question, | ||
626 | i18n("Yes"), i18n("No"), | ||
627 | 0, 0 ) != 0 ) { | ||
628 | setCaption(i18n("Aborted! Nothing synced!")); | ||
629 | return; | ||
630 | } | ||
631 | mSyncManager->multiSync( false ); | ||
632 | #ifndef DESKTOP_VERSION | ||
633 | QCopEnvelope e("QPE/Application/kapi", "doRingSync"); | ||
634 | #endif | ||
635 | } | ||
623 | QPixmap MainWindow::loadPixmap( QString name ) | 636 | QPixmap MainWindow::loadPixmap( QString name ) |
624 | { | 637 | { |
625 | return SmallIcon( name ); | 638 | return SmallIcon( name ); |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index c9817c3..a4d0523 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -52,6 +52,7 @@ class MainWindow : public QMainWindow | |||
52 | void configureAgenda( int ); | 52 | void configureAgenda( int ); |
53 | void recieve( const QCString& msg, const QByteArray& data ); | 53 | void recieve( const QCString& msg, const QByteArray& data ); |
54 | protected slots: | 54 | protected slots: |
55 | void startMultiSync(); | ||
55 | void setCaptionToDates(); | 56 | void setCaptionToDates(); |
56 | void weekAction(); | 57 | void weekAction(); |
57 | void about(); | 58 | void about(); |
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index 0e9c5e5..2ce6926 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp | |||
@@ -30,6 +30,7 @@ $Id$ | |||
30 | #include <stdlib.h> | 30 | #include <stdlib.h> |
31 | 31 | ||
32 | #include <qfile.h> | 32 | #include <qfile.h> |
33 | #include <qtimer.h> | ||
33 | #include <qmap.h> | 34 | #include <qmap.h> |
34 | #include <qregexp.h> | 35 | #include <qregexp.h> |
35 | 36 | ||
@@ -1129,15 +1130,20 @@ void ExternalAppHandler::passParameters(QCopEnvelope* e, const QString& paramete | |||
1129 | 1130 | ||
1130 | void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data ) | 1131 | void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data ) |
1131 | { | 1132 | { |
1132 | 1133 | qDebug("ExternalAppHandler::appMessage %s %x", cmsg.data(), this); | |
1133 | if ( cmsg == "nextView()" ) { | 1134 | if ( cmsg == "nextView()" ) { |
1134 | qDebug("nextView()"); | 1135 | qDebug("nextView()"); |
1135 | emit nextView(); | 1136 | QTimer::singleShot( 0, this, SIGNAL ( nextView() )); |
1136 | return; | 1137 | return; |
1137 | } | 1138 | } |
1138 | if ( cmsg == "callContactdialog()" ) { | 1139 | if ( cmsg == "callContactdialog()" ) { |
1139 | qDebug("callContactdialog()"); | 1140 | qDebug("callContactdialog()"); |
1140 | emit callContactdialog(); | 1141 | QTimer::singleShot( 0, this, SIGNAL ( callContactdialog() )); |
1142 | return; | ||
1143 | } | ||
1144 | if ( cmsg == "doRingSync" ) { | ||
1145 | qDebug("doRingSync"); | ||
1146 | QTimer::singleShot( 0, this, SIGNAL ( doRingSync() )); | ||
1141 | return; | 1147 | return; |
1142 | } | 1148 | } |
1143 | 1149 | ||
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h index 097f306..b899ad7 100644 --- a/libkdepim/externalapphandler.h +++ b/libkdepim/externalapphandler.h | |||
@@ -235,6 +235,7 @@ class ExternalAppHandler : public QObject | |||
235 | signals: | 235 | signals: |
236 | void callContactdialog(); | 236 | void callContactdialog(); |
237 | void nextView(); | 237 | void nextView(); |
238 | void doRingSync(); | ||
238 | // Emmitted when the target app receives a request from the source app | 239 | // Emmitted when the target app receives a request from the source app |
239 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& uid); | 240 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& uid); |
240 | 241 | ||
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index db815d6..038e032 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -521,14 +521,16 @@ void KSyncManager::multiSync( bool askforPrefs ) | |||
521 | if (blockSave()) | 521 | if (blockSave()) |
522 | return; | 522 | return; |
523 | setBlockSave(true); | 523 | setBlockSave(true); |
524 | QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!"); | 524 | if ( askforPrefs ) { |
525 | if ( QMessageBox::information( mParent, i18n("KDE-Pim Sync"), | 525 | QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!"); |
526 | question, | 526 | if ( QMessageBox::information( mParent, i18n("KDE-Pim Sync"), |
527 | i18n("Yes"), i18n("No"), | 527 | question, |
528 | 0, 0 ) != 0 ) { | 528 | i18n("Yes"), i18n("No"), |
529 | setBlockSave(false); | 529 | 0, 0 ) != 0 ) { |
530 | mParent->topLevelWidget()->setCaption(i18n("Aborted! Nothing synced!")); | 530 | setBlockSave(false); |
531 | return; | 531 | mParent->topLevelWidget()->setCaption(i18n("Aborted! Nothing synced!")); |
532 | return; | ||
533 | } | ||
532 | } | 534 | } |
533 | mCurrentSyncDevice = i18n("Multiple profiles") ; | 535 | mCurrentSyncDevice = i18n("Multiple profiles") ; |
534 | mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs; | 536 | mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs; |