Delete obsolete class DolphinSettings

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

diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index 0d7a4a0ab3c8c326566e51f6a6109aff8f95f27b..3ad66e3679e3ee759e58c6590de9bd37d9baa641 100644 (file)
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -21,12 +21,9 @@
 #include "behaviorsettingspage.h"
 
 #include "dolphin_generalsettings.h"
-#include <settings/filemetadataconfigurationdialog.h>
-#include <settings/dolphinsettings.h>
-#include <viewproperties.h>
 
-#include <kdialog.h>
-#include <klocale.h>
+#include <KDialog>
+#include <KLocale>
 
 #include <QCheckBox>
 #include <QGroupBox>
@@ -35,6 +32,8 @@
 #include <QRadioButton>
 #include <QVBoxLayout>
 
+#include <views/viewproperties.h>
+
 const bool CONFIRM_TRASH = false;
 const bool CONFIRM_DELETE = true;
 
@@ -47,7 +46,6 @@ BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) :
     m_confirmDelete(0),
     m_renameInline(0),
     m_showToolTips(0),
-    m_configureToolTips(0),
     m_showSelectionToggle(0),
     m_naturalSorting(0)
 {
@@ -58,10 +56,8 @@ BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) :
     propsBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
 
     m_localProps = new QRadioButton(i18nc("@option:radio", "Remember view properties for each folder"), propsBox);
