Fix memory leak using K_GLOBAL_STATIC

[dolphin.git] / src / dolphinsettingsdialog.cpp

diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp
index 998f6b4d26cd3c7a750528c9b20a749893ef97e0..2e1b6927555b795e0b0b77769ec39128664adae2 100644 (file)
--- a/src/dolphinsettingsdialog.cpp
+++ b/src/dolphinsettingsdialog.cpp
@@ -23,6 +23,7 @@
 #include "dolphinapplication.h"
 #include "dolphinmainwindow.h"
 #include "generalsettingspage.h"
+#include "startupsettingspage.h"
 #include "viewsettingspage.h"
 
 #include <klocale.h>
@@ -30,23 +31,33 @@
 #include <kicon.h>
 
 DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
-    KPageDialog(),
-    m_mainWindow(mainWindow)
+    KPageDialog(mainWindow),
+    m_startupSettingsPage(0),
+    m_generalSettingsPage(0),
+    m_viewSettingsPage(0)
+
 {
     const QSize minSize = minimumSize();
     setMinimumSize(QSize(512, minSize.height()));
 
     setFaceType(List);
-    setCaption(i18n("Dolphin Preferences"));
+    setCaption(i18nc("@title:window", "Dolphin Preferences"));
     setButtons(Ok | Apply | Cancel | Default);
     setDefaultButton(Ok);
 
+    m_startupSettingsPage = new StartupSettingsPage(mainWindow, this);
+    KPageWidgetItem* startupSettingsFrame = addPage(m_startupSettingsPage,
+                                                    i18nc("@title:group", "Startup"));
+    startupSettingsFrame->setIcon(KIcon("go-home"));
+
     m_generalSettingsPage = new GeneralSettingsPage(mainWindow, this);
-    KPageWidgetItem* generalSettingsFrame = addPage(m_generalSettingsPage, i18n("General"));
-    generalSettingsFrame->setIcon(KIcon("exec"));
+    KPageWidgetItem* generalSettingsFrame = addPage(m_generalSettingsPage,
+                                                    i18nc("@title:group", "General"));
+    generalSettingsFrame->setIcon(KIcon("system-run"));
 
     m_viewSettingsPage = new ViewSettingsPage(mainWindow, this);
-    KPageWidgetItem* viewSettingsFrame = addPage(m_viewSettingsPage, i18n("View Modes"));
+    KPageWidgetItem* viewSettingsFrame = addPage(m_viewSettingsPage,
+                                                 i18nc("@title:group", "View Modes"));
     viewSettingsFrame->setIcon(KIcon("view-choose"));
 
     const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
@@ -56,7 +67,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
 DolphinSettingsDialog::~DolphinSettingsDialog()
 {
     KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
-    saveDialogSize(dialogConfig, KConfigFlags::Persistent);
+    saveDialogSize(dialogConfig);
 }
 
 void DolphinSettingsDialog::slotButtonClicked(int button)
@@ -64,7 +75,7 @@ void DolphinSettingsDialog::slotButtonClicked(int button)
     if ((button == Ok) || (button == Apply)) {
         applySettings();
     } else if (button == Default) {
-        const QString text(i18n("All settings will be reset to default values. Do you want to continue?"));
+        const QString text(i18nc("@info", "All settings will be reset to default values. Do you want to continue?"));
         if (KMessageBox::questionYesNo(this, text) == KMessageBox::Yes) {
             restoreDefaults();
         }
@@ -75,6 +86,7 @@ void DolphinSettingsDialog::slotButtonClicked(int button)
 
 void DolphinSettingsDialog::applySettings()
 {
+    m_startupSettingsPage->applySettings();
     m_generalSettingsPage->applySettings();
     m_viewSettingsPage->applySettings();
     DolphinApplication::app()->refreshMainWindows();
@@ -82,6 +94,7 @@ void DolphinSettingsDialog::applySettings()
 
 void DolphinSettingsDialog::restoreDefaults()
 {
+    m_startupSettingsPage->restoreDefaults();
     m_generalSettingsPage->restoreDefaults();
     m_viewSettingsPage->restoreDefaults();
     DolphinApplication::app()->refreshMainWindows();