diff --git a/src/akonadicollectionview.cpp b/src/akonadicollectionview.cpp --- a/src/akonadicollectionview.cpp +++ b/src/akonadicollectionview.cpp @@ -753,12 +753,11 @@ const Akonadi::Collection collection = CalendarSupport::collectionFromIndex(index); Q_ASSERT(collection.isValid()); - const QString identifier = QString::number(collection.id()); - const QColor defaultColor = KOPrefs::instance()->resourceColor(identifier); + const QColor defaultColor = KOHelper::resourceColor(collection); QColor myColor; myColor = QColorDialog::getColor(defaultColor); if (myColor.isValid() && myColor != defaultColor) { - KOPrefs::instance()->setResourceColor(identifier, myColor); + KOHelper::setResourceColor(collection, myColor); Q_EMIT colorsChanged(); updateMenu(); updateView(); @@ -771,8 +770,7 @@ Q_ASSERT(index.isValid()); const Akonadi::Collection collection = CalendarSupport::collectionFromIndex(index); Q_ASSERT(collection.isValid()); - const QString identifier = QString::number(collection.id()); - KOPrefs::instance()->setResourceColor(identifier, QColor()); + KOHelper::setResourceColor(collection, QColor()); updateMenu(); updateView(); Q_EMIT colorsChanged(); @@ -828,8 +826,7 @@ const Akonadi::Collection collection = CalendarSupport::collectionFromIndex(index); if (collection.isValid() && !collection.contentMimeTypes().isEmpty()) { - const QString identifier = QString::number(collection.id()); - const QColor defaultColor = KOPrefs::instance()->resourceColor(identifier); + const QColor defaultColor = KOHelper::resourceColor(collection); enableAction = enableAction && defaultColor.isValid(); if (collection.remoteId() == QLatin1String("akonadi_birthdays_resource")) { enableAction = false; diff --git a/src/kohelper.cpp b/src/kohelper.cpp --- a/src/kohelper.cpp +++ b/src/kohelper.cpp @@ -25,8 +25,9 @@ #include "kohelper.h" #include "prefs/koprefs.h" -#include +#include +#include #include QColor KOHelper::getTextColor(const QColor &c) @@ -37,40 +38,22 @@ QColor KOHelper::resourceColor(const Akonadi::Collection &coll) { - if (!coll.isValid()) { - return QColor(); - } - - const QString id = QString::number(coll.id()); - return KOPrefs::instance()->resourceColor(id); + return EventViews::resourceColor(coll, KOPrefs::instance()->eventViewsPreferences()); } QColor KOHelper::resourceColorKnown(const Akonadi::Collection &coll) { - if (!coll.isValid()) { - return QColor(); - } - - const QString id = QString::number(coll.id()); - return KOPrefs::instance()->resourceColorKnown(id); + return EventViews::resourceColor(coll, KOPrefs::instance()->eventViewsPreferences()); } void KOHelper::setResourceColor(const Akonadi::Collection &collection, const QColor &color) { - if (collection.isValid()) { - const QString id = QString::number(collection.id()); - return KOPrefs::instance()->setResourceColor(id, color); - } + EventViews::setResourceColor(collection, color, KOPrefs::instance()->eventViewsPreferences()); } QColor KOHelper::resourceColor(const Akonadi::Item &item) { - if (!item.isValid()) { - return QColor(); - } - - const QString id = QString::number(item.storageCollectionId()); - return KOPrefs::instance()->resourceColor(id); + return EventViews::resourceColor(item, KOPrefs::instance()->eventViewsPreferences()); } int KOHelper::yearDiff(const QDate &start, const QDate &end)