author | zautrix <zautrix> | 2004-08-01 18:51:50 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-08-01 18:51:50 (UTC) |
commit | 3e1e7285cd2b94c0f6a041a639a0ea0a0cb72603 (patch) (unidiff) | |
tree | fc198cac2c1ffa425f98f259f272e7131265b7d7 | |
parent | f968c6f5541463caadee98e200c2ba035fa20959 (diff) | |
download | kdepimpi-3e1e7285cd2b94c0f6a041a639a0ea0a0cb72603.zip kdepimpi-3e1e7285cd2b94c0f6a041a639a0ea0a0cb72603.tar.gz kdepimpi-3e1e7285cd2b94c0f6a041a639a0ea0a0cb72603.tar.bz2 |
Added phone comfig settings
-rw-r--r-- | libkdepim/ksyncprefsdialog.cpp | 98 | ||||
-rw-r--r-- | libkdepim/ksyncprefsdialog.h | 8 | ||||
-rw-r--r-- | libkdepim/ksyncprofile.cpp | 17 | ||||
-rw-r--r-- | libkdepim/ksyncprofile.h | 14 |
4 files changed, 131 insertions, 6 deletions
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp index 355c05d..c6c5ff8 100644 --- a/libkdepim/ksyncprefsdialog.cpp +++ b/libkdepim/ksyncprefsdialog.cpp | |||
@@ -189,9 +189,36 @@ void KSyncPrefsDialog::setupSyncAlgTab() | |||
189 | mIsNotLocal = new QRadioButton ( i18n("Remote file (w down/upload command)"), gr ); | 189 | mIsNotLocal = new QRadioButton ( i18n("Remote file (w down/upload command)"), gr ); |
190 | connect (mIsLocal, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); | 190 | connect (mIsLocal, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); |
191 | mIsPhone = new QRadioButton ( i18n("Mobile device (cell phone)"), gr ); | ||
192 | connect (mIsPhone, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); | ||
193 | |||
194 | |||
195 | phoneWidget = new QVBox( topFrame); | ||
196 | topLayout->addMultiCellWidget(phoneWidget, iii,iii,0,1); | ||
197 | ++iii; | ||
198 | QHBox* temphb = new QHBox( phoneWidget ); | ||
199 | new QLabel( i18n("I/O device: "), temphb ); | ||
200 | mPhoneDevice = new QLineEdit( temphb); | ||
201 | button = new QPushButton( i18n("Help..."), temphb ); | ||
202 | connect ( button, SIGNAL( clicked()), this, SLOT ( helpDevice() ) ); | ||
203 | |||
204 | |||
205 | temphb = new QHBox( phoneWidget ); | ||
206 | new QLabel( i18n("Connection: "), temphb ); | ||
207 | mPhoneConnection = new QLineEdit( temphb); | ||
208 | button = new QPushButton( i18n("Help..."), temphb ); | ||
209 | connect ( button, SIGNAL( clicked()), this, SLOT ( helpConnection() ) ); | ||
210 | |||
211 | |||
212 | temphb = new QHBox( phoneWidget ); | ||
213 | new QLabel( i18n("Model(opt.): "), temphb ); | ||
214 | mPhoneModel = new QLineEdit( temphb); | ||
215 | button = new QPushButton( i18n("Help..."), temphb ); | ||
216 | connect ( button, SIGNAL( clicked()), this, SLOT ( helpModel() ) ); | ||
217 | |||
191 | // *** local | 218 | // *** local |
192 | localFileWidget = new QVBox( topFrame); | 219 | localFileWidget = new QVBox( topFrame); |
193 | topLayout->addMultiCellWidget(localFileWidget, iii,iii,0,1); | 220 | topLayout->addMultiCellWidget(localFileWidget, iii,iii,0,1); |
194 | ++iii; | 221 | ++iii; |
195 | QHBox* temphb = new QHBox( localFileWidget ); | 222 | temphb = new QHBox( localFileWidget ); |
196 | 223 | ||
197 | lab = new QLabel( i18n("Local file Cal:"), temphb ); | 224 | lab = new QLabel( i18n("Local file Cal:"), temphb ); |
@@ -313,4 +340,9 @@ void KSyncPrefsDialog::profileChanged( int item ) | |||
313 | mLocalTempFileAB->setText(prof->getLocalTempFileAB()); | 340 | mLocalTempFileAB->setText(prof->getLocalTempFileAB()); |
314 | mRemoteFileAB->setText(prof->getRemoteFileNameAB()) ; | 341 | mRemoteFileAB->setText(prof->getRemoteFileNameAB()) ; |
342 | |||
343 | mPhoneDevice->setText(prof->getPhoneDevice()); | ||
344 | mPhoneConnection->setText(prof->getPhoneConnection()); | ||
345 | mPhoneModel->setText(prof->getPhoneModel()); | ||
346 | |||
315 | mShowSummaryAfterSync->setChecked( prof->getShowSummaryAfterSync()); | 347 | mShowSummaryAfterSync->setChecked( prof->getShowSummaryAfterSync()); |
316 | mAskForPreferences->setChecked( prof->getAskForPreferences()); | 348 | mAskForPreferences->setChecked( prof->getAskForPreferences()); |
@@ -348,9 +380,11 @@ void KSyncPrefsDialog::profileChanged( int item ) | |||
348 | } | 380 | } |
349 | mIsLocal->setChecked(prof->getIsLocalFileSync()) ; | 381 | mIsLocal->setChecked(prof->getIsLocalFileSync()) ; |
350 | mIsNotLocal->setChecked(!prof->getIsLocalFileSync()); | 382 | mIsPhone->setChecked(prof->getIsPhoneSync()) ; |
383 | mIsNotLocal->setChecked(!prof->getIsLocalFileSync() && !prof->getIsPhoneSync() ); | ||
351 | proGr->setEnabled( item > 2 ); | 384 | proGr->setEnabled( item > 2 ); |
352 | if ( item < 3 ) { | 385 | if ( item < 3 ) { |
353 | localFileWidget->setEnabled(false); | 386 | localFileWidget->hide(); |
354 | remoteFileWidget->setEnabled(false); | 387 | remoteFileWidget->hide(); |
388 | phoneWidget->hide(); | ||
355 | 389 | ||
356 | } else | 390 | } else |
@@ -380,6 +414,20 @@ void KSyncPrefsDialog::kindChanged( bool b ) | |||
380 | { | 414 | { |
381 | 415 | ||
382 | localFileWidget->setEnabled(b); | 416 | if ( mIsLocal->isChecked () ) |
383 | remoteFileWidget->setEnabled(!b); | 417 | localFileWidget->show(); |
418 | else | ||
419 | localFileWidget->hide(); | ||
420 | |||
421 | if ( mIsNotLocal->isChecked () ) | ||
422 | remoteFileWidget->show(); | ||
423 | else | ||
424 | remoteFileWidget->hide(); | ||
425 | |||
426 | if ( mIsPhone->isChecked () ) { | ||
427 | phoneWidget->show(); | ||
428 | } | ||
429 | else { | ||
430 | phoneWidget->hide(); | ||
431 | } | ||
384 | 432 | ||
385 | } | 433 | } |
@@ -421,6 +469,11 @@ void KSyncPrefsDialog::saveProfile() | |||
421 | prof->setSyncPrefs( syncprefs); | 469 | prof->setSyncPrefs( syncprefs); |
422 | prof->setIsLocalFileSync( mIsLocal->isChecked() ); | 470 | prof->setIsLocalFileSync( mIsLocal->isChecked() ); |
471 | prof->setIsPhoneSync( mIsPhone->isChecked() ); | ||
423 | prof->setWriteBackFuture(mWriteBackFuture->isChecked()); | 472 | prof->setWriteBackFuture(mWriteBackFuture->isChecked()); |
424 | prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value()); | 473 | prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value()); |
474 | prof->setPhoneDevice( mPhoneDevice->text() ); | ||
475 | prof->setPhoneConnection( mPhoneConnection->text() ); | ||
476 | prof->setPhoneModel( mPhoneModel->text() ); | ||
477 | |||
425 | } | 478 | } |
426 | 479 | ||
@@ -528,2 +581,35 @@ void KSyncPrefsDialog::usrWriteConfig() | |||
528 | } | 581 | } |
529 | 582 | ||
583 | void KSyncPrefsDialog::helpDevice() | ||
584 | { | ||
585 | QString hint = i18n("Insert device where\nphone is connected. E.g.:\n"); | ||
586 | #ifdef _WIN32_ | ||
587 | hint += "leave empty for Irda\n" | ||
588 | "com1:\n(first serial port)\n" | ||
589 | "usb not supported\n" | ||
590 | "???\n(bluetooth device address)\n"; | ||
591 | |||
592 | #else | ||
593 | hint += "/dev/ircomm\n(Irda)\n" | ||
594 | "/dev/ttyS0\n(first serial port)\n" | ||
595 | "/dev/ttyUSB0\n(first device usb port)\n" | ||
596 | "???\n(bluetooth device address)\n"; | ||
597 | #endif | ||
598 | KMessageBox::information(this,hint,i18n("KDE-Pim sync config")); | ||
599 | } | ||
600 | void KSyncPrefsDialog::helpModel() | ||
601 | { | ||
602 | QString hint = i18n("Leave empty or\ninsert name of phone model:\n"); | ||
603 | hint += "E.g. for Nokia 6310i:\n6310i\nAlso possible:\nobex\nfor Obex connection"; | ||
604 | KMessageBox::information(this,hint,i18n("KDE-Pim sync config")); | ||
605 | |||
606 | } | ||
607 | void KSyncPrefsDialog::helpConnection() | ||
608 | { | ||
609 | QString hint = i18n("Insert kind of connection,e.g.:\n"); | ||
610 | hint += "irda | Nokia FBUS over infrared\n" | ||
611 | "irdaat | AT commands infrared\n(Siemens/Sony-Erricsson)\n" | ||
612 | "irdaobex | set model obex\n" | ||
613 | "fbus | Nokia FBUS2 serial\n"; | ||
614 | KMessageBox::information(this,hint,i18n("KDE-Pim sync config")); | ||
615 | } | ||
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h index 8c2c59c..3060e78 100644 --- a/libkdepim/ksyncprefsdialog.h +++ b/libkdepim/ksyncprefsdialog.h | |||
@@ -72,4 +72,7 @@ class KSyncPrefsDialog : public KDialog | |||
72 | void chooseFileAB(); | 72 | void chooseFileAB(); |
73 | void slotOK(); | 73 | void slotOK(); |
74 | void helpDevice(); | ||
75 | void helpModel(); | ||
76 | void helpConnection(); | ||
74 | 77 | ||
75 | protected: | 78 | protected: |
@@ -86,4 +89,5 @@ class KSyncPrefsDialog : public KDialog | |||
86 | QRadioButton* mIsLocal; | 89 | QRadioButton* mIsLocal; |
87 | QRadioButton* mIsNotLocal; | 90 | QRadioButton* mIsNotLocal; |
91 | QRadioButton* mIsPhone; | ||
88 | QCheckBox* mIncludeInRing; | 92 | QCheckBox* mIncludeInRing; |
89 | QCheckBox* mIncludeInRingAB; | 93 | QCheckBox* mIncludeInRingAB; |
@@ -106,8 +110,12 @@ class KSyncPrefsDialog : public KDialog | |||
106 | QLineEdit * mLocalTempFileAB; | 110 | QLineEdit * mLocalTempFileAB; |
107 | 111 | ||
112 | QLineEdit * mPhoneDevice; | ||
113 | QLineEdit * mPhoneConnection; | ||
114 | QLineEdit * mPhoneModel; | ||
108 | 115 | ||
109 | QWidget* mSetupSyncAlgTab; | 116 | QWidget* mSetupSyncAlgTab; |
110 | QVBox* localFileWidget; | 117 | QVBox* localFileWidget; |
111 | QVBox* remoteFileWidget; | 118 | QVBox* remoteFileWidget; |
119 | QVBox* phoneWidget; | ||
112 | QCheckBox* mWriteBackFile; | 120 | QCheckBox* mWriteBackFile; |
113 | QCheckBox* mWriteBackFuture; | 121 | QCheckBox* mWriteBackFuture; |
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp index f34c309..425285e 100644 --- a/libkdepim/ksyncprofile.cpp +++ b/libkdepim/ksyncprofile.cpp | |||
@@ -62,4 +62,5 @@ KSyncProfile* KSyncProfile::clone() | |||
62 | myClone->setSyncPrefs( mSyncPrefs); | 62 | myClone->setSyncPrefs( mSyncPrefs); |
63 | myClone->setIsLocalFileSync( mIsLocalFileSync ); | 63 | myClone->setIsLocalFileSync( mIsLocalFileSync ); |
64 | myClone->setIsPhoneSync( mIsPhoneSync ); | ||
64 | myClone->setName( "noName" ); | 65 | myClone->setName( "noName" ); |
65 | return myClone; | 66 | return myClone; |
@@ -88,4 +89,8 @@ void KSyncProfile::setDefault() | |||
88 | mSyncPrefs = SYNC_PREF_ASK; | 89 | mSyncPrefs = SYNC_PREF_ASK; |
89 | mIsLocalFileSync = true; | 90 | mIsLocalFileSync = true; |
91 | mIsPhoneSync = false; | ||
92 | mPhoneDevice = "/dev/ircomm"; | ||
93 | mPhoneConnection = "irda"; | ||
94 | mPhoneModel = "6310i"; | ||
90 | 95 | ||
91 | } | 96 | } |
@@ -105,4 +110,9 @@ void KSyncProfile::readConfig(KConfig *config ) | |||
105 | mRemoteFileNameAB = config->readEntry( prefix+ "RemoteFileNameAB", mRemoteFileNameAB ); | 110 | mRemoteFileNameAB = config->readEntry( prefix+ "RemoteFileNameAB", mRemoteFileNameAB ); |
106 | 111 | ||
112 | |||
113 | mPhoneDevice = config->readEntry( prefix+ "PhoneDevice", mPhoneDevice ); | ||
114 | mPhoneConnection = config->readEntry( prefix+ "PhoneConnection", mPhoneConnection ); | ||
115 | mPhoneModel = config->readEntry( prefix+ "PhoneModel", mPhoneModel ); | ||
116 | |||
107 | mIncludeInRingSync = config->readBoolEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync ); | 117 | mIncludeInRingSync = config->readBoolEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync ); |
108 | mIncludeInRingSyncAB = config->readBoolEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB ); | 118 | mIncludeInRingSyncAB = config->readBoolEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB ); |
@@ -114,4 +124,5 @@ void KSyncProfile::readConfig(KConfig *config ) | |||
114 | mWriteBackFutureWeeks = config->readNumEntry( prefix+ "WriteBackFutureWeeks", mWriteBackFutureWeeks ); | 124 | mWriteBackFutureWeeks = config->readNumEntry( prefix+ "WriteBackFutureWeeks", mWriteBackFutureWeeks ); |
115 | mIsLocalFileSync= config->readBoolEntry( prefix+ "IsLocalFileSync", mIsLocalFileSync ); | 125 | mIsLocalFileSync= config->readBoolEntry( prefix+ "IsLocalFileSync", mIsLocalFileSync ); |
126 | mIsPhoneSync= config->readBoolEntry( prefix+ "IsPhoneSync", mIsPhoneSync ); | ||
116 | } | 127 | } |
117 | void KSyncProfile::writeConfig( KConfig * config ) | 128 | void KSyncProfile::writeConfig( KConfig * config ) |
@@ -129,4 +140,9 @@ void KSyncProfile::writeConfig( KConfig * config ) | |||
129 | config->writeEntry( prefix+ "LocalTempFileAB", mLocalTempFileAB ); | 140 | config->writeEntry( prefix+ "LocalTempFileAB", mLocalTempFileAB ); |
130 | config->writeEntry( prefix+ "RemoteFileNameAB", mRemoteFileNameAB ); | 141 | config->writeEntry( prefix+ "RemoteFileNameAB", mRemoteFileNameAB ); |
142 | |||
143 | config->writeEntry( prefix+ "PhoneDevice", mPhoneDevice ); | ||
144 | config->writeEntry( prefix+ "PhoneConnection", mPhoneConnection ); | ||
145 | config->writeEntry( prefix+ "PhoneModel", mPhoneModel ); | ||
146 | |||
131 | config->writeEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync ); | 147 | config->writeEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync ); |
132 | config->writeEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB ); | 148 | config->writeEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB ); |
@@ -138,4 +154,5 @@ void KSyncProfile::writeConfig( KConfig * config ) | |||
138 | config->writeEntry( prefix+ "WriteBackFutureWeeks", mWriteBackFutureWeeks); | 154 | config->writeEntry( prefix+ "WriteBackFutureWeeks", mWriteBackFutureWeeks); |
139 | config->writeEntry( prefix+ "IsLocalFileSync", mIsLocalFileSync ); | 155 | config->writeEntry( prefix+ "IsLocalFileSync", mIsLocalFileSync ); |
156 | config->writeEntry( prefix+ "IsPhoneSync", mIsPhoneSync ); | ||
140 | } | 157 | } |
141 | 158 | ||
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h index 80094b1..300f70f 100644 --- a/libkdepim/ksyncprofile.h +++ b/libkdepim/ksyncprofile.h | |||
@@ -74,4 +74,10 @@ class KSyncProfile : public QObject { | |||
74 | QString getRemoteFileNameAB( ) { return mRemoteFileNameAB;} | 74 | QString getRemoteFileNameAB( ) { return mRemoteFileNameAB;} |
75 | 75 | ||
76 | void setPhoneDevice( const QString& n ) { mPhoneDevice = n;} | ||
77 | QString getPhoneDevice( ) { return mPhoneDevice;} | ||
78 | void setPhoneConnection( const QString& n ) { mPhoneConnection = n;} | ||
79 | QString getPhoneConnection( ) { return mPhoneConnection;} | ||
80 | void setPhoneModel( const QString& n ) { mPhoneModel = n;} | ||
81 | QString getPhoneModel( ) { return mPhoneModel;} | ||
76 | /* | 82 | /* |
77 | void set( const QString& n ) { = n;} | 83 | void set( const QString& n ) { = n;} |
@@ -99,4 +105,6 @@ class KSyncProfile : public QObject { | |||
99 | void setIsLocalFileSync( bool b ) { mIsLocalFileSync= b;} | 105 | void setIsLocalFileSync( bool b ) { mIsLocalFileSync= b;} |
100 | bool getIsLocalFileSync( ) { return mIsLocalFileSync;} | 106 | bool getIsLocalFileSync( ) { return mIsLocalFileSync;} |
107 | void setIsPhoneSync( bool b ) { mIsPhoneSync= b;} | ||
108 | bool getIsPhoneSync( ) { return mIsPhoneSync;} | ||
101 | 109 | ||
102 | private: | 110 | private: |
@@ -110,4 +118,9 @@ class KSyncProfile : public QObject { | |||
110 | QString mLocalTempFileAB; | 118 | QString mLocalTempFileAB; |
111 | QString mRemoteFileNameAB; | 119 | QString mRemoteFileNameAB; |
120 | |||
121 | QString mPhoneDevice; | ||
122 | QString mPhoneConnection; | ||
123 | QString mPhoneModel; | ||
124 | |||
112 | bool mIncludeInRingSync; | 125 | bool mIncludeInRingSync; |
113 | bool mIncludeInRingSyncAB; | 126 | bool mIncludeInRingSyncAB; |
@@ -120,4 +133,5 @@ class KSyncProfile : public QObject { | |||
120 | bool mShowSummaryAfterSync; | 133 | bool mShowSummaryAfterSync; |
121 | bool mIsLocalFileSync; | 134 | bool mIsLocalFileSync; |
135 | bool mIsPhoneSync; | ||
122 | }; | 136 | }; |
123 | 137 | ||