[PlacesItemModelTest] Check whether Desktop and Download folders exist

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

diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp
index 53282115975c8a55231e48b6e31f90c8673304c4..b881b7a52fdbdf7e6bb7ec23d67c1c8c634acf4c 100644 (file)
--- a/src/settings/general/confirmationssettingspage.cpp
+++ b/src/settings/general/confirmationssettingspage.cpp
@@ -19,25 +19,28 @@
 
 #include "confirmationssettingspage.h"
 
 
 #include "confirmationssettingspage.h"
 

-#include <dolphin_generalsettings.h>
+#include "dolphin_generalsettings.h"
+#include "global.h"

 
 

-#include <KDialog>
-#include <KLocale>
+#include <KLocalizedString>

 
 #include <QCheckBox>
 #include <QLabel>
 #include <QVBoxLayout>
 
 namespace {
 
 #include <QCheckBox>
 #include <QLabel>
 #include <QVBoxLayout>
 
 namespace {

+    const bool ConfirmEmptyTrash = true;

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

+    const bool ConfirmScriptExecution = true;

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

-    m_confirmMoveToTrash(0),
-    m_confirmDelete(0),
-    m_confirmClosingMultipleTabs(0)
+    m_confirmMoveToTrash(nullptr),
+    m_confirmEmptyTrash(nullptr),
+    m_confirmDelete(nullptr),
+    m_confirmClosingMultipleTabs(nullptr)

 {
     QVBoxLayout* topLayout = new QVBoxLayout(this);
 
 {
     QVBoxLayout* topLayout = new QVBoxLayout(this);
 


@@ -46,30 +49,35 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
 
     m_confirmMoveToTrash = new QCheckBox(i18nc("@option:check Ask for confirmation when",
                                                "Moving files or folders to trash"), this);
 
     m_confirmMoveToTrash = new QCheckBox(i18nc("@option:check Ask for confirmation when",
                                                "Moving files or folders to trash"), this);

+    m_confirmEmptyTrash = new QCheckBox(i18nc("@option:check Ask for confirmation when",
+                                              "Emptying trash"), this);

     m_confirmDelete = new QCheckBox(i18nc("@option:check Ask for confirmation when",
                                           "Deleting files or folders"), 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);
+    QLabel* confirmLabelDolphin = new QLabel(i18nc("@title:group", "Ask for confirmation in Dolphin when:"), this);

     confirmLabelDolphin->setWordWrap(true);
 
     confirmLabelDolphin->setWordWrap(true);
 

-    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 in Dolphin when",
+                                                       "Closing 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_confirmMoveToTrash);

+    topLayout->addWidget(m_confirmEmptyTrash);

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

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

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

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

     topLayout->addWidget(m_confirmClosingMultipleTabs);
     topLayout->addStretch();
 
     loadSettings();
 
     connect(m_confirmMoveToTrash, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
     topLayout->addWidget(m_confirmClosingMultipleTabs);
     topLayout->addStretch();
 
     loadSettings();
 
     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_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 +87,23 @@ 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());
     KConfigGroup confirmationGroup(kioConfig, "Confirmations");
     confirmationGroup.writeEntry("ConfirmTrash", m_confirmMoveToTrash->isChecked());

+    confirmationGroup.writeEntry("ConfirmEmptyTrash", m_confirmEmptyTrash->isChecked());

     confirmationGroup.writeEntry("ConfirmDelete", m_confirmDelete->isChecked());
     confirmationGroup.writeEntry("ConfirmDelete", m_confirmDelete->isChecked());

-    confirmationGroup.sync();
+
+    KConfigGroup scriptExecutionGroup(kioConfig, "Executable scripts");
+    if (m_confirmScriptExecution->isChecked()) {
+        scriptExecutionGroup.writeEntry("behaviourOnLaunch", "alwaysAsk");
+    } else {
+        scriptExecutionGroup.writeEntry("behaviourOnLaunch", "dontAsk");
+    }
+    kioConfig->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()


@@ -98,16 +114,23 @@ void ConfirmationsSettingsPage::restoreDefaults()
     settings->useDefaults(false);
 
     m_confirmMoveToTrash->setChecked(ConfirmTrash);
     settings->useDefaults(false);
 
     m_confirmMoveToTrash->setChecked(ConfirmTrash);

+    m_confirmEmptyTrash->setChecked(ConfirmEmptyTrash);

     m_confirmDelete->setChecked(ConfirmDelete);
     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));
     const KConfigGroup confirmationGroup(kioConfig, "Confirmations");
     m_confirmMoveToTrash->setChecked(confirmationGroup.readEntry("ConfirmTrash", ConfirmTrash));

+    m_confirmEmptyTrash->setChecked(confirmationGroup.readEntry("ConfirmEmptyTrash", ConfirmEmptyTrash));

     m_confirmDelete->setChecked(confirmationGroup.readEntry("ConfirmDelete", ConfirmDelete));
 
     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());
 }