Merge branch 'frameworks'

2 files changed, 12 insertions, 48 deletions

diff --git a/src/settings/navigation/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp
index 8076d705d..f9c7a4dfc 100644
--- a/src/settings/navigation/navigationsettingspage.cpp
+++ b/src/settings/navigation/navigationsettingspage.cpp
@@ -21,15 +21,9 @@
 
 #include "dolphin_generalsettings.h"
 
-#include <KDialog>
-#include <KGlobalSettings>
-#include <KLocale>
-#include <KVBox>
+#include <KLocalizedString>
 
 #include <QCheckBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QRadioButton>
 #include <QVBoxLayout>
 
 NavigationSettingsPage::NavigationSettingsPage(QWidget* parent) :
@@ -37,27 +31,17 @@ NavigationSettingsPage::NavigationSettingsPage(QWidget* parent) :
     m_openArchivesAsFolder(0),
     m_autoExpandFolders(0)
 {
-    const int spacing = KDialog::spacingHint();
-
     QVBoxLayout* topLayout = new QVBoxLayout(this);
-    KVBox* vBox = new KVBox(this);
-    vBox->setSpacing(spacing);
-
-    // create 'Mouse' group
-    QGroupBox* mouseBox = new QGroupBox(i18nc("@title:group", "Mouse"), vBox);
-    mouseBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
-    m_singleClick = new QRadioButton(i18nc("@option:check Mouse Settings",
-                                           "Single-click to open files and folders"), mouseBox);
-    m_doubleClick = new QRadioButton(i18nc("@option:check Mouse Settings",
-                                           "Double-click to open files and folders"), mouseBox);
-
-    QVBoxLayout* mouseBoxLayout = new QVBoxLayout(mouseBox);
-    mouseBoxLayout->addWidget(m_singleClick);
-    mouseBoxLayout->addWidget(m_doubleClick);
+    QWidget* vBox = new QWidget(this);
+    QVBoxLayout *vBoxLayout = new QVBoxLayout(vBox);
+    vBoxLayout->setMargin(0);
+    vBoxLayout->setAlignment(Qt::AlignTop);
 
     m_openArchivesAsFolder = new QCheckBox(i18nc("@option:check", "Open archives as folder"), vBox);
+    vBoxLayout->addWidget(m_openArchivesAsFolder);
 
     m_autoExpandFolders = new QCheckBox(i18nc("option:check", "Open folders during drag operations"), vBox);
+    vBoxLayout->addWidget(m_autoExpandFolders);
 
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
@@ -68,10 +52,8 @@ NavigationSettingsPage::NavigationSettingsPage(QWidget* parent) :
 
     loadSettings();
 
-    connect(m_singleClick, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_doubleClick, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_openArchivesAsFolder, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_autoExpandFolders, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+    connect(m_openArchivesAsFolder, &QCheckBox::toggled, this, &NavigationSettingsPage::changed);
+    connect(m_autoExpandFolders, &QCheckBox::toggled, this, &NavigationSettingsPage::changed);
 }
 
 NavigationSettingsPage::~NavigationSettingsPage()
@@ -80,17 +62,11 @@ NavigationSettingsPage::~NavigationSettingsPage()
 
 void NavigationSettingsPage::applySettings()
 {
-    KConfig config("kcminputrc");
-    KConfigGroup group = config.group("KDE");
-    group.writeEntry("SingleClick", m_singleClick->isChecked(), KConfig::Persistent|KConfig::Global);
-    config.sync();
-    KGlobalSettings::self()->emitChange(KGlobalSettings::SettingsChanged, KGlobalSettings::SETTINGS_MOUSE);
-
     GeneralSettings* settings = GeneralSettings::self();
     settings->setBrowseThroughArchives(m_openArchivesAsFolder->isChecked());
     settings->setAutoExpandFolders(m_autoExpandFolders->isChecked());
 
-    settings->writeConfig();
+    settings->save();
 }
 
 void NavigationSettingsPage::restoreDefaults()
@@ -99,20 +75,11 @@ void NavigationSettingsPage::restoreDefaults()
     settings->useDefaults(true);
     loadSettings();
     settings->useDefaults(false);
-
-    // The mouse settings stored in KGlobalSettings must be reset to
-    // the default values (= single click) manually.
-    m_singleClick->setChecked(true);
-    m_doubleClick->setChecked(false);
 }
 
 void NavigationSettingsPage::loadSettings()
 {
-    const bool singleClick = KGlobalSettings::singleClick();
-    m_singleClick->setChecked(singleClick);
-    m_doubleClick->setChecked(!singleClick);
     m_openArchivesAsFolder->setChecked(GeneralSettings::browseThroughArchives());
     m_autoExpandFolders->setChecked(GeneralSettings::autoExpandFolders());
 }
 
-#include "navigationsettingspage.moc"
diff --git a/src/settings/navigation/navigationsettingspage.h b/src/settings/navigation/navigationsettingspage.h
index 7d5b981d4..5410a4efa 100644
--- a/src/settings/navigation/navigationsettingspage.h
+++ b/src/settings/navigation/navigationsettingspage.h
@@ -22,7 +22,6 @@
 #include <settings/settingspagebase.h>
 
 class QCheckBox;
-class QRadioButton;
 
 /**
  * @brief Page for the 'Navigation' settings of the Dolphin settings dialog.
@@ -36,17 +35,15 @@ public:
     virtual ~NavigationSettingsPage();
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings();
+    virtual void applySettings() Q_DECL_OVERRIDE;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults();
+    virtual void restoreDefaults() Q_DECL_OVERRIDE;
 
 private:
     void loadSettings();
 
 private:
-    QRadioButton* m_singleClick;
-    QRadioButton* m_doubleClick;
     QCheckBox* m_openArchivesAsFolder;
     QCheckBox* m_autoExpandFolders;
 };