-rw-r--r-- | libkdepim/ksyncmanager.cpp | 2 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.h | 25 |
2 files changed, 4 insertions, 23 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 568c2a9..01309d5 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -381,25 +381,25 @@ void KSyncManager::multiSync( bool askforPrefs ) | |||
381 | if ( QMessageBox::information( mParent, i18n("KDE-Pim Sync"), | 381 | if ( QMessageBox::information( mParent, i18n("KDE-Pim Sync"), |
382 | question, | 382 | question, |
383 | i18n("Yes"), i18n("No"), | 383 | i18n("Yes"), i18n("No"), |
384 | 0, 0 ) != 0 ) { | 384 | 0, 0 ) != 0 ) { |
385 | setBlockSave(false); | 385 | setBlockSave(false); |
386 | mParent->topLevelWidget()->setCaption(i18n("Aborted! Nothing synced!")); | 386 | mParent->topLevelWidget()->setCaption(i18n("Aborted! Nothing synced!")); |
387 | return; | 387 | return; |
388 | } | 388 | } |
389 | mCurrentSyncDevice = i18n("Multiple profiles") ; | 389 | mCurrentSyncDevice = i18n("Multiple profiles") ; |
390 | mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs; | 390 | mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs; |
391 | if ( askforPrefs ) { | 391 | if ( askforPrefs ) { |
392 | edit_sync_options(); | 392 | edit_sync_options(); |
393 | mRingSyncAlgoPrefs = mSyncAlgoPrefs; | 393 | mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs; |
394 | } | 394 | } |
395 | mParent->topLevelWidget()->setCaption(i18n("Multiple sync started.") ); | 395 | mParent->topLevelWidget()->setCaption(i18n("Multiple sync started.") ); |
396 | qApp->processEvents(); | 396 | qApp->processEvents(); |
397 | int num = ringSync() ; | 397 | int num = ringSync() ; |
398 | if ( num > 1 ) | 398 | if ( num > 1 ) |
399 | ringSync(); | 399 | ringSync(); |
400 | setBlockSave(false); | 400 | setBlockSave(false); |
401 | if ( num ) | 401 | if ( num ) |
402 | emit save(); | 402 | emit save(); |
403 | if ( num ) | 403 | if ( num ) |
404 | mParent->topLevelWidget()->setCaption(i18n("%1 profiles synced. Multiple sync complete!").arg(num) ); | 404 | mParent->topLevelWidget()->setCaption(i18n("%1 profiles synced. Multiple sync complete!").arg(num) ); |
405 | else | 405 | else |
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index 7027894..1f7c7e7 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h | |||
@@ -39,25 +39,24 @@ 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 | |||
52 | signals: | 51 | signals: |
53 | void file_received( bool ); | 52 | void file_received( bool ); |
54 | void request_file(); | 53 | void request_file(); |
55 | void saveFile(); | 54 | void saveFile(); |
56 | void endConnect(); | 55 | void endConnect(); |
57 | private slots: | 56 | private slots: |
58 | void discardClient(); | 57 | void discardClient(); |
59 | void readClient(); | 58 | void readClient(); |
60 | void readBackFileFromSocket(); | 59 | void readBackFileFromSocket(); |
61 | private : | 60 | private : |
62 | bool blockRC; | 61 | bool blockRC; |
63 | void send_file(); | 62 | void send_file(); |
@@ -72,25 +71,24 @@ private slots: | |||
72 | }; | 71 | }; |
73 | 72 | ||
74 | class KCommandSocket : public QObject | 73 | class KCommandSocket : public QObject |
75 | { | 74 | { |
76 | Q_OBJECT | 75 | Q_OBJECT |
77 | public: | 76 | public: |
78 | enum state { successR, errorR, successW, errorW, errorTO, quiet }; | 77 | enum state { successR, errorR, successW, errorW, errorTO, quiet }; |
79 | 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 ); |
80 | void readFile( QString ); | 79 | void readFile( QString ); |
81 | void writeFile( QString ); | 80 | void writeFile( QString ); |
82 | void sendStop(); | 81 | void sendStop(); |
83 | 82 | ||
84 | |||
85 | signals: | 83 | signals: |
86 | void commandFinished( KCommandSocket*, int ); | 84 | void commandFinished( KCommandSocket*, int ); |
87 | private slots: | 85 | private slots: |
88 | void startReadFileFromSocket(); | 86 | void startReadFileFromSocket(); |
89 | void readFileFromSocket(); | 87 | void readFileFromSocket(); |
90 | void deleteSocket(); | 88 | void deleteSocket(); |
91 | void writeFileToSocket(); | 89 | void writeFileToSocket(); |
92 | private : | 90 | private : |
93 | QSocket* mSocket; | 91 | QSocket* mSocket; |
94 | QString mPassWord; | 92 | QString mPassWord; |
95 | Q_UINT16 mPort; | 93 | Q_UINT16 mPort; |
96 | QString mHost; | 94 | QString mHost; |
@@ -104,123 +102,106 @@ private slots: | |||
104 | 102 | ||
105 | 103 | ||
106 | class KSyncManager : public QObject | 104 | class KSyncManager : public QObject |
107 | { | 105 | { |
108 | Q_OBJECT | 106 | Q_OBJECT |
109 | 107 | ||
110 | public: | 108 | public: |
111 | enum TargetApp { | 109 | enum TargetApp { |
112 | KOPI = 0, | 110 | KOPI = 0, |
113 | KAPI = 1, | 111 | KAPI = 1, |
114 | PWMPI = 2 }; | 112 | PWMPI = 2 }; |
115 | 113 | ||
116 | |||
117 | KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu); | 114 | KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu); |
118 | ~KSyncManager() ; | 115 | ~KSyncManager() ; |
119 | 116 | ||
120 | void multiSync( bool askforPrefs ); | 117 | void multiSync( bool askforPrefs ); |
121 | bool blockSave() { return mBlockSaveFlag; } | 118 | bool blockSave() { return mBlockSaveFlag; } |
122 | void setBlockSave(bool sa) { mBlockSaveFlag = sa; } | 119 | void setBlockSave(bool sa) { mBlockSaveFlag = sa; } |
123 | void setDefaultFileName( QString s) { mDefFileName = s ;} | 120 | void setDefaultFileName( QString s) { mDefFileName = s ;} |
124 | QString defaultFileName() { return mDefFileName ;} | 121 | QString defaultFileName() { return mDefFileName ;} |
125 | QString syncFileName(); | 122 | QString syncFileName(); |
126 | void fillSyncMenu(); | ||
127 | 123 | ||
128 | QString getCurrentSyncDevice() { return mCurrentSyncDevice; } | 124 | QString getCurrentSyncDevice() { return mCurrentSyncDevice; } |
129 | QString getCurrentSyncName() { return mCurrentSyncName; } | 125 | QString getCurrentSyncName() { return mCurrentSyncName; } |
130 | 126 | ||
131 | void showProgressBar(int percentage, QString caption = QString::null, int total=100); | 127 | void showProgressBar(int percentage, QString caption = QString::null, int total=100); |
132 | void hideProgressBar(); | 128 | void hideProgressBar(); |
133 | bool isProgressBarCanceled(); | 129 | bool isProgressBarCanceled(); |
134 | 130 | ||
135 | // sync stuff | 131 | // sync stuff |
136 | QString mLocalMachineName; | 132 | QString mLocalMachineName; |
137 | QStringList mExternSyncProfiles; | 133 | QStringList mExternSyncProfiles; |
138 | QStringList mSyncProfileNames; | 134 | QStringList mSyncProfileNames; |
139 | bool mAskForPreferences; | 135 | bool mAskForPreferences; |
140 | bool mShowSyncSummary; | 136 | bool mShowSyncSummary; |
141 | bool mShowSyncEvents; | ||
142 | bool mShowTodoInAgenda; | ||
143 | bool mWriteBackExistingOnly; | 137 | bool mWriteBackExistingOnly; |
144 | int mSyncAlgoPrefs; | 138 | int mSyncAlgoPrefs; |
145 | int mRingSyncAlgoPrefs; | ||
146 | bool mWriteBackFile; | 139 | bool mWriteBackFile; |
147 | int mWriteBackInFuture; | 140 | int mWriteBackInFuture; |
148 | QString mPhoneDevice; | 141 | QString mPhoneDevice; |
149 | QString mPhoneConnection; | 142 | QString mPhoneConnection; |
150 | QString mPhoneModel; | 143 | QString mPhoneModel; |
151 | QString mPassWordPiSync; | 144 | QString mPassWordPiSync; |
152 | QString mActiveSyncPort; | 145 | QString mActiveSyncPort; |
153 | QString mActiveSyncIP ; | 146 | QString mActiveSyncIP ; |
154 | 147 | ||
155 | signals: | 148 | signals: |
156 | void save(); | 149 | void save(); |
157 | void request_file(); | 150 | void request_file(); |
158 | void getFile( bool ); | 151 | void getFile( bool ); |
159 | 152 | ||
160 | public slots: | 153 | public slots: |
161 | void slotSyncMenu( int ); | 154 | void slotSyncMenu( int ); |
162 | void deleteCommandSocket(KCommandSocket*s, int state); | 155 | void deleteCommandSocket(KCommandSocket*s, int state); |
163 | void readFileFromSocket(); | 156 | void readFileFromSocket(); |
157 | void fillSyncMenu(); | ||
164 | 158 | ||
165 | private: | 159 | private: |
166 | // LR ******************************* | ||
167 | // sync stuff! | ||
168 | void syncPi(); | 160 | void syncPi(); |
169 | KServerSocket * mServerSocket; | 161 | KServerSocket * mServerSocket; |
170 | void enableQuick(); | 162 | void enableQuick(); |
171 | KPimPrefs* mPrefs; | 163 | KPimPrefs* mPrefs; |
172 | QString mDefFileName; | 164 | QString mDefFileName; |
173 | QString mCurrentSyncDevice; | 165 | QString mCurrentSyncDevice; |
174 | QString mCurrentSyncName; | 166 | QString mCurrentSyncName; |
175 | void quickSyncLocalFile(); | 167 | void quickSyncLocalFile(); |
176 | bool syncWithFile( QString fn , bool quick ); | 168 | bool syncWithFile( QString fn , bool quick ); |
177 | void syncLocalFile(); | 169 | void syncLocalFile(); |
178 | void syncPhone(); | 170 | void syncPhone(); |
179 | void syncSharp(); | 171 | void syncSharp(); |
180 | bool syncExternalApplication(QString); | 172 | bool syncExternalApplication(QString); |
181 | int mCurrentSyncProfile ; | 173 | int mCurrentSyncProfile ; |
182 | void syncRemote( KSyncProfile* prof, bool ask = true); | 174 | void syncRemote( KSyncProfile* prof, bool ask = true); |
183 | void edit_sync_options(); | 175 | void edit_sync_options(); |
184 | int ringSync(); | 176 | int ringSync(); |
185 | QString getPassword( ); | 177 | QString getPassword( ); |
186 | 178 | ||
187 | private slots: | 179 | private slots: |
188 | void confSync(); | 180 | void confSync(); |
189 | // ********************* | ||
190 | |||
191 | private: | 181 | private: |
192 | bool mBlockSaveFlag; | 182 | bool mBlockSaveFlag; |
193 | |||
194 | |||
195 | QWidget* mParent; | 183 | QWidget* mParent; |
196 | KSyncInterface* mImplementation; | 184 | KSyncInterface* mImplementation; |
197 | TargetApp mTargetApp; | 185 | TargetApp mTargetApp; |
198 | QPopupMenu* mSyncMenu; | 186 | QPopupMenu* mSyncMenu; |
199 | |||
200 | QProgressBar* bar; | 187 | QProgressBar* bar; |
201 | 188 | ||
202 | |||
203 | |||
204 | |||
205 | |||
206 | }; | 189 | }; |
207 | 190 | ||
208 | 191 | ||
209 | class KSyncInterface | 192 | class KSyncInterface |
210 | { | 193 | { |
211 | |||
212 | |||
213 | public : | 194 | public : |
214 | virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0; | 195 | virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0; |
215 | |||
216 | virtual bool syncExternal(KSyncManager* manager, QString resource) | 196 | virtual bool syncExternal(KSyncManager* manager, QString resource) |
217 | { | 197 | { |
218 | // empty implementation, because some syncable applications do not have an external(sharpdtm) syncmode, like pwmanager. | 198 | // empty implementation, because some syncable applications do not |
199 | // have an external(sharpdtm) syncmode, like pwmanager. | ||
219 | return false; | 200 | return false; |
220 | } | 201 | } |
221 | 202 | ||
222 | 203 | ||
223 | }; | 204 | }; |
224 | 205 | ||
225 | 206 | ||
226 | #endif | 207 | #endif |