-rw-r--r-- | libkdepim/ksyncmanager.cpp | 10 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.h | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 33b4a65..6c1f444 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -243,25 +243,29 @@ void KSyncManager::slotSyncMenu( int action ) | |||
243 | mAskForPreferences = temp->getAskForPreferences(); | 243 | mAskForPreferences = temp->getAskForPreferences(); |
244 | mShowSyncSummary = temp->getShowSummaryAfterSync(); | 244 | mShowSyncSummary = temp->getShowSummaryAfterSync(); |
245 | mWriteBackFile = temp->getWriteBackFile(); | 245 | mWriteBackFile = temp->getWriteBackFile(); |
246 | mSyncAlgoPrefs = temp->getSyncPrefs(); | 246 | mSyncAlgoPrefs = temp->getSyncPrefs(); |
247 | } | 247 | } |
248 | mWriteBackExistingOnly = temp->getWriteBackExisting(); | 248 | mWriteBackExistingOnly = temp->getWriteBackExisting(); |
249 | mIsKapiFile = temp->getIsKapiFile(); | 249 | mIsKapiFile = temp->getIsKapiFile(); |
250 | mWriteBackInFuture = 0; | 250 | mWriteBackInFuture = 0; |
251 | if ( temp->getWriteBackFuture() ) { | 251 | if ( temp->getWriteBackFuture() ) { |
252 | mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); | 252 | mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); |
253 | mWriteBackInPast = temp->getWriteBackPastWeeks( ); | 253 | mWriteBackInPast = temp->getWriteBackPastWeeks( ); |
254 | } | 254 | } |
255 | 255 | mFilterInCal = temp->getFilterInCal(); | |
256 | mFilterOutCal = temp->getFilterOutCal(); | ||
257 | mFilterInAB = temp->getFilterInAB(); | ||
258 | mFilterOutAB = temp->getFilterOutAB(); | ||
259 | |||
256 | if ( action == 1000 ) { | 260 | if ( action == 1000 ) { |
257 | mIsKapiFile = false; | 261 | mIsKapiFile = false; |
258 | #ifdef DESKTOP_VERSION | 262 | #ifdef DESKTOP_VERSION |
259 | syncKDE(); | 263 | syncKDE(); |
260 | #else | 264 | #else |
261 | syncSharp(); | 265 | syncSharp(); |
262 | #endif | 266 | #endif |
263 | 267 | ||
264 | } else if ( action == 1001 ) { | 268 | } else if ( action == 1001 ) { |
265 | syncLocalFile(); | 269 | syncLocalFile(); |
266 | 270 | ||
267 | } else if ( action == 1002 ) { | 271 | } else if ( action == 1002 ) { |
@@ -575,24 +579,28 @@ int KSyncManager::ringSync() | |||
575 | mParent->topLevelWidget()->setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... ")); | 579 | mParent->topLevelWidget()->setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... ")); |
576 | ++syncedProfiles; | 580 | ++syncedProfiles; |
577 | mSyncWithDesktop = false; | 581 | mSyncWithDesktop = false; |
578 | // mAskForPreferences = temp->getAskForPreferences(); | 582 | // mAskForPreferences = temp->getAskForPreferences(); |
579 | mWriteBackFile = temp->getWriteBackFile(); | 583 | mWriteBackFile = temp->getWriteBackFile(); |
580 | mWriteBackExistingOnly = temp->getWriteBackExisting(); | 584 | mWriteBackExistingOnly = temp->getWriteBackExisting(); |
581 | mIsKapiFile = temp->getIsKapiFile(); | 585 | mIsKapiFile = temp->getIsKapiFile(); |
582 | mWriteBackInFuture = 0; | 586 | mWriteBackInFuture = 0; |
583 | if ( temp->getWriteBackFuture() ) { | 587 | if ( temp->getWriteBackFuture() ) { |
584 | mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); | 588 | mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); |
585 | mWriteBackInPast = temp->getWriteBackPastWeeks( ); | 589 | mWriteBackInPast = temp->getWriteBackPastWeeks( ); |
586 | } | 590 | } |
591 | mFilterInCal = temp->getFilterInCal(); | ||
592 | mFilterOutCal = temp->getFilterOutCal(); | ||
593 | mFilterInAB = temp->getFilterInAB(); | ||
594 | mFilterOutAB = temp->getFilterOutAB(); | ||
587 | mShowSyncSummary = false; | 595 | mShowSyncSummary = false; |
588 | mCurrentSyncDevice = syncProfileNames[i] ; | 596 | mCurrentSyncDevice = syncProfileNames[i] ; |
589 | mCurrentSyncName = mLocalMachineName; | 597 | mCurrentSyncName = mLocalMachineName; |
590 | if ( i == 0 ) { | 598 | if ( i == 0 ) { |
591 | mIsKapiFile = false; | 599 | mIsKapiFile = false; |
592 | #ifdef DESKTOP_VERSION | 600 | #ifdef DESKTOP_VERSION |
593 | syncKDE(); | 601 | syncKDE(); |
594 | #else | 602 | #else |
595 | syncSharp(); | 603 | syncSharp(); |
596 | #endif | 604 | #endif |
597 | } else { | 605 | } else { |
598 | if ( temp->getIsLocalFileSync() ) { | 606 | if ( temp->getIsLocalFileSync() ) { |
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index 2d0a4ab..6d89950 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h | |||
@@ -139,24 +139,28 @@ class KSyncManager : public QObject | |||
139 | bool mIsKapiFile; | 139 | bool mIsKapiFile; |
140 | bool mWriteBackExistingOnly; | 140 | bool mWriteBackExistingOnly; |
141 | int mSyncAlgoPrefs; | 141 | int mSyncAlgoPrefs; |
142 | bool mWriteBackFile; | 142 | bool mWriteBackFile; |
143 | int mWriteBackInFuture; | 143 | int mWriteBackInFuture; |
144 | int mWriteBackInPast; | 144 | int mWriteBackInPast; |
145 | QString mPhoneDevice; | 145 | QString mPhoneDevice; |
146 | QString mPhoneConnection; | 146 | QString mPhoneConnection; |
147 | QString mPhoneModel; | 147 | QString mPhoneModel; |
148 | QString mPassWordPiSync; | 148 | QString mPassWordPiSync; |
149 | QString mActiveSyncPort; | 149 | QString mActiveSyncPort; |
150 | QString mActiveSyncIP ; | 150 | QString mActiveSyncIP ; |
151 | QString mFilterInCal; | ||
152 | QString mFilterOutCal; | ||
153 | QString mFilterInAB; | ||
154 | QString mFilterOutAB; | ||
151 | static QDateTime mRequestedSyncEvent; | 155 | static QDateTime mRequestedSyncEvent; |
152 | 156 | ||
153 | signals: | 157 | signals: |
154 | void save(); | 158 | void save(); |
155 | void request_file(); | 159 | void request_file(); |
156 | void getFile( bool ); | 160 | void getFile( bool ); |
157 | 161 | ||
158 | public slots: | 162 | public slots: |
159 | void slotSyncMenu( int ); | 163 | void slotSyncMenu( int ); |
160 | void slotClearMenu( int action ); | 164 | void slotClearMenu( int action ); |
161 | void deleteCommandSocket(KCommandSocket*s, int state); | 165 | void deleteCommandSocket(KCommandSocket*s, int state); |
162 | void readFileFromSocket(); | 166 | void readFileFromSocket(); |