summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-02-23 22:51:41 (UTC)
committer zautrix <zautrix>2005-02-23 22:51:41 (UTC)
commita130c77b5c762131fb9ecb4cc96de52126b8c338 (patch) (unidiff)
tree655ecb4c1bb5e735a7d9a63104db8872367e84e9
parent4a9bf75c2ef12a40be3aea1d147f3703aee48638 (diff)
downloadkdepimpi-a130c77b5c762131fb9ecb4cc96de52126b8c338.zip
kdepimpi-a130c77b5c762131fb9ecb4cc96de52126b8c338.tar.gz
kdepimpi-a130c77b5c762131fb9ecb4cc96de52126b8c338.tar.bz2
socket fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/ksyncmanager.cpp26
-rw-r--r--libkdepim/ksyncmanager.h4
2 files changed, 27 insertions, 3 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 08a263c..5214fe7 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -881,636 +881,658 @@ QString KSyncManager::getPassword( )
881 return retfile; 881 return retfile;
882 882
883} 883}
884 884
885 885
886void KSyncManager::confSync() 886void KSyncManager::confSync()
887{ 887{
888 static KSyncPrefsDialog* sp = 0; 888 static KSyncPrefsDialog* sp = 0;
889 if ( ! sp ) { 889 if ( ! sp ) {
890 sp = new KSyncPrefsDialog( mParent, "syncprefs", true ); 890 sp = new KSyncPrefsDialog( mParent, "syncprefs", true );
891 } 891 }
892 sp->usrReadConfig(); 892 sp->usrReadConfig();
893#ifndef DESKTOP_VERSION 893#ifndef DESKTOP_VERSION
894 sp->showMaximized(); 894 sp->showMaximized();
895#else 895#else
896 sp->show(); 896 sp->show();
897#endif 897#endif
898 sp->exec(); 898 sp->exec();
899 QStringList oldSyncProfileNames = mSyncProfileNames; 899 QStringList oldSyncProfileNames = mSyncProfileNames;
900 mSyncProfileNames = sp->getSyncProfileNames(); 900 mSyncProfileNames = sp->getSyncProfileNames();
901 mLocalMachineName = sp->getLocalMachineName (); 901 mLocalMachineName = sp->getLocalMachineName ();
902 int ii; 902 int ii;
903 for ( ii = 0; ii < oldSyncProfileNames.count(); ++ii ) { 903 for ( ii = 0; ii < oldSyncProfileNames.count(); ++ii ) {
904 if ( ! mSyncProfileNames.contains( oldSyncProfileNames[ii] ) ) 904 if ( ! mSyncProfileNames.contains( oldSyncProfileNames[ii] ) )
905 mImplementation->removeSyncInfo( oldSyncProfileNames[ii] ); 905 mImplementation->removeSyncInfo( oldSyncProfileNames[ii] );
906 } 906 }
907 QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 907 QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) );
908} 908}
909void KSyncManager::syncKDE() 909void KSyncManager::syncKDE()
910{ 910{
911 mSyncWithDesktop = true; 911 mSyncWithDesktop = true;
912 emit save(); 912 emit save();
913 switch(mTargetApp) 913 switch(mTargetApp)
914 { 914 {
915 case (KAPI): 915 case (KAPI):
916 { 916 {
917#ifdef DESKTOP_VERSION 917#ifdef DESKTOP_VERSION
918 QString command = qApp->applicationDirPath () + "/kdeabdump"; 918 QString command = qApp->applicationDirPath () + "/kdeabdump";
919#else 919#else
920 QString command = "kdeabdump"; 920 QString command = "kdeabdump";
921#endif 921#endif
922 if ( ! QFile::exists ( command ) ) 922 if ( ! QFile::exists ( command ) )
923 command = "kdeabdump"; 923 command = "kdeabdump";
924 QString fileName = QDir::homeDirPath ()+"/.kdeaddressbookdump.vcf"; 924 QString fileName = QDir::homeDirPath ()+"/.kdeaddressbookdump.vcf";
925 system ( command.latin1()); 925 system ( command.latin1());
926 if ( syncWithFile( fileName,true ) ) { 926 if ( syncWithFile( fileName,true ) ) {
927 if ( mWriteBackFile ) { 927 if ( mWriteBackFile ) {
928 command += " --read"; 928 command += " --read";
929 system ( command.latin1()); 929 system ( command.latin1());
930 } 930 }
931 } 931 }
932 932
933 } 933 }
934 break; 934 break;
935 case (KOPI): 935 case (KOPI):
936 { 936 {
937#ifdef DESKTOP_VERSION 937#ifdef DESKTOP_VERSION
938 QString command = qApp->applicationDirPath () + "/kdecaldump"; 938 QString command = qApp->applicationDirPath () + "/kdecaldump";
939#else 939#else
940 QString command = "kdecaldump"; 940 QString command = "kdecaldump";
941#endif 941#endif
942 if ( ! QFile::exists ( command ) ) 942 if ( ! QFile::exists ( command ) )
943 command = "kdecaldump"; 943 command = "kdecaldump";
944 QString fileName = QDir::homeDirPath ()+"/.kdecalendardump.ics"; 944 QString fileName = QDir::homeDirPath ()+"/.kdecalendardump.ics";
945 system ( command.latin1()); 945 system ( command.latin1());
946 if ( syncWithFile( fileName,true ) ) { 946 if ( syncWithFile( fileName,true ) ) {
947 if ( mWriteBackFile ) { 947 if ( mWriteBackFile ) {
948 command += " --read"; 948 command += " --read";
949 system ( command.latin1()); 949 system ( command.latin1());
950 } 950 }
951 } 951 }
952 952
953 } 953 }
954 break; 954 break;
955 case (PWMPI): 955 case (PWMPI):
956 956
957 break; 957 break;
958 default: 958 default:
959 qDebug("KSM::slotSyncMenu: invalid apptype selected"); 959 qDebug("KSM::slotSyncMenu: invalid apptype selected");
960 break; 960 break;
961 961
962 } 962 }
963} 963}
964 964
965void KSyncManager::syncSharp() 965void KSyncManager::syncSharp()
966{ 966{
967 967
968 if ( ! syncExternalApplication("sharp") ) 968 if ( ! syncExternalApplication("sharp") )
969 qDebug("KSM::ERROR sync sharp "); 969 qDebug("KSM::ERROR sync sharp ");
970} 970}
971 971
972bool KSyncManager::syncExternalApplication(QString resource) 972bool KSyncManager::syncExternalApplication(QString resource)
973{ 973{
974 974
975 emit save(); 975 emit save();
976 976
977 if ( mAskForPreferences ) 977 if ( mAskForPreferences )
978 if ( !edit_sync_options()) { 978 if ( !edit_sync_options()) {
979 mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); 979 mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
980 return false; 980 return false;
981 } 981 }
982 982
983 qDebug("KSM::Sync extern %s", resource.latin1()); 983 qDebug("KSM::Sync extern %s", resource.latin1());
984 984
985 bool syncOK = mImplementation->syncExternal(this, resource); 985 bool syncOK = mImplementation->syncExternal(this, resource);
986 986
987 return syncOK; 987 return syncOK;
988 988
989} 989}
990 990
991void KSyncManager::syncPhone() 991void KSyncManager::syncPhone()
992{ 992{
993 993
994 syncExternalApplication("phone"); 994 syncExternalApplication("phone");
995 995
996} 996}
997 997
998void KSyncManager::showProgressBar(int percentage, QString caption, int total) 998void KSyncManager::showProgressBar(int percentage, QString caption, int total)
999{ 999{
1000 if (!bar->isVisible()) 1000 if (!bar->isVisible())
1001 { 1001 {
1002 bar->setCaption (caption); 1002 bar->setCaption (caption);
1003 bar->setTotalSteps ( total ) ; 1003 bar->setTotalSteps ( total ) ;
1004 bar->show(); 1004 bar->show();
1005 } 1005 }
1006 bar->raise(); 1006 bar->raise();
1007 bar->setProgress( percentage ); 1007 bar->setProgress( percentage );
1008 qApp->processEvents(); 1008 qApp->processEvents();
1009} 1009}
1010 1010
1011void KSyncManager::hideProgressBar() 1011void KSyncManager::hideProgressBar()
1012{ 1012{
1013 bar->hide(); 1013 bar->hide();
1014 qApp->processEvents(); 1014 qApp->processEvents();
1015} 1015}
1016 1016
1017bool KSyncManager::isProgressBarCanceled() 1017bool KSyncManager::isProgressBarCanceled()
1018{ 1018{
1019 return !bar->isVisible(); 1019 return !bar->isVisible();
1020} 1020}
1021 1021
1022QString KSyncManager::syncFileName() 1022QString KSyncManager::syncFileName()
1023{ 1023{
1024 1024
1025 QString fn = "tempfile"; 1025 QString fn = "tempfile";
1026 switch(mTargetApp) 1026 switch(mTargetApp)
1027 { 1027 {
1028 case (KAPI): 1028 case (KAPI):
1029 fn = "tempsyncab.vcf"; 1029 fn = "tempsyncab.vcf";
1030 break; 1030 break;
1031 case (KOPI): 1031 case (KOPI):
1032 fn = "tempsynccal.ics"; 1032 fn = "tempsynccal.ics";
1033 break; 1033 break;
1034 case (PWMPI): 1034 case (PWMPI):
1035 fn = "tempsyncpw.pwm"; 1035 fn = "tempsyncpw.pwm";
1036 break; 1036 break;
1037 default: 1037 default:
1038 break; 1038 break;
1039 } 1039 }
1040#ifdef _WIN32_ 1040#ifdef _WIN32_
1041 return locateLocal( "tmp", fn ); 1041 return locateLocal( "tmp", fn );
1042#else 1042#else
1043 return (QString( "/tmp/" )+ fn ); 1043 return (QString( "/tmp/" )+ fn );
1044#endif 1044#endif
1045} 1045}
1046 1046
1047void KSyncManager::syncPi() 1047void KSyncManager::syncPi()
1048{ 1048{
1049 mIsKapiFile = true; 1049 mIsKapiFile = true;
1050 mPisyncFinished = false; 1050 mPisyncFinished = false;
1051 qApp->processEvents(); 1051 qApp->processEvents();
1052 if ( mAskForPreferences ) 1052 if ( mAskForPreferences )
1053 if ( !edit_pisync_options()) { 1053 if ( !edit_pisync_options()) {
1054 mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); 1054 mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
1055 mPisyncFinished = true; 1055 mPisyncFinished = true;
1056 return; 1056 return;
1057 } 1057 }
1058 bool ok; 1058 bool ok;
1059 Q_UINT16 port = mActiveSyncPort.toUInt(&ok); 1059 Q_UINT16 port = mActiveSyncPort.toUInt(&ok);
1060 if ( ! ok ) { 1060 if ( ! ok ) {
1061 mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); 1061 mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") );
1062 mPisyncFinished = true; 1062 mPisyncFinished = true;
1063 return; 1063 return;
1064 } 1064 }
1065 KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); 1065 KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() );
1066 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); 1066 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
1067 commandSocket->readFile( syncFileName() ); 1067 commandSocket->readFile( syncFileName() );
1068} 1068}
1069 1069
1070void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) 1070void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
1071{ 1071{
1072 //enum { success, errorW, errorR, quiet }; 1072 //enum { success, errorW, errorR, quiet };
1073 if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) { 1073 if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW ) {
1074 mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); 1074 if ( state == KCommandSocket::errorPW )
1075 mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") );
1076 else
1077 mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") );
1075 delete s; 1078 delete s;
1076 if ( state == KCommandSocket::errorR ) { 1079 if ( state == KCommandSocket::errorR ) {
1077 KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget()); 1080 KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget());
1078 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); 1081 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
1079 commandSocket->sendStop(); 1082 commandSocket->sendStop();
1080 } 1083 }
1081 mPisyncFinished = true; 1084 mPisyncFinished = true;
1082 return; 1085 return;
1083 1086
1084 } else if ( state == KCommandSocket::errorW ) { 1087 } else if ( state == KCommandSocket::errorW ) {
1085 mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); 1088 mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") );
1086 mPisyncFinished = true; 1089 mPisyncFinished = true;
1087 1090
1088 } else if ( state == KCommandSocket::successR ) { 1091 } else if ( state == KCommandSocket::successR ) {
1089 QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); 1092 QTimer::singleShot( 1, this , SLOT ( readFileFromSocket()));
1090 1093
1091 } else if ( state == KCommandSocket::successW ) { 1094 } else if ( state == KCommandSocket::successW ) {
1092 mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") ); 1095 mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") );
1093 mPisyncFinished = true; 1096 mPisyncFinished = true;
1094 } else if ( state == KCommandSocket::quiet ){ 1097 } else if ( state == KCommandSocket::quiet ){
1095 qDebug("KSS: quiet "); 1098 qDebug("KSS: quiet ");
1096 mPisyncFinished = true; 1099 mPisyncFinished = true;
1097 } else { 1100 } else {
1098 qDebug("KSS: Error: unknown state: %d ", state); 1101 qDebug("KSS: Error: unknown state: %d ", state);
1099 mPisyncFinished = true; 1102 mPisyncFinished = true;
1100 } 1103 }
1101 1104
1102 delete s; 1105 delete s;
1103} 1106}
1104 1107
1105void KSyncManager::readFileFromSocket() 1108void KSyncManager::readFileFromSocket()
1106{ 1109{
1107 QString fileName = syncFileName(); 1110 QString fileName = syncFileName();
1108 bool syncOK = true; 1111 bool syncOK = true;
1109 mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); 1112 mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") );
1110 if ( ! syncWithFile( fileName , true ) ) { 1113 if ( ! syncWithFile( fileName , true ) ) {
1111 mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); 1114 mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") );
1112 syncOK = false; 1115 syncOK = false;
1113 } 1116 }
1114 KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() ); 1117 KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() );
1115 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); 1118 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
1116 if ( mWriteBackFile && syncOK ) 1119 if ( mWriteBackFile && syncOK )
1117 commandSocket->writeFile( fileName ); 1120 commandSocket->writeFile( fileName );
1118 else { 1121 else {
1119 commandSocket->sendStop(); 1122 commandSocket->sendStop();
1120 if ( syncOK ) 1123 if ( syncOK )
1121 mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); 1124 mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") );
1122 mPisyncFinished = true; 1125 mPisyncFinished = true;
1123 } 1126 }
1124} 1127}
1125 1128
1126KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) 1129KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name )
1127{ 1130{
1128 mPassWord = pw; 1131 mPassWord = pw;
1129 mSocket = 0; 1132 mSocket = 0;
1130 mSyncActionDialog = 0; 1133 mSyncActionDialog = 0;
1131 blockRC = false; 1134 blockRC = false;
1132} 1135}
1133 1136
1134void KServerSocket::newConnection ( int socket ) 1137void KServerSocket::newConnection ( int socket )
1135{ 1138{
1136 // qDebug("KServerSocket:New connection %d ", socket); 1139 // qDebug("KServerSocket:New connection %d ", socket);
1137 if ( mSocket ) { 1140 if ( mSocket ) {
1138 qDebug("KSS::newConnection Socket deleted! "); 1141 qDebug("KSS::newConnection Socket deleted! ");
1139 delete mSocket; 1142 delete mSocket;
1140 mSocket = 0; 1143 mSocket = 0;
1141 } 1144 }
1142 mSocket = new QSocket( this ); 1145 mSocket = new QSocket( this );
1143 connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) ); 1146 connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) );
1144 connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); 1147 connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) );
1145 mSocket->setSocket( socket ); 1148 mSocket->setSocket( socket );
1146} 1149}
1147 1150
1148void KServerSocket::discardClient() 1151void KServerSocket::discardClient()
1149{ 1152{
1150 //qDebug(" KServerSocket::discardClient()"); 1153 //qDebug(" KServerSocket::discardClient()");
1151 if ( mSocket ) { 1154 if ( mSocket ) {
1152 delete mSocket; 1155 delete mSocket;
1153 mSocket = 0; 1156 mSocket = 0;
1154 } 1157 }
1155 //emit endConnect(); 1158 //emit endConnect();
1156} 1159}
1157void KServerSocket::readClient() 1160void KServerSocket::readClient()
1158{ 1161{
1159 if ( blockRC ) 1162 if ( blockRC )
1160 return; 1163 return;
1161 if ( mSocket == 0 ) { 1164 if ( mSocket == 0 ) {
1162 qDebug("ERROR::KSS::readClient(): mSocket == 0 "); 1165 qDebug("ERROR::KSS::readClient(): mSocket == 0 ");
1163 return; 1166 return;
1164 } 1167 }
1165 //qDebug("KServerSocket::readClient()"); 1168 //qDebug("KServerSocket::readClient()");
1166 if ( mSocket->canReadLine() ) { 1169 if ( mSocket->canReadLine() ) {
1167 QString line = mSocket->readLine(); 1170 QString line = mSocket->readLine();
1168 //qDebug("KServerSocket readline: %s ", line.latin1()); 1171 //qDebug("KServerSocket readline: %s ", line.latin1());
1169 QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); 1172 QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line );
1170 if ( tokens[0] == "GET" ) { 1173 if ( tokens[0] == "GET" ) {
1171 if ( tokens[1] == mPassWord ) { 1174 if ( tokens[1] == mPassWord ) {
1172 //emit sendFile( mSocket ); 1175 //emit sendFile( mSocket );
1173 bool ok = false; 1176 bool ok = false;
1174 QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok); 1177 QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok);
1175 if ( ok ) { 1178 if ( ok ) {
1176 KSyncManager::mRequestedSyncEvent = dt; 1179 KSyncManager::mRequestedSyncEvent = dt;
1177 } 1180 }
1178 else 1181 else
1179 KSyncManager::mRequestedSyncEvent = QDateTime(); 1182 KSyncManager::mRequestedSyncEvent = QDateTime();
1180 send_file(); 1183 send_file();
1181 } 1184 }
1182 else { 1185 else {
1183 KMessageBox::error( 0, i18n("Got send file request\nwith invalid password")); 1186 KMessageBox::error( 0, i18n("Got send file request\nwith invalid password"));
1184 //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); 1187 //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
1185 } 1188 }
1186 } 1189 }
1187 if ( tokens[0] == "PUT" ) { 1190 if ( tokens[0] == "PUT" ) {
1188 if ( tokens[1] == mPassWord ) { 1191 if ( tokens[1] == mPassWord ) {
1189 //emit getFile( mSocket ); 1192 //emit getFile( mSocket );
1190 blockRC = true; 1193 blockRC = true;
1191 get_file(); 1194 get_file();
1192 } 1195 }
1193 else { 1196 else {
1194 KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password")); 1197 KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password"));
1195 //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); 1198 //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
1196 } 1199 }
1197 } 1200 }
1198 if ( tokens[0] == "STOP" ) { 1201 if ( tokens[0] == "STOP" ) {
1199 //emit endConnect(); 1202 //emit endConnect();
1200 end_connect(); 1203 end_connect();
1201 } 1204 }
1202 } 1205 }
1203} 1206}
1207void KServerSocket::error_connect()
1208{
1209 QTextStream os( mSocket );
1210 os.setEncoding( QTextStream::Latin1 );
1211 os << "ERROR_PW\r\n\r\n";
1212 mSocket->close();
1213 if ( mSocket->state() == QSocket::Idle )
1214 QTimer::singleShot( 10, this , SLOT ( discardClient()));
1215}
1204void KServerSocket::end_connect() 1216void KServerSocket::end_connect()
1205{ 1217{
1206 delete mSyncActionDialog; 1218 delete mSyncActionDialog;
1207 mSyncActionDialog = 0; 1219 mSyncActionDialog = 0;
1208} 1220}
1209void KServerSocket::send_file() 1221void KServerSocket::send_file()
1210{ 1222{
1211 //qDebug("MainWindow::sendFile(QSocket* s) "); 1223 //qDebug("MainWindow::sendFile(QSocket* s) ");
1212 if ( mSyncActionDialog ) 1224 if ( mSyncActionDialog )
1213 delete mSyncActionDialog; 1225 delete mSyncActionDialog;
1214 mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); 1226 mSyncActionDialog = new QDialog ( 0, "input-dialog", true );
1215 mSyncActionDialog->setCaption(i18n("Received sync request")); 1227 mSyncActionDialog->setCaption(i18n("Received sync request"));
1216 QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog ); 1228 QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog );
1217 label->setAlignment ( Qt::AlignHCenter ); 1229 label->setAlignment ( Qt::AlignHCenter );
1218 QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog ); 1230 QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog );
1219 lay->addWidget( label); 1231 lay->addWidget( label);
1220 lay->setMargin(7); 1232 lay->setMargin(7);
1221 lay->setSpacing(7); 1233 lay->setSpacing(7);
1222 if ( KSyncManager::mRequestedSyncEvent.isValid() ) { 1234 if ( KSyncManager::mRequestedSyncEvent.isValid() ) {
1223 int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent ); 1235 int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent );
1224 if ( secs < 0 ) 1236 if ( secs < 0 )
1225 secs = secs * (-1); 1237 secs = secs * (-1);
1226 if ( secs > 30 ) 1238 if ( secs > 30 )
1227 //if ( true ) 1239 //if ( true )
1228 { 1240 {
1229 QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs ); 1241 QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs );
1230 QLabel* label = new QLabel( warning, mSyncActionDialog ); 1242 QLabel* label = new QLabel( warning, mSyncActionDialog );
1231 label->setAlignment ( Qt::AlignHCenter ); 1243 label->setAlignment ( Qt::AlignHCenter );
1232 lay->addWidget( label); 1244 lay->addWidget( label);
1233 if ( secs > 180 ) 1245 if ( secs > 180 )
1234 { 1246 {
1235 if ( secs > 300 ) { 1247 if ( secs > 300 ) {
1236 if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(0, i18n("The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!"), i18n("High clock skew!"),i18n("Synchronize!"))) { 1248 if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(0, i18n("The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!"), i18n("High clock skew!"),i18n("Synchronize!"))) {
1237 qDebug("KSS::Sync cancelled ,cs"); 1249 qDebug("KSS::Sync cancelled ,cs");
1238 return ; 1250 return ;
1239 } 1251 }
1240 } 1252 }
1241 QFont f = label->font(); 1253 QFont f = label->font();
1242 f.setPointSize ( f.pointSize() *2 ); 1254 f.setPointSize ( f.pointSize() *2 );
1243 f. setBold (true ); 1255 f. setBold (true );
1244 QLabel* label = new QLabel( warning, mSyncActionDialog ); 1256 QLabel* label = new QLabel( warning, mSyncActionDialog );
1245 label->setFont( f ); 1257 label->setFont( f );
1246 warning = i18n("ADJUST\nYOUR\nCLOCKS!"); 1258 warning = i18n("ADJUST\nYOUR\nCLOCKS!");
1247 label->setText( warning ); 1259 label->setText( warning );
1248 label->setAlignment ( Qt::AlignHCenter ); 1260 label->setAlignment ( Qt::AlignHCenter );
1249 lay->addWidget( label); 1261 lay->addWidget( label);
1250 mSyncActionDialog->setFixedSize( 230, 300); 1262 mSyncActionDialog->setFixedSize( 230, 300);
1251 } else { 1263 } else {
1252 mSyncActionDialog->setFixedSize( 230, 200); 1264 mSyncActionDialog->setFixedSize( 230, 200);
1253 } 1265 }
1254 } else { 1266 } else {
1255 mSyncActionDialog->setFixedSize( 230, 120); 1267 mSyncActionDialog->setFixedSize( 230, 120);
1256 } 1268 }
1257 } else 1269 } else
1258 mSyncActionDialog->setFixedSize( 230, 120); 1270 mSyncActionDialog->setFixedSize( 230, 120);
1259 mSyncActionDialog->show(); 1271 mSyncActionDialog->show();
1260 mSyncActionDialog->raise(); 1272 mSyncActionDialog->raise();
1261 emit request_file(); 1273 emit request_file();
1262 qApp->processEvents(); 1274 qApp->processEvents();
1263 QString fileName = mFileName; 1275 QString fileName = mFileName;
1264 QFile file( fileName ); 1276 QFile file( fileName );
1265 if (!file.open( IO_ReadOnly ) ) { 1277 if (!file.open( IO_ReadOnly ) ) {
1266 delete mSyncActionDialog; 1278 delete mSyncActionDialog;
1267 mSyncActionDialog = 0; 1279 mSyncActionDialog = 0;
1268 qDebug("KSS::error open sync file: %s ", fileName.latin1()); 1280 qDebug("KSS::error open sync file: %s ", fileName.latin1());
1269 mSocket->close(); 1281 mSocket->close();
1270 if ( mSocket->state() == QSocket::Idle ) 1282 if ( mSocket->state() == QSocket::Idle )
1271 QTimer::singleShot( 10, this , SLOT ( discardClient())); 1283 QTimer::singleShot( 10, this , SLOT ( discardClient()));
1272 return ; 1284 return ;
1273 1285
1274 } 1286 }
1275 mSyncActionDialog->setCaption( i18n("Sending file...") ); 1287 mSyncActionDialog->setCaption( i18n("Sending file...") );
1276 QTextStream ts( &file ); 1288 QTextStream ts( &file );
1277 ts.setEncoding( QTextStream::Latin1 ); 1289 ts.setEncoding( QTextStream::Latin1 );
1278 1290
1279 QTextStream os( mSocket ); 1291 QTextStream os( mSocket );
1280 os.setEncoding( QTextStream::Latin1 ); 1292 os.setEncoding( QTextStream::Latin1 );
1281 while ( ! ts.atEnd() ) { 1293 while ( ! ts.atEnd() ) {
1282 os << ts.readLine() << "\r\n"; 1294 os << ts.readLine() << "\r\n";
1283 } 1295 }
1284 os << "\r\n"; 1296 os << "\r\n";
1285 //os << ts.read(); 1297 //os << ts.read();
1286 file.close(); 1298 file.close();
1287 mSyncActionDialog->setCaption( i18n("Waiting for synced file...") ); 1299 mSyncActionDialog->setCaption( i18n("Waiting for synced file...") );
1288 mSocket->close(); 1300 mSocket->close();
1289 if ( mSocket->state() == QSocket::Idle ) 1301 if ( mSocket->state() == QSocket::Idle )
1290 QTimer::singleShot( 10, this , SLOT ( discardClient())); 1302 QTimer::singleShot( 10, this , SLOT ( discardClient()));
1291} 1303}
1292void KServerSocket::get_file() 1304void KServerSocket::get_file()
1293{ 1305{
1294 mSyncActionDialog->setCaption( i18n("Receiving synced file...") ); 1306 mSyncActionDialog->setCaption( i18n("Receiving synced file...") );
1295 1307
1296 piTime.start(); 1308 piTime.start();
1297 piFileString = ""; 1309 piFileString = "";
1298 QTimer::singleShot( 1, this , SLOT (readBackFileFromSocket( ) )); 1310 QTimer::singleShot( 1, this , SLOT (readBackFileFromSocket( ) ));
1299} 1311}
1300 1312
1301 1313
1302void KServerSocket::readBackFileFromSocket() 1314void KServerSocket::readBackFileFromSocket()
1303{ 1315{
1304 //qDebug("readBackFileFromSocket() %d ", piTime.elapsed ()); 1316 //qDebug("readBackFileFromSocket() %d ", piTime.elapsed ());
1305 while ( mSocket->canReadLine () ) { 1317 while ( mSocket->canReadLine () ) {
1306 piTime.restart(); 1318 piTime.restart();
1307 QString line = mSocket->readLine (); 1319 QString line = mSocket->readLine ();
1308 piFileString += line; 1320 piFileString += line;
1309 //qDebug("readline: %s ", line.latin1()); 1321 //qDebug("readline: %s ", line.latin1());
1310 mSyncActionDialog->setCaption( i18n("Received %1 bytes").arg( piFileString.length() ) ); 1322 mSyncActionDialog->setCaption( i18n("Received %1 bytes").arg( piFileString.length() ) );
1311 1323
1312 } 1324 }
1313 if ( piTime.elapsed () < 3000 ) { 1325 if ( piTime.elapsed () < 3000 ) {
1314 // wait for more 1326 // wait for more
1315 //qDebug("waitformore "); 1327 //qDebug("waitformore ");
1316 QTimer::singleShot( 100, this , SLOT (readBackFileFromSocket( ) )); 1328 QTimer::singleShot( 100, this , SLOT (readBackFileFromSocket( ) ));
1317 return; 1329 return;
1318 } 1330 }
1319 QString fileName = mFileName; 1331 QString fileName = mFileName;
1320 QFile file ( fileName ); 1332 QFile file ( fileName );
1321 if (!file.open( IO_WriteOnly ) ) { 1333 if (!file.open( IO_WriteOnly ) ) {
1322 delete mSyncActionDialog; 1334 delete mSyncActionDialog;
1323 mSyncActionDialog = 0; 1335 mSyncActionDialog = 0;
1324 qDebug("KSS:Error open read back file "); 1336 qDebug("KSS:Error open read back file ");
1325 piFileString = ""; 1337 piFileString = "";
1326 emit file_received( false ); 1338 emit file_received( false );
1327 blockRC = false; 1339 blockRC = false;
1328 return ; 1340 return ;
1329 1341
1330 } 1342 }
1331 1343
1332 // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); 1344 // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
1333 QTextStream ts ( &file ); 1345 QTextStream ts ( &file );
1334 ts.setEncoding( QTextStream::Latin1 ); 1346 ts.setEncoding( QTextStream::Latin1 );
1335 mSyncActionDialog->setCaption( i18n("Writing file to disk...") ); 1347 mSyncActionDialog->setCaption( i18n("Writing file to disk...") );
1336 ts << piFileString; 1348 ts << piFileString;
1337 mSocket->close(); 1349 mSocket->close();
1338 if ( mSocket->state() == QSocket::Idle ) 1350 if ( mSocket->state() == QSocket::Idle )
1339 QTimer::singleShot( 10, this , SLOT ( discardClient())); 1351 QTimer::singleShot( 10, this , SLOT ( discardClient()));
1340 file.close(); 1352 file.close();
1341 piFileString = ""; 1353 piFileString = "";
1342 emit file_received( true ); 1354 emit file_received( true );
1343 delete mSyncActionDialog; 1355 delete mSyncActionDialog;
1344 mSyncActionDialog = 0; 1356 mSyncActionDialog = 0;
1345 blockRC = false; 1357 blockRC = false;
1346 1358
1347} 1359}
1348 1360
1349KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap, const char * name ): QObject( parent, name ) 1361KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap, const char * name ): QObject( parent, name )
1350{ 1362{
1351 mPassWord = password; 1363 mPassWord = password;
1352 mSocket = 0; 1364 mSocket = 0;
1353 mFirst = false; 1365 mFirst = false;
1366 mFirstLine = true;
1354 mPort = port; 1367 mPort = port;
1355 mHost = host; 1368 mHost = host;
1356 tlw = cap; 1369 tlw = cap;
1357 mRetVal = quiet; 1370 mRetVal = quiet;
1358 mTimerSocket = new QTimer ( this ); 1371 mTimerSocket = new QTimer ( this );
1359 connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket() ) ); 1372 connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket() ) );
1360} 1373}
1361void KCommandSocket::sendFileRequest() 1374void KCommandSocket::sendFileRequest()
1362{ 1375{
1363 if ( tlw ) 1376 if ( tlw )
1364 tlw->setCaption( i18n("Connected! Sending request for remote file ...") ); 1377 tlw->setCaption( i18n("Connected! Sending request for remote file ...") );
1365 mTimerSocket->start( 300000 ); 1378 mTimerSocket->start( 300000 );
1366 QTextStream os( mSocket ); 1379 QTextStream os( mSocket );
1367 os.setEncoding( QTextStream::Latin1 ); 1380 os.setEncoding( QTextStream::Latin1 );
1368 1381
1369 QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate ); 1382 QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate );
1370 os << "GET " << mPassWord << curDt <<"\r\n\r\n"; 1383 os << "GET " << mPassWord << curDt <<"\r\n\r\n";
1371} 1384}
1372 1385
1373void KCommandSocket::readFile( QString fn ) 1386void KCommandSocket::readFile( QString fn )
1374{ 1387{
1375 if ( !mSocket ) { 1388 if ( !mSocket ) {
1376 mSocket = new QSocket( this ); 1389 mSocket = new QSocket( this );
1377 connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) ); 1390 connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) );
1378 connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); 1391 connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
1379 connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() )); 1392 connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() ));
1380 } 1393 }
1381 mFileString = ""; 1394 mFileString = "";
1382 mFileName = fn; 1395 mFileName = fn;
1383 mFirst = true; 1396 mFirst = true;
1384 if ( tlw ) 1397 if ( tlw )
1385 tlw->setCaption( i18n("Trying to connect to remote...") ); 1398 tlw->setCaption( i18n("Trying to connect to remote...") );
1386 mTimerSocket->start( 20000 ); 1399 mTimerSocket->start( 20000 );
1387 mSocket->connectToHost( mHost, mPort ); 1400 mSocket->connectToHost( mHost, mPort );
1388 qDebug("KSS: Waiting for connection"); 1401 qDebug("KSS: Waiting for connection");
1389} 1402}
1390 1403
1391void KCommandSocket::writeFile( QString fileName ) 1404void KCommandSocket::writeFile( QString fileName )
1392{ 1405{
1393 if ( !mSocket ) { 1406 if ( !mSocket ) {
1394 mSocket = new QSocket( this ); 1407 mSocket = new QSocket( this );
1395 connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); 1408 connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
1396 connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) ); 1409 connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) );
1397 } 1410 }
1398 mFileName = fileName ; 1411 mFileName = fileName ;
1399 mTimerSocket->start( 20000 ); 1412 mTimerSocket->start( 20000 );
1400 mSocket->connectToHost( mHost, mPort ); 1413 mSocket->connectToHost( mHost, mPort );
1401} 1414}
1402void KCommandSocket::writeFileToSocket() 1415void KCommandSocket::writeFileToSocket()
1403{ 1416{
1404 mTimerSocket->stop(); 1417 mTimerSocket->stop();
1405 QFile file2( mFileName ); 1418 QFile file2( mFileName );
1406 if (!file2.open( IO_ReadOnly ) ) { 1419 if (!file2.open( IO_ReadOnly ) ) {
1407 mRetVal= errorW; 1420 mRetVal= errorW;
1408 mSocket->close(); 1421 mSocket->close();
1409 if ( mSocket->state() == QSocket::Idle ) 1422 if ( mSocket->state() == QSocket::Idle )
1410 QTimer::singleShot( 10, this , SLOT ( deleteSocket())); 1423 QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
1411 return ; 1424 return ;
1412 } 1425 }
1413 QTextStream ts2( &file2 ); 1426 QTextStream ts2( &file2 );
1414 ts2.setEncoding( QTextStream::Latin1 ); 1427 ts2.setEncoding( QTextStream::Latin1 );
1415 QTextStream os2( mSocket ); 1428 QTextStream os2( mSocket );
1416 os2.setEncoding( QTextStream::Latin1 ); 1429 os2.setEncoding( QTextStream::Latin1 );
1417 os2 << "PUT " << mPassWord << "\r\n\r\n";; 1430 os2 << "PUT " << mPassWord << "\r\n\r\n";;
1418 while ( ! ts2.atEnd() ) { 1431 while ( ! ts2.atEnd() ) {
1419 os2 << ts2.readLine() << "\r\n"; 1432 os2 << ts2.readLine() << "\r\n";
1420 } 1433 }
1421 os2 << "\r\n"; 1434 os2 << "\r\n";
1422 mRetVal= successW; 1435 mRetVal= successW;
1423 file2.close(); 1436 file2.close();
1424 mSocket->close(); 1437 mSocket->close();
1425 if ( mSocket->state() == QSocket::Idle ) 1438 if ( mSocket->state() == QSocket::Idle )
1426 QTimer::singleShot( 10, this , SLOT ( deleteSocket())); 1439 QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
1427} 1440}
1428void KCommandSocket::sendStop() 1441void KCommandSocket::sendStop()
1429{ 1442{
1430 if ( !mSocket ) { 1443 if ( !mSocket ) {
1431 mSocket = new QSocket( this ); 1444 mSocket = new QSocket( this );
1432 connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); 1445 connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
1433 } 1446 }
1434 mSocket->connectToHost( mHost, mPort ); 1447 mSocket->connectToHost( mHost, mPort );
1435 QTextStream os2( mSocket ); 1448 QTextStream os2( mSocket );
1436 os2.setEncoding( QTextStream::Latin1 ); 1449 os2.setEncoding( QTextStream::Latin1 );
1437 os2 << "STOP\r\n\r\n"; 1450 os2 << "STOP\r\n\r\n";
1438 mSocket->close(); 1451 mSocket->close();
1439 if ( mSocket->state() == QSocket::Idle ) 1452 if ( mSocket->state() == QSocket::Idle )
1440 QTimer::singleShot( 10, this , SLOT ( deleteSocket())); 1453 QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
1441} 1454}
1442 1455
1443void KCommandSocket::startReadFileFromSocket() 1456void KCommandSocket::startReadFileFromSocket()
1444{ 1457{
1445 if ( ! mFirst ) 1458 if ( ! mFirst )
1446 return; 1459 return;
1447 mFirst = false; 1460 mFirst = false;
1448 mTimerSocket->stop(); 1461 mTimerSocket->stop();
1449 mFileString = ""; 1462 mFileString = "";
1450 mTime.start(); 1463 mTime.start();
1464 mFirstLine = true;
1451 QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); 1465 QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) ));
1452 1466
1453} 1467}
1454void KCommandSocket::readFileFromSocket() 1468void KCommandSocket::readFileFromSocket()
1455{ 1469{
1456 //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ()); 1470 //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ());
1457 while ( mSocket->canReadLine () ) { 1471 while ( mSocket->canReadLine () ) {
1458 mTime.restart(); 1472 mTime.restart();
1459 QString line = mSocket->readLine (); 1473 QString line = mSocket->readLine ();
1474 if ( mFirstLine ) {
1475 mFirstLine = false;
1476 if ( line.left( 8 ) == "ERROR_PW" ) {
1477 mRetVal = errorPW;
1478 deleteSocket();
1479 return ;
1480 }
1481 }
1460 mFileString += line; 1482 mFileString += line;
1461 //qDebug("readline: %s ", line.latin1()); 1483 //qDebug("readline: %s ", line.latin1());
1462 } 1484 }
1463 if ( mTime.elapsed () < 3000 ) { 1485 if ( mTime.elapsed () < 3000 ) {
1464 // wait for more 1486 // wait for more
1465 //qDebug("waitformore "); 1487 //qDebug("waitformore ");
1466 QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) )); 1488 QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) ));
1467 return; 1489 return;
1468 } 1490 }
1469 QString fileName = mFileName; 1491 QString fileName = mFileName;
1470 QFile file ( fileName ); 1492 QFile file ( fileName );
1471 if (!file.open( IO_WriteOnly ) ) { 1493 if (!file.open( IO_WriteOnly ) ) {
1472 mFileString = ""; 1494 mFileString = "";
1473 mRetVal = errorR; 1495 mRetVal = errorR;
1474 qDebug("KSS:Error open temp sync file for writing: %s",fileName.latin1() ); 1496 qDebug("KSS:Error open temp sync file for writing: %s",fileName.latin1() );
1475 deleteSocket(); 1497 deleteSocket();
1476 return ; 1498 return ;
1477 1499
1478 } 1500 }
1479 // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); 1501 // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
1480 QTextStream ts ( &file ); 1502 QTextStream ts ( &file );
1481 ts.setEncoding( QTextStream::Latin1 ); 1503 ts.setEncoding( QTextStream::Latin1 );
1482 ts << mFileString; 1504 ts << mFileString;
1483 file.close(); 1505 file.close();
1484 mFileString = ""; 1506 mFileString = "";
1485 mRetVal = successR; 1507 mRetVal = successR;
1486 mSocket->close(); 1508 mSocket->close();
1487 // if state is not idle, deleteSocket(); is called via 1509 // if state is not idle, deleteSocket(); is called via
1488 // connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); 1510 // connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
1489 if ( mSocket->state() == QSocket::Idle ) 1511 if ( mSocket->state() == QSocket::Idle )
1490 deleteSocket(); 1512 deleteSocket();
1491} 1513}
1492 1514
1493void KCommandSocket::deleteSocket() 1515void KCommandSocket::deleteSocket()
1494{ 1516{
1495 //qDebug("KCommandSocket::deleteSocket() "); 1517 //qDebug("KCommandSocket::deleteSocket() ");
1496 if ( mTimerSocket->isActive () ) { 1518 if ( mTimerSocket->isActive () ) {
1497 mTimerSocket->stop(); 1519 mTimerSocket->stop();
1498 mRetVal = errorTO; 1520 mRetVal = errorTO;
1499 qDebug("KCS::Connection to remote host timed out"); 1521 qDebug("KCS::Connection to remote host timed out");
1500 if ( mSocket ) { 1522 if ( mSocket ) {
1501 mSocket->close(); 1523 mSocket->close();
1502 //if ( mSocket->state() == QSocket::Idle ) 1524 //if ( mSocket->state() == QSocket::Idle )
1503 // deleteSocket(); 1525 // deleteSocket();
1504 delete mSocket; 1526 delete mSocket;
1505 mSocket = 0; 1527 mSocket = 0;
1506 } 1528 }
1507 KMessageBox::error( 0, i18n("Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?")); 1529 KMessageBox::error( 0, i18n("Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?"));
1508 emit commandFinished( this, mRetVal ); 1530 emit commandFinished( this, mRetVal );
1509 return; 1531 return;
1510 } 1532 }
1511 //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); 1533 //qDebug("KCommandSocket::deleteSocket() %d", mRetVal );
1512 if ( mSocket) 1534 if ( mSocket)
1513 delete mSocket; 1535 delete mSocket;
1514 mSocket = 0; 1536 mSocket = 0;
1515 emit commandFinished( this, mRetVal ); 1537 emit commandFinished( this, mRetVal );
1516} 1538}
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 09bd1c1..810a515 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -1,225 +1,227 @@
1/* 1/*
2 This file is part of KDE-Pim/Pi. 2 This file is part of KDE-Pim/Pi.
3 Copyright (c) 2004 Ulf Schenk 3 Copyright (c) 2004 Ulf Schenk
4 4
5 This library is free software; you can redistribute it and/or 5 This library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Library General Public 6 modify it under the terms of the GNU Library General Public
7 License as published by the Free Software Foundation; either 7 License as published by the Free Software Foundation; either
8 version 2 of the License, or (at your option) any later version. 8 version 2 of the License, or (at your option) any later version.
9 9
10 This library is distributed in the hope that it will be useful, 10 This library is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Library General Public License for more details. 13 Library General Public License for more details.
14 14
15 You should have received a copy of the GNU Library General Public License 15 You should have received a copy of the GNU Library General Public License
16 along with this library; see the file COPYING.LIB. If not, write to 16 along with this library; see the file COPYING.LIB. If not, write to
17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18 Boston, MA 02111-1307, USA. 18 Boston, MA 02111-1307, USA.
19 19
20 $Id$ 20 $Id$
21*/ 21*/
22#ifndef _KSYNCMANAGER_H 22#ifndef _KSYNCMANAGER_H
23#define _KSYNCMANAGER_H 23#define _KSYNCMANAGER_H
24 24
25#include <qobject.h> 25#include <qobject.h>
26#include <qstring.h> 26#include <qstring.h>
27#include <qsocket.h> 27#include <qsocket.h>
28#include <qdatetime.h> 28#include <qdatetime.h>
29#include <qserversocket.h> 29#include <qserversocket.h>
30#include <qtextstream.h> 30#include <qtextstream.h>
31#include <qregexp.h> 31#include <qregexp.h>
32 32
33class QPopupMenu; 33class QPopupMenu;
34class KSyncProfile; 34class KSyncProfile;
35class KPimPrefs; 35class KPimPrefs;
36class QWidget; 36class QWidget;
37class KSyncManager; 37class KSyncManager;
38class KSyncInterface; 38class KSyncInterface;
39class QProgressBar; 39class QProgressBar;
40 40
41 41
42class KServerSocket : public QServerSocket 42class KServerSocket : public QServerSocket
43{ 43{
44 Q_OBJECT 44 Q_OBJECT
45 45
46 public: 46 public:
47 KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 ); 47 KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 );
48 48
49 void newConnection ( int socket ) ; 49 void newConnection ( int socket ) ;
50 void setFileName( QString fn ) {mFileName = fn;}; 50 void setFileName( QString fn ) {mFileName = fn;};
51 signals: 51 signals:
52 void file_received( bool ); 52 void file_received( bool );
53 void request_file(); 53 void request_file();
54 void saveFile(); 54 void saveFile();
55 void endConnect(); 55 void endConnect();
56 private slots: 56 private slots:
57 void discardClient(); 57 void discardClient();
58 void readClient(); 58 void readClient();
59 void readBackFileFromSocket(); 59 void readBackFileFromSocket();
60 private : 60 private :
61 bool blockRC; 61 bool blockRC;
62 void send_file(); 62 void send_file();
63 void get_file(); 63 void get_file();
64 void end_connect(); 64 void end_connect();
65 void error_connect();
65 QDialog* mSyncActionDialog; 66 QDialog* mSyncActionDialog;
66 QSocket* mSocket; 67 QSocket* mSocket;
67 QString mPassWord; 68 QString mPassWord;
68 QString mFileName; 69 QString mFileName;
69 QTime piTime; 70 QTime piTime;
70 QString piFileString; 71 QString piFileString;
71}; 72};
72 73
73class KCommandSocket : public QObject 74class KCommandSocket : public QObject
74{ 75{
75 Q_OBJECT 76 Q_OBJECT
76 public: 77 public:
77 enum state { successR, errorR, successW, errorW, errorTO, quiet }; 78 enum state { successR, errorR, successW, errorW, errorTO, errorPW,quiet };
78 KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 ); 79 KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 );
79 void readFile( QString ); 80 void readFile( QString );
80 void writeFile( QString ); 81 void writeFile( QString );
81 void sendStop(); 82 void sendStop();
82 83
83 private slots : 84 private slots :
84 void sendFileRequest(); 85 void sendFileRequest();
85 86
86 signals: 87 signals:
87 void commandFinished( KCommandSocket*, int ); 88 void commandFinished( KCommandSocket*, int );
88 private slots: 89 private slots:
89 void startReadFileFromSocket(); 90 void startReadFileFromSocket();
90 void readFileFromSocket(); 91 void readFileFromSocket();
91 void deleteSocket(); 92 void deleteSocket();
92 void writeFileToSocket(); 93 void writeFileToSocket();
93 private : 94 private :
94 QWidget* tlw; 95 QWidget* tlw;
95 QSocket* mSocket; 96 QSocket* mSocket;
96 QString mPassWord; 97 QString mPassWord;
97 Q_UINT16 mPort; 98 Q_UINT16 mPort;
98 QString mHost; 99 QString mHost;
99 QString mFileName; 100 QString mFileName;
100 QTimer* mTimerSocket; 101 QTimer* mTimerSocket;
101 int mRetVal; 102 int mRetVal;
102 QTime mTime; 103 QTime mTime;
103 QString mFileString; 104 QString mFileString;
104 bool mFirst; 105 bool mFirst;
106 bool mFirstLine;
105}; 107};
106 108
107 109
108class KSyncManager : public QObject 110class KSyncManager : public QObject
109{ 111{
110 Q_OBJECT 112 Q_OBJECT
111 113
112 public: 114 public:
113 enum TargetApp { 115 enum TargetApp {
114 KOPI = 0, 116 KOPI = 0,
115 KAPI = 1, 117 KAPI = 1,
116 PWMPI = 2 }; 118 PWMPI = 2 };
117 119
118 KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu); 120 KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu);
119 ~KSyncManager() ; 121 ~KSyncManager() ;
120 122
121 void multiSync( bool askforPrefs ); 123 void multiSync( bool askforPrefs );
122 bool blockSave() { return mBlockSaveFlag; } 124 bool blockSave() { return mBlockSaveFlag; }
123 void setBlockSave(bool sa) { mBlockSaveFlag = sa; } 125 void setBlockSave(bool sa) { mBlockSaveFlag = sa; }
124 void setDefaultFileName( QString s) ; 126 void setDefaultFileName( QString s) ;
125 QString defaultFileName() { return mDefFileName ;} 127 QString defaultFileName() { return mDefFileName ;}
126 QString syncFileName(); 128 QString syncFileName();
127 void enableQuick( bool ask = true); 129 void enableQuick( bool ask = true);
128 130
129 bool syncWithDesktop () { return mSyncWithDesktop;} 131 bool syncWithDesktop () { return mSyncWithDesktop;}
130 QString getCurrentSyncDevice() { return mCurrentSyncDevice; } 132 QString getCurrentSyncDevice() { return mCurrentSyncDevice; }
131 QString getCurrentSyncName() { return mCurrentSyncName; } 133 QString getCurrentSyncName() { return mCurrentSyncName; }
132 134
133 void showProgressBar(int percentage, QString caption = QString::null, int total=100); 135 void showProgressBar(int percentage, QString caption = QString::null, int total=100);
134 void hideProgressBar(); 136 void hideProgressBar();
135 bool isProgressBarCanceled(); 137 bool isProgressBarCanceled();
136 138
137 // sync stuff 139 // sync stuff
138 QString mLocalMachineName; 140 QString mLocalMachineName;
139 QStringList mExternSyncProfiles; 141 QStringList mExternSyncProfiles;
140 QStringList mSyncProfileNames; 142 QStringList mSyncProfileNames;
141 bool mAskForPreferences; 143 bool mAskForPreferences;
142 bool mShowSyncSummary; 144 bool mShowSyncSummary;
143 bool mIsKapiFile; 145 bool mIsKapiFile;
144 bool mWriteBackExistingOnly; 146 bool mWriteBackExistingOnly;
145 int mSyncAlgoPrefs; 147 int mSyncAlgoPrefs;
146 bool mWriteBackFile; 148 bool mWriteBackFile;
147 int mWriteBackInFuture; 149 int mWriteBackInFuture;
148 int mWriteBackInPast; 150 int mWriteBackInPast;
149 QString mPhoneDevice; 151 QString mPhoneDevice;
150 QString mPhoneConnection; 152 QString mPhoneConnection;
151 QString mPhoneModel; 153 QString mPhoneModel;
152 QString mPassWordPiSync; 154 QString mPassWordPiSync;
153 QString mActiveSyncPort; 155 QString mActiveSyncPort;
154 QString mActiveSyncIP ; 156 QString mActiveSyncIP ;
155 QString mFilterInCal; 157 QString mFilterInCal;
156 QString mFilterOutCal; 158 QString mFilterOutCal;
157 QString mFilterInAB; 159 QString mFilterInAB;
158 QString mFilterOutAB; 160 QString mFilterOutAB;
159 static QDateTime mRequestedSyncEvent; 161 static QDateTime mRequestedSyncEvent;
160 162
161 signals: 163 signals:
162 void save(); 164 void save();
163 void request_file(); 165 void request_file();
164 void getFile( bool ); 166 void getFile( bool );
165 167
166 public slots: 168 public slots:
167 void slotSyncMenu( int ); 169 void slotSyncMenu( int );
168 void slotClearMenu( int action ); 170 void slotClearMenu( int action );
169 void deleteCommandSocket(KCommandSocket*s, int state); 171 void deleteCommandSocket(KCommandSocket*s, int state);
170 void readFileFromSocket(); 172 void readFileFromSocket();
171 void fillSyncMenu(); 173 void fillSyncMenu();
172 174
173 private: 175 private:
174 void syncPi(); 176 void syncPi();
175 KServerSocket * mServerSocket; 177 KServerSocket * mServerSocket;
176 KPimPrefs* mPrefs; 178 KPimPrefs* mPrefs;
177 QString mDefFileName; 179 QString mDefFileName;
178 QString mCurrentSyncDevice; 180 QString mCurrentSyncDevice;
179 QString mCurrentSyncName; 181 QString mCurrentSyncName;
180 void quickSyncLocalFile(); 182 void quickSyncLocalFile();
181 bool syncWithFile( QString fn , bool quick ); 183 bool syncWithFile( QString fn , bool quick );
182 void syncLocalFile(); 184 void syncLocalFile();
183 void syncPhone(); 185 void syncPhone();
184 void syncSharp(); 186 void syncSharp();
185 void syncKDE(); 187 void syncKDE();
186 bool syncExternalApplication(QString); 188 bool syncExternalApplication(QString);
187 int mCurrentSyncProfile ; 189 int mCurrentSyncProfile ;
188 void syncRemote( KSyncProfile* prof, bool ask = true); 190 void syncRemote( KSyncProfile* prof, bool ask = true);
189 bool edit_sync_options(); 191 bool edit_sync_options();
190 bool edit_pisync_options(); 192 bool edit_pisync_options();
191 int ringSync(); 193 int ringSync();
192 QString getPassword( ); 194 QString getPassword( );
193 bool mPisyncFinished; 195 bool mPisyncFinished;
194 bool mBlockSaveFlag; 196 bool mBlockSaveFlag;
195 QWidget* mParent; 197 QWidget* mParent;
196 KSyncInterface* mImplementation; 198 KSyncInterface* mImplementation;
197 TargetApp mTargetApp; 199 TargetApp mTargetApp;
198 QPopupMenu* mSyncMenu; 200 QPopupMenu* mSyncMenu;
199 QProgressBar* bar; 201 QProgressBar* bar;
200 bool mSyncWithDesktop; 202 bool mSyncWithDesktop;
201 203
202private slots: 204private slots:
203 void confSync(); 205 void confSync();
204 206
205 207
206}; 208};
207 209
208 210
209class KSyncInterface 211class KSyncInterface
210{ 212{
211 public : 213 public :
212 virtual void removeSyncInfo( QString syncProfile) = 0; 214 virtual void removeSyncInfo( QString syncProfile) = 0;
213 virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0; 215 virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0;
214 virtual bool syncExternal(KSyncManager* manager, QString resource) 216 virtual bool syncExternal(KSyncManager* manager, QString resource)
215 { 217 {
216 // empty implementation, because some syncable applications do not 218 // empty implementation, because some syncable applications do not
217 // have an external(sharpdtm) syncmode, like pwmanager. 219 // have an external(sharpdtm) syncmode, like pwmanager.
218 return false; 220 return false;
219 } 221 }
220 222
221 223
222}; 224};
223 225
224 226
225#endif 227#endif