summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/ksyncprefsdialog.cpp98
-rw-r--r--libkdepim/ksyncprefsdialog.h8
-rw-r--r--libkdepim/ksyncprofile.cpp17
-rw-r--r--libkdepim/ksyncprofile.h14
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
@@ -187,13 +187,40 @@ void KSyncPrefsDialog::setupSyncAlgTab()
++iii;
mIsLocal = new QRadioButton ( i18n("Local file"), gr );
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) ) );
+
+
+ phoneWidget = new QVBox( topFrame);
+ topLayout->addMultiCellWidget(phoneWidget, iii,iii,0,1);
+ ++iii;
+ QHBox* temphb = new QHBox( phoneWidget );
+ new QLabel( i18n("I/O device: "), temphb );
+ mPhoneDevice = new QLineEdit( temphb);
+ button = new QPushButton( i18n("Help..."), temphb );
+ connect ( button, SIGNAL( clicked()), this, SLOT ( helpDevice() ) );
+
+
+ temphb = new QHBox( phoneWidget );
+ new QLabel( i18n("Connection: "), temphb );
+ mPhoneConnection = new QLineEdit( temphb);
+ button = new QPushButton( i18n("Help..."), temphb );
+ connect ( button, SIGNAL( clicked()), this, SLOT ( helpConnection() ) );
+
+
+ temphb = new QHBox( phoneWidget );
+ new QLabel( i18n("Model(opt.): "), temphb );
+ mPhoneModel = new QLineEdit( temphb);
+ button = new QPushButton( i18n("Help..."), temphb );
+ connect ( button, SIGNAL( clicked()), this, SLOT ( helpModel() ) );
+
// *** local
localFileWidget = new QVBox( topFrame);
topLayout->addMultiCellWidget(localFileWidget, iii,iii,0,1);
++iii;
- QHBox* temphb = new QHBox( localFileWidget );
+ temphb = new QHBox( localFileWidget );
lab = new QLabel( i18n("Local file Cal:"), temphb );
lab = new QLabel( i18n("Local file ABook:"), temphb );
temphb = new QHBox( localFileWidget );
@@ -311,8 +338,13 @@ void KSyncPrefsDialog::profileChanged( int item )
mRemotePrecommandAB->setText(prof->getPreSyncCommandAB());
mRemotePostcommandAB->setText(prof->getPostSyncCommandAB());
mLocalTempFileAB->setText(prof->getLocalTempFileAB());
mRemoteFileAB->setText(prof->getRemoteFileNameAB()) ;
+
+ mPhoneDevice->setText(prof->getPhoneDevice());
+ mPhoneConnection->setText(prof->getPhoneConnection());
+ mPhoneModel->setText(prof->getPhoneModel());
+
mShowSummaryAfterSync->setChecked( prof->getShowSummaryAfterSync());
mAskForPreferences->setChecked( prof->getAskForPreferences());
mWriteBackExisting->setChecked( prof->getWriteBackExisting() );
mWriteBackFile->setChecked( prof->getWriteBackFile());
@@ -346,13 +378,15 @@ void KSyncPrefsDialog::profileChanged( int item )
default:
break;
}
mIsLocal->setChecked(prof->getIsLocalFileSync()) ;
- mIsNotLocal->setChecked(!prof->getIsLocalFileSync());
+ mIsPhone->setChecked(prof->getIsPhoneSync()) ;
+ mIsNotLocal->setChecked(!prof->getIsLocalFileSync() && !prof->getIsPhoneSync() );
proGr->setEnabled( item > 2 );
if ( item < 3 ) {
- localFileWidget->setEnabled(false);
- remoteFileWidget->setEnabled(false);
+ localFileWidget->hide();
+ remoteFileWidget->hide();
+ phoneWidget->hide();
} else
kindChanged( prof->getIsLocalFileSync() );
}
@@ -378,10 +412,24 @@ void KSyncPrefsDialog::fillFTP()
}
void KSyncPrefsDialog::kindChanged( bool b )
{
- localFileWidget->setEnabled(b);
- remoteFileWidget->setEnabled(!b);
+ if ( mIsLocal->isChecked () )
+ localFileWidget->show();
+ else
+ localFileWidget->hide();
+
+ if ( mIsNotLocal->isChecked () )
+ remoteFileWidget->show();
+ else
+ remoteFileWidget->hide();
+
+ if ( mIsPhone->isChecked () ) {
+ phoneWidget->show();
+ }
+ else {
+ phoneWidget->hide();
+ }
}
void KSyncPrefsDialog::deleteProfile()
{
@@ -419,10 +467,15 @@ void KSyncPrefsDialog::saveProfile()
prof->setIncludeInRingSyncAB( mIncludeInRingAB->isChecked() );
int syncprefs = rem->isChecked()*1+newest->isChecked()*2+ ask->isChecked()*3+ f_loc->isChecked()*4+ f_rem->isChecked()*5 ;//+ both->isChecked()*6 ;
prof->setSyncPrefs( syncprefs);
prof->setIsLocalFileSync( mIsLocal->isChecked() );
+ prof->setIsPhoneSync( mIsPhone->isChecked() );
prof->setWriteBackFuture(mWriteBackFuture->isChecked());
prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value());
+ prof->setPhoneDevice( mPhoneDevice->text() );
+ prof->setPhoneConnection( mPhoneConnection->text() );
+ prof->setPhoneModel( mPhoneModel->text() );
+
}
}
@@ -526,4 +579,37 @@ void KSyncPrefsDialog::usrWriteConfig()
QString name = mMyMachineName->text();
config.writeEntry("LocalMachineName",name);
}
+void KSyncPrefsDialog::helpDevice()
+{
+ QString hint = i18n("Insert device where\nphone is connected. E.g.:\n");
+#ifdef _WIN32_
+ hint += "leave empty for Irda\n"
+ "com1:\n(first serial port)\n"
+ "usb not supported\n"
+ "???\n(bluetooth device address)\n";
+
+#else
+ hint += "/dev/ircomm\n(Irda)\n"
+ "/dev/ttyS0\n(first serial port)\n"
+ "/dev/ttyUSB0\n(first device usb port)\n"
+ "???\n(bluetooth device address)\n";
+#endif
+ KMessageBox::information(this,hint,i18n("KDE-Pim sync config"));
+}
+void KSyncPrefsDialog::helpModel()
+{
+ QString hint = i18n("Leave empty or\ninsert name of phone model:\n");
+ hint += "E.g. for Nokia 6310i:\n6310i\nAlso possible:\nobex\nfor Obex connection";
+ KMessageBox::information(this,hint,i18n("KDE-Pim sync config"));
+
+}
+void KSyncPrefsDialog::helpConnection()
+{
+ QString hint = i18n("Insert kind of connection,e.g.:\n");
+ hint += "irda | Nokia FBUS over infrared\n"
+ "irdaat | AT commands infrared\n(Siemens/Sony-Erricsson)\n"
+ "irdaobex | set model obex\n"
+ "fbus | Nokia FBUS2 serial\n";
+ KMessageBox::information(this,hint,i18n("KDE-Pim sync config"));
+}
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h
index 8c2c59c..3060e78 100644
--- a/libkdepim/ksyncprefsdialog.h
+++ b/libkdepim/ksyncprefsdialog.h
@@ -70,8 +70,11 @@ class KSyncPrefsDialog : public KDialog
void profileChanged( int );
void chooseFile();
void chooseFileAB();
void slotOK();
+ void helpDevice();
+ void helpModel();
+ void helpConnection();
protected:
void usrWriteConfig();
@@ -84,8 +87,9 @@ class KSyncPrefsDialog : public KDialog
QLineEdit * mMyMachineName;
QComboBox * mProfileBox;
QRadioButton* mIsLocal;
QRadioButton* mIsNotLocal;
+ QRadioButton* mIsPhone;
QCheckBox* mIncludeInRing;
QCheckBox* mIncludeInRingAB;
void addProfile ( KSyncProfile* );
void insertProfiles();
@@ -104,12 +108,16 @@ class KSyncPrefsDialog : public KDialog
QLineEdit * mRemotePrecommandAB;
QLineEdit * mRemoteFileAB;
QLineEdit * mLocalTempFileAB;
+ QLineEdit * mPhoneDevice;
+ QLineEdit * mPhoneConnection;
+ QLineEdit * mPhoneModel;
QWidget* mSetupSyncAlgTab;
QVBox* localFileWidget;
QVBox* remoteFileWidget;
+ QVBox* phoneWidget;
QCheckBox* mWriteBackFile;
QCheckBox* mWriteBackFuture;
QSpinBox* mWriteBackFutureWeeks;
QCheckBox* mWriteBackExisting;
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index f34c309..425285e 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -60,8 +60,9 @@ KSyncProfile* KSyncProfile::clone()
myClone->setIncludeInRingSync( mIncludeInRingSync );
myClone->setIncludeInRingSyncAB( mIncludeInRingSyncAB );
myClone->setSyncPrefs( mSyncPrefs);
myClone->setIsLocalFileSync( mIsLocalFileSync );
+ myClone->setIsPhoneSync( mIsPhoneSync );
myClone->setName( "noName" );
return myClone;
}
@@ -86,8 +87,12 @@ void KSyncProfile::setDefault()
mIncludeInRingSync = false;
mIncludeInRingSyncAB = false;
mSyncPrefs = SYNC_PREF_ASK;
mIsLocalFileSync = true;
+ mIsPhoneSync = false;
+ mPhoneDevice = "/dev/ircomm";
+ mPhoneConnection = "irda";
+ mPhoneModel = "6310i";
}
void KSyncProfile::readConfig(KConfig *config )
{
@@ -103,8 +108,13 @@ void KSyncProfile::readConfig(KConfig *config )
mPostSyncCommandAB = config->readEntry( prefix+ "PostSyncCommandAB", mPostSyncCommandAB );
mLocalTempFileAB = config->readEntry( prefix+ "LocalTempFileAB", mLocalTempFileAB );
mRemoteFileNameAB = config->readEntry( prefix+ "RemoteFileNameAB", mRemoteFileNameAB );
+
+ mPhoneDevice = config->readEntry( prefix+ "PhoneDevice", mPhoneDevice );
+ mPhoneConnection = config->readEntry( prefix+ "PhoneConnection", mPhoneConnection );
+ mPhoneModel = config->readEntry( prefix+ "PhoneModel", mPhoneModel );
+
mIncludeInRingSync = config->readBoolEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync );
mIncludeInRingSyncAB = config->readBoolEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB );
mShowSummaryAfterSync = config->readBoolEntry( prefix+ "ShowSummaryAfterSync", mShowSummaryAfterSync );
mAskForPreferences = config->readBoolEntry( prefix+ "AskForPreferences",mAskForPreferences );
@@ -112,8 +122,9 @@ void KSyncProfile::readConfig(KConfig *config )
mWriteBackFuture = config->readBoolEntry( prefix+ "WriteBackFuture",mWriteBackFuture );
mSyncPrefs = config->readNumEntry( prefix+ "SyncPrefs", mSyncPrefs );
mWriteBackFutureWeeks = config->readNumEntry( prefix+ "WriteBackFutureWeeks", mWriteBackFutureWeeks );
mIsLocalFileSync= config->readBoolEntry( prefix+ "IsLocalFileSync", mIsLocalFileSync );
+ mIsPhoneSync= config->readBoolEntry( prefix+ "IsPhoneSync", mIsPhoneSync );
}
void KSyncProfile::writeConfig( KConfig * config )
{
config->setGroup("SyncProfiles");
@@ -127,8 +138,13 @@ void KSyncProfile::writeConfig( KConfig * config )
config->writeEntry( prefix+ "PreSyncCommandAB",mPreSyncCommandAB );
config->writeEntry( prefix+ "PostSyncCommandAB", mPostSyncCommandAB );
config->writeEntry( prefix+ "LocalTempFileAB", mLocalTempFileAB );
config->writeEntry( prefix+ "RemoteFileNameAB", mRemoteFileNameAB );
+
+ config->writeEntry( prefix+ "PhoneDevice", mPhoneDevice );
+ config->writeEntry( prefix+ "PhoneConnection", mPhoneConnection );
+ config->writeEntry( prefix+ "PhoneModel", mPhoneModel );
+
config->writeEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync );
config->writeEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB );
config->writeEntry( prefix+ "ShowSummaryAfterSync", mShowSummaryAfterSync );
config->writeEntry( prefix+ "AskForPreferences",mAskForPreferences );
@@ -136,8 +152,9 @@ void KSyncProfile::writeConfig( KConfig * config )
config->writeEntry( prefix+ "WriteBackFuture",mWriteBackFuture );
config->writeEntry( prefix+ "SyncPrefs", mSyncPrefs );
config->writeEntry( prefix+ "WriteBackFutureWeeks", mWriteBackFutureWeeks);
config->writeEntry( prefix+ "IsLocalFileSync", mIsLocalFileSync );
+ config->writeEntry( prefix+ "IsPhoneSync", mIsPhoneSync );
}
/*
class KPrefsItemInt : public KPrefsItem {
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h
index 80094b1..300f70f 100644
--- a/libkdepim/ksyncprofile.h
+++ b/libkdepim/ksyncprofile.h
@@ -72,8 +72,14 @@ class KSyncProfile : public QObject {
QString getLocalTempFileAB( ) { return mLocalTempFileAB;}
void setRemoteFileNameAB( const QString& n ) { mRemoteFileNameAB = n;}
QString getRemoteFileNameAB( ) { return mRemoteFileNameAB;}
+ void setPhoneDevice( const QString& n ) { mPhoneDevice = n;}
+ QString getPhoneDevice( ) { return mPhoneDevice;}
+ void setPhoneConnection( const QString& n ) { mPhoneConnection = n;}
+ QString getPhoneConnection( ) { return mPhoneConnection;}
+ void setPhoneModel( const QString& n ) { mPhoneModel = n;}
+ QString getPhoneModel( ) { return mPhoneModel;}
/*
void set( const QString& n ) { = n;}
QString get( ) { return ;}
*/
@@ -97,8 +103,10 @@ 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;}
private:
QString mName;
QString mPreSyncCommand;
@@ -108,8 +116,13 @@ class KSyncProfile : public QObject {
QString mPreSyncCommandAB;
QString mPostSyncCommandAB;
QString mLocalTempFileAB;
QString mRemoteFileNameAB;
+
+ QString mPhoneDevice;
+ QString mPhoneConnection;
+ QString mPhoneModel;
+
bool mIncludeInRingSync;
bool mIncludeInRingSyncAB;
int mSyncPrefs;
bool mWriteBackFile;
@@ -118,7 +131,8 @@ class KSyncProfile : public QObject {
int mWriteBackFutureWeeks;
bool mAskForPreferences;
bool mShowSummaryAfterSync;
bool mIsLocalFileSync;
+ bool mIsPhoneSync;
};
#endif