GIT_SILENT Sync po/docbooks with svn

[dolphin.git] / src / statusbar / dolphinstatusbar.cpp

diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
index 8ac74e71f00cf133bf28319f594f384e5c7d4840..70ebe0c3cd338da7d2eb228892404c91202fd163 100644 (file)
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -21,7 +21,6 @@
 #include <QMenu>
 #include <QProgressBar>
 #include <QSlider>
-#include <QTextDocument>
 #include <QTimer>
 #include <QToolButton>
 
@@ -124,6 +123,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
     topLayout->addWidget(m_progressTextLabel);
     topLayout->addWidget(m_progressBar);
 
+    setVisible(GeneralSettings::showStatusBar());
     setExtensionsVisible(true);
     setWhatsThis(xi18nc("@info:whatsthis Statusbar", "<para>This is "
         "the <emphasis>Statusbar</emphasis>. It contains three elements "
@@ -245,6 +245,7 @@ int DolphinStatusBar::zoomLevel() const
 
 void DolphinStatusBar::readSettings()
 {
+    setVisible(GeneralSettings::showStatusBar());
     setExtensionsVisible(true);
 }
 
@@ -321,15 +322,13 @@ void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel)
 
 void DolphinStatusBar::setExtensionsVisible(bool visible)
 {
-    bool showStatusBar = visible;
     bool showSpaceInfo = visible;
     bool showZoomSlider = visible;
     if (visible) {
-        showStatusBar = GeneralSettings::showStatusBar();
         showSpaceInfo = GeneralSettings::showSpaceInfo();
         showZoomSlider = GeneralSettings::showZoomSlider();
     }
-    setVisible(showStatusBar);
+
     m_spaceInfo->setShown(showSpaceInfo);
     m_spaceInfo->setVisible(showSpaceInfo);
     m_zoomSlider->setVisible(showZoomSlider);