From b4bbde40055d48202f02a9f4557cb3292dc5e85b Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Fri, 13 Jun 2008 05:30:55 +0000 Subject: Fix the "Apply" - "OK" problem in the viewproperties dialog (patch done by Rafael Fernández López). One related problem still has to be solved... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CCBUG: 163366 svn path=/trunk/KDE/kdebase/apps/; revision=820062 --- src/viewpropertiesdialog.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index c0db408f2..5922f8359 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -310,8 +310,12 @@ void ViewPropertiesDialog::configureAdditionalInfo() void ViewPropertiesDialog::applyViewProperties() { - const bool applyToSubFolders = m_isDirty && - (m_applyToSubFolders != 0) && + // if nothing changed in the dialog, we have nothing to apply + if (!m_isDirty) { + return; + } + + const bool applyToSubFolders = (m_applyToSubFolders != 0) && m_applyToSubFolders->isChecked(); if (applyToSubFolders) { const QString text(i18nc("@info", "The view properties of all sub folders will be changed. Do you want to continue?")); @@ -327,8 +331,7 @@ void ViewPropertiesDialog::applyViewProperties() info->show(); } - const bool applyToAllFolders = m_isDirty && - (m_applyToAllFolders != 0) && + const bool applyToAllFolders = (m_applyToAllFolders != 0) && m_applyToAllFolders->isChecked(); // If the user selected 'Apply To All Folders' the view properties implicitely -- cgit v1.3