summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koprefsdialog.cpp14
-rw-r--r--korganizer/koprefsdialog.h1
2 files changed, 11 insertions, 4 deletions
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 7ba1392..ebcff33 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -1427,5 +1427,5 @@ void KOPrefsDialog::usrReadConfig()
1427 mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount ); 1427 mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount );
1428 mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval ); 1428 mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval );
1429 1429 mCatDefaultColor = KOPrefs::instance()->mEventColor;
1430} 1430}
1431 1431
@@ -1433,6 +1433,4 @@ void KOPrefsDialog::usrReadConfig()
1433void KOPrefsDialog::usrWriteConfig() 1433void KOPrefsDialog::usrWriteConfig()
1434{ 1434{
1435
1436
1437 KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text(); 1435 KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text();
1438 KOPrefs::instance()->setFullName(mNameEdit->text()); 1436 KOPrefs::instance()->setFullName(mNameEdit->text());
@@ -1443,5 +1441,13 @@ void KOPrefsDialog::usrWriteConfig()
1443 KOPrefs::instance()->mDefaultDuration = mDefaultDurationSpin->value(); 1441 KOPrefs::instance()->mDefaultDuration = mDefaultDurationSpin->value();
1444 KOPrefs::instance()->mAlarmTime = mAlarmTimeCombo->currentItem(); 1442 KOPrefs::instance()->mAlarmTime = mAlarmTimeCombo->currentItem();
1445 1443 if ( mCatDefaultColor != KOPrefs::instance()->mEventColor ) {
1444 QStringList cat = KOPrefs::instance()->mCustomCategories;
1445 int iii = 0;
1446 while ( iii < cat.count() ) {
1447 if ( *KOPrefs::instance()->categoryColor( cat[ iii ] ) == mCatDefaultColor )
1448 KOPrefs::instance()->setCategoryColor( cat[ iii ], KOPrefs::instance()->mEventColor );
1449 ++iii;
1450 }
1451 }
1446 QDictIterator<QColor> it(mCategoryDict); 1452 QDictIterator<QColor> it(mCategoryDict);
1447 while (it.current()) { 1453 while (it.current()) {
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index 80d6545..baa6cf9 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -91,4 +91,5 @@ class KOPrefsDialog : public KPrefsDialog
91 91
92 private: 92 private:
93 QColor mCatDefaultColor;
93 KPrefsDialogWidBool *mEnableGroupScheduling; 94 KPrefsDialogWidBool *mEnableGroupScheduling;
94 KPrefsDialogWidBool *mEnableProjectView; 95 KPrefsDialogWidBool *mEnableProjectView;