summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-10-06 04:50:56 (GMT)
committerMontel Laurent <montel@kde.org>2016-10-06 04:50:56 (GMT)
commit23115fedf9971a6d4c67253d7946fbe8172b40d0 (patch)
tree2e4a8f2bde6c60c8d36e9c07534308e656328d8c
parentf1978e83ea45316d96c874e74791f7ebe0d4b662 (diff)
Store linkcolor
-rw-r--r--CMakeLists.txt2
-rw-r--r--messagecore/src/messagecoreutil.cpp6
-rw-r--r--messagecore/src/messagecoreutil.h2
-rw-r--r--messageviewer/src/viewer/csshelper.cpp2
4 files changed, 10 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55dc55d..ce27757 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
-set(PIM_VERSION "5.3.70")
+set(PIM_VERSION "5.3.71")
set(MESSAGELIB_LIB_VERSION ${PIM_VERSION})
set(AKONADIMIME_LIB_VERSION "5.3.40")
diff --git a/messagecore/src/messagecoreutil.cpp b/messagecore/src/messagecoreutil.cpp
index 60086d6..dab4b1b 100644
--- a/messagecore/src/messagecoreutil.cpp
+++ b/messagecore/src/messagecoreutil.cpp
@@ -70,6 +70,7 @@ void ColorUtil::initializeColors()
mPgpSignedUntrustedTextColor = scheme.foreground(KColorScheme::NeutralText).color();
mPgpSignedBadMessageColor = scheme.background(KColorScheme::NegativeBackground).color();
mPgpSignedBadTextColor = scheme.foreground(KColorScheme::NegativeText).color();
+ mLinkColor = scheme.foreground(KColorScheme::LinkText).color();
}
QColor ColorUtil::misspelledDefaultTextColor() const
@@ -131,3 +132,8 @@ QColor ColorUtil::pgpEncryptedTextColor() const
{
return mPgpEncryptedTextColor;
}
+
+QColor ColorUtil::linkColor() const
+{
+ return mLinkColor;
+}
diff --git a/messagecore/src/messagecoreutil.h b/messagecore/src/messagecoreutil.h
index 55be400..995b252 100644
--- a/messagecore/src/messagecoreutil.h
+++ b/messagecore/src/messagecoreutil.h
@@ -47,6 +47,7 @@ public:
QColor pgpSignedBadTextColor() const;
QColor pgpEncryptedMessageColor() const;
QColor pgpEncryptedTextColor() const;
+ QColor linkColor() const;
private:
void initializeColors();
@@ -63,6 +64,7 @@ private:
QColor mPgpSignedBadTextColor;
QColor mPgpEncryptedMessageColor;
QColor mPgpEncryptedTextColor;
+ QColor mLinkColor;
};
}
diff --git a/messageviewer/src/viewer/csshelper.cpp b/messageviewer/src/viewer/csshelper.cpp
index 71db368..edfb6f3 100644
--- a/messageviewer/src/viewer/csshelper.cpp
+++ b/messageviewer/src/viewer/csshelper.cpp
@@ -52,7 +52,7 @@ CSSHelper::CSSHelper(const QPaintDevice *pd)
// initialize with defaults - should match the corresponding application defaults
mForegroundColor = QApplication::palette().color(QPalette::Text);
- mLinkColor = scheme.foreground(KColorScheme::LinkText).color();
+ mLinkColor = MessageCore::ColorUtil::self()->linkColor();
mBackgroundColor = QApplication::palette().color(QPalette::Base);
cHtmlWarning = QColor(0xFF, 0x40, 0x40); // warning frame color: light red