X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/8eb9b508ca87fb1d634d8b8ba62c054ed04466d2..885916b7b4:/src/settings/general/statusbarsettingspage.cpp

diff --git a/src/settings/general/statusbarsettingspage.cpp b/src/settings/general/statusbarsettingspage.cpp
index 8c3833ec4..58c570f9d 100644
--- a/src/settings/general/statusbarsettingspage.cpp
+++ b/src/settings/general/statusbarsettingspage.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2009 by Peter Penz <peter.penz19@gmail.com>             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -19,41 +19,30 @@
 
 #include "statusbarsettingspage.h"
 
-#include <dolphin_generalsettings.h>
+#include "dolphin_generalsettings.h"
 
-#include <KDialog>
-#include <KLocale>
-#include <KVBox>
-
-#include <settings/dolphinsettings.h>
+#include <KLocalizedString>
 
 #include <QCheckBox>
 #include <QVBoxLayout>
 
 StatusBarSettingsPage::StatusBarSettingsPage(QWidget* parent) :
     SettingsPageBase(parent),
-    m_showZoomSlider(0),
-    m_showSpaceInfo(0)
+    m_showZoomSlider(nullptr),
+    m_showSpaceInfo(nullptr)
 {
-    QVBoxLayout* topLayout = new QVBoxLayout(this);
-    KVBox* vBox = new KVBox(this);
-    vBox->setSpacing(KDialog::spacingHint());
-
-    m_showZoomSlider = new QCheckBox(i18nc("@option:check", "Show zoom slider"), vBox);
+    m_showZoomSlider = new QCheckBox(i18nc("@option:check", "Show zoom slider"), this);
+    m_showSpaceInfo = new QCheckBox(i18nc("@option:check", "Show space information"), this);
 
-    m_showSpaceInfo = new QCheckBox(i18nc("@option:check", "Show space information"), vBox);
-
-    // Add a dummy widget with no restriction regarding
-    // a vertical resizing. This assures that the dialog layout
-    // is not stretched vertically.
-    new QWidget(vBox);
-
-    topLayout->addWidget(vBox);
+    QVBoxLayout* topLayout = new QVBoxLayout(this);
+    topLayout->addWidget(m_showZoomSlider);
+    topLayout->addWidget(m_showSpaceInfo);
+    topLayout->addStretch();
 
     loadSettings();
 
-    connect(m_showZoomSlider, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_showSpaceInfo, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+    connect(m_showZoomSlider, &QCheckBox::toggled, this, &StatusBarSettingsPage::changed);
+    connect(m_showSpaceInfo, &QCheckBox::toggled, this, &StatusBarSettingsPage::changed);
 }
 
 StatusBarSettingsPage::~StatusBarSettingsPage()
@@ -62,15 +51,15 @@ StatusBarSettingsPage::~StatusBarSettingsPage()
 
 void StatusBarSettingsPage::applySettings()
 {
-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    GeneralSettings* settings = GeneralSettings::self();
     settings->setShowZoomSlider(m_showZoomSlider->isChecked());
     settings->setShowSpaceInfo(m_showSpaceInfo->isChecked());
-    settings->writeConfig();
+    settings->save();
 }
 
 void StatusBarSettingsPage::restoreDefaults()
 {
-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    GeneralSettings* settings = GeneralSettings::self();
     settings->useDefaults(true);
     loadSettings();
     settings->useDefaults(false);
@@ -78,9 +67,7 @@ void StatusBarSettingsPage::restoreDefaults()
 
 void StatusBarSettingsPage::loadSettings()
 {
-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    m_showZoomSlider->setChecked(settings->showZoomSlider());
-    m_showSpaceInfo->setChecked(settings->showSpaceInfo());
+    m_showZoomSlider->setChecked(GeneralSettings::showZoomSlider());
+    m_showSpaceInfo->setChecked(GeneralSettings::showSpaceInfo());
 }
 
-#include "statusbarsettingspage.moc"