| -rw-r--r-- | korganizer/koprefs.cpp | 4 | ||||
| -rw-r--r-- | korganizer/koprefs.h | 3 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 25 |
3 files changed, 13 insertions, 19 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 716a125..84e3d00 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -79,10 +79,6 @@ KOPrefs::KOPrefs() : KPrefs::setCurrentGroup("General"); - addItemString("Ex2PhoneDevice",&mEx2PhoneDevice,"/dev/ircomm"); - addItemString("Ex2PhoneConnection",&mEx2PhoneConnection,"irda"); - addItemString("Ex2PhoneModel",&mEx2PhoneModel,"6310i"); - addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true); diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index a1ba8b3..d9ac851 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -210,9 +210,6 @@ class KOPrefs : public KPimPrefs QString mPhoneDevice; QString mPhoneConnection; QString mPhoneModel; - QString mEx2PhoneDevice; - QString mEx2PhoneConnection; - QString mEx2PhoneModel; int mLastSyncTime; int mSyncAlgoPrefs; diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index bd14fbf..2f286e0 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -103,7 +103,7 @@ class KOex2phonePrefs : public QDialog mWriteBackFutureWeeks= new QSpinBox(1,104, 1, temphb); mWriteBackFutureWeeks->setValue( 8 ); lay->addWidget( temphb ); - lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\n todo/calendar data on phone!"), this ) ); + lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ntodo/calendar data on phone!"), this ) ); lab->setAlignment (AlignHCenter ); QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this ); lay->addWidget( ok ); @@ -1171,13 +1171,14 @@ void MainWindow::slotSyncMenu( int action ) } void MainWindow::exportToPhone( int mode ) { - + //ex2phone->insertItem(i18n("Complete calendar..."), 1 ); //ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); - KOex2phonePrefs ex2phone; - ex2phone.mPhoneConnection->setText( KOPrefs::instance()->mEx2PhoneConnection ); - ex2phone.mPhoneDevice->setText( KOPrefs::instance()->mEx2PhoneDevice ); - ex2phone.mPhoneModel->setText( KOPrefs::instance()->mEx2PhoneModel ); + KOex2phonePrefs ex2phone; + + ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); + ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); + ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); if ( mode == 1 ) ex2phone.setCaption(i18n("Export complete calendar")); if ( mode == 2 ) @@ -1186,9 +1187,9 @@ void MainWindow::exportToPhone( int mode ) if ( !ex2phone.exec() ) { return; } - KOPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); - KOPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); - KOPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); + KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); + KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); + KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); int inFuture = 0; if ( ex2phone.mWriteBackFuture->isChecked() ) @@ -1232,9 +1233,9 @@ void MainWindow::exportToPhone( int mode ) } incidence = delSel.next(); } - PhoneFormat::writeConfig( KOPrefs::instance()->mEx2PhoneDevice, - KOPrefs::instance()->mEx2PhoneConnection, - KOPrefs::instance()->mEx2PhoneModel ); + PhoneFormat::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice, + KPimGlobalPrefs::instance()->mEx2PhoneConnection, + KPimGlobalPrefs::instance()->mEx2PhoneModel ); setCaption( i18n("Writing to phone...")); if ( PhoneFormat::writeToPhone( cal ) ) |