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

diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp
index dd4d60f3b10fe24526098b8544fc6179867afdb7..6a72824d9ef2b2b86db84c185b536d6bab47ea51 100644 (file)
--- 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", "alwaysAsk");
         break;
     case ScriptExecution::Open:

-        scriptExecutionGroup.writeEntry("behaviourOnLaunch", "dontAsk");
+        scriptExecutionGroup.writeEntry("behaviourOnLaunch", "open");

         break;
     case ScriptExecution::Execute:
         scriptExecutionGroup.writeEntry("behaviourOnLaunch", "execute");
         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");
 
     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("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());
     }
 
     m_confirmClosingMultipleTabs->setChecked(GeneralSettings::confirmClosingMultipleTabs());