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

diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp
index edf242e66..eabbc77b1 100644
--- a/src/dolphinstatusbar.cpp
+++ b/src/dolphinstatusbar.cpp
@@ -19,9 +19,12 @@
  ***************************************************************************/
 
 #include "dolphinstatusbar.h"
+#include "dolphinsettings.h"
 #include "dolphinview.h"
+#include "dolphin_generalsettings.h"
 #include "statusbarmessagelabel.h"
 #include "statusbarspaceinfo.h"
+#include "zoomlevelinfo.h"
 
 #include <QtGui/QLabel>
 #include <QtGui/QProgressBar>
@@ -30,42 +33,67 @@
 #include <kiconloader.h>
 #include <kvbox.h>
 
-DolphinStatusBar::DolphinStatusBar(QWidget* parent, const KUrl& url) :
+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(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();
 
-    const QSize size(m_progressBar->sizeHint());
-    const int barHeight = size.height();
+    // initialize sizes
+    const int contentHeight = QFontMetrics(m_messageLabel->font()).height() + 4;
+    const int barHeight = contentHeight + 4;
 
-    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);
+    m_zoomSlider->setMaximumWidth(100);
+    
+    setExtensionsVisible(true);
 }
 
 
 DolphinStatusBar::~DolphinStatusBar()
-{}
+{
+}
 
 void DolphinStatusBar::setMessage(const QString& msg,
                                   Type type)
@@ -77,7 +105,7 @@ void DolphinStatusBar::setMessage(const QString& msg,
         m_progressBar->hide();
         m_progressText->hide();
     }
-    showSpaceInfo();
+    assureVisibleText();
 }
 
 DolphinStatusBar::Type DolphinStatusBar::type() const
@@ -117,7 +145,7 @@ void DolphinStatusBar::setProgress(int percent)
 
     m_progressBar->setValue(m_progress);
     if (!m_progressBar->isVisible() || (percent == 100)) {
-        QTimer::singleShot(500, this, SLOT(updateProgressInfo()));
+        QTimer::singleShot(300, this, SLOT(updateProgressInfo()));
     }
 
     const QString& defaultText = m_messageLabel->defaultText();
@@ -147,49 +175,70 @@ const QString& DolphinStatusBar::defaultText() const
 void DolphinStatusBar::resizeEvent(QResizeEvent* event)
 {
     QWidget::resizeEvent(event);
-    QTimer::singleShot(0, this, SLOT(showSpaceInfo()));
+    QMetaObject::invokeMethod(this, "assureVisibleText", Qt::QueuedConnection);
 }
 
 void DolphinStatusBar::updateProgressInfo()
 {
     const bool isErrorShown = (m_messageLabel->type() == Error);
     if (m_progress < 100) {
-        // show the progress information and hide the space information
-        m_spaceInfo->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 space information
+        // hide the progress information and show the extensions
         m_progressText->hide();
         m_progressBar->hide();
-        showSpaceInfo();
+        assureVisibleText();
     }
 }
 
 void DolphinStatusBar::updateSpaceInfoContent(const KUrl& url)
 {
     m_spaceInfo->setUrl(url);
-    showSpaceInfo();
+    assureVisibleText();
 }
 
-void DolphinStatusBar::showSpaceInfo()
+void DolphinStatusBar::setZoomLevel(int zoomLevel)
+{
+    m_view->setZoomLevel(zoomLevel);
+}
+
+void DolphinStatusBar::assureVisibleText()
 {
     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();
+    
+    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 (widthGap + m_spaceInfo->width() <= 0) {
-        m_spaceInfo->show();
+    } 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"