showing clcok skew in pisync

1 files changed, 28 insertions, 3 deletions

diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 9857e3e..9a1f2a9 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -351,6 +351,7 @@ void KSyncManager::enableQuick( bool ask )
 #ifdef DESKTOP_VERSION
 #ifdef _WIN32_
         QCheckBox syncdesktop( i18n("Automatically sync with Outlook\nwhen receiving sync request"),&dia );
+        syncdesktop.hide();// not implemented!
 #else
         QCheckBox syncdesktop( i18n("Automatically sync with KDE-Desktop\nwhen receiving sync request"),&dia );
 #endif
@@ -573,6 +574,7 @@ int KSyncManager::ringSync()
             // mAskForPreferences = temp->getAskForPreferences();
             mWriteBackFile = temp->getWriteBackFile();
             mWriteBackExistingOnly = temp->getWriteBackExisting();
+            mIsKapiFile = temp->getIsKapiFile();
             mWriteBackInFuture = 0;
             if ( temp->getWriteBackFuture() )
                 mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
@@ -580,6 +582,7 @@ int KSyncManager::ringSync()
             mCurrentSyncDevice = syncProfileNames[i] ;
             mCurrentSyncName = mLocalMachineName;
             if ( i == 0 ) {
+                mIsKapiFile = false; 
 #ifdef DESKTOP_VERSION
                 syncKDE();
 #else
@@ -1021,6 +1024,7 @@ QString KSyncManager::syncFileName()
 
 void KSyncManager::syncPi()
 {
+    mIsKapiFile = true; 
     mPisyncFinished = false;
     qApp->processEvents();
     if ( mAskForPreferences )
@@ -1138,8 +1142,9 @@ void KServerSocket::readClient()
                 //emit sendFile( mSocket );
                 bool ok = false;
                 QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok);
-                if ( ok )
+                if ( ok ) {
                     KSyncManager::mRequestedSyncEvent = dt; 
+                }
                 else
                     KSyncManager::mRequestedSyncEvent = QDateTime();
                 send_file();
@@ -1183,7 +1188,27 @@ void KServerSocket::send_file()
     lay->addWidget( label);
     lay->setMargin(7);
     lay->setSpacing(7);
-    mSyncActionDialog->setFixedSize( 230, 120);
+    if ( KSyncManager::mRequestedSyncEvent.isValid() ) {
+        int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent );
+        //if ( secs > 30 ) 
+        if ( true ) 
+            {
+                QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs );
+                QLabel* label = new QLabel( warning, mSyncActionDialog );
+                if ( secs > 600 )
+                    {
+                        QFont f = label->font();
+                        f. setBold (true ); 
+                        f.setPointSize (  f.pointSize() + 10);
+                        label->setFont( f );
+                    }
+                lay->addWidget( label);
+                mSyncActionDialog->setFixedSize( 230, 200);
+            } else {
+            mSyncActionDialog->setFixedSize( 230, 120);
+        }
+    } else
+        mSyncActionDialog->setFixedSize( 230, 120);
     mSyncActionDialog->show();
     mSyncActionDialog->raise();
     emit request_file();
@@ -1298,7 +1323,7 @@ void KCommandSocket::readFile( QString fn )
     QTextStream os( mSocket );
     os.setEncoding( QTextStream::Latin1 );
 
-    QString curDt = KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate );
+    QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate );
     os << "GET " << mPassWord << curDt <<"\r\n";
     mTimerSocket->start( 20000 );
 }