Write correct value for "Open in application" script execution setting

[dolphin.git] / src / settings / general / confirmationssettingspage.cpp

diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp
index 27e4ab662f2bd27e1d7af8c4e4d27ecf0c483e13..6a72824d9ef2b2b86db84c185b536d6bab47ea51 100644 (file)
--- a/src/settings/general/confirmationssettingspage.cpp
+++ b/src/settings/general/confirmationssettingspage.cpp
@@ -25,14 +25,23 @@
 #include <KLocalizedString>
 
 #include <QCheckBox>
 #include <KLocalizedString>
 
 #include <QCheckBox>

+#include <QComboBox>

 #include <QLabel>
 #include <QLabel>

+#include <QHBoxLayout>

 #include <QVBoxLayout>
 
 namespace {
 #include <QVBoxLayout>
 
 namespace {

+    enum ScriptExecution
+    {
+        AlwaysAsk = 0,
+        Open = 1,
+        Execute = 2
+    };
+

     const bool ConfirmEmptyTrash = true;
     const bool ConfirmTrash = false;
     const bool ConfirmDelete = true;
     const bool ConfirmEmptyTrash = true;
     const bool ConfirmTrash = false;
     const bool ConfirmDelete = true;

-    const bool ConfirmScriptExecution = true;
+    const int  ConfirmScriptExecution = ScriptExecution::AlwaysAsk;

 }
 
 ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
 }
 
 ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :


@@ -41,9 +50,9 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
     m_confirmEmptyTrash(nullptr),
     m_confirmDelete(nullptr),
 
     m_confirmEmptyTrash(nullptr),
     m_confirmDelete(nullptr),
 

-    #ifndef Q_OS_WIN
+#ifdef HAVE_TERMINAL

     m_confirmClosingTerminalRunningProgram(nullptr),
     m_confirmClosingTerminalRunningProgram(nullptr),

-    #endif
+#endif

 
     m_confirmClosingMultipleTabs(nullptr)
 {
 
     m_confirmClosingMultipleTabs(nullptr)
 {


@@ -58,8 +67,6 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
                                               "Emptying trash"), this);
     m_confirmDelete = new QCheckBox(i18nc("@option:check Ask for confirmation when",
                                           "Deleting files or folders"), this);
                                               "Emptying trash"), this);
     m_confirmDelete = new QCheckBox(i18nc("@option:check Ask for confirmation when",
                                           "Deleting files or folders"), this);

-    m_confirmScriptExecution = new QCheckBox(i18nc("@option:check Ask for confirmation when",
-                                                   "Executing scripts or desktop files"), this);

 
     QLabel* confirmLabelDolphin = new QLabel(i18nc("@title:group", "Ask for confirmation in Dolphin when:"), this);
     confirmLabelDolphin->setWordWrap(true);
 
     QLabel* confirmLabelDolphin = new QLabel(i18nc("@title:group", "Ask for confirmation in Dolphin when:"), this);
     confirmLabelDolphin->setWordWrap(true);


@@ -67,23 +74,34 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
     m_confirmClosingMultipleTabs = new QCheckBox(i18nc("@option:check Ask for confirmation in Dolphin when",
                                                        "Closing windows with multiple tabs"), this);
 
     m_confirmClosingMultipleTabs = new QCheckBox(i18nc("@option:check Ask for confirmation in Dolphin when",
                                                        "Closing windows with multiple tabs"), this);
 

-    #ifndef Q_OS_WIN
+#ifdef HAVE_TERMINAL

     m_confirmClosingTerminalRunningProgram = new QCheckBox(i18nc("@option:check Ask for confirmation when",
                                                        "Closing windows with a program running in the Terminal panel"), this);
     m_confirmClosingTerminalRunningProgram = new QCheckBox(i18nc("@option:check Ask for confirmation when",
                                                        "Closing windows with a program running in the Terminal panel"), this);

-    #endif
+#endif
+
+    QHBoxLayout* executableScriptLayout = new QHBoxLayout();
+    QLabel* executableScriptLabel = new QLabel(i18nc("@title:group", "When opening an executable file:"), this);
+    confirmLabelKde->setWordWrap(true);
+    executableScriptLayout->addWidget(executableScriptLabel);
+
+    m_confirmScriptExecution = new QComboBox(this);
+    m_confirmScriptExecution->addItems({i18n("Always ask"), i18n("Open in application"), i18n("Run script")});
+    executableScriptLayout->addWidget(m_confirmScriptExecution);

 
     topLayout->addWidget(confirmLabelKde);
     topLayout->addWidget(m_confirmMoveToTrash);
     topLayout->addWidget(m_confirmEmptyTrash);
     topLayout->addWidget(m_confirmDelete);
 
     topLayout->addWidget(confirmLabelKde);
     topLayout->addWidget(m_confirmMoveToTrash);
     topLayout->addWidget(m_confirmEmptyTrash);
     topLayout->addWidget(m_confirmDelete);

-    topLayout->addWidget(m_confirmScriptExecution);

     topLayout->addSpacing(Dolphin::VERTICAL_SPACER_HEIGHT);
     topLayout->addWidget(confirmLabelDolphin);
     topLayout->addWidget(m_confirmClosingMultipleTabs);
 
     topLayout->addSpacing(Dolphin::VERTICAL_SPACER_HEIGHT);
     topLayout->addWidget(confirmLabelDolphin);
     topLayout->addWidget(m_confirmClosingMultipleTabs);
 

-    #ifndef Q_OS_WIN
+#ifdef HAVE_TERMINAL

     topLayout->addWidget(m_confirmClosingTerminalRunningProgram);
     topLayout->addWidget(m_confirmClosingTerminalRunningProgram);

