show column mode in viewport context menu (thanks to Thomas Georgiou for the patch)

[dolphin.git] / src / statusbarspaceinfo.cpp

diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index 0b2c4d1332be74c9f3b69d941ed27bd6cc714720..09976372ab7c569bb2422f462eb79529668d66ea 100644 (file)
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -15,15 +15,15 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *

- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *

  ***************************************************************************/
 
 #include "statusbarspaceinfo.h"
 
  ***************************************************************************/
 
 #include "statusbarspaceinfo.h"
 

-#include <qpainter.h>
-#include <qtimer.h>
-//Added by qt3to4:
-#include <QPaintEvent>
+#include <QtCore/QTimer>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
+

 #include <kglobalsettings.h>
 #include <kdiskfreesp.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
 #include <kdiskfreesp.h>
 #include <klocale.h>


@@ -52,21 +52,21 @@ void StatusBarSpaceInfo::setUrl(const KUrl& url)
 {
     m_url = url;
     refresh();
 {
     m_url = url;
     refresh();

-    update();
+    QTimer::singleShot(300, this, SLOT(update()));

 }
 
 void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
 {
     QPainter painter(this);
     const int barWidth = width();
 }
 
 void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
 {
     QPainter painter(this);
     const int barWidth = width();

-    const int barTop = 2;
-    const int barHeight = height() - 4;
+    const int barTop = 1;
+    const int barHeight = height() - 5;

 
     QString text;
 
     const int widthDec = 3;  // visual decrement for the available width
 
 
     QString text;
 
     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,
     const QColor c2 = KGlobalSettings::buttonTextColor();
     const QColor frameColor((c1.red()   + c2.red())   / 2,
                             (c1.green() + c2.green()) / 2,


@@ -83,39 +83,40 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
         painter.setPen(Qt::NoPen);
         painter.setBrush(progressColor(backgrColor));
         int usedWidth = barWidth - static_cast<int>((m_kBAvailable *
         painter.setPen(Qt::NoPen);
         painter.setBrush(progressColor(backgrColor));
         int usedWidth = barWidth - static_cast<int>((m_kBAvailable *

-                                                    static_cast<float>(barWidth)) / m_kBSize);
+                        static_cast<float>(barWidth)) / m_kBSize);

         const int left = 1;
         const int left = 1;

-        int right = usedWidth - (widthDec + 1);
+        int right = usedWidth - widthDec;

         if (right < left) {
             right = left;
         }
         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));
-    }
-    else {
+        text = i18n("%1 free", KIO::convertSizeFromKiB(m_kBAvailable));
+    } else {

         if (m_gettingSize) {
             text = i18n("Getting size...");
         if (m_gettingSize) {
             text = i18n("Getting size...");

-        }
-        else {
-            text = "";
+        } else {
+            text = QString();

             QTimer::singleShot(0, this, SLOT(hide()));
         }
     }
 
             QTimer::singleShot(0, this, SLOT(hide()));
         }
     }
 

-    // draw text (usually 'X% of Y GB used')
+    // draw text

     painter.setPen(KGlobalSettings::textColor());
     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);
 }
 
 
 void StatusBarSpaceInfo::slotFoundMountPoint(const unsigned long& kBSize,
                      text);
 }
 
 
 void StatusBarSpaceInfo::slotFoundMountPoint(const unsigned long& kBSize,

-                                             const unsigned long& /* kBUsed */,
+                                             const unsigned long& kBUsed,

                                              const unsigned long& kBAvailable,
                                              const unsigned long& kBAvailable,

-                                             const QString& /* mountPoint */)
+                                             const QString& mountPoint)

 {
 {

+    Q_UNUSED(kBUsed);
+    Q_UNUSED(mountPoint);
+

     m_gettingSize = false;
     m_kBSize = kBSize;
     m_kBAvailable = kBAvailable;
     m_gettingSize = false;
     m_kBSize = kBSize;
     m_kBAvailable = kBAvailable;


@@ -132,13 +133,9 @@ void StatusBarSpaceInfo::slotFoundMountPoint(const unsigned long& kBSize,
     update();
 }
 
     update();
 }
 

-void StatusBarSpaceInfo::slotDone()
+void StatusBarSpaceInfo::showResult()

 {
     m_gettingSize = false;
 {
     m_gettingSize = false;

-    if ((m_kBSize > 0) && (m_kBAvailable > 0)) {
-       show();
-    }
-

     update();
 }
 
     update();
 }
 


@@ -154,13 +151,13 @@ void StatusBarSpaceInfo::refresh()
     connect(job, SIGNAL(foundMountPoint(const unsigned long&,
                                         const unsigned long&,
                                         const unsigned long&,
     connect(job, SIGNAL(foundMountPoint(const unsigned long&,
                                         const unsigned long&,
                                         const unsigned long&,

-                                        const QString& )),
+                                        const QString&)),

             this, SLOT(slotFoundMountPoint(const unsigned long&,
                                            const unsigned long&,
                                            const unsigned long&,
             this, SLOT(slotFoundMountPoint(const unsigned long&,
                                            const unsigned long&,
                                            const unsigned long&,

-                                           const QString& )));
+                                           const QString&)));

     connect(job, SIGNAL(done()),
     connect(job, SIGNAL(done()),

-            this, SLOT(slotDone()));
+            this, SLOT(showResult()));

 
     job->readDF(mountPoint);
 }
 
     job->readDF(mountPoint);
 }