Merge remote-tracking branch 'origin/KDE/4.9'

[dolphin.git] / src / settings / startup / startupsettingspage.cpp

diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index ce6139d1dcc44ed5321787b6f1707c57fed1624e..633cdacad1fd8a5b122d43791a6464e78dc744ea 100644 (file)
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -19,7 +19,6 @@
 
 #include "startupsettingspage.h"
 
-#include "settings/dolphinsettings.h"
 #include "dolphinmainwindow.h"
 #include "dolphinviewcontainer.h"
 
@@ -66,6 +65,11 @@ StartupSettingsPage::StartupSettingsPage(const KUrl& url, QWidget* parent) :
     m_homeUrl->setClearButtonShown(true);
 
     QPushButton* selectHomeUrlButton = new QPushButton(KIcon("folder-open"), QString(), homeUrlBox);
+
+#ifndef QT_NO_ACCESSIBILITY
+    selectHomeUrlButton->setAccessibleName(i18nc("@action:button", "Select Home Location"));
+#endif
+
     connect(selectHomeUrlButton, SIGNAL(clicked()),
             this, SLOT(selectHomeUrl()));
 
@@ -111,7 +115,7 @@ StartupSettingsPage::~StartupSettingsPage()
 
 void StartupSettingsPage::applySettings()
 {
-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    GeneralSettings* settings = GeneralSettings::self();
 
     const KUrl url(m_homeUrl->text());
     KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, url);
@@ -131,7 +135,7 @@ void StartupSettingsPage::applySettings()
 
 void StartupSettingsPage::restoreDefaults()
 {
-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    GeneralSettings* settings = GeneralSettings::self();
     settings->useDefaults(true);
     loadSettings();
     settings->useDefaults(false);
@@ -142,9 +146,7 @@ void StartupSettingsPage::slotSettingsChanged()
     // Provide a hint that the startup settings have been changed. This allows the views
     // to apply the startup settings only if they have been explicitly changed by the user
     // (see bug #254947).
-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    settings->setModifiedStartupSettings(true);
-
+    GeneralSettings::setModifiedStartupSettings(true);
     emit changed();
 }
 
@@ -171,13 +173,12 @@ void StartupSettingsPage::useDefaultLocation()
 
 void StartupSettingsPage::loadSettings()
 {
-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    KUrl url(settings->homeUrl());
+    const KUrl url(GeneralSettings::homeUrl());
     m_homeUrl->setText(url.prettyUrl());
-    m_splitView->setChecked(settings->splitView());
-    m_editableUrl->setChecked(settings->editableUrl());
-    m_showFullPath->setChecked(settings->showFullPath());
-    m_filterBar->setChecked(settings->filterBar());
+    m_splitView->setChecked(GeneralSettings::splitView());
+    m_editableUrl->setChecked(GeneralSettings::editableUrl());
+    m_showFullPath->setChecked(GeneralSettings::showFullPath());
+    m_filterBar->setChecked(GeneralSettings::filterBar());
 }
 
 #include "startupsettingspage.moc"