Support 'select all' and 'invert selection' again.

[dolphin.git] / src / statusbarspaceinfo.cpp

diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index 0b2c4d1332be74c9f3b69d941ed27bd6cc714720..d63b12eb7fbb70e97bef2250ffbf71869e45fae1 100644 (file)
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -20,10 +20,10 @@
 
 #include "statusbarspaceinfo.h"
 
-#include <qpainter.h>
-#include <qtimer.h>
-//Added by qt3to4:
+#include <QPainter>
 #include <QPaintEvent>
+#include <QTimer>
+
 #include <kglobalsettings.h>
 #include <kdiskfreesp.h>
 #include <klocale.h>
@@ -66,7 +66,7 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
 
     const int widthDec = 3;  // visual decrement for the available width
 
-    const QColor c1 = colorGroup().background();
+    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,
@@ -85,11 +85,11 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
         int usedWidth = barWidth - static_cast<int>((m_kBAvailable *
                                                     static_cast<float>(barWidth)) / m_kBSize);
         const int left = 1;
-        int right = usedWidth - (widthDec + 1);
+        int right = usedWidth - widthDec;
         if (right < left) {
             right = left;
         }
-        painter.drawRect(QRect(left, barTop + 2, right, barHeight - 2));
+        painter.drawRect(QRect(left, barTop + 2, right, barHeight - 1));
 
         text = i18n("%1% of %2 used", QString::number(100 - (int)(100.0 * m_kBAvailable / m_kBSize)), KIO::convertSizeFromKiB(m_kBSize));
     }
@@ -105,8 +105,8 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
 
     // draw text (usually 'X% of Y GB used')
     painter.setPen(KGlobalSettings::textColor());
-    painter.drawText(QRect(1, 1, barWidth - 2, barHeight + 4),
-                     Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextWordWrap,
+    painter.drawText(QRect(1, 1, barWidth - 2, barHeight + 6),
+                     Qt::AlignCenter | Qt::TextWordWrap,
                      text);
 }