Code adaptation because of changes on libraries related to revision 719630

[dolphin.git] / src / statusbarmessagelabel.cpp

diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index 49d3b2750d2a317e3bf4f0ee5f6368a8ffe743fc..a32d259fc69f62d8e5302d93b5697c464383cdf7 100644 (file)
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -42,7 +42,7 @@ StatusBarMessageLabel::StatusBarMessageLabel(QWidget* parent) :
     m_timer(0),
     m_closeButton(0)
 {
-    setMinimumHeight(K3Icon::SizeSmall);
+    setMinimumHeight(KIconLoader::SizeSmall);
 
     QPalette palette;
     palette.setColor(QPalette::Background, Qt::transparent);
@@ -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;
 
@@ -140,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"?