From 445f0b64bdd34e39f0565ef870937ebd3d5dfa61 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sun, 7 Jan 2007 09:47:05 +0000 Subject: Allow that Dolphin can also be used with global view properties. Per default Dolphin remembers the view properties for each directory, but from the feedback I've got there is a not ignorable amount of people who prefer having global view properties instead. svn path=/trunk/playground/utils/dolphin/; revision=620774 --- src/generalviewsettingspage.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'src/generalviewsettingspage.cpp') diff --git a/src/generalviewsettingspage.cpp b/src/generalviewsettingspage.cpp index 97a8af905..bdaa681a6 100644 --- a/src/generalviewsettingspage.cpp +++ b/src/generalviewsettingspage.cpp @@ -19,8 +19,10 @@ ***************************************************************************/ #include "generalviewsettingspage.h" +#include "dolphinmainwindow.h" #include "dolphinsettings.h" #include "generalsettings.h" +#include "viewproperties.h" #include @@ -32,8 +34,10 @@ #include #include -GeneralViewSettingsPage::GeneralViewSettingsPage(QWidget* parent) : +GeneralViewSettingsPage::GeneralViewSettingsPage(DolphinMainWindow* mainWindow, + QWidget* parent) : KVBox(parent), + m_mainWindow(mainWindow), m_localProps(0), m_globalProps(0) { @@ -77,9 +81,23 @@ GeneralViewSettingsPage::~GeneralViewSettingsPage() void GeneralViewSettingsPage::applySettings() { + const KUrl& url = m_mainWindow->activeView()->url(); + ViewProperties props(url); // read current view properties + + const bool useGlobalProps = m_globalProps->isChecked(); + GeneralSettings* settings = DolphinSettings::instance().generalSettings(); assert(settings != 0); - settings->setGlobalViewProps(m_globalProps->isChecked()); + settings->setGlobalViewProps(useGlobalProps); + + if (useGlobalProps) { + // Remember the global view properties by applying the current view properties. + // It is important that GeneralSettings::globalViewProps() is set before + // the class ViewProperties is used, as ViewProperties uses this setting + // to find the destination folder for storing the view properties. + ViewProperties globalProps(url); + globalProps.setDirProperties(props); + } } #include "generalviewsettingspage.moc" -- cgit v1.3