summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/kaddressbook/germantranslation.txt1
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt2
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.cpp26
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.h2
-rw-r--r--libkdepim/kdatepicker.cpp1
5 files changed, 27 insertions, 5 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index 9532759..e874b85 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -808,4 +808,5 @@
808{ "Sending back file ...","Sende Datei zurück..." }, 808{ "Sending back file ...","Sende Datei zurück..." },
809{ "Eeek, there I am ticklish!","Huch, da bin ich kitzlig!" }, 809{ "Eeek, there I am ticklish!","Huch, da bin ich kitzlig!" },
810{ "Save using LOCAL storage","Speichere nutze LOCAL Pfad" },
810{ "","" }, 811{ "","" },
811{ "","" }, 812{ "","" },
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index e699fe9..f3f5333 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1531,5 +1531,5 @@
1531{ "Checking conflicts ... please wait","Überprüfe Konflikte ... bitte warten" }, 1531{ "Checking conflicts ... please wait","Überprüfe Konflikte ... bitte warten" },
1532{ "Show times on two lines","Zeige Zeiten auf zwei Zeilen" }, 1532{ "Show times on two lines","Zeige Zeiten auf zwei Zeilen" },
1533{ "","" }, 1533{ "Save using LOCAL storage","Speichere nutze LOCAL Pfad" },
1534{ "","" }, 1534{ "","" },
1535{ "","" }, 1535{ "","" },
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
@@ -199,5 +199,5 @@ void KDEPIMConfigWidget::setupStoreTab()
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 );
@@ -215,6 +215,12 @@ void KDEPIMConfigWidget::setupStoreTab()
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}
220void KDEPIMConfigWidget::setLocalStore() 226void KDEPIMConfigWidget::setLocalStore()
@@ -232,4 +238,15 @@ void KDEPIMConfigWidget::setStandardStore()
232void KDEPIMConfigWidget::saveStoreSettings() 238void 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();
@@ -245,4 +262,5 @@ void KDEPIMConfigWidget::saveStoreSettings()
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" );
@@ -842,6 +860,8 @@ void KDEPIMConfigWidget::usrReadConfig()
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);
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
@@ -153,5 +153,5 @@ class KDEPIMConfigWidget : public KPrefsWidget
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 ;
diff --git a/libkdepim/kdatepicker.cpp b/libkdepim/kdatepicker.cpp
index 7f352d6..25b4e81 100644
--- a/libkdepim/kdatepicker.cpp
+++ b/libkdepim/kdatepicker.cpp
@@ -478,4 +478,5 @@ void KDatePicker::keyPressEvent ( QKeyEvent * e )
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;