There are some extractable strings in subdirs too.

[dolphin.git] / src / statusbarmessagelabel.cpp

diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index d734a5e0c0db09530020f0b8f9ca36b744fb1c04..e24a59add4949a0cfc57e9cc34f12f6e5709507f 100644 (file)
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -21,7 +21,6 @@
 #include "statusbarmessagelabel.h"
 
 #include <kcolorscheme.h>
-#include <kcolorutils.h>
 #include <kiconloader.h>
 #include <kicon.h>
 #include <klocale.h>
@@ -90,7 +89,8 @@ void StatusBarMessageLabel::setMessage(const QString& text,
     QPixmap pixmap;
     switch (type) {
     case DolphinStatusBar::OperationCompleted:
-        iconName = "ok";
+        iconName = "dialog-ok";
+        // "ok" icon should probably be "dialog-success", but we don't have that icon in KDE 4.0
         m_closeButton->hide();
         break;
 
@@ -141,17 +141,17 @@ void StatusBarMessageLabel::paintEvent(QPaintEvent* /* event */)
     QPainter painter(this);
 
     // draw background
-    QColor backgroundColor = palette().brush(QPalette::Background).color();
-    QColor foregroundColor = KColorScheme(QPalette::Active, KColorScheme::View).foreground().color();
+    QColor backgroundColor = palette().window().color();
     if (m_illumination > 0) {
-        // 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);
+        // 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
@@ -164,7 +164,7 @@ void StatusBarMessageLabel::paintEvent(QPaintEvent* /* event */)
     }
 
     // draw text
-    painter.setPen(foregroundColor);
+    painter.setPen(palette().windowText().color());
     int flags = Qt::AlignVCenter;
     if (height() > m_minTextHeight) {
         flags = flags | Qt::TextWordWrap;
@@ -229,15 +229,20 @@ void StatusBarMessageLabel::assureVisibleText()
         return;
     }
 
-    // calculate the required height of the widget thats
-    // needed for having a fully visible text
-    QFontMetrics fontMetrics(font());
-    const QRect bounds(fontMetrics.boundingRect(0, 0, availableTextWidth(), height(),
-                       Qt::AlignVCenter | Qt::TextWordWrap,
-                       m_text));
-    int requiredHeight = bounds.height();
-    if (requiredHeight < m_minTextHeight) {
-        requiredHeight = m_minTextHeight;
+    int requiredHeight = m_minTextHeight;
+    if (m_type != DolphinStatusBar::Default) {
+        // Calculate the required height of the widget thats
+        // needed for having a fully visible text. Note that for the default
+        // statusbar type (e. g. hover information) increasing the text height
+        // is not wanted, as this might rearrange the layout of items.
+
+        QFontMetrics fontMetrics(font());
+        const QRect bounds(fontMetrics.boundingRect(0, 0, availableTextWidth(), height(),
+                           Qt::AlignVCenter | Qt::TextWordWrap, m_text));
+        requiredHeight = bounds.height();
+        if (requiredHeight < m_minTextHeight) {
+            requiredHeight = m_minTextHeight;
+        }
     }
 
     // Increase/decrease the current height of the widget to the