-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 26 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.h | 2 | ||||
-rw-r--r-- | libkdepim/kdatepicker.cpp | 1 |
3 files changed, 25 insertions, 4 deletions
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index ff1e240..764c495 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -198,7 +198,7 @@ void KDEPIMConfigWidget::setupStoreTab() | |||
198 | } | 198 | } |
199 | } | 199 | } |
200 | 200 | ||
201 | #endif | 201 | #endif |
202 | new QLabel( i18n("New dirs are created automatically"), storePage ); | 202 | new QLabel( i18n("New dirs are created automatically"), storePage ); |
203 | QHBox *bb = new QHBox( storePage ); | 203 | QHBox *bb = new QHBox( storePage ); |
204 | QPushButton * pb; | 204 | QPushButton * pb; |
@@ -214,8 +214,14 @@ void KDEPIMConfigWidget::setupStoreTab() | |||
214 | connect(pb, SIGNAL( clicked() ), this, SLOT ( setLocalStore() ) ); | 214 | connect(pb, SIGNAL( clicked() ), this, SLOT ( setLocalStore() ) ); |
215 | #endif | 215 | #endif |
216 | new QLabel( i18n("<b>New settings are used\nafter a restart</b>"), storePage ); | 216 | new QLabel( i18n("<b>New settings are used\nafter a restart</b>"), storePage ); |
217 | new QLabel( i18n("Settings are stored in\n%1").arg(QDir::homeDirPath() + "/.microkdehome" ), storePage ); | 217 | mDataStoragePath = new QLabel( i18n("Settings are stored in\n%1").arg(QDir::homeDirPath() + "/.microkdehome" ), storePage ); |
218 | tabWidget->addTab( storePage, i18n( "Data storage path" ) ); | 218 | tabWidget->addTab( storePage, i18n( "Data storage path" ) ); |
219 | |||
220 | #ifdef DESKTOP_VERSION | ||
221 | if ( mStoreUrl->url().startsWith( "LOCAL:" ) ) { | ||
222 | mDataStoragePath->setText( i18n("Settings are stored in\n%1").arg( qApp->applicationDirPath ()+"/.microkdehome" )); | ||
223 | } | ||
224 | #endif | ||
219 | } | 225 | } |
220 | void KDEPIMConfigWidget::setLocalStore() | 226 | void KDEPIMConfigWidget::setLocalStore() |
221 | { | 227 | { |
@@ -231,6 +237,17 @@ void KDEPIMConfigWidget::setStandardStore() | |||
231 | } | 237 | } |
232 | void KDEPIMConfigWidget::saveStoreSettings() | 238 | void KDEPIMConfigWidget::saveStoreSettings() |
233 | { | 239 | { |
240 | #ifdef DESKTOP_VERSION | ||
241 | if ( !mStoreUrl->url().startsWith( "LOCAL:" ) ) { | ||
242 | QString file = qApp->applicationDirPath ()+"/.microkdehome"; | ||
243 | QFileInfo fi ( file ); | ||
244 | if ( fi.exists() ) { | ||
245 | bool res = QFile::remove( file ); | ||
246 | if ( ! res ) | ||
247 | KMessageBox::information( this, i18n("ERROR: Cannot remove file\n%1\nPlease remove it manually.").arg( file )); | ||
248 | } | ||
249 | } | ||
250 | #endif | ||
234 | if ( !mStoreUrl->url().isEmpty() ) { | 251 | if ( !mStoreUrl->url().isEmpty() ) { |
235 | QString path = QDir::homeDirPath(); | 252 | QString path = QDir::homeDirPath(); |
236 | QString url = mStoreUrl->url(); | 253 | QString url = mStoreUrl->url(); |
@@ -244,6 +261,7 @@ void KDEPIMConfigWidget::saveStoreSettings() | |||
244 | cfg.writeEntry( "MICROKDEHOME", url ); | 261 | cfg.writeEntry( "MICROKDEHOME", url ); |
245 | qDebug("cfg.writeEntry( MICROKDEHOME, %s ", url.latin1()); | 262 | qDebug("cfg.writeEntry( MICROKDEHOME, %s ", url.latin1()); |
246 | cfg.sync(); | 263 | cfg.sync(); |
264 | mDataStoragePath->setText( i18n("Settings are stored in\n%1").arg( path+"/.microkdehome" )); | ||
247 | } else { | 265 | } else { |
248 | mStoreUrl->setURL( QDir::homeDirPath() + "/kdepim" ); | 266 | mStoreUrl->setURL( QDir::homeDirPath() + "/kdepim" ); |
249 | saveStoreSettings(); | 267 | saveStoreSettings(); |
@@ -841,8 +859,10 @@ void KDEPIMConfigWidget::usrReadConfig() | |||
841 | 859 | ||
842 | if (KPimGlobalPrefs::instance()->mBackupUseDefaultDir ) | 860 | if (KPimGlobalPrefs::instance()->mBackupUseDefaultDir ) |
843 | mBackupUrl->setURL( KGlobalSettings::backupDataDir() ); | 861 | mBackupUrl->setURL( KGlobalSettings::backupDataDir() ); |
844 | else | 862 | else { |
845 | mBackupUrl->setURL(prefs->mBackupDatadir); | 863 | mBackupUrl->setURL(prefs->mBackupDatadir); |
864 | |||
865 | } | ||
846 | mBackupNumbersSpin->setValue( prefs->mBackupNumbers ); | 866 | mBackupNumbersSpin->setValue( prefs->mBackupNumbers ); |
847 | mBackupDayCountSpin->setValue( prefs->mBackupDayCount); | 867 | mBackupDayCountSpin->setValue( prefs->mBackupDayCount); |
848 | 868 | ||
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.h b/libkdepim/kcmconfigs/kdepimconfigwidget.h index c0b92a9..824ef79 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.h +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.h | |||
@@ -152,7 +152,7 @@ class KDEPIMConfigWidget : public KPrefsWidget | |||
152 | QString mSipOtherMessage; | 152 | QString mSipOtherMessage; |
153 | QString mSipOtherMessageParameters; | 153 | QString mSipOtherMessageParameters; |
154 | 154 | ||
155 | 155 | QLabel* mDataStoragePath; | |
156 | KURLRequester* mBackupUrl; | 156 | KURLRequester* mBackupUrl; |
157 | QSpinBox* mBackupDayCountSpin, *mBackupNumbersSpin ; | 157 | QSpinBox* mBackupDayCountSpin, *mBackupNumbersSpin ; |
158 | QMap<ExternalAppHandler::Types, QString> mExternalAppsMap; | 158 | QMap<ExternalAppHandler::Types, QString> mExternalAppsMap; |
diff --git a/libkdepim/kdatepicker.cpp b/libkdepim/kdatepicker.cpp index 7f352d6..25b4e81 100644 --- a/libkdepim/kdatepicker.cpp +++ b/libkdepim/kdatepicker.cpp | |||
@@ -477,6 +477,7 @@ void KDatePicker::keyPressEvent ( QKeyEvent * e ) | |||
477 | 477 | ||
478 | case Qt::Key_Return: | 478 | case Qt::Key_Return: |
479 | case Qt::Key_Enter: | 479 | case Qt::Key_Enter: |
480 | case Qt::Key_Space: | ||
480 | tableClickedSlot(); | 481 | tableClickedSlot(); |
481 | break; | 482 | break; |
482 | case Qt::Key_Escape: | 483 | case Qt::Key_Escape: |