From 8acb68ed2835410af934459073048339c7b262a0 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sat, 17 Jan 2009 18:42:06 +0000 Subject: Relayout of the settings dialog, so that all Dolphin KPart relevant settings can be made available in Konqueror's settings dialog too. Further cleanups and layout fixes are required and will be done during the next week. svn path=/trunk/KDE/kdebase/apps/; revision=912587 --- src/settings/dolphinsettingsdialog.cpp | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'src/settings/dolphinsettingsdialog.cpp') diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp index 54ac74bde..64ebdeed7 100644 --- a/src/settings/dolphinsettingsdialog.cpp +++ b/src/settings/dolphinsettingsdialog.cpp @@ -23,6 +23,8 @@ #include #include #include "generalsettingspage.h" +#include "navigationsettingspage.h" +#include "servicessettingspage.h" #include "startupsettingspage.h" #include "viewsettingspage.h" @@ -30,8 +32,8 @@ #include #include -DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) : - KPageDialog(mainWindow), +DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) : + KPageDialog(parent), m_pages() { @@ -44,19 +46,36 @@ DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) : enableButtonApply(false); setDefaultButton(Ok); - StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(mainWindow, this); + // Startup + StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(url, this); KPageWidgetItem* startupSettingsFrame = addPage(startupSettingsPage, i18nc("@title:group", "Startup")); startupSettingsFrame->setIcon(KIcon("go-home")); connect(startupSettingsPage, SIGNAL(changed()), this, SLOT(enableApply())); - ViewSettingsPage* viewSettingsPage = new ViewSettingsPage(mainWindow, this); + // View Modes + ViewSettingsPage* viewSettingsPage = new ViewSettingsPage(this); KPageWidgetItem* viewSettingsFrame = addPage(viewSettingsPage, i18nc("@title:group", "View Modes")); viewSettingsFrame->setIcon(KIcon("view-choose")); connect(viewSettingsPage, SIGNAL(changed()), this, SLOT(enableApply())); - GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(mainWindow, this); + // Navigation + NavigationSettingsPage* navigationSettingsPage = new NavigationSettingsPage(this); + KPageWidgetItem* navigationSettingsFrame = addPage(navigationSettingsPage, + i18nc("@title:group", "Navigation")); + navigationSettingsFrame->setIcon(KIcon("input-mouse")); + connect(navigationSettingsPage, SIGNAL(changed()), this, SLOT(enableApply())); + + // Services + ServicesSettingsPage* servicesSettingsPage = new ServicesSettingsPage(this); + KPageWidgetItem* servicesSettingsFrame = addPage(servicesSettingsPage, + i18nc("@title:group", "Services")); + servicesSettingsFrame->setIcon(KIcon("services")); + connect(servicesSettingsPage, SIGNAL(changed()), this, SLOT(enableApply())); + + // General + GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(url, this); KPageWidgetItem* generalSettingsFrame = addPage(generalSettingsPage, i18nc("@title:group General settings", "General")); generalSettingsFrame->setIcon(KIcon("system-run")); @@ -67,6 +86,8 @@ DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) : m_pages.append(startupSettingsPage); m_pages.append(viewSettingsPage); + m_pages.append(navigationSettingsPage); + m_pages.append(servicesSettingsPage); m_pages.append(generalSettingsPage); } -- cgit v1.3