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
@@ -187,16 +187,18 @@ void KSyncPrefsDialog::setupSyncAlgTab()
proGr = new QButtonGroup ( 1, Qt::Horizontal, i18n("Profile kind"), topFrame);
gr = proGr;
topLayout->addMultiCellWidget(gr, iii,iii,0,1);
++iii;
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 );
connect (mIsLocal, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) );
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) ) );
phoneWidget = new QVBox( topFrame);
topLayout->addMultiCellWidget(phoneWidget, iii,iii,0,1);
++iii;
mWriteContactToSIM= new QCheckBox( i18n("Sync contacts with phone SIM card (If not, sync with phone memory)"), phoneWidget );
@@ -273,15 +275,46 @@ void KSyncPrefsDialog::setupSyncAlgTab()
temphb = new QHBox( remoteFileWidget );
button = new QPushButton( i18n("ssh/scp"), temphb );
connect ( button, SIGNAL( clicked()), this, SLOT (fillSSH() ) );
button = new QPushButton( i18n("ftp"), temphb );
connect ( button, SIGNAL( clicked()), this, SLOT (fillFTP() ) );
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()
{
if ( mMyMachineName->text() == "undefined" ) {
KMessageBox::error(this,i18n("Local device name undefined!\nPlease define device name!"),i18n("KO/Pi config error"));
return;
}
@@ -350,12 +383,25 @@ void KSyncPrefsDialog::profileChanged( int item )
{
//qDebug("KSyncPrefsDialog::profileChanged before %d, count %d ", item, mProfileBox->count() );
KSyncProfile* prof;
saveProfile();
currentSelection = 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());
mRemotePostcommand->setText(prof->getPostSyncCommand());
mLocalTempFile->setText(prof->getLocalTempFile());
mRemoteFile->setText(prof->getRemoteFileName()) ;
mRemotePrecommandAB->setText(prof->getPreSyncCommandAB());
@@ -413,12 +459,13 @@ void KSyncPrefsDialog::profileChanged( int item )
mIsNotLocal->setChecked(!prof->getIsLocalFileSync() && !prof->getIsPhoneSync() );
proGr->setEnabled( item > 2 );
if ( item < 3 ) {
localFileWidget->hide();
remoteFileWidget->hide();
phoneWidget->hide();
+ piWidget->hide();
} else
kindChanged( prof->getIsLocalFileSync() );
}
void KSyncPrefsDialog::fillSSH()
@@ -463,12 +510,18 @@ void KSyncPrefsDialog::kindChanged( bool b )
if ( mIsPhone->isChecked () ) {
phoneWidget->show();
}
else {
phoneWidget->hide();
}
+ if ( mIsPi->isChecked () ) {
+ piWidget->show();
+ }
+ else {
+ piWidget->hide();
+ }
}
void KSyncPrefsDialog::deleteProfile()
{
//qDebug("KSyncPrefsDialog::deleteProfile() ");
if ( currentSelection >= 0 ) {
@@ -485,12 +538,25 @@ void KSyncPrefsDialog::deleteProfile()
void KSyncPrefsDialog::saveProfile()
{
KSyncProfile* prof;
if ( currentSelection >= 0 ) {
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());
prof->setPostSyncCommand( mRemotePostcommand->text() );
prof->setLocalTempFile( mLocalTempFile->text());
prof->setRemoteFileName( mRemoteFile->text() );
prof->setPreSyncCommandAB( mRemotePrecommandAB->text());
prof->setPostSyncCommandAB( mRemotePostcommandAB->text() );
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h
index 8094bdd..d3f8f4c 100644
--- a/libkdepim/ksyncprefsdialog.h
+++ b/libkdepim/ksyncprefsdialog.h
@@ -87,12 +87,13 @@ class KSyncPrefsDialog : public KDialog
QStringList mSyncProfileNames;
QLineEdit * mMyMachineName;
QComboBox * mProfileBox;
QRadioButton* mIsLocal;
QRadioButton* mIsNotLocal;
QRadioButton* mIsPhone;
+ QRadioButton* mIsPi;
QCheckBox* mIncludeInRing;
QCheckBox* mIncludeInRingAB;
QCheckBox* mIncludeInRingPWM;
void addProfile ( KSyncProfile* );
void insertProfiles();
void saveProfile();
@@ -113,20 +114,34 @@ class KSyncPrefsDialog : public KDialog
QLineEdit * mRemotePostcommandPWM;
QLineEdit * mRemotePrecommandPWM;
QLineEdit * mRemoteFilePWM;
QLineEdit * mLocalTempFilePWM;
+
+ QLineEdit * mRemotePw;
+ QLineEdit * mRemoteIP;
+ QLineEdit * mRemotePort;
+
+ QLineEdit * mRemotePwAB;
+ QLineEdit * mRemoteIPAB;
+ QLineEdit * mRemotePortAB;
+
+ QLineEdit * mRemotePwPWM;
+ QLineEdit * mRemoteIPPWM;
+ QLineEdit * mRemotePortPWM;
+
QLineEdit * mPhoneDevice;
QLineEdit * mPhoneConnection;
QLineEdit * mPhoneModel;
QWidget* mSetupSyncAlgTab;
QVBox* localFileWidget;
QVBox* remoteFileWidget;
QVBox* phoneWidget;
+ QVBox* piWidget;
QCheckBox* mWriteBackFile;
QCheckBox* mWriteBackFuture;
QSpinBox* mWriteBackFutureWeeks;
QCheckBox* mWriteBackExisting;
QCheckBox* mAskForPreferences;
QCheckBox* mShowSummaryAfterSync;
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index 2bf4e6c..76dfe00 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -40,12 +40,21 @@ KSyncProfile::~KSyncProfile()
}
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 );
myClone->setPostSyncCommand( mPostSyncCommand );
myClone->setLocalTempFile( mLocalTempFile);
myClone->setRemoteFileName( mRemoteFileName );
myClone->setPreSyncCommandAB( mPreSyncCommandAB );
myClone->setPostSyncCommandAB( mPostSyncCommandAB );
@@ -64,12 +73,13 @@ KSyncProfile* KSyncProfile::clone()
myClone->setIncludeInRingSync( mIncludeInRingSync );
myClone->setIncludeInRingSyncAB( mIncludeInRingSyncAB );
myClone->setIncludeInRingSyncPWM( mIncludeInRingSyncPWM );
myClone->setSyncPrefs( mSyncPrefs);
myClone->setIsLocalFileSync( mIsLocalFileSync );
myClone->setIsPhoneSync( mIsPhoneSync );
+ myClone->setIsPiSync( mIsPiSync );
myClone->setWriteContactToSIM( mWriteContactToSIM );
myClone->setName( "noName" );
//myClone->setIdentifier( "noID" );
return myClone;
}
@@ -85,12 +95,25 @@ void KSyncProfile::setDefault()
mLocalTempFileAB = "/tmp/std.vcf";
mRemoteFileNameAB = "/home/polo/kdepim/apps/kabc/localfile.vcf";
mPreSyncCommandPWM = i18n("command for downloading remote file to local device");
mPostSyncCommandPWM = i18n("command for uploading local temp file to remote device");
mLocalTempFilePWM = "/tmp/passwords.pwm";
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;
mAskForPreferences = true;
mWriteBackExisting = false;
mWriteBackFuture = false;
mWriteBackFutureWeeks = 12;
mWriteBackFile = true;
@@ -98,12 +121,13 @@ void KSyncProfile::setDefault()
mIncludeInRingSyncAB = false;
mIncludeInRingSyncPWM = false;
mSyncPrefs = SYNC_PREF_ASK;
mIsLocalFileSync = true;
mName = "noName";
mIsPhoneSync = false;
+ mIsPiSync = false;
mWriteContactToSIM = false;
mPhoneDevice = "/dev/ircomm";
mPhoneConnection = "irda";
mPhoneModel = "6310i";
}
void KSyncProfile::readConfig(KConfig *config )
@@ -111,12 +135,23 @@ void KSyncProfile::readConfig(KConfig *config )
if (config)
{
config->setGroup( mName );
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 );
mPostSyncCommand = config->readEntry( "PostSyncCommand", mPostSyncCommand );
mLocalTempFile = config->readEntry( "LocalTempFile", mLocalTempFile );
mRemoteFileName = config->readEntry( "RemoteFileName", mRemoteFileName );
mPreSyncCommandAB = config->readEntry( "PreSyncCommandAB",mPreSyncCommandAB );
@@ -143,12 +178,13 @@ void KSyncProfile::readConfig(KConfig *config )
mWriteBackFile = config->readBoolEntry( "WriteBackFile",mWriteBackFile );
mWriteContactToSIM = config->readBoolEntry( "WriteContactToSIM",mWriteContactToSIM );
mSyncPrefs = config->readNumEntry( "SyncPrefs", mSyncPrefs );
mWriteBackFutureWeeks = config->readNumEntry( "WriteBackFutureWeeks", mWriteBackFutureWeeks );
mIsLocalFileSync= config->readBoolEntry( "IsLocalFileSync", mIsLocalFileSync );
mIsPhoneSync= config->readBoolEntry( "IsPhoneSync", mIsPhoneSync );
+ mIsPiSync= config->readBoolEntry( "IsPiSync", mIsPiSync );
}
else
{
setDefault();
}
}
@@ -159,12 +195,24 @@ void KSyncProfile::deleteConfig(KConfig *config )
}
void KSyncProfile::writeConfig( KConfig * config )
{
config->setGroup(mName);
+ 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 );
config->writeEntry( "PreSyncCommand",mPreSyncCommand );
config->writeEntry( "PostSyncCommand", mPostSyncCommand );
config->writeEntry( "LocalTempFile", mLocalTempFile );
config->writeEntry( "RemoteFileName", mRemoteFileName );
@@ -192,8 +240,9 @@ void KSyncProfile::writeConfig( KConfig * config )
config->writeEntry( "WriteBackFile",mWriteBackFile );
config->writeEntry( "WriteContactToSIM",mWriteContactToSIM );
config->writeEntry( "SyncPrefs", mSyncPrefs );
config->writeEntry( "WriteBackFutureWeeks", mWriteBackFutureWeeks);
config->writeEntry( "IsLocalFileSync", mIsLocalFileSync );
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
@@ -42,12 +42,33 @@ class KSyncProfile : public QObject {
KSyncProfile* clone();
void setDefault();
void readConfig(KConfig *);
void writeConfig(KConfig *);
void deleteConfig(KConfig *);
+ 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;}
QString getPreSyncCommand( ) { return mPreSyncCommand; }
void setPostSyncCommand( const QString& n ) {mPostSyncCommand = n;}
QString getPostSyncCommand( ) { return mPostSyncCommand;}
void setLocalTempFile( const QString& n ) { mLocalTempFile= n;}
QString getLocalTempFile( ) { return mLocalTempFile;}
@@ -108,12 +129,14 @@ class KSyncProfile : public QObject {
void setWriteBackFutureWeeks( int n ) { mWriteBackFutureWeeks= n;}
int getWriteBackFutureWeeks( ) { return mWriteBackFutureWeeks;}
void setIsLocalFileSync( bool b ) { mIsLocalFileSync= b;}
bool getIsLocalFileSync( ) { return mIsLocalFileSync;}
void setIsPhoneSync( bool b ) { mIsPhoneSync= b;}
bool getIsPhoneSync( ) { return mIsPhoneSync;}
+ void setIsPiSync( bool b ) { mIsPiSync= b;}
+ bool getIsPiSync( ) { return mIsPiSync;}
private:
QString mName;
QString mPreSyncCommand;
QString mPostSyncCommand;
QString mLocalTempFile;
QString mRemoteFileName;
@@ -123,12 +146,24 @@ class KSyncProfile : public QObject {
QString mRemoteFileNameAB;
QString mPreSyncCommandPWM;
QString mPostSyncCommandPWM;
QString mLocalTempFilePWM;
QString mRemoteFileNamePWM;
+ QString mRemotePw;
+ QString mRemoteIP;
+ QString mRemotePort;
+
+ QString mRemotePwAB;
+ QString mRemoteIPAB;
+ QString mRemotePortAB;
+
+ QString mRemotePwPWM;
+ QString mRemoteIPPWM;
+ QString mRemotePortPWM;
+
QString mPhoneDevice;
QString mPhoneConnection;
QString mPhoneModel;
bool mIncludeInRingSync;
bool mIncludeInRingSyncAB;
@@ -140,9 +175,11 @@ class KSyncProfile : public QObject {
int mWriteBackFutureWeeks;
bool mAskForPreferences;
bool mShowSummaryAfterSync;
bool mIsLocalFileSync;
bool mIsPhoneSync;
bool mWriteContactToSIM;
+
+ bool mIsPiSync;
};
#endif