Load KFileItemAction plugins with json metadata

[dolphin.git] / src / settings / general / statusbarsettingspage.cpp

diff --git a/src/settings/general/statusbarsettingspage.cpp b/src/settings/general/statusbarsettingspage.cpp
index 0e85a12958ee17a313b8e9ebc8baa3fcbd9bb368..03846253ba68c942304cd5f49cbf6cb42e6b637d 100644 (file)
--- a/src/settings/general/statusbarsettingspage.cpp
+++ b/src/settings/general/statusbarsettingspage.cpp
@@ -21,11 +21,7 @@
 
 #include <dolphin_generalsettings.h>
 
 
 #include <dolphin_generalsettings.h>
 

-#include <KDialog>
-#include <KLocale>
-#include <KVBox>
-
-#include <settings/dolphinsettings.h>
+#include <KLocalizedString>

 
 #include <QCheckBox>
 #include <QVBoxLayout>
 
 #include <QCheckBox>
 #include <QVBoxLayout>


@@ -35,25 +31,18 @@ StatusBarSettingsPage::StatusBarSettingsPage(QWidget* parent) :
     m_showZoomSlider(0),
     m_showSpaceInfo(0)
 {
     m_showZoomSlider(0),
     m_showSpaceInfo(0)
 {

-    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();
 
 
     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()
 }
 
 StatusBarSettingsPage::~StatusBarSettingsPage()


@@ -62,15 +51,15 @@ StatusBarSettingsPage::~StatusBarSettingsPage()
 
 void StatusBarSettingsPage::applySettings()
 {
 
 void StatusBarSettingsPage::applySettings()
 {

-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    GeneralSettings* settings = GeneralSettings::self();

     settings->setShowZoomSlider(m_showZoomSlider->isChecked());
     settings->setShowSpaceInfo(m_showSpaceInfo->isChecked());
     settings->setShowZoomSlider(m_showZoomSlider->isChecked());
     settings->setShowSpaceInfo(m_showSpaceInfo->isChecked());

-    settings->writeConfig();
+    settings->save();

 }
 
 void StatusBarSettingsPage::restoreDefaults()
 {
 }
 
 void StatusBarSettingsPage::restoreDefaults()
 {

-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    GeneralSettings* settings = GeneralSettings::self();

     settings->useDefaults(true);
     loadSettings();
     settings->useDefaults(false);
     settings->useDefaults(true);
     loadSettings();
     settings->useDefaults(false);


@@ -78,9 +67,7 @@ void StatusBarSettingsPage::restoreDefaults()
 
 void StatusBarSettingsPage::loadSettings()
 {
 
 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"