summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/ksyncprefsdialog.cpp70
-rw-r--r--libkdepim/ksyncprefsdialog.h15
-rw-r--r--libkdepim/ksyncprofile.cpp49
-rw-r--r--libkdepim/ksyncprofile.h37
4 files changed, 169 insertions, 2 deletions
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 28aac45..f05c846 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -192,2 +192,4 @@ void KSyncPrefsDialog::setupSyncAlgTab()
mIsLocal = new QRadioButton ( i18n("Local file"), gr );
+ mIsPi = new QRadioButton ( i18n("Quick Pi-Sync"), gr );
+ connect (mIsPi, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) );
mIsNotLocal = new QRadioButton ( i18n("Remote file (w down/upload command)"), gr );
@@ -195,3 +197,3 @@ void KSyncPrefsDialog::setupSyncAlgTab()
mIsPhone = new QRadioButton ( i18n("Mobile device (cell phone)"), gr );
- connect (mIsPhone, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) );
+ connect (mIsPhone, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) );
@@ -278,5 +280,36 @@ void KSyncPrefsDialog::setupSyncAlgTab()
lab = new QLabel( i18n("Hint: Use $PWD$ for placeholder of password!"), remoteFileWidget);
-
+
+ // *** pi-sync
+ piWidget = new QVBox( topFrame);
+ topLayout->addMultiCellWidget(piWidget, iii,iii,0,1);
+ ++iii;
+ temphb = new QHBox( piWidget );
+ new QLabel( i18n("Calendar:"), temphb);
+ new QLabel( i18n("AddressBook:"), temphb);
+ new QLabel( i18n("PWManager:"), temphb);
+
+ lab = new QLabel( i18n("Password for remote access:"), piWidget);
+ temphb = new QHBox( piWidget );
+ mRemotePw = new QLineEdit(temphb);
+ mRemotePwAB = new QLineEdit(temphb);
+ mRemotePwPWM = new QLineEdit(temphb);
+
+ lab = new QLabel( i18n("Remote IP address:"), piWidget);
+ temphb = new QHBox( piWidget );
+ mRemoteIP = new QLineEdit(temphb);
+ mRemoteIPAB = new QLineEdit(temphb);
+ mRemoteIPPWM = new QLineEdit(temphb);
+
+ lab = new QLabel( i18n("Remote port number:"), piWidget);
+ temphb = new QHBox( piWidget );
+ mRemotePort = new QLineEdit(temphb);
+ mRemotePortAB = new QLineEdit(temphb);
+ mRemotePortPWM = new QLineEdit(temphb);
}
+
+
+
+
+
void KSyncPrefsDialog::slotOK()
@@ -355,2 +388,15 @@ void KSyncPrefsDialog::profileChanged( int item )
prof = mSyncProfiles.at(item) ;
+
+ mRemotePw->setText(prof->getRemotePw());
+ mRemoteIP->setText(prof->getRemoteIP());
+ mRemotePort->setText(prof->getRemotePort());
+
+ mRemotePwAB->setText(prof->getRemotePwAB());
+ mRemoteIPAB->setText(prof->getRemoteIPAB());
+ mRemotePortAB->setText(prof->getRemotePortAB());
+
+ mRemotePwPWM->setText(prof->getRemotePwPWM());
+ mRemoteIPPWM->setText(prof->getRemoteIPPWM());
+ mRemotePortPWM->setText(prof->getRemotePortPWM());
+
mRemotePrecommand->setText(prof->getPreSyncCommand());
@@ -418,2 +464,3 @@ void KSyncPrefsDialog::profileChanged( int item )
phoneWidget->hide();
+ piWidget->hide();
@@ -468,2 +515,8 @@ void KSyncPrefsDialog::kindChanged( bool b )
}
+ if ( mIsPi->isChecked () ) {
+ piWidget->show();
+ }
+ else {
+ piWidget->hide();
+ }
@@ -490,2 +543,15 @@ void KSyncPrefsDialog::saveProfile()
prof = mSyncProfiles.at(currentSelection) ;
+
+ prof->setRemotePw( mRemotePw->text());
+ prof->setRemoteIP( mRemoteIP->text());
+ prof->setRemotePort( mRemotePort->text());
+
+ prof->setRemotePwAB( mRemotePwAB->text());
+ prof->setRemoteIPAB( mRemoteIPAB->text());
+ prof->setRemotePortAB( mRemotePortAB->text());
+
+ prof->setRemotePwPWM( mRemotePwPWM->text());
+ prof->setRemoteIPPWM( mRemoteIPPWM->text());
+ prof->setRemotePortPWM( mRemotePortPWM->text());
+
prof->setPreSyncCommand( mRemotePrecommand->text());
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h
index 8094bdd..d3f8f4c 100644
--- a/libkdepim/ksyncprefsdialog.h
+++ b/libkdepim/ksyncprefsdialog.h
@@ -92,2 +92,3 @@ class KSyncPrefsDialog : public KDialog
QRadioButton* mIsPhone;
+ QRadioButton* mIsPi;
QCheckBox* mIncludeInRing;
@@ -118,2 +119,15 @@ class KSyncPrefsDialog : public KDialog
+
+ QLineEdit * mRemotePw;
+ QLineEdit * mRemoteIP;
+ QLineEdit * mRemotePort;
+
+ QLineEdit * mRemotePwAB;
+ QLineEdit * mRemoteIPAB;
+ QLineEdit * mRemotePortAB;
+
+ QLineEdit * mRemotePwPWM;
+ QLineEdit * mRemoteIPPWM;
+ QLineEdit * mRemotePortPWM;
+
QLineEdit * mPhoneDevice;
@@ -126,2 +140,3 @@ class KSyncPrefsDialog : public KDialog
QVBox* phoneWidget;
+ QVBox* piWidget;
QCheckBox* mWriteBackFile;
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index 2bf4e6c..76dfe00 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -45,2 +45,11 @@ KSyncProfile* KSyncProfile::clone()
KSyncProfile* myClone = new KSyncProfile();
+ myClone->setRemotePw(mRemotePw);
+ myClone->setRemoteIP(mRemoteIP);
+ myClone->setRemotePort(mRemotePort);
+ myClone->setRemotePwAB(mRemotePwAB);
+ myClone->setRemoteIPAB(mRemoteIPAB);
+ myClone->setRemotePortAB(mRemotePortAB);
+ myClone->setRemotePwPWM(mRemotePwPWM);
+ myClone->setRemoteIPPWM(mRemoteIPPWM);
+ myClone->setRemotePortPWM (mRemotePortPWM);
myClone->setPreSyncCommand( mPreSyncCommand );
@@ -69,2 +78,3 @@ KSyncProfile* KSyncProfile::clone()
myClone->setIsPhoneSync( mIsPhoneSync );
+ myClone->setIsPiSync( mIsPiSync );
myClone->setWriteContactToSIM( mWriteContactToSIM );
@@ -90,2 +100,15 @@ void KSyncProfile::setDefault()
mRemoteFileNamePWM = "/home/polo/kdepim/apps/pwmanager/localfile.pwm";
+
+ mRemotePw = "abc";
+ mRemoteIP = "192.168.0.99";
+ mRemotePort = "9197";
+
+ mRemotePwAB = "abc";
+ mRemoteIPAB = "192.168.0.99";
+ mRemotePortAB = "9198";
+
+ mRemotePwPWM = "abc";
+ mRemoteIPPWM = "192.168.0.99";
+ mRemotePortPWM = "9199";
+
mShowSummaryAfterSync = true;
@@ -103,2 +126,3 @@ void KSyncProfile::setDefault()
mIsPhoneSync = false;
+ mIsPiSync = false;
mWriteContactToSIM = false;
@@ -116,2 +140,13 @@ void KSyncProfile::readConfig(KConfig *config )
mName = config->readEntry( "Name", mName );
+
+ mRemotePw = config->readEntry( "RemotePw",mRemotePw );
+ mRemoteIP = config->readEntry( "RemoteIP",mRemoteIP );
+ mRemotePort = config->readEntry( "RemotePort", mRemotePort );
+ mRemotePwAB = config->readEntry( "RemotePwAB", mRemotePwAB );
+ mRemoteIPAB = config->readEntry( "RemoteIPAB", mRemoteIPAB );
+ mRemotePortAB = config->readEntry( "RemotePortAB", mRemotePortAB );
+ mRemotePwPWM = config->readEntry( "RemotePwPWM", mRemotePwPWM );
+ mRemoteIPPWM = config->readEntry( "RemoteIPPWM", mRemoteIPPWM );
+ mRemotePortPWM = config->readEntry( "RemotePortPWM", mRemotePortPWM );
+
mPreSyncCommand = config->readEntry( "PreSyncCommand",mPreSyncCommand );
@@ -148,2 +183,3 @@ void KSyncProfile::readConfig(KConfig *config )
mIsPhoneSync= config->readBoolEntry( "IsPhoneSync", mIsPhoneSync );
+ mIsPiSync= config->readBoolEntry( "IsPiSync", mIsPiSync );
}
@@ -164,2 +200,14 @@ void KSyncProfile::writeConfig( KConfig * config )
+ config->writeEntry( "RemotePw", mRemotePw);
+ config->writeEntry( "RemoteIP", mRemoteIP);
+ config->writeEntry( "RemotePort", mRemotePort);
+
+ config->writeEntry( "RemotePwAB", mRemotePwAB);
+ config->writeEntry( "RemoteIPAB", mRemoteIPAB);
+ config->writeEntry( "RemotePortAB", mRemotePortAB);
+
+ config->writeEntry( "RemotePwPWM", mRemotePwPWM);
+ config->writeEntry( "RemoteIPPWM", mRemoteIPPWM);
+ config->writeEntry( "RemotePortPWM", mRemotePortPWM);
+
config->writeEntry( "Name", mName );
@@ -197,2 +245,3 @@ void KSyncProfile::writeConfig( KConfig * config )
config->writeEntry( "IsPhoneSync", mIsPhoneSync );
+ config->writeEntry( "IsPiSync", mIsPiSync );
}
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h
index a81a9ad..6a68bd7 100644
--- a/libkdepim/ksyncprofile.h
+++ b/libkdepim/ksyncprofile.h
@@ -47,2 +47,23 @@ class KSyncProfile : public QObject {
+ void setRemotePw( const QString& n ) {mRemotePw = n;}
+ QString getRemotePw( ) { return mRemotePw; }
+ void setRemotePwAB( const QString& n ) {mRemotePwAB = n;}
+ QString getRemotePwAB( ) { return mRemotePwAB; }
+ void setRemotePwPWM( const QString& n ) {mRemotePwPWM = n;}
+ QString getRemotePwPWM( ) { return mRemotePwPWM; }
+
+ void setRemoteIP( const QString& n ) {mRemoteIP = n;}
+ QString getRemoteIP( ) { return mRemoteIP; }
+ void setRemoteIPAB( const QString& n ) {mRemoteIPAB = n;}
+ QString getRemoteIPAB( ) { return mRemoteIPAB; }
+ void setRemoteIPPWM( const QString& n ) {mRemoteIPPWM = n;}
+ QString getRemoteIPPWM( ) { return mRemoteIPPWM; }
+
+ void setRemotePort( const QString& n ) {mRemotePort = n;}
+ QString getRemotePort( ) { return mRemotePort; }
+ void setRemotePortAB( const QString& n ) {mRemotePortAB = n;}
+ QString getRemotePortAB( ) { return mRemotePortAB; }
+ void setRemotePortPWM( const QString& n ) {mRemotePortPWM = n;}
+ QString getRemotePortPWM( ) { return mRemotePortPWM; }
+
void setPreSyncCommand( const QString& n ) {mPreSyncCommand = n;}
@@ -113,2 +134,4 @@ class KSyncProfile : public QObject {
bool getIsPhoneSync( ) { return mIsPhoneSync;}
+ void setIsPiSync( bool b ) { mIsPiSync= b;}
+ bool getIsPiSync( ) { return mIsPiSync;}
private:
@@ -128,2 +151,14 @@ class KSyncProfile : public QObject {
+ QString mRemotePw;
+ QString mRemoteIP;
+ QString mRemotePort;
+
+ QString mRemotePwAB;
+ QString mRemoteIPAB;
+ QString mRemotePortAB;
+
+ QString mRemotePwPWM;
+ QString mRemoteIPPWM;
+ QString mRemotePortPWM;
+
QString mPhoneDevice;
@@ -145,2 +180,4 @@ class KSyncProfile : public QObject {
bool mWriteContactToSIM;
+
+ bool mIsPiSync;
};