author | zautrix <zautrix> | 2004-10-07 07:28:54 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-07 07:28:54 (UTC) |
commit | 77280f6a176a15b60004f312e6cacdfbbd3909c1 (patch) (unidiff) | |
tree | e074d4abedc2f4cc575e5655575e038b9d460106 /kaddressbook | |
parent | f1eb5b74c962909851607c4b4cb05ee18a347d37 (diff) | |
download | kdepimpi-77280f6a176a15b60004f312e6cacdfbbd3909c1.zip kdepimpi-77280f6a176a15b60004f312e6cacdfbbd3909c1.tar.gz kdepimpi-77280f6a176a15b60004f312e6cacdfbbd3909c1.tar.bz2 |
sync changes
-rw-r--r-- | kaddressbook/kabcore.cpp | 31 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 7 |
2 files changed, 14 insertions, 24 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index d9eb391..83fede4 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1685,2 +1685,6 @@ void KABCore::initGUI() | |||
1685 | 1685 | ||
1686 | connect(syncManager , SIGNAL( save() ), this, SLOT( save() ) ); | ||
1687 | connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); | ||
1688 | syncManager->setDefaultFileName(locateLocal( "apps","kabc/std.vcf") ); | ||
1689 | //connect(syncManager , SIGNAL( ), this, SLOT( ) ); | ||
1686 | 1690 | ||
@@ -2839,3 +2843,2 @@ bool KABCore::syncExternal(KSyncManager* manager, QString resource) | |||
2839 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); | 2843 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); |
2840 | qDebug("KABCore::syncExternal: why do we acces here KABPrefs and not somehow KSyncProfile? "); | ||
2841 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); | 2844 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); |
@@ -2855,19 +2858,12 @@ bool KABCore::syncExternal(KSyncManager* manager, QString resource) | |||
2855 | 2858 | ||
2856 | //called by the syncmanager to indicate that the work has to marked as dirty. | 2859 | void KABCore::getFile( bool success ) |
2857 | void KABCore::sync_setModified() | ||
2858 | { | 2860 | { |
2859 | setModified(); | 2861 | if ( ! success ) { |
2860 | } | 2862 | setCaption( i18n("Error receiving file. Nothing changed!") ); |
2861 | 2863 | return; | |
2862 | //called by the syncmanager to ask if the dirty flag is set. | 2864 | } |
2863 | bool KABCore::sync_isModified() | 2865 | //mView->watchSavedFile(); |
2864 | { | 2866 | //mView->openCalendar( defaultFileName() ); |
2865 | return mModified; | 2867 | // pending: reload received file! |
2866 | } | 2868 | setCaption( i18n("Pi-Sync successful!") ); |
2867 | |||
2868 | |||
2869 | //called by the syncmanager to indicate that the work has to be saved. | ||
2870 | void KABCore::sync_save() | ||
2871 | { | ||
2872 | save(); | ||
2873 | } | 2869 | } |
@@ -2875,2 +2871 @@ void KABCore::sync_save() | |||
2875 | |||
2876 | |||
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index c9c0d38..355e828 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -344,2 +344,3 @@ class KABCore : public QWidget, public KSyncInterface | |||
344 | public slots: | 344 | public slots: |
345 | void getFile( bool success ); | ||
345 | void setDetailsVisible( bool visible ); | 346 | void setDetailsVisible( bool visible ); |
@@ -463,8 +464,2 @@ class KABCore : public QWidget, public KSyncInterface | |||
463 | 464 | ||
464 | //called by the syncmanager to indicate that the work has to marked as dirty. | ||
465 | virtual void sync_setModified(); | ||
466 | //called by the syncmanager to ask if the dirty flag is set. | ||
467 | virtual bool sync_isModified(); | ||
468 | //called by the syncmanager to indicate that the work has to be saved. | ||
469 | virtual void sync_save(); | ||
470 | 465 | ||