-    connect(m_localProps, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 
     m_globalProps = new QRadioButton(i18nc("@option:radio", "Use common view properties for all folders"), propsBox);
-    connect(m_globalProps, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 
     QVBoxLayout* propsBoxLayout = new QVBoxLayout(propsBox);
     propsBoxLayout->addWidget(m_localProps);
@@ -72,13 +68,10 @@ BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) :
     confirmBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
     m_confirmMoveToTrash = new QCheckBox(i18nc("@option:check Ask for Confirmation When",
                                                "Moving files or folders to trash"), confirmBox);
-    connect(m_confirmMoveToTrash, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
     m_confirmDelete = new QCheckBox(i18nc("@option:check Ask for Confirmation When",
                                           "Deleting files or folders"), confirmBox);
-    connect(m_confirmDelete, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
     m_confirmClosingMultipleTabs = new QCheckBox(i18nc("@option:check Ask for Confirmation When",
                                                        "Closing windows with multiple tabs"), confirmBox);
-    connect(m_confirmClosingMultipleTabs, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 
     QVBoxLayout* confirmBoxLayout = new QVBoxLayout(confirmBox);
     confirmBoxLayout->addWidget(m_confirmMoveToTrash);
@@ -87,40 +80,35 @@ BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) :
 
     // 'Rename inline'
     m_renameInline = new QCheckBox(i18nc("@option:check", "Rename inline"), this);
-    connect(m_renameInline, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 
     // 'Show tooltips'
-    QWidget* toolTipContainer = new QWidget(this);
-    QHBoxLayout* toolTipsLayout = new QHBoxLayout(toolTipContainer);
-    toolTipsLayout->setMargin(0);
-    m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips"), toolTipContainer);
-    connect(m_showToolTips, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_showToolTips, SIGNAL(toggled(bool)), this, SLOT(updateConfigureButton()));
-
-    m_configureToolTips = new QLabel(toolTipContainer);
-    connect(m_configureToolTips, SIGNAL(linkActivated(const QString&)),
-            this, SLOT(configureToolTips()));
-
-    toolTipsLayout->addWidget(m_showToolTips);
-    toolTipsLayout->addWidget(m_configureToolTips, 1, Qt::AlignLeft);
+    m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips"), this);
 
     // 'Show selection marker'
     m_showSelectionToggle = new QCheckBox(i18nc("@option:check", "Show selection marker"), this);
-    connect(m_showSelectionToggle, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 
     // 'Natural sorting of items'
     m_naturalSorting = new QCheckBox(i18nc("option:check", "Natural sorting of items"), this);
-    connect(m_naturalSorting, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 
     topLayout->addWidget(propsBox);
     topLayout->addWidget(confirmBox);
     topLayout->addWidget(m_renameInline);
-    topLayout->addWidget(toolTipContainer);
+    topLayout->addWidget(m_showToolTips);
     topLayout->addWidget(m_showSelectionToggle);
     topLayout->addWidget(m_naturalSorting);
     topLayout->addStretch();
 
     loadSettings();
+
+    connect(m_localProps, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+    connect(m_globalProps, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+    connect(m_confirmMoveToTrash, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+    connect(m_confirmDelete, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+    connect(m_confirmClosingMultipleTabs, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+    connect(m_renameInline, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+    connect(m_showToolTips, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+    connect(m_showSelectionToggle, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+    connect(m_naturalSorting, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 }
 
 BehaviorSettingsPage::~BehaviorSettingsPage()
@@ -133,7 +121,7 @@ void BehaviorSettingsPage::applySettings()
 
     const bool useGlobalProps = m_globalProps->isChecked();
 
-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    GeneralSettings* settings = GeneralSettings::self();
     settings->setGlobalViewProps(useGlobalProps);
 
     if (useGlobalProps) {
@@ -167,7 +155,7 @@ void BehaviorSettingsPage::applySettings()
 
 void BehaviorSettingsPage::restoreDefaults()
 {
-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    GeneralSettings* settings = GeneralSettings::self();
     settings->useDefaults(true);
     loadSettings();
     settings->useDefaults(false);
@@ -175,32 +163,9 @@ void BehaviorSettingsPage::restoreDefaults()
     m_confirmDelete->setChecked(CONFIRM_DELETE);
 }
 
-void BehaviorSettingsPage::updateConfigureButton()
-{
-    if (m_showToolTips->isChecked()) {
-        m_configureToolTips->setText("<a href=\"configure\">" +
-                                     i18nc("@action:button", "Configure...") +
-                                     "</a>");
-    } else {
-        m_configureToolTips->setText(QString());
-    }
-}
-
-void BehaviorSettingsPage::configureToolTips()
-{
-    FileMetaDataConfigurationDialog* dialog = new FileMetaDataConfigurationDialog();
-    dialog->setDescription(i18nc("@label::textbox",
-                                 "Select which data should be shown in the tooltip."));
-    dialog->setAttribute(Qt::WA_DeleteOnClose);
-    dialog->show();
-    dialog->raise();
-    dialog->activateWindow();
-}
-
 void BehaviorSettingsPage::loadSettings()
 {
-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    if (settings->globalViewProps()) {
+    if (GeneralSettings::globalViewProps()) {
         m_globalProps->setChecked(true);
     } else {
         m_localProps->setChecked(true);
@@ -211,13 +176,11 @@ void BehaviorSettingsPage::loadSettings()
     m_confirmMoveToTrash->setChecked(confirmationGroup.readEntry("ConfirmTrash", CONFIRM_TRASH));
     m_confirmDelete->setChecked(confirmationGroup.readEntry("ConfirmDelete", CONFIRM_DELETE));
 
-    m_confirmClosingMultipleTabs->setChecked(settings->confirmClosingMultipleTabs());
-    m_renameInline->setChecked(settings->renameInline());
-    m_showToolTips->setChecked(settings->showToolTips());
-    m_showSelectionToggle->setChecked(settings->showSelectionToggle());
+    m_confirmClosingMultipleTabs->setChecked(GeneralSettings::confirmClosingMultipleTabs());
+    m_renameInline->setChecked(GeneralSettings::renameInline());
+    m_showToolTips->setChecked(GeneralSettings::showToolTips());
+    m_showSelectionToggle->setChecked(GeneralSettings::showSelectionToggle());
     m_naturalSorting->setChecked(KGlobalSettings::naturalSorting());
-
-    updateConfigureButton();
 }
 
 #include "behaviorsettingspage.moc"