-rw-r--r-- | korganizer/koprefsdialog.cpp | 14 | ||||
-rw-r--r-- | korganizer/koprefsdialog.h | 1 |
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 | |||
@@ -1421,33 +1421,39 @@ void KOPrefsDialog::usrReadConfig() | |||
1421 | 1421 | ||
1422 | //that soundmLocalTempFile->setText(KOPrefs::instance()->mLocalTempFile); | 1422 | //that soundmLocalTempFile->setText(KOPrefs::instance()->mLocalTempFile); |
1423 | mDefaultAlarmFile->setText(KOPrefs::instance()->mDefaultAlarmFile); | 1423 | mDefaultAlarmFile->setText(KOPrefs::instance()->mDefaultAlarmFile); |
1424 | updateCategories(); | 1424 | updateCategories(); |
1425 | mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps ); | 1425 | mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps ); |
1426 | mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime ); | 1426 | mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime ); |
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 | ||
1432 | 1432 | ||
1433 | void KOPrefsDialog::usrWriteConfig() | 1433 | void 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()); |
1439 | KOPrefs::instance()->setEmail(mEmailEdit->text()); | 1437 | KOPrefs::instance()->setEmail(mEmailEdit->text()); |
1440 | 1438 | ||
1441 | KOPrefs::instance()->mAutoSaveInterval = mAutoSaveIntervalSpin->value(); | 1439 | KOPrefs::instance()->mAutoSaveInterval = mAutoSaveIntervalSpin->value(); |
1442 | KOPrefs::instance()->mStartTime = mStartTimeSpin->value(); | 1440 | KOPrefs::instance()->mStartTime = mStartTimeSpin->value(); |
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()) { |
1448 | KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current()); | 1454 | KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current()); |
1449 | ++it; | 1455 | ++it; |
1450 | } | 1456 | } |
1451 | 1457 | ||
1452 | KOPrefs::instance()->mNextXDays = mNextXDaysSpin->value(); | 1458 | KOPrefs::instance()->mNextXDays = mNextXDaysSpin->value(); |
1453 | KOPrefs::instance()->mWhatsNextDays = mWhatsNextSpin->value(); | 1459 | KOPrefs::instance()->mWhatsNextDays = mWhatsNextSpin->value(); |
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h index 80d6545..baa6cf9 100644 --- a/korganizer/koprefsdialog.h +++ b/korganizer/koprefsdialog.h | |||
@@ -85,16 +85,17 @@ class KOPrefsDialog : public KPrefsDialog | |||
85 | void setupPrinterTab(); | 85 | void setupPrinterTab(); |
86 | void setupGroupSchedulingTab(); | 86 | void setupGroupSchedulingTab(); |
87 | void setupGroupAutomationTab(); | 87 | void setupGroupAutomationTab(); |
88 | 88 | ||
89 | void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0); | 89 | void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0); |
90 | 90 | ||
91 | 91 | ||
92 | private: | 92 | private: |
93 | QColor mCatDefaultColor; | ||
93 | KPrefsDialogWidBool *mEnableGroupScheduling; | 94 | KPrefsDialogWidBool *mEnableGroupScheduling; |
94 | KPrefsDialogWidBool *mEnableProjectView; | 95 | KPrefsDialogWidBool *mEnableProjectView; |
95 | 96 | ||
96 | QFrame *mPrinterTab; | 97 | QFrame *mPrinterTab; |
97 | 98 | ||
98 | QLineEdit *nameEdit; | 99 | QLineEdit *nameEdit; |
99 | QLineEdit *emailEdit; | 100 | QLineEdit *emailEdit; |
100 | 101 | ||