author | zautrix <zautrix> | 2005-07-27 16:02:58 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-27 16:02:58 (UTC) |
commit | 136f9082862e7a56abb3a201e96f5e7386c4f1b9 (patch) (unidiff) | |
tree | ebddba3dd07aa3ac5ea5f75cb962606d84d4fec0 /libkdepim | |
parent | cdd39d566d5d054edf26bd142d6be05cb35451dd (diff) | |
download | kdepimpi-136f9082862e7a56abb3a201e96f5e7386c4f1b9.zip kdepimpi-136f9082862e7a56abb3a201e96f5e7386c4f1b9.tar.gz kdepimpi-136f9082862e7a56abb3a201e96f5e7386c4f1b9.tar.bz2 |
fixxxuuu
-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 | |||
@@ -200,3 +200,3 @@ void KDEPIMConfigWidget::setupStoreTab() | |||
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 ); |
@@ -216,4 +216,10 @@ void KDEPIMConfigWidget::setupStoreTab() | |||
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 | } |
@@ -233,2 +239,13 @@ 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() ) { |
@@ -246,2 +263,3 @@ void KDEPIMConfigWidget::saveStoreSettings() | |||
246 | cfg.sync(); | 263 | cfg.sync(); |
264 | mDataStoragePath->setText( i18n("Settings are stored in\n%1").arg( path+"/.microkdehome" )); | ||
247 | } else { | 265 | } else { |
@@ -843,4 +861,6 @@ void KDEPIMConfigWidget::usrReadConfig() | |||
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 ); |
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 | |||
@@ -154,3 +154,3 @@ class KDEPIMConfigWidget : public KPrefsWidget | |||
154 | 154 | ||
155 | 155 | QLabel* mDataStoragePath; | |
156 | KURLRequester* mBackupUrl; | 156 | KURLRequester* mBackupUrl; |
diff --git a/libkdepim/kdatepicker.cpp b/libkdepim/kdatepicker.cpp index 7f352d6..25b4e81 100644 --- a/libkdepim/kdatepicker.cpp +++ b/libkdepim/kdatepicker.cpp | |||
@@ -479,2 +479,3 @@ void KDatePicker::keyPressEvent ( QKeyEvent * e ) | |||
479 | case Qt::Key_Enter: | 479 | case Qt::Key_Enter: |
480 | case Qt::Key_Space: | ||
480 | tableClickedSlot(); | 481 | tableClickedSlot(); |