X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/9c8e7f4e43d23c6d014ca4ffe2083ad8cc737753..d6488887ecf69d7f192b94de8dce34fae0b7eb76:/src/dolphinstatusbar.cpp

diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp
index f908a24cd..df67ac28f 100644
--- a/src/dolphinstatusbar.cpp
+++ b/src/dolphinstatusbar.cpp
@@ -23,14 +23,14 @@
 #include "statusbarmessagelabel.h"
 #include "statusbarspaceinfo.h"
 
-#include <QLabel>
-#include <QProgressBar>
-#include <QTimer>
+#include <QtGui/QLabel>
+#include <QtGui/QProgressBar>
+#include <QtCore/QTimer>
 
 #include <kiconloader.h>
 #include <kvbox.h>
 
-DolphinStatusBar::DolphinStatusBar(DolphinView* parent) :
+DolphinStatusBar::DolphinStatusBar(QWidget* parent, const KUrl& url) :
     KHBox(parent),
     m_messageLabel(0),
     m_spaceInfo(0),
@@ -43,7 +43,7 @@ DolphinStatusBar::DolphinStatusBar(DolphinView* parent) :
     m_messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
     m_spaceInfo = new StatusBarSpaceInfo(this);
-    m_spaceInfo->setUrl(parent->url());
+    m_spaceInfo->setUrl(url);
 
     m_progressText = new QLabel(this);
     m_progressText->hide();
@@ -51,16 +51,14 @@ DolphinStatusBar::DolphinStatusBar(DolphinView* parent) :
     m_progressBar = new QProgressBar(this);
     m_progressBar->hide();
 
-    const QSize size(m_progressBar->sizeHint());
-    const int barHeight = size.height();
+    const int contentHeight = QFontMetrics(m_messageLabel->font()).height();
+    const int barHeight = contentHeight + 8;
 
-    m_progressBar->setMaximumWidth(200);
     setMinimumHeight(barHeight);
     m_messageLabel->setMinimumTextHeight(barHeight);
-    m_spaceInfo->setFixedHeight(barHeight);
-
-    connect(parent, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(updateSpaceInfoContent(const KUrl&)));
+    m_spaceInfo->setFixedHeight(contentHeight);
+    m_progressBar->setFixedHeight(contentHeight);
+    m_progressBar->setMaximumWidth(200);
 }
 
 
@@ -105,8 +103,7 @@ void DolphinStatusBar::setProgress(int percent)
 {
     if (percent < 0) {
         percent = 0;
-    }
-    else if (percent > 100) {
+    } else if (percent > 100) {
         percent = 100;
     }
 
@@ -126,8 +123,7 @@ void DolphinStatusBar::setProgress(int percent)
     const QString msg(m_messageLabel->text());
     if ((percent == 0) && !msg.isEmpty()) {
         setMessage(QString(), Default);
-    }
-    else if ((percent == 100) && (msg != defaultText)) {
+    } else if ((percent == 100) && (msg != defaultText)) {
         setMessage(defaultText, Default);
     }
 }
@@ -150,7 +146,7 @@ const QString& DolphinStatusBar::defaultText() const
 void DolphinStatusBar::resizeEvent(QResizeEvent* event)
 {
     QWidget::resizeEvent(event);
-    QTimer::singleShot(0, this, SLOT(showSpaceInfo()));
+    QMetaObject::invokeMethod(this, "showSpaceInfo", Qt::QueuedConnection);
 }
 
 void DolphinStatusBar::updateProgressInfo()
@@ -163,8 +159,7 @@ void DolphinStatusBar::updateProgressInfo()
             m_progressText->show();
             m_progressBar->show();
         }
-    }
-    else {
+    } else {
         // hide the progress information and show the space information
         m_progressText->hide();
         m_progressBar->hide();
@@ -187,12 +182,10 @@ void DolphinStatusBar::showSpaceInfo()
         // The space information is shown currently. Hide it
         // if the progress bar is visible or if the status bar
         // text does not fit into the available width.
-        const QSize size(m_progressBar->sizeHint());
         if (isProgressBarVisible || (widthGap > 0)) {
             m_spaceInfo->hide();
         }
-    }
-    else if (widthGap + m_spaceInfo->width() <= 0) {
+    } else if (widthGap + m_spaceInfo->width() <= 0) {
         m_spaceInfo->show();
     }
 }