X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/3bd97ea34c72164a2c583ec28eafcdfc887455cf..a124f2ada3bc3f36862dd2e207ceb68672610929:/src/dolphinstatusbar.cpp

diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp
index 82cb09e11..eabbc77b1 100644
--- a/src/dolphinstatusbar.cpp
+++ b/src/dolphinstatusbar.cpp
@@ -19,49 +19,75 @@
  ***************************************************************************/
 
 #include "dolphinstatusbar.h"
+#include "dolphinsettings.h"
 #include "dolphinview.h"
+#include "dolphin_generalsettings.h"
 #include "statusbarmessagelabel.h"
 #include "statusbarspaceinfo.h"
+#include "zoomlevelinfo.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, DolphinView* view) :
     KHBox(parent),
+    m_view(view),
     m_messageLabel(0),
     m_spaceInfo(0),
+    m_zoomSlider(0),
     m_progressBar(0),
     m_progress(100)
 {
     setSpacing(4);
 
+    connect(m_view, SIGNAL(urlChanged(const KUrl&)),
+            this, SLOT(updateSpaceInfoContent(const KUrl&)));
+
+    // initialize message label
     m_messageLabel = new StatusBarMessageLabel(this);
     m_messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
+    // initialize space information
     m_spaceInfo = new StatusBarSpaceInfo(this);
-    m_spaceInfo->setUrl(parent->url());
-
+    m_spaceInfo->setUrl(m_view->url());
+    
+    // initialize zoom slider
+    m_zoomSlider = new QSlider(Qt::Horizontal, this);
+    m_zoomSlider->setPageStep(1);
+    
+    const int min = ZoomLevelInfo::minimumLevel();
+    const int max = ZoomLevelInfo::maximumLevel();
+    m_zoomSlider->setRange(min, max);
+    m_zoomSlider->setValue(view->zoomLevel());
+    
+    connect(m_zoomSlider, SIGNAL(sliderMoved(int)),
+            this, SLOT(setZoomLevel(int)));
+    connect(m_view, SIGNAL(zoomLevelChanged(int)),
+            m_zoomSlider, SLOT(setValue(int)));
+            
+    // initialize progress informatino
     m_progressText = new QLabel(this);
     m_progressText->hide();
 
     m_progressBar = new QProgressBar(this);
     m_progressBar->hide();
 
-    m_progressTimer = new QTimer(this);
-    connect(m_progressTimer, SIGNAL(timeout()),
-            this, SLOT(slotProgressTimer()));
+    // initialize sizes
+    const int contentHeight = QFontMetrics(m_messageLabel->font()).height() + 4;
+    const int barHeight = contentHeight + 4;
 
-    const QSize size(m_progressBar->sizeHint());
+    setMinimumHeight(barHeight);
+    m_messageLabel->setMinimumTextHeight(barHeight);
+    m_spaceInfo->setFixedHeight(contentHeight);
+    m_progressBar->setFixedHeight(contentHeight);
     m_progressBar->setMaximumWidth(200);
-    setMinimumHeight(size.height());
-    m_messageLabel->setMinimumTextHeight(size.height());
-
-    connect(parent, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(slotUrlChanged(const KUrl&)));
+    m_zoomSlider->setMaximumWidth(100);
+    
+    setExtensionsVisible(true);
 }
 
 
@@ -72,20 +98,14 @@ DolphinStatusBar::~DolphinStatusBar()
 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();
-        setProgress(100);
     }
+    assureVisibleText();
 }
 
 DolphinStatusBar::Type DolphinStatusBar::type() const
@@ -112,60 +132,113 @@ void DolphinStatusBar::setProgress(int percent)
 {
     if (percent < 0) {
         percent = 0;
-    }
-    else if (percent > 100) {
+    } else if (percent > 100) {
         percent = 100;
     }
 
     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_progressTimer->setSingleShot(true);
-    m_progressTimer->start(300);
+    if (!m_progressBar->isVisible() || (percent == 100)) {
+        QTimer::singleShot(300, this, SLOT(updateProgressInfo()));
+    }
 
+    const QString& defaultText = m_messageLabel->defaultText();
     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(), Default);
+    } else if ((percent == 100) && (msg != defaultText)) {
+        setMessage(defaultText, Default);
     }
 }
 
 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)
 {
-    m_defaultText = text;
+    m_messageLabel->setDefaultText(text);
+}
+
+const QString& DolphinStatusBar::defaultText() const
+{
+    return m_messageLabel->defaultText();
+}
+
+void DolphinStatusBar::resizeEvent(QResizeEvent* event)
+{
+    QWidget::resizeEvent(event);
+    QMetaObject::invokeMethod(this, "assureVisibleText", Qt::QueuedConnection);
 }
 
-void DolphinStatusBar::slotProgressTimer()
+void DolphinStatusBar::updateProgressInfo()
 {
+    const bool isErrorShown = (m_messageLabel->type() == Error);
     if (m_progress < 100) {
-        // progress should be shown
-        m_progressBar->show();
-        m_progressText->show();
-        m_spaceInfo->hide();
-    }
-    else {
-        // progress should not be shown anymore
-        m_progressBar->hide();
+        // show the progress information and hide the extensions
+        setExtensionsVisible(false);
+        if (!isErrorShown) {
+            m_progressText->show();
+            m_progressBar->show();
+        }
+    } else {
+        // hide the progress information and show the extensions
         m_progressText->hide();
-        m_spaceInfo->show();
+        m_progressBar->hide();
+        assureVisibleText();
     }
 }
 
-void DolphinStatusBar::slotUrlChanged(const KUrl& url)
+void DolphinStatusBar::updateSpaceInfoContent(const KUrl& url)
 {
     m_spaceInfo->setUrl(url);
+    assureVisibleText();
+}
+
+void DolphinStatusBar::setZoomLevel(int zoomLevel)
+{
+    m_view->setZoomLevel(zoomLevel);
+}
+
+void DolphinStatusBar::assureVisibleText()
+{
+    const int widthGap = m_messageLabel->widthGap();
+    const bool isProgressBarVisible = m_progressBar->isVisible();
+    
+    const int spaceInfoWidth  = m_spaceInfo->isVisible()  ? m_spaceInfo->width()  : 0;
+    const int zoomSliderWidth = m_zoomSlider->isVisible() ? m_zoomSlider->width() : 0;
+    const int widgetsWidth = spaceInfoWidth + zoomSliderWidth;
+
+    if (widgetsWidth > 0) {
+        // The space information and (or) the zoom slider are (is) shown.
+        // Hide them if the status bar text does not fit into the available width.
+        if (widthGap > 0) {
+            setExtensionsVisible(false);
+        }
+    } else if (!isProgressBarVisible && (widthGap + widgetsWidth <= 0)) {
+        setExtensionsVisible(true);
+    }
+}
+
+void DolphinStatusBar::setExtensionsVisible(bool visible)
+{
+    bool spaceInfoVisible = visible;
+    bool zoomSliderVisible = visible;
+    if (visible) {
+        const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+        spaceInfoVisible = settings->showSpaceInfo();
+        zoomSliderVisible = settings->showZoomSlider();
+    }
+    
+    m_spaceInfo->setVisible(spaceInfoVisible);
+    m_zoomSlider->setVisible(zoomSliderVisible);
 }
 
 #include "dolphinstatusbar.moc"