X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a91482a1d2fcc2fee8076c36208c7c4eb2c394b8..ec00f379dc42b00a64ab1af25bb4bb1a06bd7449:/src/statusbarmessagelabel.cpp

diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index 54eb2d3f6..fd2c2abd9 100644
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -20,18 +20,18 @@
 
 #include "statusbarmessagelabel.h"
 
-#include <kglobalsettings.h>
+#include <kcolorscheme.h>
 #include <kcolorutils.h>
 #include <kiconloader.h>
 #include <kicon.h>
 #include <klocale.h>
 
-#include <QtGui/QFontMetrics>
-#include <QtGui/QPainter>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QPushButton>
-#include <QtGui/QPixmap>
-#include <QtCore/QTimer>
+#include <QFontMetrics>
+#include <QPainter>
+#include <QKeyEvent>
+#include <QPushButton>
+#include <QPixmap>
+#include <QTimer>
 
 StatusBarMessageLabel::StatusBarMessageLabel(QWidget* parent) :
     QWidget(parent),
@@ -44,11 +44,15 @@ StatusBarMessageLabel::StatusBarMessageLabel(QWidget* parent) :
 {
     setMinimumHeight(K3Icon::SizeSmall);
 
+    QPalette palette;
+    palette.setColor(QPalette::Background, Qt::transparent);
+    setPalette(palette);
+
     m_timer = new QTimer(this);
     connect(m_timer, SIGNAL(timeout()),
             this, SLOT(timerDone()));
 
-    m_closeButton = new QPushButton(i18n("Close"), this);
+    m_closeButton = new QPushButton(i18nc("@action:button", "Close"), this);
     m_closeButton->hide();
     connect(m_closeButton, SIGNAL(clicked()),
             this, SLOT(closeErrorMessage()));
@@ -95,7 +99,6 @@ void StatusBarMessageLabel::setMessage(const QString& text,
         break;
 
     case DolphinStatusBar::Error:
-        iconName = "dialog-error";
         m_timer->start(100);
         m_state = Illuminate;
 
@@ -135,13 +138,13 @@ void StatusBarMessageLabel::paintEvent(QPaintEvent* /* event */)
     QPainter painter(this);
 
     // draw background
-    QColor backgroundColor(palette().brush(QPalette::Background).color());
-    QColor foregroundColor(KGlobalSettings::textColor());
+    QColor backgroundColor = palette().brush(QPalette::Background).color();
+    QColor foregroundColor = KColorScheme(KColorScheme::View).foreground();
     if (m_illumination > 0) {
-        QColor mixColor(255, 255, 128, m_illumination);
-        backgroundColor = KColorUtils::overlayColors(backgroundColor, mixColor);
-
-        mixColor.setRgb(0, 0, 0, m_illumination);
+        // TODO: are there foreground and background colors available for
+        // "error messages"?
+        backgroundColor.setRgb(255, 255, 0, m_illumination);
+        QColor mixColor(0, 0, 0, m_illumination);
         foregroundColor = KColorUtils::overlayColors(foregroundColor, mixColor);
     }
     painter.setBrush(backgroundColor);
@@ -179,10 +182,11 @@ void StatusBarMessageLabel::timerDone()
     switch (m_state) {
     case Illuminate: {
         // increase the illumination
-        if (m_illumination < 255) {
+        const int illumination_max = 128;
+        if (m_illumination < illumination_max) {
             m_illumination += 32;
-            if (m_illumination > 255) {
-                m_illumination = 255;
+            if (m_illumination > illumination_max) {
+                m_illumination = illumination_max;
             }
             update();
         } else {