Commit 275d7b53 authored by Elvis Angelaccio's avatar Elvis Angelaccio
Browse files

Merge branch 'release/20.04'

parents bbae04bc 7a6956da
...@@ -137,7 +137,7 @@ void ConfirmationsSettingsPage::applySettings() ...@@ -137,7 +137,7 @@ void ConfirmationsSettingsPage::applySettings()
scriptExecutionGroup.writeEntry("behaviourOnLaunch", "alwaysAsk"); scriptExecutionGroup.writeEntry("behaviourOnLaunch", "alwaysAsk");
break; break;
case ScriptExecution::Open: case ScriptExecution::Open:
scriptExecutionGroup.writeEntry("behaviourOnLaunch", "dontAsk"); scriptExecutionGroup.writeEntry("behaviourOnLaunch", "open");
break; break;
case ScriptExecution::Execute: case ScriptExecution::Execute:
scriptExecutionGroup.writeEntry("behaviourOnLaunch", "execute"); scriptExecutionGroup.writeEntry("behaviourOnLaunch", "execute");
...@@ -178,12 +178,12 @@ void ConfirmationsSettingsPage::loadSettings() ...@@ -178,12 +178,12 @@ void ConfirmationsSettingsPage::loadSettings()
const KConfigGroup scriptExecutionGroup(KSharedConfig::openConfig(QStringLiteral("kiorc")), "Executable scripts"); const KConfigGroup scriptExecutionGroup(KSharedConfig::openConfig(QStringLiteral("kiorc")), "Executable scripts");
const QString value = scriptExecutionGroup.readEntry("behaviourOnLaunch", "alwaysAsk"); const QString value = scriptExecutionGroup.readEntry("behaviourOnLaunch", "alwaysAsk");
if (value == QLatin1String("dontAsk")) { if (value == QLatin1String("alwaysAsk")) {
m_confirmScriptExecution->setCurrentIndex(ScriptExecution::Open); m_confirmScriptExecution->setCurrentIndex(ScriptExecution::AlwaysAsk);
} else if (value == QLatin1String("execute")) { } else if (value == QLatin1String("execute")) {
m_confirmScriptExecution->setCurrentIndex(ScriptExecution::Execute); m_confirmScriptExecution->setCurrentIndex(ScriptExecution::Execute);
} else /* if (value == QLatin1String("alwaysAsk"))*/ { } else /* if (value == QLatin1String("open"))*/ {
m_confirmScriptExecution->setCurrentIndex(ScriptExecution::AlwaysAsk); m_confirmScriptExecution->setCurrentIndex(ScriptExecution::Open);
} }
m_confirmClosingMultipleTabs->setChecked(GeneralSettings::confirmClosingMultipleTabs()); m_confirmClosingMultipleTabs->setChecked(GeneralSettings::confirmClosingMultipleTabs());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment