Delete obsolete class DolphinSettings

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

diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
index b005d45c687b5c546c257e5d34da376dc6a1b918..681fbf407a69682677a18780a04dd10243938b0e 100644 (file)
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -28,7 +28,6 @@
 #include <KMenu>
 #include <KVBox>
 
-#include "settings/dolphinsettings.h"
 #include "statusbarspaceinfo.h"
 
 #include <QApplication>
@@ -55,14 +54,15 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) :
     m_showProgressBarTimer(0),
     m_messageTimeStamp()
 {
-    connect(m_view, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(updateSpaceInfoContent(const KUrl&)));
+    connect(m_view, SIGNAL(urlChanged(KUrl)),
+            this, SLOT(updateSpaceInfoContent(KUrl)));
 
     // Initialize message label
     m_messageLabel = new KonqStatusBarMessageLabel(this);
 
     // Initialize zoom widget
     m_zoomSlider = new QSlider(Qt::Horizontal, this);
+    m_zoomSlider->setAccessibleName(i18n("Zoom slider"));
     m_zoomSlider->setPageStep(1);
 
     const int min = ZoomLevelInfo::minimumLevel();
@@ -73,7 +73,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) :
 
     connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(setZoomLevel(int)));
     connect(m_zoomSlider, SIGNAL(sliderMoved(int)), this, SLOT(showZoomSliderToolTip(int)));
-    connect(m_view, SIGNAL(zoomLevelChanged(int, int)), this, SLOT(slotZoomLevelChanged(int, int)));
+    connect(m_view, SIGNAL(zoomLevelChanged(int,int)), this, SLOT(slotZoomLevelChanged(int,int)));
 
     // Initialize space information
     m_spaceInfo = new StatusBarSpaceInfo(this);
@@ -82,6 +82,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) :
     // Initialize progress information
     m_stopButton = new QToolButton(this);
     m_stopButton->setIcon(KIcon("process-stop"));
+    m_stopButton->setAccessibleName(i18n("Stop"));
     // TODO: Add tooltip for KDE SC 4.7.0, if new strings are allowed again
     m_stopButton->setAutoRaise(true);
     m_stopButton->hide();
@@ -276,15 +277,13 @@ void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event)
     default: break;
     }
 
-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-
     QAction* showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider"));
     showZoomSliderAction->setCheckable(true);
-    showZoomSliderAction->setChecked(settings->showZoomSlider());
+    showZoomSliderAction->setChecked(GeneralSettings::showZoomSlider());
 
     QAction* showSpaceInfoAction = menu.addAction(i18nc("@action:inmenu", "Show Space Information"));
     showSpaceInfoAction->setCheckable(true);
-    showSpaceInfoAction->setChecked(settings->showSpaceInfo());
+    showSpaceInfoAction->setChecked(GeneralSettings::showSpaceInfo());
 
     const QAction* action = menu.exec(QCursor::pos());
     if (action == copyAction) {
@@ -293,11 +292,11 @@ void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event)
         QApplication::clipboard()->setMimeData(mimeData);
     } else if (action == showZoomSliderAction) {
         const bool visible = showZoomSliderAction->isChecked();
-        settings->setShowZoomSlider(visible);
+        GeneralSettings::setShowZoomSlider(visible);
         m_zoomSlider->setVisible(visible);
     } else if (action == showSpaceInfoAction) {
         const bool visible = showSpaceInfoAction->isChecked();
-        settings->setShowSpaceInfo(visible);
+        GeneralSettings::setShowSpaceInfo(visible);
         m_spaceInfo->setVisible(visible);
     }
 }
@@ -354,9 +353,8 @@ void DolphinStatusBar::setExtensionsVisible(bool visible)
     bool showSpaceInfo = visible;
     bool showZoomSlider = visible;
     if (visible) {
-        const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-        showSpaceInfo = settings->showSpaceInfo();
-        showZoomSlider = settings->showZoomSlider();
+        showSpaceInfo = GeneralSettings::showSpaceInfo();
+        showZoomSlider = GeneralSettings::showZoomSlider();
     }
     m_spaceInfo->setVisible(showSpaceInfo);
     m_zoomSlider->setVisible(showZoomSlider);