Create a SidebarTreeView which will include support for drag & drop in later releases...

[dolphin.git] / src / statusbarspaceinfo.cpp

diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index d63b12eb7fbb70e97bef2250ffbf71869e45fae1..c648351ebcecc88c105e645934eba9c63449ec93 100644 (file)
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -15,7 +15,7 @@
  *   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"


@@ -52,15 +52,15 @@ 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;
 
 
     QString text;
 


@@ -91,14 +91,14 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
         }
         painter.drawRect(QRect(left, barTop + 2, right, barHeight - 1));
 
         }
         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));
+        text = i18n("%1% of %2 used", 100 - (int)(100.0 * m_kBAvailable / m_kBSize), KIO::convertSizeFromKiB(m_kBSize));

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

-            text = "";
+            text = QString();

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


@@ -132,13 +132,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();
 }
 


@@ -160,7 +156,7 @@ void StatusBarSpaceInfo::refresh()
                                            const unsigned long&,
                                            const QString& )));
     connect(job, SIGNAL(done()),
                                            const unsigned long&,
                                            const QString& )));
     connect(job, SIGNAL(done()),

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

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