-rw-r--r-- | libkdepim/ksyncprefsdialog.cpp | 66 | ||||
-rw-r--r-- | libkdepim/ksyncprefsdialog.h | 15 | ||||
-rw-r--r-- | libkdepim/ksyncprofile.cpp | 49 | ||||
-rw-r--r-- | libkdepim/ksyncprofile.h | 37 |
4 files changed, 167 insertions, 0 deletions
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp index 28aac45..f05c846 100644 --- a/libkdepim/ksyncprefsdialog.cpp +++ b/libkdepim/ksyncprefsdialog.cpp | |||
@@ -191,4 +191,6 @@ void KSyncPrefsDialog::setupSyncAlgTab() | |||
191 | ++iii; | 191 | ++iii; |
192 | mIsLocal = new QRadioButton ( i18n("Local file"), gr ); | 192 | mIsLocal = new QRadioButton ( i18n("Local file"), gr ); |
193 | mIsPi = new QRadioButton ( i18n("Quick Pi-Sync"), gr ); | ||
194 | connect (mIsPi, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); | ||
193 | mIsNotLocal = new QRadioButton ( i18n("Remote file (w down/upload command)"), gr ); | 195 | mIsNotLocal = new QRadioButton ( i18n("Remote file (w down/upload command)"), gr ); |
194 | connect (mIsLocal, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); | 196 | connect (mIsLocal, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); |
@@ -278,6 +280,37 @@ void KSyncPrefsDialog::setupSyncAlgTab() | |||
278 | lab = new QLabel( i18n("Hint: Use $PWD$ for placeholder of password!"), remoteFileWidget); | 280 | lab = new QLabel( i18n("Hint: Use $PWD$ for placeholder of password!"), remoteFileWidget); |
279 | 281 | ||
282 | // *** pi-sync | ||
283 | piWidget = new QVBox( topFrame); | ||
284 | topLayout->addMultiCellWidget(piWidget, iii,iii,0,1); | ||
285 | ++iii; | ||
286 | temphb = new QHBox( piWidget ); | ||
287 | new QLabel( i18n("Calendar:"), temphb); | ||
288 | new QLabel( i18n("AddressBook:"), temphb); | ||
289 | new QLabel( i18n("PWManager:"), temphb); | ||
290 | |||
291 | lab = new QLabel( i18n("Password for remote access:"), piWidget); | ||
292 | temphb = new QHBox( piWidget ); | ||
293 | mRemotePw = new QLineEdit(temphb); | ||
294 | mRemotePwAB = new QLineEdit(temphb); | ||
295 | mRemotePwPWM = new QLineEdit(temphb); | ||
296 | |||
297 | lab = new QLabel( i18n("Remote IP address:"), piWidget); | ||
298 | temphb = new QHBox( piWidget ); | ||
299 | mRemoteIP = new QLineEdit(temphb); | ||
300 | mRemoteIPAB = new QLineEdit(temphb); | ||
301 | mRemoteIPPWM = new QLineEdit(temphb); | ||
302 | |||
303 | lab = new QLabel( i18n("Remote port number:"), piWidget); | ||
304 | temphb = new QHBox( piWidget ); | ||
305 | mRemotePort = new QLineEdit(temphb); | ||
306 | mRemotePortAB = new QLineEdit(temphb); | ||
307 | mRemotePortPWM = new QLineEdit(temphb); | ||
280 | 308 | ||
281 | } | 309 | } |
310 | |||
311 | |||
312 | |||
313 | |||
314 | |||
282 | void KSyncPrefsDialog::slotOK() | 315 | void KSyncPrefsDialog::slotOK() |
283 | { | 316 | { |
@@ -354,4 +387,17 @@ void KSyncPrefsDialog::profileChanged( int item ) | |||
354 | currentSelection = item; | 387 | currentSelection = item; |
355 | prof = mSyncProfiles.at(item) ; | 388 | prof = mSyncProfiles.at(item) ; |
389 | |||
390 | mRemotePw->setText(prof->getRemotePw()); | ||
391 | mRemoteIP->setText(prof->getRemoteIP()); | ||
392 | mRemotePort->setText(prof->getRemotePort()); | ||
393 | |||
394 | mRemotePwAB->setText(prof->getRemotePwAB()); | ||
395 | mRemoteIPAB->setText(prof->getRemoteIPAB()); | ||
396 | mRemotePortAB->setText(prof->getRemotePortAB()); | ||
397 | |||
398 | mRemotePwPWM->setText(prof->getRemotePwPWM()); | ||
399 | mRemoteIPPWM->setText(prof->getRemoteIPPWM()); | ||
400 | mRemotePortPWM->setText(prof->getRemotePortPWM()); | ||
401 | |||
356 | mRemotePrecommand->setText(prof->getPreSyncCommand()); | 402 | mRemotePrecommand->setText(prof->getPreSyncCommand()); |
357 | mRemotePostcommand->setText(prof->getPostSyncCommand()); | 403 | mRemotePostcommand->setText(prof->getPostSyncCommand()); |
@@ -417,4 +463,5 @@ void KSyncPrefsDialog::profileChanged( int item ) | |||
417 | remoteFileWidget->hide(); | 463 | remoteFileWidget->hide(); |
418 | phoneWidget->hide(); | 464 | phoneWidget->hide(); |
465 | piWidget->hide(); | ||
419 | 466 | ||
420 | } else | 467 | } else |
@@ -467,4 +514,10 @@ void KSyncPrefsDialog::kindChanged( bool b ) | |||
467 | phoneWidget->hide(); | 514 | phoneWidget->hide(); |
468 | } | 515 | } |
516 | if ( mIsPi->isChecked () ) { | ||
517 | piWidget->show(); | ||
518 | } | ||
519 | else { | ||
520 | piWidget->hide(); | ||
521 | } | ||
469 | 522 | ||
470 | } | 523 | } |
@@ -489,4 +542,17 @@ void KSyncPrefsDialog::saveProfile() | |||
489 | if ( currentSelection >= 0 ) { | 542 | if ( currentSelection >= 0 ) { |
490 | prof = mSyncProfiles.at(currentSelection) ; | 543 | prof = mSyncProfiles.at(currentSelection) ; |
544 | |||
545 | prof->setRemotePw( mRemotePw->text()); | ||
546 | prof->setRemoteIP( mRemoteIP->text()); | ||
547 | prof->setRemotePort( mRemotePort->text()); | ||
548 | |||
549 | prof->setRemotePwAB( mRemotePwAB->text()); | ||
550 | prof->setRemoteIPAB( mRemoteIPAB->text()); | ||
551 | prof->setRemotePortAB( mRemotePortAB->text()); | ||
552 | |||
553 | prof->setRemotePwPWM( mRemotePwPWM->text()); | ||
554 | prof->setRemoteIPPWM( mRemoteIPPWM->text()); | ||
555 | prof->setRemotePortPWM( mRemotePortPWM->text()); | ||
556 | |||
491 | prof->setPreSyncCommand( mRemotePrecommand->text()); | 557 | prof->setPreSyncCommand( mRemotePrecommand->text()); |
492 | prof->setPostSyncCommand( mRemotePostcommand->text() ); | 558 | prof->setPostSyncCommand( mRemotePostcommand->text() ); |
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h index 8094bdd..d3f8f4c 100644 --- a/libkdepim/ksyncprefsdialog.h +++ b/libkdepim/ksyncprefsdialog.h | |||
@@ -91,4 +91,5 @@ class KSyncPrefsDialog : public KDialog | |||
91 | QRadioButton* mIsNotLocal; | 91 | QRadioButton* mIsNotLocal; |
92 | QRadioButton* mIsPhone; | 92 | QRadioButton* mIsPhone; |
93 | QRadioButton* mIsPi; | ||
93 | QCheckBox* mIncludeInRing; | 94 | QCheckBox* mIncludeInRing; |
94 | QCheckBox* mIncludeInRingAB; | 95 | QCheckBox* mIncludeInRingAB; |
@@ -117,4 +118,17 @@ class KSyncPrefsDialog : public KDialog | |||
117 | QLineEdit * mLocalTempFilePWM; | 118 | QLineEdit * mLocalTempFilePWM; |
118 | 119 | ||
120 | |||
121 | QLineEdit * mRemotePw; | ||
122 | QLineEdit * mRemoteIP; | ||
123 | QLineEdit * mRemotePort; | ||
124 | |||
125 | QLineEdit * mRemotePwAB; | ||
126 | QLineEdit * mRemoteIPAB; | ||
127 | QLineEdit * mRemotePortAB; | ||
128 | |||
129 | QLineEdit * mRemotePwPWM; | ||
130 | QLineEdit * mRemoteIPPWM; | ||
131 | QLineEdit * mRemotePortPWM; | ||
132 | |||
119 | QLineEdit * mPhoneDevice; | 133 | QLineEdit * mPhoneDevice; |
120 | QLineEdit * mPhoneConnection; | 134 | QLineEdit * mPhoneConnection; |
@@ -125,4 +139,5 @@ class KSyncPrefsDialog : public KDialog | |||
125 | QVBox* remoteFileWidget; | 139 | QVBox* remoteFileWidget; |
126 | QVBox* phoneWidget; | 140 | QVBox* phoneWidget; |
141 | QVBox* piWidget; | ||
127 | QCheckBox* mWriteBackFile; | 142 | QCheckBox* mWriteBackFile; |
128 | QCheckBox* mWriteBackFuture; | 143 | QCheckBox* mWriteBackFuture; |
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp index 2bf4e6c..76dfe00 100644 --- a/libkdepim/ksyncprofile.cpp +++ b/libkdepim/ksyncprofile.cpp | |||
@@ -44,4 +44,13 @@ KSyncProfile* KSyncProfile::clone() | |||
44 | { | 44 | { |
45 | KSyncProfile* myClone = new KSyncProfile(); | 45 | KSyncProfile* myClone = new KSyncProfile(); |
46 | myClone->setRemotePw(mRemotePw); | ||
47 | myClone->setRemoteIP(mRemoteIP); | ||
48 | myClone->setRemotePort(mRemotePort); | ||
49 | myClone->setRemotePwAB(mRemotePwAB); | ||
50 | myClone->setRemoteIPAB(mRemoteIPAB); | ||
51 | myClone->setRemotePortAB(mRemotePortAB); | ||
52 | myClone->setRemotePwPWM(mRemotePwPWM); | ||
53 | myClone->setRemoteIPPWM(mRemoteIPPWM); | ||
54 | myClone->setRemotePortPWM (mRemotePortPWM); | ||
46 | myClone->setPreSyncCommand( mPreSyncCommand ); | 55 | myClone->setPreSyncCommand( mPreSyncCommand ); |
47 | myClone->setPostSyncCommand( mPostSyncCommand ); | 56 | myClone->setPostSyncCommand( mPostSyncCommand ); |
@@ -68,4 +77,5 @@ KSyncProfile* KSyncProfile::clone() | |||
68 | myClone->setIsLocalFileSync( mIsLocalFileSync ); | 77 | myClone->setIsLocalFileSync( mIsLocalFileSync ); |
69 | myClone->setIsPhoneSync( mIsPhoneSync ); | 78 | myClone->setIsPhoneSync( mIsPhoneSync ); |
79 | myClone->setIsPiSync( mIsPiSync ); | ||
70 | myClone->setWriteContactToSIM( mWriteContactToSIM ); | 80 | myClone->setWriteContactToSIM( mWriteContactToSIM ); |
71 | myClone->setName( "noName" ); | 81 | myClone->setName( "noName" ); |
@@ -89,4 +99,17 @@ void KSyncProfile::setDefault() | |||
89 | mLocalTempFilePWM = "/tmp/passwords.pwm"; | 99 | mLocalTempFilePWM = "/tmp/passwords.pwm"; |
90 | mRemoteFileNamePWM = "/home/polo/kdepim/apps/pwmanager/localfile.pwm"; | 100 | mRemoteFileNamePWM = "/home/polo/kdepim/apps/pwmanager/localfile.pwm"; |
101 | |||
102 | mRemotePw = "abc"; | ||
103 | mRemoteIP = "192.168.0.99"; | ||
104 | mRemotePort = "9197"; | ||
105 | |||
106 | mRemotePwAB = "abc"; | ||
107 | mRemoteIPAB = "192.168.0.99"; | ||
108 | mRemotePortAB = "9198"; | ||
109 | |||
110 | mRemotePwPWM = "abc"; | ||
111 | mRemoteIPPWM = "192.168.0.99"; | ||
112 | mRemotePortPWM = "9199"; | ||
113 | |||
91 | mShowSummaryAfterSync = true; | 114 | mShowSummaryAfterSync = true; |
92 | mAskForPreferences = true; | 115 | mAskForPreferences = true; |
@@ -102,4 +125,5 @@ void KSyncProfile::setDefault() | |||
102 | mName = "noName"; | 125 | mName = "noName"; |
103 | mIsPhoneSync = false; | 126 | mIsPhoneSync = false; |
127 | mIsPiSync = false; | ||
104 | mWriteContactToSIM = false; | 128 | mWriteContactToSIM = false; |
105 | mPhoneDevice = "/dev/ircomm"; | 129 | mPhoneDevice = "/dev/ircomm"; |
@@ -115,4 +139,15 @@ void KSyncProfile::readConfig(KConfig *config ) | |||
115 | 139 | ||
116 | mName = config->readEntry( "Name", mName ); | 140 | mName = config->readEntry( "Name", mName ); |
141 | |||
142 | mRemotePw = config->readEntry( "RemotePw",mRemotePw ); | ||
143 | mRemoteIP = config->readEntry( "RemoteIP",mRemoteIP ); | ||
144 | mRemotePort = config->readEntry( "RemotePort", mRemotePort ); | ||
145 | mRemotePwAB = config->readEntry( "RemotePwAB", mRemotePwAB ); | ||
146 | mRemoteIPAB = config->readEntry( "RemoteIPAB", mRemoteIPAB ); | ||
147 | mRemotePortAB = config->readEntry( "RemotePortAB", mRemotePortAB ); | ||
148 | mRemotePwPWM = config->readEntry( "RemotePwPWM", mRemotePwPWM ); | ||
149 | mRemoteIPPWM = config->readEntry( "RemoteIPPWM", mRemoteIPPWM ); | ||
150 | mRemotePortPWM = config->readEntry( "RemotePortPWM", mRemotePortPWM ); | ||
151 | |||
117 | mPreSyncCommand = config->readEntry( "PreSyncCommand",mPreSyncCommand ); | 152 | mPreSyncCommand = config->readEntry( "PreSyncCommand",mPreSyncCommand ); |
118 | mPostSyncCommand = config->readEntry( "PostSyncCommand", mPostSyncCommand ); | 153 | mPostSyncCommand = config->readEntry( "PostSyncCommand", mPostSyncCommand ); |
@@ -147,4 +182,5 @@ void KSyncProfile::readConfig(KConfig *config ) | |||
147 | mIsLocalFileSync= config->readBoolEntry( "IsLocalFileSync", mIsLocalFileSync ); | 182 | mIsLocalFileSync= config->readBoolEntry( "IsLocalFileSync", mIsLocalFileSync ); |
148 | mIsPhoneSync= config->readBoolEntry( "IsPhoneSync", mIsPhoneSync ); | 183 | mIsPhoneSync= config->readBoolEntry( "IsPhoneSync", mIsPhoneSync ); |
184 | mIsPiSync= config->readBoolEntry( "IsPiSync", mIsPiSync ); | ||
149 | } | 185 | } |
150 | else | 186 | else |
@@ -163,4 +199,16 @@ void KSyncProfile::writeConfig( KConfig * config ) | |||
163 | config->setGroup(mName); | 199 | config->setGroup(mName); |
164 | 200 | ||
201 | config->writeEntry( "RemotePw", mRemotePw); | ||
202 | config->writeEntry( "RemoteIP", mRemoteIP); | ||
203 | config->writeEntry( "RemotePort", mRemotePort); | ||
204 | |||
205 | config->writeEntry( "RemotePwAB", mRemotePwAB); | ||
206 | config->writeEntry( "RemoteIPAB", mRemoteIPAB); | ||
207 | config->writeEntry( "RemotePortAB", mRemotePortAB); | ||
208 | |||
209 | config->writeEntry( "RemotePwPWM", mRemotePwPWM); | ||
210 | config->writeEntry( "RemoteIPPWM", mRemoteIPPWM); | ||
211 | config->writeEntry( "RemotePortPWM", mRemotePortPWM); | ||
212 | |||
165 | config->writeEntry( "Name", mName ); | 213 | config->writeEntry( "Name", mName ); |
166 | config->writeEntry( "PreSyncCommand",mPreSyncCommand ); | 214 | config->writeEntry( "PreSyncCommand",mPreSyncCommand ); |
@@ -196,4 +244,5 @@ void KSyncProfile::writeConfig( KConfig * config ) | |||
196 | config->writeEntry( "IsLocalFileSync", mIsLocalFileSync ); | 244 | config->writeEntry( "IsLocalFileSync", mIsLocalFileSync ); |
197 | config->writeEntry( "IsPhoneSync", mIsPhoneSync ); | 245 | config->writeEntry( "IsPhoneSync", mIsPhoneSync ); |
246 | config->writeEntry( "IsPiSync", mIsPiSync ); | ||
198 | } | 247 | } |
199 | 248 | ||
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h index a81a9ad..6a68bd7 100644 --- a/libkdepim/ksyncprofile.h +++ b/libkdepim/ksyncprofile.h | |||
@@ -46,4 +46,25 @@ class KSyncProfile : public QObject { | |||
46 | void deleteConfig(KConfig *); | 46 | void deleteConfig(KConfig *); |
47 | 47 | ||
48 | void setRemotePw( const QString& n ) {mRemotePw = n;} | ||
49 | QString getRemotePw( ) { return mRemotePw; } | ||
50 | void setRemotePwAB( const QString& n ) {mRemotePwAB = n;} | ||
51 | QString getRemotePwAB( ) { return mRemotePwAB; } | ||
52 | void setRemotePwPWM( const QString& n ) {mRemotePwPWM = n;} | ||
53 | QString getRemotePwPWM( ) { return mRemotePwPWM; } | ||
54 | |||
55 | void setRemoteIP( const QString& n ) {mRemoteIP = n;} | ||
56 | QString getRemoteIP( ) { return mRemoteIP; } | ||
57 | void setRemoteIPAB( const QString& n ) {mRemoteIPAB = n;} | ||
58 | QString getRemoteIPAB( ) { return mRemoteIPAB; } | ||
59 | void setRemoteIPPWM( const QString& n ) {mRemoteIPPWM = n;} | ||
60 | QString getRemoteIPPWM( ) { return mRemoteIPPWM; } | ||
61 | |||
62 | void setRemotePort( const QString& n ) {mRemotePort = n;} | ||
63 | QString getRemotePort( ) { return mRemotePort; } | ||
64 | void setRemotePortAB( const QString& n ) {mRemotePortAB = n;} | ||
65 | QString getRemotePortAB( ) { return mRemotePortAB; } | ||
66 | void setRemotePortPWM( const QString& n ) {mRemotePortPWM = n;} | ||
67 | QString getRemotePortPWM( ) { return mRemotePortPWM; } | ||
68 | |||
48 | void setPreSyncCommand( const QString& n ) {mPreSyncCommand = n;} | 69 | void setPreSyncCommand( const QString& n ) {mPreSyncCommand = n;} |
49 | QString getPreSyncCommand( ) { return mPreSyncCommand; } | 70 | QString getPreSyncCommand( ) { return mPreSyncCommand; } |
@@ -112,4 +133,6 @@ class KSyncProfile : public QObject { | |||
112 | void setIsPhoneSync( bool b ) { mIsPhoneSync= b;} | 133 | void setIsPhoneSync( bool b ) { mIsPhoneSync= b;} |
113 | bool getIsPhoneSync( ) { return mIsPhoneSync;} | 134 | bool getIsPhoneSync( ) { return mIsPhoneSync;} |
135 | void setIsPiSync( bool b ) { mIsPiSync= b;} | ||
136 | bool getIsPiSync( ) { return mIsPiSync;} | ||
114 | private: | 137 | private: |
115 | QString mName; | 138 | QString mName; |
@@ -127,4 +150,16 @@ class KSyncProfile : public QObject { | |||
127 | QString mRemoteFileNamePWM; | 150 | QString mRemoteFileNamePWM; |
128 | 151 | ||
152 | QString mRemotePw; | ||
153 | QString mRemoteIP; | ||
154 | QString mRemotePort; | ||
155 | |||
156 | QString mRemotePwAB; | ||
157 | QString mRemoteIPAB; | ||
158 | QString mRemotePortAB; | ||
159 | |||
160 | QString mRemotePwPWM; | ||
161 | QString mRemoteIPPWM; | ||
162 | QString mRemotePortPWM; | ||
163 | |||
129 | QString mPhoneDevice; | 164 | QString mPhoneDevice; |
130 | QString mPhoneConnection; | 165 | QString mPhoneConnection; |
@@ -144,4 +179,6 @@ class KSyncProfile : public QObject { | |||
144 | bool mIsPhoneSync; | 179 | bool mIsPhoneSync; |
145 | bool mWriteContactToSIM; | 180 | bool mWriteContactToSIM; |
181 | |||
182 | bool mIsPiSync; | ||
146 | }; | 183 | }; |
147 | 184 | ||