X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/8ce343ba3d1f3f60dc8a53fdf23497db0fffb37d..747a86573feb65e2ffe57cdae7dedf6ad272e789:/src/settings/dolphinsettingsdialog.cpp diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp index 93f95ca44..611648561 100644 --- a/src/settings/dolphinsettingsdialog.cpp +++ b/src/settings/dolphinsettingsdialog.cpp @@ -22,16 +22,18 @@ #include #include -#include "generalsettingspage.h" -#include "navigationsettingspage.h" -#include "servicessettingspage.h" -#include "startupsettingspage.h" -#include "viewsettingspage.h" -#include "trashsettingspage.h" - -#include -#include -#include +#include "dolphinsettings.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 +#include +#include DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) : KPageDialog(parent), @@ -128,6 +130,15 @@ void DolphinSettingsDialog::applySettings() page->applySettings(); } DolphinApplication::app()->refreshMainWindows(); + + GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + if (settings->modifiedStartupSettings()) { + // Reset the modified startup settings hint. The changed startup settings + // have been applied already in app()->refreshMainWindows(). + settings->setModifiedStartupSettings(false); + settings->writeConfig(); + } + enableButtonApply(false); }