summaryrefslogtreecommitdiffabout
path: root/libkdepim
Unidiff
Diffstat (limited to 'libkdepim') (more/less context) (show whitespace changes)
-rw-r--r--libkdepim/ksyncmanager.cpp15
-rw-r--r--libkdepim/ksyncprefsdialog.cpp18
-rw-r--r--libkdepim/ksyncprofile.cpp2
3 files changed, 24 insertions, 11 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 719d80b..61a9899 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -323,7 +323,7 @@ void KSyncManager::slotSyncMenu( int action )
323 mActiveSyncIP = temp->getRemoteIPAB(); 323 mActiveSyncIP = temp->getRemoteIPAB();
324 } else if ( mTargetApp == KOPI ) { 324 } else if ( mTargetApp == KOPI ) {
325 if ( temp->getIsPiSyncSpec() ) 325 if ( temp->getIsPiSyncSpec() )
326 mSpecificResources = QStringList::split( ":", temp->getResSpecKopi() ); 326 mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true );
327 mPassWordPiSync = temp->getRemotePw(); 327 mPassWordPiSync = temp->getRemotePw();
328 mActiveSyncPort = temp->getRemotePort(); 328 mActiveSyncPort = temp->getRemotePort();
329 mActiveSyncIP = temp->getRemoteIP(); 329 mActiveSyncIP = temp->getRemoteIP();
@@ -665,7 +665,7 @@ int KSyncManager::ringSync()
665 mActiveSyncPort = temp->getRemotePortAB(); 665 mActiveSyncPort = temp->getRemotePortAB();
666 mActiveSyncIP = temp->getRemoteIPAB(); 666 mActiveSyncIP = temp->getRemoteIPAB();
667 } else if ( mTargetApp == KOPI ) { 667 } else if ( mTargetApp == KOPI ) {
668 mSpecificResources = QStringList::split( ":", temp->getResSpecKopi() ); 668 mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true );
669 mPassWordPiSync = temp->getRemotePw(); 669 mPassWordPiSync = temp->getRemotePw();
670 mActiveSyncPort = temp->getRemotePort(); 670 mActiveSyncPort = temp->getRemotePort();
671 mActiveSyncIP = temp->getRemoteIP(); 671 mActiveSyncIP = temp->getRemoteIP();
@@ -1141,15 +1141,23 @@ void KSyncManager::syncPi()
1141 mCurrentResourceLocal = ""; 1141 mCurrentResourceLocal = "";
1142 mCurrentResourceRemote = ""; 1142 mCurrentResourceRemote = "";
1143 if ( mSpecificResources.count() ) { 1143 if ( mSpecificResources.count() ) {
1144 int lastSyncRes = mSpecificResources.count()/2;
1145 int ccc = mSpecificResources.count()-1;
1146 while ( lastSyncRes > 0 && ccc > 0 && mSpecificResources[ ccc ].isEmpty() ) {
1147 --ccc;
1148 --lastSyncRes;
1149 }
1144 int startLocal = 0; 1150 int startLocal = 0;
1145 int startRemote = mSpecificResources.count()/2; 1151 int startRemote = mSpecificResources.count()/2;
1146 emit multiResourceSyncStart( true ); 1152 emit multiResourceSyncStart( true );
1147 while ( startLocal < mSpecificResources.count()/2 ) { 1153 while ( startLocal < mSpecificResources.count()/2 ) {
1148 if ( startLocal+1 >= mSpecificResources.count()/2 ) 1154 if ( startLocal+1 >= lastSyncRes )
1149 emit multiResourceSyncStart( false ); 1155 emit multiResourceSyncStart( false );
1150 mPisyncFinished = false; 1156 mPisyncFinished = false;
1151 mCurrentResourceLocal = mSpecificResources[ startLocal ]; 1157 mCurrentResourceLocal = mSpecificResources[ startLocal ];
1152 mCurrentResourceRemote = mSpecificResources[ startRemote ]; 1158 mCurrentResourceRemote = mSpecificResources[ startRemote ];
1159 if ( !mCurrentResourceRemote.isEmpty() ) {
1160 qDebug ( "KSM: Syncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(), mCurrentResourceRemote.latin1() );
1153 KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote, mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); 1161 KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote, mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() );
1154 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); 1162 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
1155 commandSocket->readFile( syncFileName() ); 1163 commandSocket->readFile( syncFileName() );
@@ -1157,6 +1165,7 @@ void KSyncManager::syncPi()
1157 //qDebug("waiting "); 1165 //qDebug("waiting ");
1158 qApp->processEvents(); 1166 qApp->processEvents();
1159 } 1167 }
1168 }
1160 ++startLocal; 1169 ++startLocal;
1161 } 1170 }
1162 } else { 1171 } else {
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 27f7932..744a914 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -591,14 +591,16 @@ void KSyncPrefsDialog::profileChanged( int item )
591 mIsKapiFileR->setChecked(prof->getIsKapiFile()) ; 591 mIsKapiFileR->setChecked(prof->getIsKapiFile()) ;
592 592
593 593
594 QStringList res = QStringList::split( ":",prof->getResSpecKopi()); 594 QStringList res = QStringList::split( ":",prof->getResSpecKopi(), true );
595 int i= res.count()/2; 595 int add = res.count()/2;
596 for ( ;i < res.count(); ++i ) { 596 int i;
597 mResTableKopi->setText( i, 0, res[i] ); 597 for ( i = 0;i < add ; ++i ) {
598 } 598 mResTableKopi->setText( i, 0, res[i+add] );
599 res = QStringList::split( ":",prof->getResSpecKapi()); 599 }
600 for ( i = 0;i < res.count(); ++i ) { 600 res = QStringList::split( ":",prof->getResSpecKapi(), true);
601 mResTableKapi->setText( i, 0, res[i] ); 601 add = res.count()/2;
602 for ( i = 0;i < add; ++i ) {
603 mResTableKapi->setText( i, 0, res[i+add] );
602 } 604 }
603 mIsNotLocal->setChecked(!prof->getIsLocalFileSync() && !prof->getIsPhoneSync() &&!prof->getIsPiSync() &&!prof->getIsPiSyncSpec()); 605 mIsNotLocal->setChecked(!prof->getIsLocalFileSync() && !prof->getIsPhoneSync() &&!prof->getIsPiSync() &&!prof->getIsPiSyncSpec());
604 proGr->setEnabled( item > 2 ); 606 proGr->setEnabled( item > 2 );
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index d6620c8..b0d3efc 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -142,6 +142,8 @@ void KSyncProfile::setDefault()
142 mFilterOutCal = "no filter"; 142 mFilterOutCal = "no filter";
143 mFilterInAB = "no filter"; 143 mFilterInAB = "no filter";
144 mFilterOutAB = "no filter"; 144 mFilterOutAB = "no filter";
145 mResSpecKopi = "";
146 mResSpecKapi = "";
145} 147}
146void KSyncProfile::readConfig(KConfig *config ) 148void KSyncProfile::readConfig(KConfig *config )
147{ 149{