┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/dolphincolumnview.cpp8
-rw-r--r--src/dolphinview.cpp2
-rw-r--r--src/iconsizedialog.cpp2
-rw-r--r--src/statusbarmessagelabel.cpp2
-rw-r--r--src/statusbarspaceinfo.cpp6
5 files changed, 10 insertions, 10 deletions
diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index e4669442c..3e03ef571 100644
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -386,7 +386,7 @@ void ColumnWidget::paintEvent(QPaintEvent* event)
QPainter painter(viewport());
painter.save();
- QColor color = KColorScheme(KColorScheme::View).foreground();
+ QColor color = KColorScheme(QPalette::Active, KColorScheme::View).foreground().color();
color.setAlpha(32);
painter.setPen(Qt::NoPen);
painter.setBrush(color);
@@ -433,7 +433,7 @@ void ColumnWidget::selectionChanged(const QItemSelection& selected, const QItemS
void ColumnWidget::activate()
{
- const QColor bgColor = KColorScheme(KColorScheme::View).background();
+ const QColor bgColor = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
QPalette palette = viewport()->palette();
palette.setColor(viewport()->backgroundRole(), bgColor);
viewport()->setPalette(palette);
@@ -443,8 +443,8 @@ void ColumnWidget::activate()
void ColumnWidget::deactivate()
{
- QColor bgColor = KColorScheme(KColorScheme::View).background();
- const QColor fgColor = KColorScheme(KColorScheme::View).foreground();
+ QColor bgColor = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
+ const QColor fgColor = KColorScheme(QPalette::Active, KColorScheme::View).foreground().color();
bgColor = KColorUtils::mix(bgColor, fgColor, 0.04);
QPalette palette = viewport()->palette();
diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 7339b8227..d145597ca 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -911,7 +911,7 @@ void DolphinView::applyCutItemEffect()
void DolphinView::updateViewportColor()
{
- QColor color = KColorScheme(KColorScheme::View).background();
+ QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
if (m_active) {
emit urlChanged(url()); // Hmm, this is a hack; the url hasn't really changed.
emit selectionChanged(selectedItems());
diff --git a/src/iconsizedialog.cpp b/src/iconsizedialog.cpp
index da5c66e2f..d55380294 100644
--- a/src/iconsizedialog.cpp
+++ b/src/iconsizedialog.cpp
@@ -59,7 +59,7 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
// create 'Icon Size' group including slider and preview
QGroupBox* iconSizeBox = new QGroupBox(i18nc("@title:group", "Icon Size"), main);
- const QColor iconBackgroundColor = KColorScheme(KColorScheme::View).background();
+ const QColor iconBackgroundColor = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
KHBox* iconSizeHBox = new KHBox(iconSizeBox);
iconSizeHBox->setSpacing(spacing);
diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index fd2c2abd9..8f5f2096e 100644
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -139,7 +139,7 @@ void StatusBarMessageLabel::paintEvent(QPaintEvent* /* event */)
// draw background
QColor backgroundColor = palette().brush(QPalette::Background).color();
- QColor foregroundColor = KColorScheme(KColorScheme::View).foreground();
+ QColor foregroundColor = KColorScheme(QPalette::Active, KColorScheme::View).foreground().color();
if (m_illumination > 0) {
// TODO: are there foreground and background colors available for
// "error messages"?
diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index 117d63f16..844368136 100644
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -75,7 +75,7 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
frameColor.setAlpha(128);
painter.setPen(frameColor);
- const QColor backgrColor = KColorScheme(KColorScheme::View).background();
+ const QColor backgrColor = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
painter.setBrush(backgrColor);
painter.drawRect(QRect(0, barTop + 1 , barWidth - widthDec, barHeight));
@@ -104,7 +104,7 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
}
// draw text
- painter.setPen(KColorScheme(KColorScheme::View).foreground());
+ painter.setPen(KColorScheme(QPalette::Active, KColorScheme::View).foreground().color());
painter.drawText(QRect(1, 1, barWidth - 2, barHeight + 6),
Qt::AlignCenter | Qt::TextWordWrap,
text);
@@ -164,7 +164,7 @@ void StatusBarSpaceInfo::refresh()
QColor StatusBarSpaceInfo::progressColor(const QColor& bgColor) const
{
- QColor color = KColorScheme(KColorScheme::Button).background();
+ QColor color = KColorScheme(QPalette::Active, KColorScheme::Button).background().color();
// assure that enough contrast is given between the background color
// and the progressbar color