X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/652d08c9242ed51d86dba3b2afda9d3b2e9a9cd7..8eb9b508ca87fb1d634d8b8ba62c054ed04466d2:/src/settings/startup/startupsettingspage.cpp?ds=sidebyside

diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index d891558e1..47da64d0a 100644
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -25,12 +25,12 @@
 
 #include "dolphin_generalsettings.h"
 
-#include <kdialog.h>
+#include <KDialog>
 #include <kfiledialog.h>
-#include <klocale.h>
-#include <klineedit.h>
-#include <kmessagebox.h>
-#include <kvbox.h>
+#include <KLocale>
+#include <KLineEdit>
+#include <KMessageBox>
+#include <KVBox>
 
 #include <QCheckBox>
 #include <QGroupBox>
@@ -88,10 +88,6 @@ StartupSettingsPage::StartupSettingsPage(const KUrl& url, QWidget* parent) :
     m_editableUrl = new QCheckBox(i18nc("@option:check Startup Settings", "Editable location bar"), vBox);
     m_showFullPath = new QCheckBox(i18nc("@option:check Startup Settings", "Show full path inside location bar"), vBox);
     m_filterBar = new QCheckBox(i18nc("@option:check Startup Settings", "Show filter bar"), vBox);
-    connect(m_splitView,    SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_editableUrl,  SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_showFullPath, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_filterBar,    SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
@@ -102,9 +98,11 @@ StartupSettingsPage::StartupSettingsPage(const KUrl& url, QWidget* parent) :
 
     loadSettings();
 
-    // it's important connecting 'textChanged' after loadSettings(), as loadSettings()
-    // invokes m_homeUrl->setText()
-    connect(m_homeUrl, SIGNAL(textChanged(const QString&)), this, SIGNAL(changed()));
+    connect(m_homeUrl, SIGNAL(textChanged(const QString&)), this, SLOT(slotSettingsChanged()));
+    connect(m_splitView,    SIGNAL(toggled(bool)), this, SLOT(slotSettingsChanged()));
+    connect(m_editableUrl,  SIGNAL(toggled(bool)), this, SLOT(slotSettingsChanged()));
+    connect(m_showFullPath, SIGNAL(toggled(bool)), this, SLOT(slotSettingsChanged()));
+    connect(m_filterBar,    SIGNAL(toggled(bool)), this, SLOT(slotSettingsChanged()));
 }
 
 StartupSettingsPage::~StartupSettingsPage()
@@ -139,13 +137,24 @@ void StartupSettingsPage::restoreDefaults()
     settings->useDefaults(false);
 }
 
+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);
+
+    emit changed();
+}
+
 void StartupSettingsPage::selectHomeUrl()
 {
     const QString homeUrl = m_homeUrl->text();
     KUrl url = KFileDialog::getExistingDirectoryUrl(homeUrl, this);
     if (!url.isEmpty()) {
         m_homeUrl->setText(url.prettyUrl());
-        emit changed();
+        slotSettingsChanged();
     }
 }
 
@@ -156,7 +165,7 @@ void StartupSettingsPage::useCurrentLocation()
 
 void StartupSettingsPage::useDefaultLocation()
 {
-   KUrl url(QDir::homePath());
+    KUrl url(QDir::homePath());
     m_homeUrl->setText(url.prettyUrl());
 }