X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c8a4f1fd8d3c9b50e51b7234123b3fbe0b979552..862ceee323ad3b474ce9de11eefbddd99c528fac:/src/dolphinsettingsdialog.cpp diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp index 909fd6f28..998f6b4d2 100644 --- a/src/dolphinsettingsdialog.cpp +++ b/src/dolphinsettingsdialog.cpp @@ -19,25 +19,26 @@ ***************************************************************************/ #include "dolphinsettingsdialog.h" -#include -#include -#include "generalsettingspage.h" -#include "viewsettingspage.h" + #include "dolphinapplication.h" #include "dolphinmainwindow.h" -//Added by qt3to4: -#include +#include "generalsettingspage.h" +#include "viewsettingspage.h" + +#include +#include +#include DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) : - KPageDialog(), - m_mainWindow(mainWindow) + KPageDialog(), + m_mainWindow(mainWindow) { const QSize minSize = minimumSize(); setMinimumSize(QSize(512, minSize.height())); setFaceType(List); setCaption(i18n("Dolphin Preferences")); - setButtons(Ok | Apply | Cancel); + setButtons(Ok | Apply | Cancel | Default); setDefaultButton(Ok); m_generalSettingsPage = new GeneralSettingsPage(mainWindow, this); @@ -47,16 +48,28 @@ DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) : m_viewSettingsPage = new ViewSettingsPage(mainWindow, this); KPageWidgetItem* viewSettingsFrame = addPage(m_viewSettingsPage, i18n("View Modes")); viewSettingsFrame->setIcon(KIcon("view-choose")); + + const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog"); + restoreDialogSize(dialogConfig); } DolphinSettingsDialog::~DolphinSettingsDialog() -{} +{ + KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog"); + saveDialogSize(dialogConfig, KConfigFlags::Persistent); +} void DolphinSettingsDialog::slotButtonClicked(int button) { - if (button == Ok || button == Apply) { + 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?")); + if (KMessageBox::questionYesNo(this, text) == KMessageBox::Yes) { + restoreDefaults(); + } } + KPageDialog::slotButtonClicked(button); } @@ -67,4 +80,11 @@ void DolphinSettingsDialog::applySettings() DolphinApplication::app()->refreshMainWindows(); } +void DolphinSettingsDialog::restoreDefaults() +{ + m_generalSettingsPage->restoreDefaults(); + m_viewSettingsPage->restoreDefaults(); + DolphinApplication::app()->refreshMainWindows(); +} + #include "dolphinsettingsdialog.moc"