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

[dolphin.git] / src / settings / dolphinsettingsdialog.cpp

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index e2c236354662e852c428e8c30ccdf9a6b677b902..609e2ab92d69b61bc0cdb0b478fae9076b796521 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -22,15 +22,17 @@
 
 #include <dolphinapplication.h>
 #include <dolphinmainwindow.h>
-#include "generalsettingspage.h"
-#include "navigationsettingspage.h"
-#include "servicessettingspage.h"
-#include "startupsettingspage.h"
-#include "viewsettingspage.h"
-
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kicon.h>
+#include "dolphin_generalsettings.h"
+#include "general/generalsettingspage.h"
+#include "navigation/navigationsettingspage.h"
+#include "services/servicessettingspage.h"
+#include "startup/startupsettingspage.h"
+#include "viewmodes/viewsettingspage.h"
+#include "trash/trashsettingspage.h"
+
+#include <KLocale>
+#include <KMessageBox>
+#include <KIcon>
 
 DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) :
     KPageDialog(parent),
@@ -74,6 +76,13 @@ DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) :
     servicesSettingsFrame->setIcon(KIcon("services"));
     connect(servicesSettingsPage, SIGNAL(changed()), this, SLOT(enableApply()));
 
+    // Trash
+    TrashSettingsPage* trashSettingsPage = new TrashSettingsPage(this);
+    KPageWidgetItem* trashSettingsFrame = addPage(trashSettingsPage,
+                                                   i18nc("@title:group", "Trash"));
+    trashSettingsFrame->setIcon(KIcon("user-trash"));
+    connect(trashSettingsPage, SIGNAL(changed()), this, SLOT(enableApply()));
+
     // General
     GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(url, this);
     KPageWidgetItem* generalSettingsFrame = addPage(generalSettingsPage,
@@ -88,6 +97,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) :
     m_pages.append(viewSettingsPage);
     m_pages.append(navigationSettingsPage);
     m_pages.append(servicesSettingsPage);
+    m_pages.append(trashSettingsPage);
     m_pages.append(generalSettingsPage);
 }
 
@@ -118,7 +128,17 @@ void DolphinSettingsDialog::applySettings()
     foreach (SettingsPageBase* page, m_pages) {
         page->applySettings();
     }
-    DolphinApplication::app()->refreshMainWindows();
+
+    emit settingsChanged();
+
+    GeneralSettings* settings = GeneralSettings::self();
+    if (settings->modifiedStartupSettings()) {
+        // Reset the modified startup settings hint. The changed startup settings
+        // have been applied already due to emitting settingsChanged().
+        settings->setModifiedStartupSettings(false);
+        settings->writeConfig();
+    }
+
     enableButtonApply(false);
 }