SVN_SILENT: typo, small msvc warning--

[dolphin.git] / src / statusbarspaceinfo.cpp

diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index 794d140787129469a7495b087e818e1757ab4c73..62b46700ab15d90554a11a53044ce467b2d74a0b 100644 (file)
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -22,7 +22,7 @@
 
 #include <QtCore/QTimer>
 #include <QtGui/QPainter>
-#include <QtGui/QPaintEvent>
+#include <QtGui/QKeyEvent>
 
 #include <kglobalsettings.h>
 #include <kdiskfreespace.h>
@@ -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();
@@ -110,9 +111,9 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
 }
 
 
-void StatusBarSpaceInfo::slotFoundMountPoint(const unsigned long& kBSize,
-                                             const unsigned long& kBUsed,
-                                             const unsigned long& kBAvailable,
+void StatusBarSpaceInfo::slotFoundMountPoint(const quint64& kBSize,
+                                             const quint64& kBUsed,
+                                             const quint64& kBAvailable,
                                              const QString& mountPoint)
 {
     Q_UNUSED(kBUsed);
@@ -146,13 +147,13 @@ void StatusBarSpaceInfo::refresh()
         return;
 
     KDiskFreeSpace* job = new KDiskFreeSpace(this);
-    connect(job, SIGNAL(foundMountPoint(const unsigned long&,
-                                        const unsigned long&,
-                                        const unsigned long&,
+    connect(job, SIGNAL(foundMountPoint(const quint64&,
+                                        const quint64&,
+                                        const quint64&,
                                         const QString&)),
-            this, SLOT(slotFoundMountPoint(const unsigned long&,
-                                           const unsigned long&,
-                                           const unsigned long&,
+            this, SLOT(slotFoundMountPoint(const quint64&,
+                                           const quint64&,
+                                           const quint64&,
                                            const QString&)));
     connect(job, SIGNAL(done()),
             this, SLOT(showResult()));