author | zautrix <zautrix> | 2004-10-26 22:56:24 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-26 22:56:24 (UTC) |
commit | 00d623c9391a9bdaeb142f443f1dd09861317608 (patch) (unidiff) | |
tree | 941b77a6da7a5db84ed9f4c00ab18918231cb643 /libkdepim | |
parent | 6385f303bef3cbcd19d097a7b05c30e144d5dd6e (diff) | |
download | kdepimpi-00d623c9391a9bdaeb142f443f1dd09861317608.zip kdepimpi-00d623c9391a9bdaeb142f443f1dd09861317608.tar.gz kdepimpi-00d623c9391a9bdaeb142f443f1dd09861317608.tar.bz2 |
added external time for pisync - kdesync
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 16 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.h | 1 |
2 files changed, 15 insertions, 2 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index feb184b..e09050e 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -1,185 +1,188 @@ | |||
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 | 20 | ||
21 | // $Id$ | 21 | // $Id$ |
22 | 22 | ||
23 | #include "ksyncmanager.h" | 23 | #include "ksyncmanager.h" |
24 | 24 | ||
25 | #include <stdlib.h> | 25 | #include <stdlib.h> |
26 | 26 | ||
27 | #ifndef _WIN32_ | 27 | #ifndef _WIN32_ |
28 | #include <unistd.h> | 28 | #include <unistd.h> |
29 | #endif | 29 | #endif |
30 | 30 | ||
31 | 31 | ||
32 | #include "ksyncprofile.h" | 32 | #include "ksyncprofile.h" |
33 | #include "ksyncprefsdialog.h" | 33 | #include "ksyncprefsdialog.h" |
34 | #include "kpimprefs.h" | 34 | #include "kpimprefs.h" |
35 | #include <kmessagebox.h> | 35 | #include <kmessagebox.h> |
36 | 36 | ||
37 | #include <qdir.h> | 37 | #include <qdir.h> |
38 | #include <qprogressbar.h> | 38 | #include <qprogressbar.h> |
39 | #include <qpopupmenu.h> | 39 | #include <qpopupmenu.h> |
40 | #include <qpushbutton.h> | 40 | #include <qpushbutton.h> |
41 | #include <qradiobutton.h> | 41 | #include <qradiobutton.h> |
42 | #include <qbuttongroup.h> | 42 | #include <qbuttongroup.h> |
43 | #include <qtimer.h> | 43 | #include <qtimer.h> |
44 | #include <qmessagebox.h> | 44 | #include <qmessagebox.h> |
45 | #include <qapplication.h> | 45 | #include <qapplication.h> |
46 | #include <qlineedit.h> | 46 | #include <qlineedit.h> |
47 | #include <qdialog.h> | 47 | #include <qdialog.h> |
48 | #include <qlayout.h> | 48 | #include <qlayout.h> |
49 | #include <qtextcodec.h> | 49 | #include <qtextcodec.h> |
50 | #include <qlabel.h> | 50 | #include <qlabel.h> |
51 | #include <qcheckbox.h> | 51 | #include <qcheckbox.h> |
52 | 52 | ||
53 | #include <klocale.h> | 53 | #include <klocale.h> |
54 | #include <kglobal.h> | 54 | #include <kglobal.h> |
55 | #include <kconfig.h> | 55 | #include <kconfig.h> |
56 | #include <kfiledialog.h> | 56 | #include <kfiledialog.h> |
57 | 57 | ||
58 | QDateTime KSyncManager::mRequestedSyncEvent; | ||
59 | |||
60 | |||
58 | KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu) | 61 | KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu) |
59 | : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mPrefs(prefs ),mSyncMenu(syncmenu) | 62 | : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mPrefs(prefs ),mSyncMenu(syncmenu) |
60 | { | 63 | { |
61 | mServerSocket = 0; | 64 | mServerSocket = 0; |
62 | bar = new QProgressBar ( 1, 0 ); | 65 | bar = new QProgressBar ( 1, 0 ); |
63 | bar->setCaption (""); | 66 | bar->setCaption (""); |
64 | 67 | ||
65 | int w = 300; | 68 | int w = 300; |
66 | if ( QApplication::desktop()->width() < 320 ) | 69 | if ( QApplication::desktop()->width() < 320 ) |
67 | w = 220; | 70 | w = 220; |
68 | int h = bar->sizeHint().height() ; | 71 | int h = bar->sizeHint().height() ; |
69 | int dw = QApplication::desktop()->width(); | 72 | int dw = QApplication::desktop()->width(); |
70 | int dh = QApplication::desktop()->height(); | 73 | int dh = QApplication::desktop()->height(); |
71 | bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 74 | bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
72 | if ( mPrefs->mPassiveSyncAutoStart ) | 75 | if ( mPrefs->mPassiveSyncAutoStart ) |
73 | enableQuick( false ); | 76 | enableQuick( false ); |
74 | 77 | ||
75 | } | 78 | } |
76 | 79 | ||
77 | KSyncManager::~KSyncManager() | 80 | KSyncManager::~KSyncManager() |
78 | { | 81 | { |
79 | delete bar; | 82 | delete bar; |
80 | } | 83 | } |
81 | 84 | ||
82 | 85 | ||
83 | void KSyncManager::fillSyncMenu() | 86 | void KSyncManager::fillSyncMenu() |
84 | { | 87 | { |
85 | if ( mSyncMenu->count() ) | 88 | if ( mSyncMenu->count() ) |
86 | mSyncMenu->clear(); | 89 | mSyncMenu->clear(); |
87 | 90 | ||
88 | mSyncMenu->insertItem( i18n("Configure..."), 0 ); | 91 | mSyncMenu->insertItem( i18n("Configure..."), 0 ); |
89 | mSyncMenu->insertSeparator(); | 92 | mSyncMenu->insertSeparator(); |
90 | QPopupMenu *clearMenu = new QPopupMenu ( mSyncMenu ); | 93 | QPopupMenu *clearMenu = new QPopupMenu ( mSyncMenu ); |
91 | mSyncMenu->insertItem( i18n("Remove sync info"),clearMenu, 5000 ); | 94 | mSyncMenu->insertItem( i18n("Remove sync info"),clearMenu, 5000 ); |
92 | clearMenu->insertItem( i18n("For all profiles"), 1 ); | 95 | clearMenu->insertItem( i18n("For all profiles"), 1 ); |
93 | clearMenu->insertSeparator(); | 96 | clearMenu->insertSeparator(); |
94 | connect ( clearMenu, SIGNAL( activated ( int ) ), this, SLOT (slotClearMenu( int ) ) ); | 97 | connect ( clearMenu, SIGNAL( activated ( int ) ), this, SLOT (slotClearMenu( int ) ) ); |
95 | mSyncMenu->insertSeparator(); | 98 | mSyncMenu->insertSeparator(); |
96 | if ( mServerSocket == 0 ) { | 99 | if ( mServerSocket == 0 ) { |
97 | mSyncMenu->insertItem( i18n("Enable Pi-Sync"), 2 ); | 100 | mSyncMenu->insertItem( i18n("Enable Pi-Sync"), 2 ); |
98 | } else { | 101 | } else { |
99 | mSyncMenu->insertItem( i18n("Disable Pi-Sync"), 3 ); | 102 | mSyncMenu->insertItem( i18n("Disable Pi-Sync"), 3 ); |
100 | } | 103 | } |
101 | mSyncMenu->insertSeparator(); | 104 | mSyncMenu->insertSeparator(); |
102 | mSyncMenu->insertItem( i18n("Multiple sync"), 1 ); | 105 | mSyncMenu->insertItem( i18n("Multiple sync"), 1 ); |
103 | mSyncMenu->insertSeparator(); | 106 | mSyncMenu->insertSeparator(); |
104 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); | 107 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
105 | config.setGroup("General"); | 108 | config.setGroup("General"); |
106 | QStringList prof = config.readListEntry("SyncProfileNames"); | 109 | QStringList prof = config.readListEntry("SyncProfileNames"); |
107 | mLocalMachineName = config.readEntry("LocalMachineName","undefined"); | 110 | mLocalMachineName = config.readEntry("LocalMachineName","undefined"); |
108 | if ( prof.count() < 2 ) { | 111 | if ( prof.count() < 2 ) { |
109 | prof.clear(); | 112 | prof.clear(); |
110 | QString externalName; | 113 | QString externalName; |
111 | #ifdef DESKTOP_VERSION | 114 | #ifdef DESKTOP_VERSION |
112 | #ifdef _WIN32_ | 115 | #ifdef _WIN32_ |
113 | externalName = "OutLook(not_implemented)"; | 116 | externalName = "OutLook(not_implemented)"; |
114 | #else | 117 | #else |
115 | externalName = "KDE_Desktop"; | 118 | externalName = "KDE_Desktop"; |
116 | #endif | 119 | #endif |
117 | #else | 120 | #else |
118 | externalName = "Sharp_DTM"; | 121 | externalName = "Sharp_DTM"; |
119 | #endif | 122 | #endif |
120 | prof << externalName; | 123 | prof << externalName; |
121 | prof << i18n("Local_file"); | 124 | prof << i18n("Local_file"); |
122 | prof << i18n("Last_file"); | 125 | prof << i18n("Last_file"); |
123 | KSyncProfile* temp = new KSyncProfile (); | 126 | KSyncProfile* temp = new KSyncProfile (); |
124 | temp->setName( prof[0] ); | 127 | temp->setName( prof[0] ); |
125 | temp->writeConfig(&config); | 128 | temp->writeConfig(&config); |
126 | temp->setName( prof[1] ); | 129 | temp->setName( prof[1] ); |
127 | temp->writeConfig(&config); | 130 | temp->writeConfig(&config); |
128 | temp->setName( prof[2] ); | 131 | temp->setName( prof[2] ); |
129 | temp->writeConfig(&config); | 132 | temp->writeConfig(&config); |
130 | config.setGroup("General"); | 133 | config.setGroup("General"); |
131 | config.writeEntry("SyncProfileNames",prof); | 134 | config.writeEntry("SyncProfileNames",prof); |
132 | config.writeEntry("ExternSyncProfiles",externalName); | 135 | config.writeEntry("ExternSyncProfiles",externalName); |
133 | config.sync(); | 136 | config.sync(); |
134 | delete temp; | 137 | delete temp; |
135 | } | 138 | } |
136 | mExternSyncProfiles = config.readListEntry("ExternSyncProfiles"); | 139 | mExternSyncProfiles = config.readListEntry("ExternSyncProfiles"); |
137 | mSyncProfileNames = prof; | 140 | mSyncProfileNames = prof; |
138 | unsigned int i; | 141 | unsigned int i; |
139 | for ( i = 0; i < prof.count(); ++i ) { | 142 | for ( i = 0; i < prof.count(); ++i ) { |
140 | mSyncMenu->insertItem( prof[i], 1000+i ); | 143 | mSyncMenu->insertItem( prof[i], 1000+i ); |
141 | clearMenu->insertItem( prof[i], 1000+i ); | 144 | clearMenu->insertItem( prof[i], 1000+i ); |
142 | if ( i == 2 ) | 145 | if ( i == 2 ) |
143 | mSyncMenu->insertSeparator(); | 146 | mSyncMenu->insertSeparator(); |
144 | } | 147 | } |
145 | QDir app_dir; | 148 | QDir app_dir; |
146 | //US do not display SharpDTM if app is pwmpi, or no sharpfiles available | 149 | //US do not display SharpDTM if app is pwmpi, or no sharpfiles available |
147 | if ( mTargetApp == PWMPI) { | 150 | if ( mTargetApp == PWMPI) { |
148 | mSyncMenu->removeItem( 1000 ); | 151 | mSyncMenu->removeItem( 1000 ); |
149 | clearMenu->removeItem( 1000 ); | 152 | clearMenu->removeItem( 1000 ); |
150 | } | 153 | } |
151 | #ifndef DESKTOP_VERSION | 154 | #ifndef DESKTOP_VERSION |
152 | else if (!app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) { | 155 | else if (!app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) { |
153 | mSyncMenu->removeItem( 1000 ); | 156 | mSyncMenu->removeItem( 1000 ); |
154 | clearMenu->removeItem( 1000 ); | 157 | clearMenu->removeItem( 1000 ); |
155 | } | 158 | } |
156 | #endif | 159 | #endif |
157 | mSyncMenu->removeItem( 1002 ); | 160 | mSyncMenu->removeItem( 1002 ); |
158 | clearMenu->removeItem( 1002 ); | 161 | clearMenu->removeItem( 1002 ); |
159 | } | 162 | } |
160 | void KSyncManager::slotClearMenu( int action ) | 163 | void KSyncManager::slotClearMenu( int action ) |
161 | { | 164 | { |
162 | QString syncDevice; | 165 | QString syncDevice; |
163 | if ( action > 999 ) { | 166 | if ( action > 999 ) { |
164 | syncDevice = mSyncProfileNames[action - 1000] ; | 167 | syncDevice = mSyncProfileNames[action - 1000] ; |
165 | } | 168 | } |
166 | 169 | ||
167 | 170 | ||
168 | 171 | ||
169 | int result = 0; | 172 | int result = 0; |
170 | QString sd; | 173 | QString sd; |
171 | if ( syncDevice.isEmpty() ) | 174 | if ( syncDevice.isEmpty() ) |
172 | sd = i18n("Do you want to\nclear all sync info\nof all profiles?"); | 175 | sd = i18n("Do you want to\nclear all sync info\nof all profiles?"); |
173 | else | 176 | else |
174 | sd = i18n("Do you want to\nclear the sync\ninfo of profile\n%1?\n"). arg( syncDevice ); | 177 | sd = i18n("Do you want to\nclear the sync\ninfo of profile\n%1?\n"). arg( syncDevice ); |
175 | 178 | ||
176 | result = QMessageBox::warning( mParent, i18n("Warning!"),sd,i18n("OK"), i18n("Cancel"), 0, | 179 | result = QMessageBox::warning( mParent, i18n("Warning!"),sd,i18n("OK"), i18n("Cancel"), 0, |
177 | 0, 1 ); | 180 | 0, 1 ); |
178 | if ( result ) | 181 | if ( result ) |
179 | return; | 182 | return; |
180 | mImplementation->removeSyncInfo( syncDevice ); | 183 | mImplementation->removeSyncInfo( syncDevice ); |
181 | } | 184 | } |
182 | void KSyncManager::slotSyncMenu( int action ) | 185 | void KSyncManager::slotSyncMenu( int action ) |
183 | { | 186 | { |
184 | qDebug("syncaction %d ", action); | 187 | qDebug("syncaction %d ", action); |
185 | if ( action == 5000 ) | 188 | if ( action == 5000 ) |
@@ -986,411 +989,420 @@ QString KSyncManager::syncFileName() | |||
986 | case (PWMPI): | 989 | case (PWMPI): |
987 | fn = "tempsyncpw.pwm"; | 990 | fn = "tempsyncpw.pwm"; |
988 | break; | 991 | break; |
989 | default: | 992 | default: |
990 | break; | 993 | break; |
991 | } | 994 | } |
992 | #ifdef _WIN32_ | 995 | #ifdef _WIN32_ |
993 | return locateLocal( "tmp", fn ); | 996 | return locateLocal( "tmp", fn ); |
994 | #else | 997 | #else |
995 | return (QString( "/tmp/" )+ fn ); | 998 | return (QString( "/tmp/" )+ fn ); |
996 | #endif | 999 | #endif |
997 | } | 1000 | } |
998 | 1001 | ||
999 | void KSyncManager::syncPi() | 1002 | void KSyncManager::syncPi() |
1000 | { | 1003 | { |
1001 | mPisyncFinished = false; | 1004 | mPisyncFinished = false; |
1002 | qApp->processEvents(); | 1005 | qApp->processEvents(); |
1003 | if ( mAskForPreferences ) | 1006 | if ( mAskForPreferences ) |
1004 | if ( !edit_pisync_options()) { | 1007 | if ( !edit_pisync_options()) { |
1005 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); | 1008 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); |
1006 | return; | 1009 | return; |
1007 | } | 1010 | } |
1008 | bool ok; | 1011 | bool ok; |
1009 | Q_UINT16 port = mActiveSyncPort.toUInt(&ok); | 1012 | Q_UINT16 port = mActiveSyncPort.toUInt(&ok); |
1010 | if ( ! ok ) { | 1013 | if ( ! ok ) { |
1011 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); | 1014 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); |
1012 | return; | 1015 | return; |
1013 | } | 1016 | } |
1014 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this ); | 1017 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this ); |
1015 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); | 1018 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); |
1016 | mParent->topLevelWidget()->setCaption( i18n("Sending request for remote file ...") ); | 1019 | mParent->topLevelWidget()->setCaption( i18n("Sending request for remote file ...") ); |
1017 | commandSocket->readFile( syncFileName() ); | 1020 | commandSocket->readFile( syncFileName() ); |
1018 | } | 1021 | } |
1019 | 1022 | ||
1020 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) | 1023 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) |
1021 | { | 1024 | { |
1022 | //enum { success, errorW, errorR, quiet }; | 1025 | //enum { success, errorW, errorR, quiet }; |
1023 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) { | 1026 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) { |
1024 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); | 1027 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); |
1025 | delete s; | 1028 | delete s; |
1026 | if ( state == KCommandSocket::errorR ) { | 1029 | if ( state == KCommandSocket::errorR ) { |
1027 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this ); | 1030 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this ); |
1028 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 1031 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
1029 | commandSocket->sendStop(); | 1032 | commandSocket->sendStop(); |
1030 | } | 1033 | } |
1031 | mPisyncFinished = true; | 1034 | mPisyncFinished = true; |
1032 | return; | 1035 | return; |
1033 | 1036 | ||
1034 | } else if ( state == KCommandSocket::errorW ) { | 1037 | } else if ( state == KCommandSocket::errorW ) { |
1035 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); | 1038 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); |
1036 | mPisyncFinished = true; | 1039 | mPisyncFinished = true; |
1037 | 1040 | ||
1038 | } else if ( state == KCommandSocket::successR ) { | 1041 | } else if ( state == KCommandSocket::successR ) { |
1039 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); | 1042 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); |
1040 | 1043 | ||
1041 | } else if ( state == KCommandSocket::successW ) { | 1044 | } else if ( state == KCommandSocket::successW ) { |
1042 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); | 1045 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); |
1043 | mPisyncFinished = true; | 1046 | mPisyncFinished = true; |
1044 | } | 1047 | } |
1045 | 1048 | ||
1046 | delete s; | 1049 | delete s; |
1047 | } | 1050 | } |
1048 | 1051 | ||
1049 | void KSyncManager::readFileFromSocket() | 1052 | void KSyncManager::readFileFromSocket() |
1050 | { | 1053 | { |
1051 | QString fileName = syncFileName(); | 1054 | QString fileName = syncFileName(); |
1052 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); | 1055 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); |
1053 | if ( ! syncWithFile( fileName , true ) ) { | 1056 | if ( ! syncWithFile( fileName , true ) ) { |
1054 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); | 1057 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); |
1055 | mPisyncFinished = true; | 1058 | mPisyncFinished = true; |
1056 | return; | 1059 | return; |
1057 | } | 1060 | } |
1058 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this ); | 1061 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this ); |
1059 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 1062 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
1060 | if ( mWriteBackFile ) | 1063 | if ( mWriteBackFile ) |
1061 | commandSocket->writeFile( fileName ); | 1064 | commandSocket->writeFile( fileName ); |
1062 | else { | 1065 | else { |
1063 | commandSocket->sendStop(); | 1066 | commandSocket->sendStop(); |
1064 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); | 1067 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); |
1065 | mPisyncFinished = true; | 1068 | mPisyncFinished = true; |
1066 | } | 1069 | } |
1067 | } | 1070 | } |
1068 | 1071 | ||
1069 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) | 1072 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) |
1070 | { | 1073 | { |
1071 | mPassWord = pw; | 1074 | mPassWord = pw; |
1072 | mSocket = 0; | 1075 | mSocket = 0; |
1073 | mSyncActionDialog = 0; | 1076 | mSyncActionDialog = 0; |
1074 | blockRC = false; | 1077 | blockRC = false; |
1075 | }; | 1078 | }; |
1076 | 1079 | ||
1077 | void KServerSocket::newConnection ( int socket ) | 1080 | void KServerSocket::newConnection ( int socket ) |
1078 | { | 1081 | { |
1079 | // qDebug("KServerSocket:New connection %d ", socket); | 1082 | // qDebug("KServerSocket:New connection %d ", socket); |
1080 | if ( mSocket ) { | 1083 | if ( mSocket ) { |
1081 | qDebug("KServerSocket::newConnection Socket deleted! "); | 1084 | qDebug("KServerSocket::newConnection Socket deleted! "); |
1082 | delete mSocket; | 1085 | delete mSocket; |
1083 | mSocket = 0; | 1086 | mSocket = 0; |
1084 | } | 1087 | } |
1085 | mSocket = new QSocket( this ); | 1088 | mSocket = new QSocket( this ); |
1086 | connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) ); | 1089 | connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) ); |
1087 | connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); | 1090 | connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); |
1088 | mSocket->setSocket( socket ); | 1091 | mSocket->setSocket( socket ); |
1089 | } | 1092 | } |
1090 | 1093 | ||
1091 | void KServerSocket::discardClient() | 1094 | void KServerSocket::discardClient() |
1092 | { | 1095 | { |
1093 | //qDebug(" KServerSocket::discardClient()"); | 1096 | //qDebug(" KServerSocket::discardClient()"); |
1094 | if ( mSocket ) { | 1097 | if ( mSocket ) { |
1095 | delete mSocket; | 1098 | delete mSocket; |
1096 | mSocket = 0; | 1099 | mSocket = 0; |
1097 | } | 1100 | } |
1098 | //emit endConnect(); | 1101 | //emit endConnect(); |
1099 | } | 1102 | } |
1100 | void KServerSocket::readClient() | 1103 | void KServerSocket::readClient() |
1101 | { | 1104 | { |
1102 | if ( blockRC ) | 1105 | if ( blockRC ) |
1103 | return; | 1106 | return; |
1104 | if ( mSocket == 0 ) { | 1107 | if ( mSocket == 0 ) { |
1105 | qDebug("ERROR::KServerSocket::readClient(): mSocket == 0 "); | 1108 | qDebug("ERROR::KServerSocket::readClient(): mSocket == 0 "); |
1106 | return; | 1109 | return; |
1107 | } | 1110 | } |
1108 | //qDebug("KServerSocket::readClient()"); | 1111 | //qDebug("KServerSocket::readClient()"); |
1109 | if ( mSocket->canReadLine() ) { | 1112 | if ( mSocket->canReadLine() ) { |
1110 | QString line = mSocket->readLine(); | 1113 | QString line = mSocket->readLine(); |
1111 | //qDebug("KServerSocket readline: %s ", line.latin1()); | 1114 | //qDebug("KServerSocket readline: %s ", line.latin1()); |
1112 | QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); | 1115 | QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); |
1113 | if ( tokens[0] == "GET" ) { | 1116 | if ( tokens[0] == "GET" ) { |
1114 | if ( tokens[1] == mPassWord ) | 1117 | if ( tokens[1] == mPassWord ) { |
1115 | //emit sendFile( mSocket ); | 1118 | //emit sendFile( mSocket ); |
1119 | bool ok = false; | ||
1120 | QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok); | ||
1121 | if ( ok ) | ||
1122 | KSyncManager::mRequestedSyncEvent = dt; | ||
1123 | else | ||
1124 | KSyncManager::mRequestedSyncEvent = QDateTime(); | ||
1116 | send_file(); | 1125 | send_file(); |
1126 | } | ||
1117 | else { | 1127 | else { |
1118 | KMessageBox::error( 0, i18n("Got send file request\nwith invalid password")); | 1128 | KMessageBox::error( 0, i18n("Got send file request\nwith invalid password")); |
1119 | //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); | 1129 | //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); |
1120 | } | 1130 | } |
1121 | } | 1131 | } |
1122 | if ( tokens[0] == "PUT" ) { | 1132 | if ( tokens[0] == "PUT" ) { |
1123 | if ( tokens[1] == mPassWord ) { | 1133 | if ( tokens[1] == mPassWord ) { |
1124 | //emit getFile( mSocket ); | 1134 | //emit getFile( mSocket ); |
1125 | blockRC = true; | 1135 | blockRC = true; |
1126 | get_file(); | 1136 | get_file(); |
1127 | } | 1137 | } |
1128 | else { | 1138 | else { |
1129 | KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password")); | 1139 | KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password")); |
1130 | //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); | 1140 | //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); |
1131 | } | 1141 | } |
1132 | } | 1142 | } |
1133 | if ( tokens[0] == "STOP" ) { | 1143 | if ( tokens[0] == "STOP" ) { |
1134 | //emit endConnect(); | 1144 | //emit endConnect(); |
1135 | end_connect(); | 1145 | end_connect(); |
1136 | } | 1146 | } |
1137 | } | 1147 | } |
1138 | } | 1148 | } |
1139 | void KServerSocket::end_connect() | 1149 | void KServerSocket::end_connect() |
1140 | { | 1150 | { |
1141 | delete mSyncActionDialog; | 1151 | delete mSyncActionDialog; |
1142 | mSyncActionDialog = 0; | 1152 | mSyncActionDialog = 0; |
1143 | } | 1153 | } |
1144 | void KServerSocket::send_file() | 1154 | void KServerSocket::send_file() |
1145 | { | 1155 | { |
1146 | //qDebug("MainWindow::sendFile(QSocket* s) "); | 1156 | //qDebug("MainWindow::sendFile(QSocket* s) "); |
1147 | if ( mSyncActionDialog ) | 1157 | if ( mSyncActionDialog ) |
1148 | delete mSyncActionDialog; | 1158 | delete mSyncActionDialog; |
1149 | mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); | 1159 | mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); |
1150 | mSyncActionDialog->setCaption(i18n("Received sync request")); | 1160 | mSyncActionDialog->setCaption(i18n("Received sync request")); |
1151 | QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog ); | 1161 | QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog ); |
1152 | QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog ); | 1162 | QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog ); |
1153 | lay->addWidget( label); | 1163 | lay->addWidget( label); |
1154 | lay->setMargin(7); | 1164 | lay->setMargin(7); |
1155 | lay->setSpacing(7); | 1165 | lay->setSpacing(7); |
1156 | mSyncActionDialog->setFixedSize( 230, 120); | 1166 | mSyncActionDialog->setFixedSize( 230, 120); |
1157 | mSyncActionDialog->show(); | 1167 | mSyncActionDialog->show(); |
1158 | mSyncActionDialog->raise(); | 1168 | mSyncActionDialog->raise(); |
1159 | emit request_file(); | 1169 | emit request_file(); |
1160 | qApp->processEvents(); | 1170 | qApp->processEvents(); |
1161 | QString fileName = mFileName; | 1171 | QString fileName = mFileName; |
1162 | QFile file( fileName ); | 1172 | QFile file( fileName ); |
1163 | if (!file.open( IO_ReadOnly ) ) { | 1173 | if (!file.open( IO_ReadOnly ) ) { |
1164 | delete mSyncActionDialog; | 1174 | delete mSyncActionDialog; |
1165 | mSyncActionDialog = 0; | 1175 | mSyncActionDialog = 0; |
1166 | qDebug("KSS::error open file "); | 1176 | qDebug("KSS::error open file "); |
1167 | mSocket->close(); | 1177 | mSocket->close(); |
1168 | if ( mSocket->state() == QSocket::Idle ) | 1178 | if ( mSocket->state() == QSocket::Idle ) |
1169 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | 1179 | QTimer::singleShot( 10, this , SLOT ( discardClient())); |
1170 | return ; | 1180 | return ; |
1171 | 1181 | ||
1172 | } | 1182 | } |
1173 | mSyncActionDialog->setCaption( i18n("Sending file...") ); | 1183 | mSyncActionDialog->setCaption( i18n("Sending file...") ); |
1174 | QTextStream ts( &file ); | 1184 | QTextStream ts( &file ); |
1175 | ts.setEncoding( QTextStream::Latin1 ); | 1185 | ts.setEncoding( QTextStream::Latin1 ); |
1176 | 1186 | ||
1177 | QTextStream os( mSocket ); | 1187 | QTextStream os( mSocket ); |
1178 | os.setEncoding( QTextStream::Latin1 ); | 1188 | os.setEncoding( QTextStream::Latin1 ); |
1179 | while ( ! ts.atEnd() ) { | 1189 | while ( ! ts.atEnd() ) { |
1180 | os << ts.readLine() << "\r\n"; | 1190 | os << ts.readLine() << "\r\n"; |
1181 | } | 1191 | } |
1182 | //os << ts.read(); | 1192 | //os << ts.read(); |
1183 | file.close(); | 1193 | file.close(); |
1184 | mSyncActionDialog->setCaption( i18n("Waiting for synced file...") ); | 1194 | mSyncActionDialog->setCaption( i18n("Waiting for synced file...") ); |
1185 | mSocket->close(); | 1195 | mSocket->close(); |
1186 | if ( mSocket->state() == QSocket::Idle ) | 1196 | if ( mSocket->state() == QSocket::Idle ) |
1187 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | 1197 | QTimer::singleShot( 10, this , SLOT ( discardClient())); |
1188 | } | 1198 | } |
1189 | void KServerSocket::get_file() | 1199 | void KServerSocket::get_file() |
1190 | { | 1200 | { |
1191 | mSyncActionDialog->setCaption( i18n("Receiving synced file...") ); | 1201 | mSyncActionDialog->setCaption( i18n("Receiving synced file...") ); |
1192 | 1202 | ||
1193 | piTime.start(); | 1203 | piTime.start(); |
1194 | piFileString = ""; | 1204 | piFileString = ""; |
1195 | QTimer::singleShot( 1, this , SLOT (readBackFileFromSocket( ) )); | 1205 | QTimer::singleShot( 1, this , SLOT (readBackFileFromSocket( ) )); |
1196 | } | 1206 | } |
1197 | 1207 | ||
1198 | 1208 | ||
1199 | void KServerSocket::readBackFileFromSocket() | 1209 | void KServerSocket::readBackFileFromSocket() |
1200 | { | 1210 | { |
1201 | //qDebug("readBackFileFromSocket() %d ", piTime.elapsed ()); | 1211 | //qDebug("readBackFileFromSocket() %d ", piTime.elapsed ()); |
1202 | while ( mSocket->canReadLine () ) { | 1212 | while ( mSocket->canReadLine () ) { |
1203 | piTime.restart(); | 1213 | piTime.restart(); |
1204 | QString line = mSocket->readLine (); | 1214 | QString line = mSocket->readLine (); |
1205 | piFileString += line; | 1215 | piFileString += line; |
1206 | //qDebug("readline: %s ", line.latin1()); | 1216 | //qDebug("readline: %s ", line.latin1()); |
1207 | mSyncActionDialog->setCaption( i18n("Received %1 bytes").arg( piFileString.length() ) ); | 1217 | mSyncActionDialog->setCaption( i18n("Received %1 bytes").arg( piFileString.length() ) ); |
1208 | 1218 | ||
1209 | } | 1219 | } |
1210 | if ( piTime.elapsed () < 3000 ) { | 1220 | if ( piTime.elapsed () < 3000 ) { |
1211 | // wait for more | 1221 | // wait for more |
1212 | //qDebug("waitformore "); | 1222 | //qDebug("waitformore "); |
1213 | QTimer::singleShot( 100, this , SLOT (readBackFileFromSocket( ) )); | 1223 | QTimer::singleShot( 100, this , SLOT (readBackFileFromSocket( ) )); |
1214 | return; | 1224 | return; |
1215 | } | 1225 | } |
1216 | QString fileName = mFileName; | 1226 | QString fileName = mFileName; |
1217 | QFile file ( fileName ); | 1227 | QFile file ( fileName ); |
1218 | if (!file.open( IO_WriteOnly ) ) { | 1228 | if (!file.open( IO_WriteOnly ) ) { |
1219 | delete mSyncActionDialog; | 1229 | delete mSyncActionDialog; |
1220 | mSyncActionDialog = 0; | 1230 | mSyncActionDialog = 0; |
1221 | qDebug("KSS:Error open read back file "); | 1231 | qDebug("KSS:Error open read back file "); |
1222 | piFileString = ""; | 1232 | piFileString = ""; |
1223 | emit file_received( false ); | 1233 | emit file_received( false ); |
1224 | blockRC = false; | 1234 | blockRC = false; |
1225 | return ; | 1235 | return ; |
1226 | 1236 | ||
1227 | } | 1237 | } |
1228 | 1238 | ||
1229 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); | 1239 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); |
1230 | QTextStream ts ( &file ); | 1240 | QTextStream ts ( &file ); |
1231 | ts.setEncoding( QTextStream::Latin1 ); | 1241 | ts.setEncoding( QTextStream::Latin1 ); |
1232 | mSyncActionDialog->setCaption( i18n("Writing file to disk...") ); | 1242 | mSyncActionDialog->setCaption( i18n("Writing file to disk...") ); |
1233 | ts << piFileString; | 1243 | ts << piFileString; |
1234 | mSocket->close(); | 1244 | mSocket->close(); |
1235 | if ( mSocket->state() == QSocket::Idle ) | 1245 | if ( mSocket->state() == QSocket::Idle ) |
1236 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | 1246 | QTimer::singleShot( 10, this , SLOT ( discardClient())); |
1237 | file.close(); | 1247 | file.close(); |
1238 | piFileString = ""; | 1248 | piFileString = ""; |
1239 | emit file_received( true ); | 1249 | emit file_received( true ); |
1240 | delete mSyncActionDialog; | 1250 | delete mSyncActionDialog; |
1241 | mSyncActionDialog = 0; | 1251 | mSyncActionDialog = 0; |
1242 | blockRC = false; | 1252 | blockRC = false; |
1243 | 1253 | ||
1244 | } | 1254 | } |
1245 | 1255 | ||
1246 | KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, const char * name ): QObject( parent, name ) | 1256 | KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, const char * name ): QObject( parent, name ) |
1247 | { | 1257 | { |
1248 | mPassWord = password; | 1258 | mPassWord = password; |
1249 | mSocket = 0; | 1259 | mSocket = 0; |
1250 | mPort = port; | 1260 | mPort = port; |
1251 | mHost = host; | 1261 | mHost = host; |
1252 | 1262 | ||
1253 | mRetVal = quiet; | 1263 | mRetVal = quiet; |
1254 | mTimerSocket = new QTimer ( this ); | 1264 | mTimerSocket = new QTimer ( this ); |
1255 | connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket() ) ); | 1265 | connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket() ) ); |
1256 | } | 1266 | } |
1257 | void KCommandSocket::readFile( QString fn ) | 1267 | void KCommandSocket::readFile( QString fn ) |
1258 | { | 1268 | { |
1259 | if ( !mSocket ) { | 1269 | if ( !mSocket ) { |
1260 | mSocket = new QSocket( this ); | 1270 | mSocket = new QSocket( this ); |
1261 | connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) ); | 1271 | connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) ); |
1262 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1272 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1263 | } | 1273 | } |
1264 | mFileString = ""; | 1274 | mFileString = ""; |
1265 | mFileName = fn; | 1275 | mFileName = fn; |
1266 | mFirst = true; | 1276 | mFirst = true; |
1267 | mSocket->connectToHost( mHost, mPort ); | 1277 | mSocket->connectToHost( mHost, mPort ); |
1268 | QTextStream os( mSocket ); | 1278 | QTextStream os( mSocket ); |
1269 | os.setEncoding( QTextStream::Latin1 ); | 1279 | os.setEncoding( QTextStream::Latin1 ); |
1270 | os << "GET " << mPassWord << "\r\n"; | 1280 | |
1281 | QString curDt = KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate ); | ||
1282 | os << "GET " << mPassWord << curDt <<"\r\n"; | ||
1271 | mTimerSocket->start( 20000 ); | 1283 | mTimerSocket->start( 20000 ); |
1272 | } | 1284 | } |
1273 | 1285 | ||
1274 | void KCommandSocket::writeFile( QString fileName ) | 1286 | void KCommandSocket::writeFile( QString fileName ) |
1275 | { | 1287 | { |
1276 | if ( !mSocket ) { | 1288 | if ( !mSocket ) { |
1277 | mSocket = new QSocket( this ); | 1289 | mSocket = new QSocket( this ); |
1278 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1290 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1279 | connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) ); | 1291 | connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) ); |
1280 | } | 1292 | } |
1281 | mFileName = fileName ; | 1293 | mFileName = fileName ; |
1282 | mSocket->connectToHost( mHost, mPort ); | 1294 | mSocket->connectToHost( mHost, mPort ); |
1283 | } | 1295 | } |
1284 | void KCommandSocket::writeFileToSocket() | 1296 | void KCommandSocket::writeFileToSocket() |
1285 | { | 1297 | { |
1286 | QFile file2( mFileName ); | 1298 | QFile file2( mFileName ); |
1287 | if (!file2.open( IO_ReadOnly ) ) { | 1299 | if (!file2.open( IO_ReadOnly ) ) { |
1288 | mRetVal= errorW; | 1300 | mRetVal= errorW; |
1289 | mSocket->close(); | 1301 | mSocket->close(); |
1290 | if ( mSocket->state() == QSocket::Idle ) | 1302 | if ( mSocket->state() == QSocket::Idle ) |
1291 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1303 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1292 | return ; | 1304 | return ; |
1293 | } | 1305 | } |
1294 | QTextStream ts2( &file2 ); | 1306 | QTextStream ts2( &file2 ); |
1295 | ts2.setEncoding( QTextStream::Latin1 ); | 1307 | ts2.setEncoding( QTextStream::Latin1 ); |
1296 | QTextStream os2( mSocket ); | 1308 | QTextStream os2( mSocket ); |
1297 | os2.setEncoding( QTextStream::Latin1 ); | 1309 | os2.setEncoding( QTextStream::Latin1 ); |
1298 | os2 << "PUT " << mPassWord << "\r\n";; | 1310 | os2 << "PUT " << mPassWord << "\r\n";; |
1299 | while ( ! ts2.atEnd() ) { | 1311 | while ( ! ts2.atEnd() ) { |
1300 | os2 << ts2.readLine() << "\r\n"; | 1312 | os2 << ts2.readLine() << "\r\n"; |
1301 | } | 1313 | } |
1302 | mRetVal= successW; | 1314 | mRetVal= successW; |
1303 | file2.close(); | 1315 | file2.close(); |
1304 | mSocket->close(); | 1316 | mSocket->close(); |
1305 | if ( mSocket->state() == QSocket::Idle ) | 1317 | if ( mSocket->state() == QSocket::Idle ) |
1306 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1318 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1307 | } | 1319 | } |
1308 | void KCommandSocket::sendStop() | 1320 | void KCommandSocket::sendStop() |
1309 | { | 1321 | { |
1310 | if ( !mSocket ) { | 1322 | if ( !mSocket ) { |
1311 | mSocket = new QSocket( this ); | 1323 | mSocket = new QSocket( this ); |
1312 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1324 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1313 | } | 1325 | } |
1314 | mSocket->connectToHost( mHost, mPort ); | 1326 | mSocket->connectToHost( mHost, mPort ); |
1315 | QTextStream os2( mSocket ); | 1327 | QTextStream os2( mSocket ); |
1316 | os2.setEncoding( QTextStream::Latin1 ); | 1328 | os2.setEncoding( QTextStream::Latin1 ); |
1317 | os2 << "STOP\r\n"; | 1329 | os2 << "STOP\r\n"; |
1318 | mSocket->close(); | 1330 | mSocket->close(); |
1319 | if ( mSocket->state() == QSocket::Idle ) | 1331 | if ( mSocket->state() == QSocket::Idle ) |
1320 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1332 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1321 | } | 1333 | } |
1322 | 1334 | ||
1323 | void KCommandSocket::startReadFileFromSocket() | 1335 | void KCommandSocket::startReadFileFromSocket() |
1324 | { | 1336 | { |
1325 | if ( ! mFirst ) | 1337 | if ( ! mFirst ) |
1326 | return; | 1338 | return; |
1327 | mFirst = false; | 1339 | mFirst = false; |
1328 | mTimerSocket->stop(); | 1340 | mTimerSocket->stop(); |
1329 | mFileString = ""; | 1341 | mFileString = ""; |
1330 | mTime.start(); | 1342 | mTime.start(); |
1331 | QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); | 1343 | QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); |
1332 | 1344 | ||
1333 | } | 1345 | } |
1334 | void KCommandSocket::readFileFromSocket() | 1346 | void KCommandSocket::readFileFromSocket() |
1335 | { | 1347 | { |
1336 | //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ()); | 1348 | //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ()); |
1337 | while ( mSocket->canReadLine () ) { | 1349 | while ( mSocket->canReadLine () ) { |
1338 | mTime.restart(); | 1350 | mTime.restart(); |
1339 | QString line = mSocket->readLine (); | 1351 | QString line = mSocket->readLine (); |
1340 | mFileString += line; | 1352 | mFileString += line; |
1341 | //qDebug("readline: %s ", line.latin1()); | 1353 | //qDebug("readline: %s ", line.latin1()); |
1342 | } | 1354 | } |
1343 | if ( mTime.elapsed () < 3000 ) { | 1355 | if ( mTime.elapsed () < 3000 ) { |
1344 | // wait for more | 1356 | // wait for more |
1345 | //qDebug("waitformore "); | 1357 | //qDebug("waitformore "); |
1346 | QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) )); | 1358 | QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) )); |
1347 | return; | 1359 | return; |
1348 | } | 1360 | } |
1349 | QString fileName = mFileName; | 1361 | QString fileName = mFileName; |
1350 | QFile file ( fileName ); | 1362 | QFile file ( fileName ); |
1351 | if (!file.open( IO_WriteOnly ) ) { | 1363 | if (!file.open( IO_WriteOnly ) ) { |
1352 | mFileString = ""; | 1364 | mFileString = ""; |
1353 | mRetVal = errorR; | 1365 | mRetVal = errorR; |
1354 | qDebug("KSS:Error open temp sync file for writing: %s",fileName.latin1() ); | 1366 | qDebug("KSS:Error open temp sync file for writing: %s",fileName.latin1() ); |
1355 | deleteSocket(); | 1367 | deleteSocket(); |
1356 | return ; | 1368 | return ; |
1357 | 1369 | ||
1358 | } | 1370 | } |
1359 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); | 1371 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); |
1360 | QTextStream ts ( &file ); | 1372 | QTextStream ts ( &file ); |
1361 | ts.setEncoding( QTextStream::Latin1 ); | 1373 | ts.setEncoding( QTextStream::Latin1 ); |
1362 | ts << mFileString; | 1374 | ts << mFileString; |
1363 | file.close(); | 1375 | file.close(); |
1364 | mFileString = ""; | 1376 | mFileString = ""; |
1365 | mRetVal = successR; | 1377 | mRetVal = successR; |
1366 | mSocket->close(); | 1378 | mSocket->close(); |
1367 | // if state is not idle, deleteSocket(); is called via | 1379 | // if state is not idle, deleteSocket(); is called via |
1368 | // connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1380 | // connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1369 | if ( mSocket->state() == QSocket::Idle ) | 1381 | if ( mSocket->state() == QSocket::Idle ) |
1370 | deleteSocket(); | 1382 | deleteSocket(); |
1371 | } | 1383 | } |
1372 | 1384 | ||
1373 | void KCommandSocket::deleteSocket() | 1385 | void KCommandSocket::deleteSocket() |
1374 | { | 1386 | { |
1375 | //qDebug("KCommandSocket::deleteSocket() "); | 1387 | //qDebug("KCommandSocket::deleteSocket() "); |
1376 | if ( mTimerSocket->isActive () ) { | 1388 | if ( mTimerSocket->isActive () ) { |
1377 | mTimerSocket->stop(); | 1389 | mTimerSocket->stop(); |
1378 | mRetVal = errorTO; | 1390 | mRetVal = errorTO; |
1379 | qDebug("Connection to remote host timed out"); | 1391 | qDebug("Connection to remote host timed out"); |
1380 | if ( mSocket ) { | 1392 | if ( mSocket ) { |
1381 | mSocket->close(); | 1393 | mSocket->close(); |
1382 | //if ( mSocket->state() == QSocket::Idle ) | 1394 | //if ( mSocket->state() == QSocket::Idle ) |
1383 | // deleteSocket(); | 1395 | // deleteSocket(); |
1384 | delete mSocket; | 1396 | delete mSocket; |
1385 | mSocket = 0; | 1397 | mSocket = 0; |
1386 | } | 1398 | } |
1387 | KMessageBox::error( 0, i18n("Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host? ")); | 1399 | KMessageBox::error( 0, i18n("Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host? ")); |
1388 | emit commandFinished( this, mRetVal ); | 1400 | emit commandFinished( this, mRetVal ); |
1389 | return; | 1401 | return; |
1390 | } | 1402 | } |
1391 | //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); | 1403 | //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); |
1392 | if ( mSocket) | 1404 | if ( mSocket) |
1393 | delete mSocket; | 1405 | delete mSocket; |
1394 | mSocket = 0; | 1406 | mSocket = 0; |
1395 | emit commandFinished( this, mRetVal ); | 1407 | emit commandFinished( this, mRetVal ); |
1396 | } | 1408 | } |
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index aa32e28..2af891b 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h | |||
@@ -21,193 +21,194 @@ | |||
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 | ||
33 | class QPopupMenu; | 33 | class QPopupMenu; |
34 | class KSyncProfile; | 34 | class KSyncProfile; |
35 | class KPimPrefs; | 35 | class KPimPrefs; |
36 | class QWidget; | 36 | class QWidget; |
37 | class KSyncManager; | 37 | class KSyncManager; |
38 | class KSyncInterface; | 38 | class KSyncInterface; |
39 | class QProgressBar; | 39 | class QProgressBar; |
40 | 40 | ||
41 | 41 | ||
42 | class KServerSocket : public QServerSocket | 42 | class 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 | QDialog* mSyncActionDialog; | 65 | QDialog* mSyncActionDialog; |
66 | QSocket* mSocket; | 66 | QSocket* mSocket; |
67 | QString mPassWord; | 67 | QString mPassWord; |
68 | QString mFileName; | 68 | QString mFileName; |
69 | QTime piTime; | 69 | QTime piTime; |
70 | QString piFileString; | 70 | QString piFileString; |
71 | }; | 71 | }; |
72 | 72 | ||
73 | class KCommandSocket : public QObject | 73 | class KCommandSocket : public QObject |
74 | { | 74 | { |
75 | Q_OBJECT | 75 | Q_OBJECT |
76 | public: | 76 | public: |
77 | enum state { successR, errorR, successW, errorW, errorTO, quiet }; | 77 | enum state { successR, errorR, successW, errorW, errorTO, quiet }; |
78 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, const char * name=0 ); | 78 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, const char * name=0 ); |
79 | void readFile( QString ); | 79 | void readFile( QString ); |
80 | void writeFile( QString ); | 80 | void writeFile( QString ); |
81 | void sendStop(); | 81 | void sendStop(); |
82 | 82 | ||
83 | signals: | 83 | signals: |
84 | void commandFinished( KCommandSocket*, int ); | 84 | void commandFinished( KCommandSocket*, int ); |
85 | private slots: | 85 | private slots: |
86 | void startReadFileFromSocket(); | 86 | void startReadFileFromSocket(); |
87 | void readFileFromSocket(); | 87 | void readFileFromSocket(); |
88 | void deleteSocket(); | 88 | void deleteSocket(); |
89 | void writeFileToSocket(); | 89 | void writeFileToSocket(); |
90 | private : | 90 | private : |
91 | QSocket* mSocket; | 91 | QSocket* mSocket; |
92 | QString mPassWord; | 92 | QString mPassWord; |
93 | Q_UINT16 mPort; | 93 | Q_UINT16 mPort; |
94 | QString mHost; | 94 | QString mHost; |
95 | QString mFileName; | 95 | QString mFileName; |
96 | QTimer* mTimerSocket; | 96 | QTimer* mTimerSocket; |
97 | int mRetVal; | 97 | int mRetVal; |
98 | QTime mTime; | 98 | QTime mTime; |
99 | QString mFileString; | 99 | QString mFileString; |
100 | bool mFirst; | 100 | bool mFirst; |
101 | }; | 101 | }; |
102 | 102 | ||
103 | 103 | ||
104 | class KSyncManager : public QObject | 104 | class KSyncManager : public QObject |
105 | { | 105 | { |
106 | Q_OBJECT | 106 | Q_OBJECT |
107 | 107 | ||
108 | public: | 108 | public: |
109 | enum TargetApp { | 109 | enum TargetApp { |
110 | KOPI = 0, | 110 | KOPI = 0, |
111 | KAPI = 1, | 111 | KAPI = 1, |
112 | PWMPI = 2 }; | 112 | PWMPI = 2 }; |
113 | 113 | ||
114 | KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu); | 114 | KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu); |
115 | ~KSyncManager() ; | 115 | ~KSyncManager() ; |
116 | 116 | ||
117 | void multiSync( bool askforPrefs ); | 117 | void multiSync( bool askforPrefs ); |
118 | bool blockSave() { return mBlockSaveFlag; } | 118 | bool blockSave() { return mBlockSaveFlag; } |
119 | void setBlockSave(bool sa) { mBlockSaveFlag = sa; } | 119 | void setBlockSave(bool sa) { mBlockSaveFlag = sa; } |
120 | void setDefaultFileName( QString s) { mDefFileName = s ;} | 120 | void setDefaultFileName( QString s) { mDefFileName = s ;} |
121 | QString defaultFileName() { return mDefFileName ;} | 121 | QString defaultFileName() { return mDefFileName ;} |
122 | QString syncFileName(); | 122 | QString syncFileName(); |
123 | void enableQuick( bool ask = true); | 123 | void enableQuick( bool ask = true); |
124 | 124 | ||
125 | QString getCurrentSyncDevice() { return mCurrentSyncDevice; } | 125 | QString getCurrentSyncDevice() { return mCurrentSyncDevice; } |
126 | QString getCurrentSyncName() { return mCurrentSyncName; } | 126 | QString getCurrentSyncName() { return mCurrentSyncName; } |
127 | 127 | ||
128 | void showProgressBar(int percentage, QString caption = QString::null, int total=100); | 128 | void showProgressBar(int percentage, QString caption = QString::null, int total=100); |
129 | void hideProgressBar(); | 129 | void hideProgressBar(); |
130 | bool isProgressBarCanceled(); | 130 | bool isProgressBarCanceled(); |
131 | 131 | ||
132 | // sync stuff | 132 | // sync stuff |
133 | QString mLocalMachineName; | 133 | QString mLocalMachineName; |
134 | QStringList mExternSyncProfiles; | 134 | QStringList mExternSyncProfiles; |
135 | QStringList mSyncProfileNames; | 135 | QStringList mSyncProfileNames; |
136 | bool mAskForPreferences; | 136 | bool mAskForPreferences; |
137 | bool mShowSyncSummary; | 137 | bool mShowSyncSummary; |
138 | bool mIsKapiFile; | 138 | bool mIsKapiFile; |
139 | bool mWriteBackExistingOnly; | 139 | bool mWriteBackExistingOnly; |
140 | int mSyncAlgoPrefs; | 140 | int mSyncAlgoPrefs; |
141 | bool mWriteBackFile; | 141 | bool mWriteBackFile; |
142 | int mWriteBackInFuture; | 142 | int mWriteBackInFuture; |
143 | QString mPhoneDevice; | 143 | QString mPhoneDevice; |
144 | QString mPhoneConnection; | 144 | QString mPhoneConnection; |
145 | QString mPhoneModel; | 145 | QString mPhoneModel; |
146 | QString mPassWordPiSync; | 146 | QString mPassWordPiSync; |
147 | QString mActiveSyncPort; | 147 | QString mActiveSyncPort; |
148 | QString mActiveSyncIP ; | 148 | QString mActiveSyncIP ; |
149 | static QDateTime mRequestedSyncEvent; | ||
149 | 150 | ||
150 | signals: | 151 | signals: |
151 | void save(); | 152 | void save(); |
152 | void request_file(); | 153 | void request_file(); |
153 | void getFile( bool ); | 154 | void getFile( bool ); |
154 | 155 | ||
155 | public slots: | 156 | public slots: |
156 | void slotSyncMenu( int ); | 157 | void slotSyncMenu( int ); |
157 | void slotClearMenu( int action ); | 158 | void slotClearMenu( int action ); |
158 | void deleteCommandSocket(KCommandSocket*s, int state); | 159 | void deleteCommandSocket(KCommandSocket*s, int state); |
159 | void readFileFromSocket(); | 160 | void readFileFromSocket(); |
160 | void fillSyncMenu(); | 161 | void fillSyncMenu(); |
161 | 162 | ||
162 | private: | 163 | private: |
163 | void syncPi(); | 164 | void syncPi(); |
164 | KServerSocket * mServerSocket; | 165 | KServerSocket * mServerSocket; |
165 | KPimPrefs* mPrefs; | 166 | KPimPrefs* mPrefs; |
166 | QString mDefFileName; | 167 | QString mDefFileName; |
167 | QString mCurrentSyncDevice; | 168 | QString mCurrentSyncDevice; |
168 | QString mCurrentSyncName; | 169 | QString mCurrentSyncName; |
169 | void quickSyncLocalFile(); | 170 | void quickSyncLocalFile(); |
170 | bool syncWithFile( QString fn , bool quick ); | 171 | bool syncWithFile( QString fn , bool quick ); |
171 | void syncLocalFile(); | 172 | void syncLocalFile(); |
172 | void syncPhone(); | 173 | void syncPhone(); |
173 | void syncSharp(); | 174 | void syncSharp(); |
174 | void syncKDE(); | 175 | void syncKDE(); |
175 | bool syncExternalApplication(QString); | 176 | bool syncExternalApplication(QString); |
176 | int mCurrentSyncProfile ; | 177 | int mCurrentSyncProfile ; |
177 | void syncRemote( KSyncProfile* prof, bool ask = true); | 178 | void syncRemote( KSyncProfile* prof, bool ask = true); |
178 | bool edit_sync_options(); | 179 | bool edit_sync_options(); |
179 | bool edit_pisync_options(); | 180 | bool edit_pisync_options(); |
180 | int ringSync(); | 181 | int ringSync(); |
181 | QString getPassword( ); | 182 | QString getPassword( ); |
182 | bool mPisyncFinished; | 183 | bool mPisyncFinished; |
183 | bool mBlockSaveFlag; | 184 | bool mBlockSaveFlag; |
184 | QWidget* mParent; | 185 | QWidget* mParent; |
185 | KSyncInterface* mImplementation; | 186 | KSyncInterface* mImplementation; |
186 | TargetApp mTargetApp; | 187 | TargetApp mTargetApp; |
187 | QPopupMenu* mSyncMenu; | 188 | QPopupMenu* mSyncMenu; |
188 | QProgressBar* bar; | 189 | QProgressBar* bar; |
189 | 190 | ||
190 | private slots: | 191 | private slots: |
191 | void confSync(); | 192 | void confSync(); |
192 | 193 | ||
193 | 194 | ||
194 | }; | 195 | }; |
195 | 196 | ||
196 | 197 | ||
197 | class KSyncInterface | 198 | class KSyncInterface |
198 | { | 199 | { |
199 | public : | 200 | public : |
200 | virtual void removeSyncInfo( QString syncProfile) = 0; | 201 | virtual void removeSyncInfo( QString syncProfile) = 0; |
201 | virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0; | 202 | virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0; |
202 | virtual bool syncExternal(KSyncManager* manager, QString resource) | 203 | virtual bool syncExternal(KSyncManager* manager, QString resource) |
203 | { | 204 | { |
204 | // empty implementation, because some syncable applications do not | 205 | // empty implementation, because some syncable applications do not |
205 | // have an external(sharpdtm) syncmode, like pwmanager. | 206 | // have an external(sharpdtm) syncmode, like pwmanager. |
206 | return false; | 207 | return false; |
207 | } | 208 | } |
208 | 209 | ||
209 | 210 | ||
210 | }; | 211 | }; |
211 | 212 | ||
212 | 213 | ||
213 | #endif | 214 | #endif |