assure that all statusbar elements use a transparent background to look nice with...

svn path=/trunk/KDE/kdebase/apps/; revision=672293

diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index 54eb2d3f6e6450f1599ac2b8ea6d03b2768a8ee4..759ceed6df9e466bbbe8f233f4e413b7e47a8a36 100644 (file)
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -44,6 +44,10 @@ 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()));
@@ -138,10 +142,10 @@ void StatusBarMessageLabel::paintEvent(QPaintEvent* /* event */)
     QColor backgroundColor(palette().brush(QPalette::Background).color());
     QColor foregroundColor(KGlobalSettings::textColor());
     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 +183,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 {

diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index 999f0ad54bc29b8b6de0aefc556b9711d67f11ec..bb0ed712a55ca14c42a1bb8d6450ab329629007e 100644 (file)
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -38,6 +38,10 @@ StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
 {
     setMinimumWidth(200);
 
+    QPalette palette;
+    palette.setColor(QPalette::Background, Qt::transparent);
+    setPalette(palette);
+
     // Update the space information each 10 seconds. Polling is useful
     // here, as files can be deleted/added outside the scope of Dolphin.
     QTimer* timer = new QTimer(this);
@@ -67,11 +71,8 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
 
     const int widthDec = 3;  // visual decrement for the available width
 
-    const QColor c1 = palette().brush(QPalette::Background).color();
-    const QColor c2 = KGlobalSettings::buttonTextColor();
-    const QColor frameColor((c1.red()   + c2.red())   / 2,
-                            (c1.green() + c2.green()) / 2,
-                            (c1.blue()  + c2.blue())  / 2);
+    QColor frameColor = palette().brush(QPalette::Background).color();
+    frameColor.setAlpha(128);
     painter.setPen(frameColor);
 
     const QColor backgrColor = KGlobalSettings::baseColor();