Load KFileItemAction plugins with json metadata

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

diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp
index b04ab6192b5973dd229850494e2ca98a29864a9b..2419dc0f4343b129a3ab32133d5aaf80bbe68086 100644 (file)
--- a/src/settings/general/confirmationssettingspage.cpp
+++ b/src/settings/general/confirmationssettingspage.cpp
@@ -21,7 +21,6 @@
 
 #include <dolphin_generalsettings.h>
 
 
 #include <dolphin_generalsettings.h>
 

-#include <KDialog>

 #include <KLocalizedString>
 
 #include <QCheckBox>
 #include <KLocalizedString>
 
 #include <QCheckBox>


@@ -31,6 +30,7 @@
 namespace {
     const bool ConfirmTrash = false;
     const bool ConfirmDelete = true;
 namespace {
     const bool ConfirmTrash = false;
     const bool ConfirmDelete = true;

+    const bool ConfirmScriptExecution = true;

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


@@ -48,6 +48,8 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
                                                "Moving files or folders to trash"), this);
     m_confirmDelete = new QCheckBox(i18nc("@option:check Ask for confirmation when",
                                           "Deleting files or folders"), this);
                                                "Moving files or folders to 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 when:"), this);
     confirmLabelDolphin->setWordWrap(true);
 
     QLabel* confirmLabelDolphin = new QLabel(i18nc("@title:group", "Ask for confirmation when:"), this);
     confirmLabelDolphin->setWordWrap(true);


@@ -55,14 +57,11 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
     m_confirmClosingMultipleTabs = new QCheckBox(i18nc("@option:check Ask for confirmation when",
                                                        "Closing Dolphin windows with multiple tabs"), this);
 
     m_confirmClosingMultipleTabs = new QCheckBox(i18nc("@option:check Ask for confirmation when",
                                                        "Closing Dolphin windows with multiple tabs"), this);
 

-    topLayout->addSpacing(KDialog::spacingHint());

     topLayout->addWidget(confirmLabelKde);
     topLayout->addWidget(confirmLabelKde);

-    topLayout->addSpacing(KDialog::spacingHint());

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

-    topLayout->addSpacing(KDialog::spacingHint());
+    topLayout->addWidget(m_confirmScriptExecution);

     topLayout->addWidget(confirmLabelDolphin);
     topLayout->addWidget(confirmLabelDolphin);

-    topLayout->addSpacing(KDialog::spacingHint());

     topLayout->addWidget(m_confirmClosingMultipleTabs);
     topLayout->addStretch();
 
     topLayout->addWidget(m_confirmClosingMultipleTabs);
     topLayout->addStretch();
 


@@ -70,6 +69,7 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
 
     connect(m_confirmMoveToTrash, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
     connect(m_confirmDelete, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
 
     connect(m_confirmMoveToTrash, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
     connect(m_confirmDelete, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);

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

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


@@ -79,15 +79,21 @@ ConfirmationsSettingsPage::~ConfirmationsSettingsPage()
 
 void ConfirmationsSettingsPage::applySettings()
 {
 
 void ConfirmationsSettingsPage::applySettings()
 {

-    KSharedConfig::Ptr kioConfig = KSharedConfig::openConfig("kiorc", KConfig::NoGlobals);
+    KSharedConfig::Ptr kioConfig = KSharedConfig::openConfig(QStringLiteral("kiorc"), KConfig::NoGlobals);

     KConfigGroup confirmationGroup(kioConfig, "Confirmations");
     confirmationGroup.writeEntry("ConfirmTrash", m_confirmMoveToTrash->isChecked());
     confirmationGroup.writeEntry("ConfirmDelete", m_confirmDelete->isChecked());
     confirmationGroup.sync();
 
     KConfigGroup confirmationGroup(kioConfig, "Confirmations");
     confirmationGroup.writeEntry("ConfirmTrash", m_confirmMoveToTrash->isChecked());
     confirmationGroup.writeEntry("ConfirmDelete", m_confirmDelete->isChecked());
     confirmationGroup.sync();
 

+    if (m_confirmScriptExecution->isChecked()) {
+        KConfigGroup scriptExecutionGroup(kioConfig, "Executable scripts");
+        scriptExecutionGroup.writeEntry("behaviourOnLaunch", "alwaysAsk");
+        scriptExecutionGroup.sync();
+    }
+

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

-    settings->writeConfig();
+    settings->save();

 }
 
 void ConfirmationsSettingsPage::restoreDefaults()
 }
 
 void ConfirmationsSettingsPage::restoreDefaults()


@@ -99,15 +105,20 @@ void ConfirmationsSettingsPage::restoreDefaults()
 
     m_confirmMoveToTrash->setChecked(ConfirmTrash);
     m_confirmDelete->setChecked(ConfirmDelete);
 
     m_confirmMoveToTrash->setChecked(ConfirmTrash);
     m_confirmDelete->setChecked(ConfirmDelete);

+    m_confirmScriptExecution->setChecked(ConfirmScriptExecution);

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

-    KSharedConfig::Ptr kioConfig = KSharedConfig::openConfig("kiorc", KConfig::IncludeGlobals);
+    KSharedConfig::Ptr kioConfig = KSharedConfig::openConfig(QStringLiteral("kiorc"), KConfig::IncludeGlobals);

     const KConfigGroup confirmationGroup(kioConfig, "Confirmations");
     m_confirmMoveToTrash->setChecked(confirmationGroup.readEntry("ConfirmTrash", ConfirmTrash));
     m_confirmDelete->setChecked(confirmationGroup.readEntry("ConfirmDelete", ConfirmDelete));
 
     const KConfigGroup confirmationGroup(kioConfig, "Confirmations");
     m_confirmMoveToTrash->setChecked(confirmationGroup.readEntry("ConfirmTrash", ConfirmTrash));
     m_confirmDelete->setChecked(confirmationGroup.readEntry("ConfirmDelete", ConfirmDelete));
 

+    const KConfigGroup scriptExecutionGroup(KSharedConfig::openConfig(QStringLiteral("kiorc")), "Executable scripts");
+    const QString value = scriptExecutionGroup.readEntry("behaviourOnLaunch", "alwaysAsk");
+    m_confirmScriptExecution->setChecked(value == QLatin1String("alwaysAsk"));
+

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