-    #endif
+#endif
+
+    topLayout->addSpacing(Dolphin::VERTICAL_SPACER_HEIGHT);
+    topLayout->addLayout(executableScriptLayout);

 
     topLayout->addStretch();
 
 
     topLayout->addStretch();
 


@@ -92,12 +110,12 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
     connect(m_confirmMoveToTrash, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
     connect(m_confirmEmptyTrash, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
     connect(m_confirmDelete, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
     connect(m_confirmMoveToTrash, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
     connect(m_confirmEmptyTrash, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
     connect(m_confirmDelete, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);

-    connect(m_confirmScriptExecution, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
+    connect(m_confirmScriptExecution, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ConfirmationsSettingsPage::changed);

     connect(m_confirmClosingMultipleTabs, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
 
     connect(m_confirmClosingMultipleTabs, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
 

-    #ifndef Q_OS_WIN
+#ifdef HAVE_TERMINAL

     connect(m_confirmClosingTerminalRunningProgram, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
     connect(m_confirmClosingTerminalRunningProgram, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);

-    #endif
+#endif

 }
 
 ConfirmationsSettingsPage::~ConfirmationsSettingsPage()
 }
 
 ConfirmationsSettingsPage::~ConfirmationsSettingsPage()


@@ -113,19 +131,26 @@ void ConfirmationsSettingsPage::applySettings()
     confirmationGroup.writeEntry("ConfirmDelete", m_confirmDelete->isChecked());
 
     KConfigGroup scriptExecutionGroup(kioConfig, "Executable scripts");
     confirmationGroup.writeEntry("ConfirmDelete", m_confirmDelete->isChecked());
 
     KConfigGroup scriptExecutionGroup(kioConfig, "Executable scripts");

-    if (m_confirmScriptExecution->isChecked()) {
+    const int index = m_confirmScriptExecution->currentIndex();
+    switch (index) {
+    case ScriptExecution::AlwaysAsk:

         scriptExecutionGroup.writeEntry("behaviourOnLaunch", "alwaysAsk");
         scriptExecutionGroup.writeEntry("behaviourOnLaunch", "alwaysAsk");

-    } else {
-        scriptExecutionGroup.writeEntry("behaviourOnLaunch", "dontAsk");
+        break;
+    case ScriptExecution::Open:
+        scriptExecutionGroup.writeEntry("behaviourOnLaunch", "open");
+        break;
+    case ScriptExecution::Execute:
+        scriptExecutionGroup.writeEntry("behaviourOnLaunch", "execute");
+        break;

     }
     kioConfig->sync();
 
     GeneralSettings* settings = GeneralSettings::self();
     settings->setConfirmClosingMultipleTabs(m_confirmClosingMultipleTabs->isChecked());
 
     }
     kioConfig->sync();
 
     GeneralSettings* settings = GeneralSettings::self();
     settings->setConfirmClosingMultipleTabs(m_confirmClosingMultipleTabs->isChecked());
 

-    #ifndef Q_OS_WIN
+#ifdef HAVE_TERMINAL

     settings->setConfirmClosingTerminalRunningProgram(m_confirmClosingTerminalRunningProgram->isChecked());
     settings->setConfirmClosingTerminalRunningProgram(m_confirmClosingTerminalRunningProgram->isChecked());

-    #endif
+#endif

 
     settings->save();
 }
 
     settings->save();
 }


@@ -140,7 +165,7 @@ void ConfirmationsSettingsPage::restoreDefaults()
     m_confirmMoveToTrash->setChecked(ConfirmTrash);
     m_confirmEmptyTrash->setChecked(ConfirmEmptyTrash);
     m_confirmDelete->setChecked(ConfirmDelete);
     m_confirmMoveToTrash->setChecked(ConfirmTrash);
     m_confirmEmptyTrash->setChecked(ConfirmEmptyTrash);
     m_confirmDelete->setChecked(ConfirmDelete);

-    m_confirmScriptExecution->setChecked(ConfirmScriptExecution);
+    m_confirmScriptExecution->setCurrentIndex(ConfirmScriptExecution);

 }
 
 void ConfirmationsSettingsPage::loadSettings()
 }
 
 void ConfirmationsSettingsPage::loadSettings()


@@ -153,12 +178,18 @@ 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");

-    m_confirmScriptExecution->setChecked(value == QLatin1String("alwaysAsk"));
+    if (value == QLatin1String("alwaysAsk")) {
+        m_confirmScriptExecution->setCurrentIndex(ScriptExecution::AlwaysAsk);
+    } else if (value == QLatin1String("execute")) {
+        m_confirmScriptExecution->setCurrentIndex(ScriptExecution::Execute);
+    } else /* if (value == QLatin1String("open"))*/ {
+        m_confirmScriptExecution->setCurrentIndex(ScriptExecution::Open);
+    }

 
     m_confirmClosingMultipleTabs->setChecked(GeneralSettings::confirmClosingMultipleTabs());
 
 
     m_confirmClosingMultipleTabs->setChecked(GeneralSettings::confirmClosingMultipleTabs());
 

-    #ifndef Q_OS_WIN
+#ifdef HAVE_TERMINAL

     m_confirmClosingTerminalRunningProgram->setChecked(GeneralSettings::confirmClosingTerminalRunningProgram());
     m_confirmClosingTerminalRunningProgram->setChecked(GeneralSettings::confirmClosingTerminalRunningProgram());

-    #endif
+#endif

 }
 
 }