author | zautrix <zautrix> | 2005-11-25 18:35:16 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-11-25 18:35:16 (UTC) |
commit | 231e6f8215bbc4f7e301965f8f3c650e44586ec9 (patch) (unidiff) | |
tree | 4c221ec7ac9909b5f0d192c68558739b4dcc1f48 | |
parent | 279e183c0325cd9565605f60af0215bb9bfdc825 (diff) | |
download | kdepimpi-231e6f8215bbc4f7e301965f8f3c650e44586ec9.zip kdepimpi-231e6f8215bbc4f7e301965f8f3c650e44586ec9.tar.gz kdepimpi-231e6f8215bbc4f7e301965f8f3c650e44586ec9.tar.bz2 |
sync
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 15 | ||||
-rw-r--r-- | libkdepim/ksyncprefsdialog.cpp | 18 | ||||
-rw-r--r-- | libkdepim/ksyncprofile.cpp | 2 |
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 | |||
@@ -318,17 +318,17 @@ void KSyncManager::slotSyncMenu( int action ) | |||
318 | } else if ( temp->getIsPiSync()|| temp->getIsPiSyncSpec()) { | 318 | } else if ( temp->getIsPiSync()|| temp->getIsPiSyncSpec()) { |
319 | mSpecificResources.clear(); | 319 | mSpecificResources.clear(); |
320 | if ( mTargetApp == KAPI ) { | 320 | if ( mTargetApp == KAPI ) { |
321 | mPassWordPiSync = temp->getRemotePwAB(); | 321 | mPassWordPiSync = temp->getRemotePwAB(); |
322 | mActiveSyncPort = temp->getRemotePortAB(); | 322 | mActiveSyncPort = temp->getRemotePortAB(); |
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(); |
330 | } else { | 330 | } else { |
331 | mPassWordPiSync = temp->getRemotePwPWM(); | 331 | mPassWordPiSync = temp->getRemotePwPWM(); |
332 | mActiveSyncPort = temp->getRemotePortPWM(); | 332 | mActiveSyncPort = temp->getRemotePortPWM(); |
333 | mActiveSyncIP = temp->getRemoteIPPWM(); | 333 | mActiveSyncIP = temp->getRemoteIPPWM(); |
334 | } | 334 | } |
@@ -660,17 +660,17 @@ int KSyncManager::ringSync() | |||
660 | syncPhone(); | 660 | syncPhone(); |
661 | } else if ( temp->getIsPiSync() || temp->getIsPiSyncSpec()) { | 661 | } else if ( temp->getIsPiSync() || temp->getIsPiSyncSpec()) { |
662 | mSpecificResources.clear(); | 662 | mSpecificResources.clear(); |
663 | if ( mTargetApp == KAPI ) { | 663 | if ( mTargetApp == KAPI ) { |
664 | mPassWordPiSync = temp->getRemotePwAB(); | 664 | mPassWordPiSync = temp->getRemotePwAB(); |
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(); |
672 | } else { | 672 | } else { |
673 | mPassWordPiSync = temp->getRemotePwPWM(); | 673 | mPassWordPiSync = temp->getRemotePwPWM(); |
674 | mActiveSyncPort = temp->getRemotePortPWM(); | 674 | mActiveSyncPort = temp->getRemotePortPWM(); |
675 | mActiveSyncIP = temp->getRemoteIPPWM(); | 675 | mActiveSyncIP = temp->getRemoteIPPWM(); |
676 | } | 676 | } |
@@ -1136,32 +1136,41 @@ void KSyncManager::syncPi() | |||
1136 | if ( ! ok ) { | 1136 | if ( ! ok ) { |
1137 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); | 1137 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); |
1138 | mPisyncFinished = true; | 1138 | mPisyncFinished = true; |
1139 | return; | 1139 | return; |
1140 | } | 1140 | } |
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() ); |
1156 | while ( !mPisyncFinished ) { | 1164 | while ( !mPisyncFinished ) { |
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 { |
1163 | KCommandSocket* commandSocket = new KCommandSocket( "", mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); | 1172 | KCommandSocket* commandSocket = new KCommandSocket( "", mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); |
1164 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); | 1173 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); |
1165 | commandSocket->readFile( syncFileName() ); | 1174 | commandSocket->readFile( syncFileName() ); |
1166 | } | 1175 | } |
1167 | } | 1176 | } |
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp index 27f7932..744a914 100644 --- a/libkdepim/ksyncprefsdialog.cpp +++ b/libkdepim/ksyncprefsdialog.cpp | |||
@@ -586,24 +586,26 @@ void KSyncPrefsDialog::profileChanged( int item ) | |||
586 | mIsLocal->setChecked(prof->getIsLocalFileSync()) ; | 586 | mIsLocal->setChecked(prof->getIsLocalFileSync()) ; |
587 | mIsPhone->setChecked(prof->getIsPhoneSync()) ; | 587 | mIsPhone->setChecked(prof->getIsPhoneSync()) ; |
588 | mIsPi->setChecked(prof->getIsPiSync()) ; | 588 | mIsPi->setChecked(prof->getIsPiSync()) ; |
589 | mIsPiSpecific->setChecked(prof->getIsPiSyncSpec()) ; | 589 | mIsPiSpecific->setChecked(prof->getIsPiSyncSpec()) ; |
590 | mIsKapiFileL->setChecked(prof->getIsKapiFile()) ; | 590 | mIsKapiFileL->setChecked(prof->getIsKapiFile()) ; |
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 ); |
605 | if ( item < 3 ) { | 607 | if ( item < 3 ) { |
606 | localFileWidget->hide(); | 608 | localFileWidget->hide(); |
607 | remoteFileWidget->hide(); | 609 | remoteFileWidget->hide(); |
608 | phoneWidget->hide(); | 610 | phoneWidget->hide(); |
609 | piWidget->hide(); | 611 | piWidget->hide(); |
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp index d6620c8..b0d3efc 100644 --- a/libkdepim/ksyncprofile.cpp +++ b/libkdepim/ksyncprofile.cpp | |||
@@ -137,16 +137,18 @@ void KSyncProfile::setDefault() | |||
137 | mWriteContactToSIM = false; | 137 | mWriteContactToSIM = false; |
138 | mPhoneDevice = "/dev/ircomm"; | 138 | mPhoneDevice = "/dev/ircomm"; |
139 | mPhoneConnection = "irda"; | 139 | mPhoneConnection = "irda"; |
140 | mPhoneModel = "6310i"; | 140 | mPhoneModel = "6310i"; |
141 | mFilterInCal = "no filter"; | 141 | mFilterInCal = "no filter"; |
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 | } |
146 | void KSyncProfile::readConfig(KConfig *config ) | 148 | void KSyncProfile::readConfig(KConfig *config ) |
147 | { | 149 | { |
148 | if (config) | 150 | if (config) |
149 | { | 151 | { |
150 | 152 | ||
151 | config->setGroup( mName ); | 153 | config->setGroup( mName ); |
152 | 154 | ||