Diffstat (limited to 'libkdepim/kcmconfigs/kdepimconfigwidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 24 |
1 files changed, 22 insertions, 2 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 | |||
@@ -209,46 +209,64 @@ void KDEPIMConfigWidget::setupStoreTab() | |||
209 | connect(pb, SIGNAL( clicked() ), this, SLOT ( saveStoreSettings() ) ); | 209 | connect(pb, SIGNAL( clicked() ), this, SLOT ( saveStoreSettings() ) ); |
210 | pb = new QPushButton ( i18n("Save standard"), bb ); | 210 | pb = new QPushButton ( i18n("Save standard"), bb ); |
211 | connect(pb, SIGNAL( clicked() ), this, SLOT ( setStandardStore() ) ); | 211 | connect(pb, SIGNAL( clicked() ), this, SLOT ( setStandardStore() ) ); |
212 | #ifdef DESKTOP_VERSION | 212 | #ifdef DESKTOP_VERSION |
213 | pb = new QPushButton ( i18n("Save using LOCAL storage"), bb ); | 213 | pb = new QPushButton ( i18n("Save using LOCAL storage"), bb ); |
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 | { |
222 | mStoreUrl->setURL( "LOCAL:kdepimpi" ); | 228 | mStoreUrl->setURL( "LOCAL:kdepimpi" ); |
223 | saveStoreSettings(); | 229 | saveStoreSettings(); |
224 | QString message = i18n("'LOCAL' mode makes is possible to run\nKA/Pi and KO/Pi from a USB memory stick.\nIn LOCAL mode the data is stored\nin a path relative to the executable.\nNote, that in LOCAL mode only addressbook\nresource files in\n <path of the executable>/<dirname after LOCAL:>/apps/kabc/*.vcf\n are supported.\nIf you use the standard addressbook settings\nyou do not have to reconfigure any path,\njust restart the application and import\nyour addressbook and calendar data."); | 230 | QString message = i18n("'LOCAL' mode makes is possible to run\nKA/Pi and KO/Pi from a USB memory stick.\nIn LOCAL mode the data is stored\nin a path relative to the executable.\nNote, that in LOCAL mode only addressbook\nresource files in\n <path of the executable>/<dirname after LOCAL:>/apps/kabc/*.vcf\n are supported.\nIf you use the standard addressbook settings\nyou do not have to reconfigure any path,\njust restart the application and import\nyour addressbook and calendar data."); |
225 | KMessageBox::information( this, message); | 231 | KMessageBox::information( this, message); |
226 | } | 232 | } |
227 | void KDEPIMConfigWidget::setStandardStore() | 233 | void KDEPIMConfigWidget::setStandardStore() |
228 | { | 234 | { |
229 | mStoreUrl->setURL( QDir::homeDirPath() + "/kdepim" ); | 235 | mStoreUrl->setURL( QDir::homeDirPath() + "/kdepim" ); |
230 | saveStoreSettings(); | 236 | saveStoreSettings(); |
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(); |
237 | #ifdef DESKTOP_VERSION | 254 | #ifdef DESKTOP_VERSION |
238 | if ( url.startsWith( "LOCAL:" ) ) { | 255 | if ( url.startsWith( "LOCAL:" ) ) { |
239 | path = qApp->applicationDirPath () ; | 256 | path = qApp->applicationDirPath () ; |
240 | } | 257 | } |
241 | #endif | 258 | #endif |
242 | KConfig cfg ( path + "/.microkdehome" ); | 259 | KConfig cfg ( path + "/.microkdehome" ); |
243 | cfg.setGroup("Global"); | 260 | cfg.setGroup("Global"); |
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(); |
250 | } | 268 | } |
251 | } | 269 | } |
252 | void KDEPIMConfigWidget::setupExternalAppTab() | 270 | void KDEPIMConfigWidget::setupExternalAppTab() |
253 | { | 271 | { |
254 | QWidget *externalAppsPage = new QWidget( this ); | 272 | QWidget *externalAppsPage = new QWidget( this ); |
@@ -836,18 +854,20 @@ void KDEPIMConfigWidget::usrReadConfig() | |||
836 | { | 854 | { |
837 | KPimGlobalPrefs* prefs = KPimGlobalPrefs::instance(); | 855 | KPimGlobalPrefs* prefs = KPimGlobalPrefs::instance(); |
838 | 856 | ||
839 | bool blocked = signalsBlocked(); | 857 | bool blocked = signalsBlocked(); |
840 | blockSignals( true ); | 858 | blockSignals( true ); |
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 | ||
849 | QString dummy = prefs->mUserDateFormatLong; | 869 | QString dummy = prefs->mUserDateFormatLong; |
850 | mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") )); | 870 | mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") )); |
851 | dummy = prefs->mUserDateFormatShort; | 871 | dummy = prefs->mUserDateFormatShort; |
852 | mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") )); | 872 | mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") )); |
853 | 873 | ||