-rw-r--r-- | libkdepim/ksyncprefsdialog.cpp | 68 | ||||
-rw-r--r-- | libkdepim/ksyncprefsdialog.h | 10 | ||||
-rw-r--r-- | libkdepim/ksyncprofile.cpp | 7 | ||||
-rw-r--r-- | libkdepim/ksyncprofile.h | 11 |
4 files changed, 93 insertions, 3 deletions
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp index 8873ed1..292cde1 100644 --- a/libkdepim/ksyncprefsdialog.cpp +++ b/libkdepim/ksyncprefsdialog.cpp @@ -243,4 +243,6 @@ void KSyncPrefsDialog::setupSyncAlgTab() mIsLocal = new QRadioButton ( i18n("Local file"), gr ); - mIsPi = new QRadioButton ( i18n("Pi-Sync ( direct Kx/Pi to Kx/Pi sync )"), gr ); + mIsPi = new QRadioButton ( i18n("Pi-Sync - all resources ( direct Kx/Pi to Kx/Pi sync )"), gr ); connect (mIsPi, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); + mIsPiSpecific = new QRadioButton ( i18n("Pi-Sync - selected resources ( direct Kx/Pi to Kx/Pi sync )"), gr ); + connect (mIsPiSpecific, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); mIsNotLocal = new QRadioButton ( i18n("Remote file (w down/upload command)"), gr ); @@ -368,2 +370,12 @@ void KSyncPrefsDialog::setupSyncAlgTab() mRemotePortPWM = new QLineEdit(temphb); + + lab = new QLabel( i18n("Local/remote Resource sync partners"), piWidget); + mTableBox = new QHBox( piWidget ); + mResTableKopi = new QTable( 1, 1, mTableBox ); + mResTableKapi = new QTable( 1, 1, mTableBox ); + mResTablePwmpi = new QTable( 1, 1, mTableBox ); + mResTableKopi->horizontalHeader()->setLabel( 0, i18n("Remote") ); + mResTableKapi->horizontalHeader()->setLabel( 0, i18n("Remote") ); + mResTablePwmpi->horizontalHeader()->setLabel( 0, i18n("Remote") ); + mResTableKopi->setLeftMargin( 80 ); } @@ -374,2 +386,22 @@ void KSyncPrefsDialog::setupSyncAlgTab() +void KSyncPrefsDialog::readResources() +{ + mResourcesKopi.clear(); + mResourcesKapi.clear(); + KConfig fc(locateLocal("config","kopicalendarrc")); + fc.setGroup("CC"); + int numCals = fc.readNumEntry("NumberCalendars",0 ); + int curCal = 1; + while ( curCal <= numCals ) { + QString prefix = "Cal_" +QString::number( curCal ); + QString name = fc.readEntry( prefix+"_Name", "Calendar"); + mResourcesKopi.append( name ); + ++curCal; + } + mResTableKopi->setNumRows( mResourcesKopi.count() ); + int i; + for ( i = 0;i < mResourcesKopi.count(); ++i ) { + mResTableKopi->verticalHeader ()->setLabel( i, mResourcesKopi[i] ); + } +} void KSyncPrefsDialog::readFilter() @@ -475,2 +507,3 @@ void KSyncPrefsDialog::profileChanged( int item ) readFilter(); + readResources(); currentSelection = item; @@ -555,2 +588,3 @@ void KSyncPrefsDialog::profileChanged( int item ) mIsPi->setChecked(prof->getIsPiSync()) ; + mIsPiSpecific->setChecked(prof->getIsPiSyncSpec()) ; mIsKapiFileL->setChecked(prof->getIsKapiFile()) ; @@ -558,3 +592,13 @@ void KSyncPrefsDialog::profileChanged( int item ) - mIsNotLocal->setChecked(!prof->getIsLocalFileSync() && !prof->getIsPhoneSync() &&!prof->getIsPiSync() ); + + QStringList res = QStringList::split( ":",prof->getResSpecKopi()); + int i; + for ( i = 0;i < res.count(); ++i ) { + mResTableKopi->setText( i, 0, res[i] ); + } + res = QStringList::split( ":",prof->getResSpecKapi()); + for ( i = 0;i < res.count(); ++i ) { + mResTableKapi->setText( i, 0, res[i] ); + } + mIsNotLocal->setChecked(!prof->getIsLocalFileSync() && !prof->getIsPhoneSync() &&!prof->getIsPiSync() &&!prof->getIsPiSyncSpec()); proGr->setEnabled( item > 2 ); @@ -621,4 +665,11 @@ void KSyncPrefsDialog::kindChanged( bool b ) } - if ( mIsPi->isChecked () ) { + + if ( mIsPi->isChecked () || mIsPiSpecific->isChecked () ) { piWidget->show(); + if (mIsPiSpecific->isChecked () ) { + mTableBox->show(); + } + else { + mTableBox->hide(); + } } @@ -628,2 +679,3 @@ void KSyncPrefsDialog::kindChanged( bool b ) + } @@ -686,2 +738,3 @@ void KSyncPrefsDialog::saveProfile() prof->setIsPiSync( mIsPi->isChecked() ); + prof->setIsPiSyncSpec( mIsPiSpecific->isChecked() ); prof->setIsKapiFile( mIsKapiFileL->isChecked() ); @@ -699,2 +752,11 @@ void KSyncPrefsDialog::saveProfile() prof->setFilterOutAB ( mFilterOutAB ->currentText ()); + if ( mIsPiSpecific->isChecked() ) { + + QStringList res; + int i; + for ( i = 0;i < mResourcesKopi.count(); ++i ) { + res.append( mResTableKopi->text( i, 0 )); + } + prof->setResSpecKopi( res.join(":")); + } } diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h index 24543e1..e8a9709 100644 --- a/libkdepim/ksyncprefsdialog.h +++ b/libkdepim/ksyncprefsdialog.h @@ -28,2 +28,4 @@ #include <qptrlist.h> +#include <qtable.h> +#include <qhbox.h> @@ -82,2 +84,3 @@ class KSyncPrefsDialog : public KDialog void readFilter(); + void readResources(); private: @@ -88,2 +91,4 @@ class KSyncPrefsDialog : public KDialog QStringList mFilterKopi; + QStringList mResourcesKopi; + QStringList mResourcesKapi; QLineEdit * mMyMachineName; @@ -94,2 +99,3 @@ class KSyncPrefsDialog : public KDialog QRadioButton* mIsPi; + QRadioButton* mIsPiSpecific; QCheckBox* mIncludeInRing; @@ -101,2 +107,6 @@ class KSyncPrefsDialog : public KDialog QButtonGroup* proGr; + QHBox * mTableBox; + QTable* mResTableKopi; + QTable* mResTableKapi; + QTable* mResTablePwmpi; diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp index 0d72fc9..d6620c8 100644 --- a/libkdepim/ksyncprofile.cpp +++ b/libkdepim/ksyncprofile.cpp @@ -134,2 +134,3 @@ void KSyncProfile::setDefault() mIsPiSync = false; + mIsPiSyncSpec = false; mIsKapiFile = false; @@ -197,2 +198,3 @@ void KSyncProfile::readConfig(KConfig *config ) mIsPiSync= config->readBoolEntry( "IsPiSync", mIsPiSync ); + mIsPiSyncSpec= config->readBoolEntry( "IsPiSyncSpec", mIsPiSyncSpec ); mIsKapiFile = config->readBoolEntry( "IsKapiFile", mIsKapiFile ); @@ -203,2 +205,4 @@ void KSyncProfile::readConfig(KConfig *config ) mFilterOutAB = config->readEntry( "FilterOutAB", mFilterOutAB ); + mResSpecKopi = config->readEntry( "ResSpecKopi", mResSpecKopi ); + mResSpecKapi = config->readEntry( "ResSpecKapi", mResSpecKapi ); @@ -267,2 +271,3 @@ void KSyncProfile::writeConfig( KConfig * config ) config->writeEntry( "IsPiSync", mIsPiSync ); + config->writeEntry( "IsPiSyncSpec", mIsPiSyncSpec ); config->writeEntry( "IsKapiFile", mIsKapiFile ); @@ -273,2 +278,4 @@ void KSyncProfile::writeConfig( KConfig * config ) + config->writeEntry( "ResSpecKopi", mResSpecKopi ); + config->writeEntry( "ResSpecKapi", mResSpecKapi ); } diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h index aad63d3..91fcfc5 100644 --- a/libkdepim/ksyncprofile.h +++ b/libkdepim/ksyncprofile.h @@ -146,5 +146,13 @@ class KSyncProfile : public QObject { void setIsPiSync( bool b ) { mIsPiSync= b;} + void setIsPiSyncSpec( bool b ) { mIsPiSyncSpec= b;} bool getIsPiSync( ) { return mIsPiSync;} + bool getIsPiSyncSpec( ) { return mIsPiSyncSpec;} void setIsKapiFile( bool b ) { mIsKapiFile= b;} bool getIsKapiFile( ) { return mIsKapiFile;} + + + QString getResSpecKopi() { return mResSpecKopi;} + QString getResSpecKapi() { return mResSpecKapi;} + void setResSpecKopi( const QString& n ) {mResSpecKopi = n;} + void setResSpecKapi( const QString& n ) {mResSpecKapi = n;} private: @@ -201,3 +209,6 @@ class KSyncProfile : public QObject { bool mIsPiSync; + bool mIsPiSyncSpec; bool mIsKapiFile; + QString mResSpecKopi; + QString mResSpecKapi; }; |