diff options
| author | Wolfgang Bauer <[email protected]> | 2020-06-30 18:01:39 +0000 |
|---|---|---|
| committer | Elvis Angelaccio <[email protected]> | 2020-07-05 15:22:47 +0000 |
| commit | 7a6956da997a39a22c1f08138674459c3c3aa32b (patch) | |
| tree | 0aee61292ad87407b384ecd27fa4a410c655dcd9 /src/settings | |
| parent | a91d1db06293f00382b88150a29594642d5217c8 (diff) | |
Write correct value for "Open in application" script execution setting
KIO actually uses "alwaysAsk", "execute", and "open" as possible values.
When reading the setting, map unknown values to "open" like KIO does.
That also provides compatibility with older dolphin versions.
BUG: 421294
FIXED-IN: 20.04.3
Diffstat (limited to 'src/settings')
| -rw-r--r-- | src/settings/general/confirmationssettingspage.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp index dd4d60f3b..6a72824d9 100644 --- a/src/settings/general/confirmationssettingspage.cpp +++ b/src/settings/general/confirmationssettingspage.cpp @@ -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()); |
