differ between pasting one folder, pasting one file and pasting n items

[dolphin.git] / src / dolphinsettingsdialog.cpp

diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp
index 1bbbbde55064de520d9c95f1f3b22662c7c7b313..d3f387aa9bf5de99e3456d0bf9f2b7b628e8c076 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,7 +31,11 @@
 #include <kicon.h>
 
 DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
-    KPageDialog(mainWindow)
+    KPageDialog(mainWindow),
+    m_startupSettingsPage(0),
+    m_generalSettingsPage(0),
+    m_viewSettingsPage(0)
+
 {
     const QSize minSize = minimumSize();
     setMinimumSize(QSize(512, minSize.height()));
@@ -40,16 +45,21 @@ DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
     setButtons(Ok | Apply | Cancel | Default);
     setDefaultButton(Ok);
 
-    m_generalSettingsPage = new GeneralSettingsPage(mainWindow, this);
-    KPageWidgetItem* generalSettingsFrame = addPage(m_generalSettingsPage,
-                                                    i18nc("@title:group", "General"));
-    generalSettingsFrame->setIcon(KIcon("system-run"));
+    m_startupSettingsPage = new StartupSettingsPage(mainWindow, this);
+    KPageWidgetItem* startupSettingsFrame = addPage(m_startupSettingsPage,
+                                                    i18nc("@title:group", "Startup"));
+    startupSettingsFrame->setIcon(KIcon("go-home"));
 
     m_viewSettingsPage = new ViewSettingsPage(mainWindow, this);
     KPageWidgetItem* viewSettingsFrame = addPage(m_viewSettingsPage,
                                                  i18nc("@title:group", "View Modes"));
     viewSettingsFrame->setIcon(KIcon("view-choose"));
 
+    m_generalSettingsPage = new GeneralSettingsPage(mainWindow, this);
+    KPageWidgetItem* generalSettingsFrame = addPage(m_generalSettingsPage,
+                                                    i18nc("@title:group", "General"));
+    generalSettingsFrame->setIcon(KIcon("system-run"));
+
     const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
     restoreDialogSize(dialogConfig);
 }
@@ -76,6 +86,7 @@ void DolphinSettingsDialog::slotButtonClicked(int button)
 
 void DolphinSettingsDialog::applySettings()
 {
+    m_startupSettingsPage->applySettings();
     m_generalSettingsPage->applySettings();
     m_viewSettingsPage->applySettings();
     DolphinApplication::app()->refreshMainWindows();
@@ -83,6 +94,7 @@ void DolphinSettingsDialog::applySettings()
 
 void DolphinSettingsDialog::restoreDefaults()
 {
+    m_startupSettingsPage->restoreDefaults();
     m_generalSettingsPage->restoreDefaults();
     m_viewSettingsPage->restoreDefaults();
     DolphinApplication::app()->refreshMainWindows();