From da1adf7ba407fc58cf458b8ebe26c793090c1763 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Fri, 5 Nov 2010 17:02:58 +0000 Subject: If the user has changed the startup settings, they should also get applied to the current views. BUG: 254947 FIXED-IN: 4.6.0 svn path=/trunk/KDE/kdebase/apps/; revision=1193344 --- src/dolphinviewcontainer.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/dolphinviewcontainer.cpp') diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index be02ef60b..3f3eb91cd 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -219,6 +219,16 @@ bool DolphinViewContainer::isActive() const void DolphinViewContainer::refresh() { + GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + if (settings->modifiedStartupSettings()) { + // The startup settings should only get applied if they have been + // modified by the user. Otherwise keep the (possibly) different current + // settings of the URL navigator and the filterbar. + m_urlNavigator->setUrlEditable(settings->editableUrl()); + m_urlNavigator->setShowFullPath(settings->showFullPath()); + showFilterBar(settings->filterBar()); + } + m_view->refresh(); m_statusBar->refresh(); } -- cgit v1.3