X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/983273924d2887cdccdd7c3618d332b52dc0dad6..67ebd66f94356b4e66005b1072919cb7b5e858bb:/src/settings/general/confirmationssettingspage.cpp diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp index dd4d60f3b..66a2bb9bf 100644 --- a/src/settings/general/confirmationssettingspage.cpp +++ b/src/settings/general/confirmationssettingspage.cpp @@ -1,21 +1,8 @@ -/*************************************************************************** - * Copyright (C) 2012 by Peter Penz * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ +/* + * SPDX-FileCopyrightText: 2012 Peter Penz + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "confirmationssettingspage.h" @@ -137,7 +124,7 @@ void ConfirmationsSettingsPage::applySettings() scriptExecutionGroup.writeEntry("behaviourOnLaunch", "alwaysAsk"); break; case ScriptExecution::Open: - scriptExecutionGroup.writeEntry("behaviourOnLaunch", "dontAsk"); + scriptExecutionGroup.writeEntry("behaviourOnLaunch", "open"); break; case ScriptExecution::Execute: scriptExecutionGroup.writeEntry("behaviourOnLaunch", "execute"); @@ -178,12 +165,12 @@ void ConfirmationsSettingsPage::loadSettings() const KConfigGroup scriptExecutionGroup(KSharedConfig::openConfig(QStringLiteral("kiorc")), "Executable scripts"); const QString value = scriptExecutionGroup.readEntry("behaviourOnLaunch", "alwaysAsk"); - if (value == QLatin1String("dontAsk")) { - m_confirmScriptExecution->setCurrentIndex(ScriptExecution::Open); + if (value == QLatin1String("alwaysAsk")) { + m_confirmScriptExecution->setCurrentIndex(ScriptExecution::AlwaysAsk); } else if (value == QLatin1String("execute")) { m_confirmScriptExecution->setCurrentIndex(ScriptExecution::Execute); - } else /* if (value == QLatin1String("alwaysAsk"))*/ { - m_confirmScriptExecution->setCurrentIndex(ScriptExecution::AlwaysAsk); + } else /* if (value == QLatin1String("open"))*/ { + m_confirmScriptExecution->setCurrentIndex(ScriptExecution::Open); } m_confirmClosingMultipleTabs->setChecked(GeneralSettings::confirmClosingMultipleTabs());