kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-28 03:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/20.04'

Browse source
This commit is contained in:
Elvis Angelaccio 2020-07-05 17:26:52 +02:00
parent bbae04bc4e 7a6956da99
commit 275d7b537d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/settings/general/confirmationssettingspage.cpp
View file

@ -137,7 +137,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 +178,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());