Dolphin is now a KUniqueApplication. A lot of thanks go to Oscar Blumberg, who submit...

[dolphin.git] / src / dolphinstatusbar.cpp

diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp
index 82cb09e110b20d104d7c5eda572364618c2726fc..26a373875ebb82f34d5a73b4ee2aacd3c8752ead 100644 (file)
--- a/src/dolphinstatusbar.cpp
+++ b/src/dolphinstatusbar.cpp
@@ -51,17 +51,16 @@ DolphinStatusBar::DolphinStatusBar(DolphinView* parent) :
     m_progressBar = new QProgressBar(this);
     m_progressBar->hide();
 
     m_progressBar = new QProgressBar(this);
     m_progressBar->hide();
 

-    m_progressTimer = new QTimer(this);
-    connect(m_progressTimer, SIGNAL(timeout()),
-            this, SLOT(slotProgressTimer()));
-

     const QSize size(m_progressBar->sizeHint());
     const QSize size(m_progressBar->sizeHint());

+    const int barHeight = size.height();
+

     m_progressBar->setMaximumWidth(200);
     m_progressBar->setMaximumWidth(200);

-    setMinimumHeight(size.height());
-    m_messageLabel->setMinimumTextHeight(size.height());
+    setMinimumHeight(barHeight);
+    m_messageLabel->setMinimumTextHeight(barHeight);
+    m_spaceInfo->setFixedHeight(barHeight);

 
     connect(parent, SIGNAL(urlChanged(const KUrl&)),
 
     connect(parent, SIGNAL(urlChanged(const KUrl&)),

-            this, SLOT(slotUrlChanged(const KUrl&)));
+            this, SLOT(updateSpaceInfoContent(const KUrl&)));

 }
 
 
 }
 
 


@@ -72,20 +71,14 @@ DolphinStatusBar::~DolphinStatusBar()
 void DolphinStatusBar::setMessage(const QString& msg,
                                   Type type)
 {
 void DolphinStatusBar::setMessage(const QString& msg,
                                   Type type)
 {

-    m_messageLabel->setText(msg);
-    if (msg.isEmpty() || (msg == m_defaultText)) {
-        type = Default;
-    }
-    m_messageLabel->setType(type);
+    m_messageLabel->setMessage(msg, type);

 
 

-    if ((type == Error) && (m_progress < 100)) {
-        // If an error message is shown during a progress is ongoing,
-        // the (never finishing) progress information should be hidden immediately
-        // (invoking 'setProgress(100)' only leads to a delayed hiding).
+    const int widthGap = m_messageLabel->widthGap();
+    if (widthGap > 0) {

         m_progressBar->hide();
         m_progressText->hide();
         m_progressBar->hide();
         m_progressText->hide();

-        setProgress(100);

     }
     }

+    showSpaceInfo();

 }
 
 DolphinStatusBar::Type DolphinStatusBar::type() const
 }
 
 DolphinStatusBar::Type DolphinStatusBar::type() const


@@ -118,54 +111,90 @@ void DolphinStatusBar::setProgress(int percent)
     }
 
     m_progress = percent;
     }
 
     m_progress = percent;

+    if (m_messageLabel->type() == Error) {
+        // don't update any widget or status bar text if an
+        // error message is shown
+        return;
+    }
+

     m_progressBar->setValue(m_progress);
     m_progressBar->setValue(m_progress);

-    m_progressTimer->setSingleShot(true);
-    m_progressTimer->start(300);
+    if (!m_progressBar->isVisible() || (percent == 100)) {
+        QTimer::singleShot(500, this, SLOT(updateProgressInfo()));
+    }

 
 

+    const QString& defaultText = m_messageLabel->defaultText();

     const QString msg(m_messageLabel->text());
     const QString msg(m_messageLabel->text());

-    if (msg.isEmpty() || (msg == m_defaultText)) {
-        if (percent == 0) {
-            m_messageLabel->setText(QString::null);
-            m_messageLabel->setType(Default);
-        }
-        else if (percent == 100) {
-            m_messageLabel->setText(m_defaultText);
-        }
+    if ((percent == 0) && !msg.isEmpty()) {
+        setMessage(QString::null, Default);
+    }
+    else if ((percent == 100) && (msg != defaultText)) {
+        setMessage(defaultText, Default);

     }
 }
 
 void DolphinStatusBar::clear()
 {
     }
 }
 
 void DolphinStatusBar::clear()
 {

-    // TODO: check for timeout, so that it's prevented that
-    // a message is cleared too early.
-    m_messageLabel->setText(m_defaultText);
-    m_messageLabel->setType(Default);
+    setMessage(m_messageLabel->defaultText(), Default);

 }
 
 void DolphinStatusBar::setDefaultText(const QString& text)
 {
 }
 
 void DolphinStatusBar::setDefaultText(const QString& text)
 {

-    m_defaultText = text;
+    m_messageLabel->setDefaultText(text);
+}
+
+const QString& DolphinStatusBar::defaultText() const
+{
+    return m_messageLabel->defaultText();
+}
+
+void DolphinStatusBar::resizeEvent(QResizeEvent* event)
+{
+    QWidget::resizeEvent(event);
+    QTimer::singleShot(0, this, SLOT(showSpaceInfo()));

 }
 
 }
 

-void DolphinStatusBar::slotProgressTimer()
+void DolphinStatusBar::updateProgressInfo()

 {
 {

+    const bool isErrorShown = (m_messageLabel->type() == Error);

     if (m_progress < 100) {
     if (m_progress < 100) {

-        // progress should be shown
-        m_progressBar->show();
-        m_progressText->show();
+        // show the progress information and hide the space information

         m_spaceInfo->hide();
         m_spaceInfo->hide();

+        if (!isErrorShown) {
+            m_progressText->show();
+            m_progressBar->show();
+        }

     }
     else {
     }
     else {

-        // progress should not be shown anymore
-        m_progressBar->hide();
+        // hide the progress information and show the space information

         m_progressText->hide();
         m_progressText->hide();

-        m_spaceInfo->show();
+        m_progressBar->hide();
+        showSpaceInfo();

     }
 }
 
     }
 }
 

-void DolphinStatusBar::slotUrlChanged(const KUrl& url)
+void DolphinStatusBar::updateSpaceInfoContent(const KUrl& url)

 {
     m_spaceInfo->setUrl(url);
 {
     m_spaceInfo->setUrl(url);

+    showSpaceInfo();
+}
+
+void DolphinStatusBar::showSpaceInfo()
+{
+    const int widthGap = m_messageLabel->widthGap();
+    const bool isProgressBarVisible = m_progressBar->isVisible();
+
+    if (m_spaceInfo->isVisible()) {
+        // 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) {
+        m_spaceInfo->show();
+    }

 }
 
 #include "dolphinstatusbar.moc"
 }
 
 #include "dolphinstatusbar.moc"