-rw-r--r-- | kaddressbook/kabcore.cpp | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index d9eb391..83fede4 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1674,24 +1674,28 @@ void KABCore::initGUI() | |||
1674 | 1674 | ||
1675 | mDetails = new ViewContainer( this ); | 1675 | mDetails = new ViewContainer( this ); |
1676 | 1676 | ||
1677 | topLayout->addWidget( viewSpace ); | 1677 | topLayout->addWidget( viewSpace ); |
1678 | // topLayout->setStretchFactor( mDetailsSplitter, 100 ); | 1678 | // topLayout->setStretchFactor( mDetailsSplitter, 100 ); |
1679 | topLayout->addWidget( mDetails ); | 1679 | topLayout->addWidget( mDetails ); |
1680 | #endif //KAB_NOSPLITTER | 1680 | #endif //KAB_NOSPLITTER |
1681 | */ | 1681 | */ |
1682 | 1682 | ||
1683 | syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu); | 1683 | syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu); |
1684 | syncManager->setBlockSave(false); | 1684 | syncManager->setBlockSave(false); |
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 | ||
1687 | #endif //KAB_EMBEDDED | 1691 | #endif //KAB_EMBEDDED |
1688 | initActions(); | 1692 | initActions(); |
1689 | 1693 | ||
1690 | #ifdef KAB_EMBEDDED | 1694 | #ifdef KAB_EMBEDDED |
1691 | addActionsManually(); | 1695 | addActionsManually(); |
1692 | //US make sure the export and import menues are initialized before creating the xxPortManager. | 1696 | //US make sure the export and import menues are initialized before creating the xxPortManager. |
1693 | mXXPortManager = new XXPortManager( this, this ); | 1697 | mXXPortManager = new XXPortManager( this, this ); |
1694 | 1698 | ||
1695 | // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() ); | 1699 | // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() ); |
1696 | //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget); | 1700 | //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget); |
1697 | // mActionQuit->plug ( mMainWindow->toolBar()); | 1701 | // mActionQuit->plug ( mMainWindow->toolBar()); |
@@ -2828,49 +2832,40 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) | |||
2828 | 2832 | ||
2829 | //this is a overwritten callbackmethods from the syncinterface | 2833 | //this is a overwritten callbackmethods from the syncinterface |
2830 | bool KABCore::syncExternal(KSyncManager* manager, QString resource) | 2834 | bool KABCore::syncExternal(KSyncManager* manager, QString resource) |
2831 | { | 2835 | { |
2832 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); | 2836 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); |
2833 | 2837 | ||
2834 | AddressBook abLocal( resource,"syncContact"); | 2838 | AddressBook abLocal( resource,"syncContact"); |
2835 | bool syncOK = false; | 2839 | bool syncOK = false; |
2836 | if ( abLocal.load() ) { | 2840 | if ( abLocal.load() ) { |
2837 | qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1()); | 2841 | qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1()); |
2838 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 2842 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
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 ); |
2842 | if ( syncOK ) { | 2845 | if ( syncOK ) { |
2843 | if ( syncManager->mWriteBackFile ) { | 2846 | if ( syncManager->mWriteBackFile ) { |
2844 | abLocal.saveAB(); | 2847 | abLocal.saveAB(); |
2845 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ); | 2848 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ); |
2846 | } | 2849 | } |
2847 | } | 2850 | } |
2848 | setModified(); | 2851 | setModified(); |
2849 | } | 2852 | } |
2850 | if ( syncOK ) | 2853 | if ( syncOK ) |
2851 | mViewManager->refreshView(); | 2854 | mViewManager->refreshView(); |
2852 | return syncOK; | 2855 | return syncOK; |
2853 | 2856 | ||
2854 | } | 2857 | } |
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 | } |
2874 | 2870 | ||
2875 | 2871 | ||
2876 | |||