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

diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index 54eb2d3f6..4db953750 100644
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -20,18 +20,17 @@
 
 #include "statusbarmessagelabel.h"
 
-#include <kglobalsettings.h>
-#include <kcolorutils.h>
+#include <kcolorscheme.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),
@@ -42,20 +41,25 @@ StatusBarMessageLabel::StatusBarMessageLabel(QWidget* parent) :
     m_timer(0),
     m_closeButton(0)
 {
-    setMinimumHeight(K3Icon::SizeSmall);
+    setMinimumHeight(KIconLoader::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()));
 }
 
 StatusBarMessageLabel::~StatusBarMessageLabel()
-{}
+{
+}
 
 void StatusBarMessageLabel::setMessage(const QString& text,
                                        DolphinStatusBar::Type type)
@@ -95,7 +99,6 @@ void StatusBarMessageLabel::setMessage(const QString& text,
         break;
 
     case DolphinStatusBar::Error:
-        iconName = "dialog-error";
         m_timer->start(100);
         m_state = Illuminate;
 
@@ -119,7 +122,9 @@ void StatusBarMessageLabel::setMinimumTextHeight(int min)
     if (min != m_minTextHeight) {
         m_minTextHeight = min;
         setMinimumHeight(min);
-        m_closeButton->setFixedHeight(min - borderGap() * 2);
+        if (m_closeButton->height() > min) {
+            m_closeButton->setFixedHeight(min);
+        }
     }
 }
 
@@ -135,30 +140,30 @@ void StatusBarMessageLabel::paintEvent(QPaintEvent* /* event */)
     QPainter painter(this);
 
     // draw background
-    QColor backgroundColor(palette().brush(QPalette::Background).color());
-    QColor foregroundColor(KGlobalSettings::textColor());
+    QColor backgroundColor = palette().window().color();
     if (m_illumination > 0) {
-        QColor mixColor(255, 255, 128, m_illumination);
-        backgroundColor = KColorUtils::overlayColors(backgroundColor, mixColor);
-
-        mixColor.setRgb(0, 0, 0, m_illumination);
-        foregroundColor = KColorUtils::overlayColors(foregroundColor, mixColor);
+        // at this point, a: we are a second label being drawn over the already
+        // painted status area, so we can be translucent, and b: our palette's
+        // window color (bg only) seems to be wrong (always black)
+        KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window);
+        backgroundColor = scheme.background(KColorScheme::NegativeBackground).color();
+        backgroundColor.setAlpha(qMin(255, m_illumination*2));
     }
     painter.setBrush(backgroundColor);
-    painter.setPen(backgroundColor);
+    painter.setPen(Qt::NoPen);
     painter.drawRect(QRect(0, 0, width(), height()));
 
     // draw pixmap
-    int x = borderGap();
+    int x = BorderGap;
     int y = (m_minTextHeight - m_pixmap.height()) / 2;
 
     if (!m_pixmap.isNull()) {
         painter.drawPixmap(x, y, m_pixmap);
-        x += m_pixmap.width() + borderGap();
+        x += m_pixmap.width() + BorderGap;
     }
 
     // draw text
-    painter.setPen(foregroundColor);
+    painter.setPen(palette().windowText().color());
     int flags = Qt::AlignVCenter;
     if (height() > m_minTextHeight) {
         flags = flags | Qt::TextWordWrap;
@@ -179,10 +184,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 {
@@ -261,14 +267,14 @@ void StatusBarMessageLabel::assureVisibleText()
 int StatusBarMessageLabel::availableTextWidth() const
 {
     const int buttonWidth = (m_type == DolphinStatusBar::Error) ?
-                            m_closeButton->width() + borderGap() : 0;
-    return width() - m_pixmap.width() - (borderGap() * 4) - buttonWidth;
+                            m_closeButton->width() + BorderGap : 0;
+    return width() - m_pixmap.width() - (BorderGap * 4) - buttonWidth;
 }
 
 void StatusBarMessageLabel::updateCloseButtonPosition()
 {
-    const int x = width() - m_closeButton->width() - borderGap();
-    const int y = height() - m_closeButton->height() - borderGap();
+    const int x = width() - m_closeButton->width() - BorderGap;
+    const int y = (height() - m_closeButton->height()) / 2;
     m_closeButton->move(x, y);
 }