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

diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index 759ceed6d..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),
@@ -52,7 +52,7 @@ StatusBarMessageLabel::StatusBarMessageLabel(QWidget* parent) :
     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()));
@@ -99,7 +99,6 @@ void StatusBarMessageLabel::setMessage(const QString& text,
         break;
 
     case DolphinStatusBar::Error:
-        iconName = "dialog-error";
         m_timer->start(100);
         m_state = Illuminate;
 
@@ -139,8 +138,8 @@ 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) {
         // TODO: are there foreground and background colors available for
         // "error messages"?