Fix for crash which was introduced by commit

[dolphin.git] / src / settings / services / servicessettingspage.cpp

diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp
index fbddbbfa7d3916f307c18c81ba796a5a43a68f6c..f258b53e2707906bff735a9eeb3989fe7ee881e0 100644 (file)
--- a/src/settings/services/servicessettingspage.cpp
+++ b/src/settings/services/servicessettingspage.cpp
@@ -19,19 +19,20 @@
 
 #include "servicessettingspage.h"
 
 
 #include "servicessettingspage.h"
 

+#include "dolphin_generalsettings.h"

 #include "dolphin_versioncontrolsettings.h"
 
 #include <KConfig>
 #include <KConfigGroup>
 #include <KDesktopFile>
 #include <kdesktopfileactions.h>
 #include "dolphin_versioncontrolsettings.h"
 
 #include <KConfig>
 #include <KConfigGroup>
 #include <KDesktopFile>
 #include <kdesktopfileactions.h>

-#include <KIcon>
-#include <KLocale>
+#include <QIcon>
+#include <KLocalizedString>

 #include <KMessageBox>
 #include <KMessageBox>

-#include <knewstuff3/knewstuffbutton.h>
+#include <KNS3/Button>

 #include <KService>
 #include <KServiceTypeTrader>
 #include <KService>
 #include <KServiceTypeTrader>

-#include <KStandardDirs>
+#include <QStandardPaths>

 
 #include <settings/serviceitemdelegate.h>
 #include <settings/servicemodel.h>
 
 #include <settings/serviceitemdelegate.h>
 #include <settings/servicemodel.h>


@@ -45,12 +46,20 @@
 #include <QSortFilterProxyModel>
 #include <QShowEvent>
 
 #include <QSortFilterProxyModel>
 #include <QShowEvent>
 

+namespace
+{
+    const bool ShowDeleteDefault = false;
+    const char VersionControlServicePrefix[] = "_version_control_";
+    const char DeleteService[] = "_delete";
+    const char CopyToMoveToService[] ="_copy_to_move_to";
+}
+

 ServicesSettingsPage::ServicesSettingsPage(QWidget* parent) :
     SettingsPageBase(parent),
     m_initialized(false),
 ServicesSettingsPage::ServicesSettingsPage(QWidget* parent) :
     SettingsPageBase(parent),
     m_initialized(false),

+    m_serviceModel(0),
+    m_sortModel(0),

     m_listView(0),
     m_listView(0),

-    m_vcsGroupBox(0),
-    m_vcsPluginsMap(),

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


@@ -62,31 +71,26 @@ ServicesSettingsPage::ServicesSettingsPage(QWidget* parent) :
 
     m_listView = new QListView(this);
     ServiceItemDelegate* delegate = new ServiceItemDelegate(m_listView, m_listView);
 
     m_listView = new QListView(this);
     ServiceItemDelegate* delegate = new ServiceItemDelegate(m_listView, m_listView);

-    ServiceModel* serviceModel = new ServiceModel(this);
-    QSortFilterProxyModel* proxyModel = new QSortFilterProxyModel(this);
-    proxyModel->setSourceModel(serviceModel);
-    proxyModel->setSortRole(Qt::DisplayRole);
-    m_listView->setModel(proxyModel);
+    m_serviceModel = new ServiceModel(this);
+    m_sortModel = new QSortFilterProxyModel(this);
+    m_sortModel->setSourceModel(m_serviceModel);
+    m_sortModel->setSortRole(Qt::DisplayRole);
+    m_listView->setModel(m_sortModel);

     m_listView->setItemDelegate(delegate);
     m_listView->setVerticalScrollMode(QListView::ScrollPerPixel);
     m_listView->setItemDelegate(delegate);
     m_listView->setVerticalScrollMode(QListView::ScrollPerPixel);

-    connect(m_listView, SIGNAL(clicked(QModelIndex)), this, SIGNAL(changed()));
+    connect(m_listView, &QListView::clicked, this, &ServicesSettingsPage::changed);

 
     KNS3::Button* downloadButton = new KNS3::Button(i18nc("@action:button", "Download New Services..."),
                                                     "servicemenu.knsrc",
                                                     this);
 
     KNS3::Button* downloadButton = new KNS3::Button(i18nc("@action:button", "Download New Services..."),
                                                     "servicemenu.knsrc",
                                                     this);

-    connect(downloadButton, SIGNAL(dialogFinished(KNS3::Entry::List)), this, SLOT(loadServices()));
-
-    m_vcsGroupBox = new QGroupBox(i18nc("@title:group", "Version Control Systems"), this);
-    // Only show the version control group box, if a version
-    // control system could be found (see loadVersionControlSystems())
-    m_vcsGroupBox->hide();
+    connect(downloadButton, &KNS3::Button::dialogFinished, this, &ServicesSettingsPage::loadServices);

 
     topLayout->addWidget(label);
     topLayout->addWidget(m_listView);
     topLayout->addWidget(downloadButton);
 
     topLayout->addWidget(label);
     topLayout->addWidget(m_listView);
     topLayout->addWidget(downloadButton);

-    topLayout->addWidget(m_vcsGroupBox);

 
     m_enabledVcsPlugins = VersionControlSettings::enabledPlugins();
 
     m_enabledVcsPlugins = VersionControlSettings::enabledPlugins();

+    qSort(m_enabledVcsPlugins);

 }
 
 ServicesSettingsPage::~ServicesSettingsPage()
 }
 
 ServicesSettingsPage::~ServicesSettingsPage()


@@ -99,33 +103,39 @@ void ServicesSettingsPage::applySettings()
         return;
     }
 
         return;
     }
 

-    // Apply service menu settingsentries

     KConfig config("kservicemenurc", KConfig::NoGlobals);
     KConfigGroup showGroup = config.group("Show");
 
     KConfig config("kservicemenurc", KConfig::NoGlobals);
     KConfigGroup showGroup = config.group("Show");
 

+    QStringList enabledPlugins;
+

     const QAbstractItemModel* model = m_listView->model();
     for (int i = 0; i < model->rowCount(); ++i) {
         const QModelIndex index = model->index(i, 0);
     const QAbstractItemModel* model = m_listView->model();
     for (int i = 0; i < model->rowCount(); ++i) {
         const QModelIndex index = model->index(i, 0);

-        const bool show = model->data(index, Qt::CheckStateRole).toBool();

         const QString service = model->data(index, ServiceModel::DesktopEntryNameRole).toString();
         const QString service = model->data(index, ServiceModel::DesktopEntryNameRole).toString();

-        showGroup.writeEntry(service, show);
-    }
-
-    showGroup.sync();
+        const bool checked = model->data(index, Qt::CheckStateRole).toBool();

 
 

-    // Apply version control settings
-    QStringList enabledPlugins;
-    QMap<QString, QCheckBox*>::const_iterator it = m_vcsPluginsMap.constBegin();
-    while (it != m_vcsPluginsMap.constEnd()) {
-        if (it.value()->isChecked()) {
-            enabledPlugins.append(it.key());
+        if (service.startsWith(VersionControlServicePrefix)) {
+            if (checked) {
+                enabledPlugins.append(model->data(index, Qt::DisplayRole).toString());
+            }
+        } else if (service == QLatin1String(DeleteService)) {
+            KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
+            KConfigGroup configGroup(globalConfig, "KDE");
+            configGroup.writeEntry("ShowDeleteCommand", checked);
+            configGroup.sync();
+        } else if (service == QLatin1String(CopyToMoveToService)) {
+            GeneralSettings::setShowCopyMoveMenu(checked);
+            GeneralSettings::self()->save();
+        } else {
+            showGroup.writeEntry(service, checked);

         }
         }

-        ++it;

     }
 
     }
 

+    showGroup.sync();
+

     if (m_enabledVcsPlugins != enabledPlugins) {
         VersionControlSettings::setEnabledPlugins(enabledPlugins);
     if (m_enabledVcsPlugins != enabledPlugins) {
         VersionControlSettings::setEnabledPlugins(enabledPlugins);

-        VersionControlSettings::self()->writeConfig();
+        VersionControlSettings::self()->save();

 
         KMessageBox::information(window(),
                                  i18nc("@info", "Dolphin must be restarted to apply the "
 
         KMessageBox::information(window(),
                                  i18nc("@info", "Dolphin must be restarted to apply the "


@@ -140,7 +150,12 @@ void ServicesSettingsPage::restoreDefaults()
     QAbstractItemModel* model = m_listView->model();
     for (int i = 0; i < model->rowCount(); ++i) {
         const QModelIndex index = model->index(i, 0);
     QAbstractItemModel* model = m_listView->model();
     for (int i = 0; i < model->rowCount(); ++i) {
         const QModelIndex index = model->index(i, 0);

-        model->setData(index, true, Qt::CheckStateRole);
+        const QString service = model->data(index, ServiceModel::DesktopEntryNameRole).toString();
+
+        const bool checked = !service.startsWith(VersionControlServicePrefix)
+                             && service != QLatin1String(DeleteService)
+                             && service != QLatin1String(CopyToMoveToService);
+        model->setData(index, checked, Qt::CheckStateRole);

     }
 }
 
     }
 }
 


@@ -148,7 +163,25 @@ void ServicesSettingsPage::showEvent(QShowEvent* event)
 {
     if (!event->spontaneous() && !m_initialized) {
         loadServices();
 {
     if (!event->spontaneous() && !m_initialized) {
         loadServices();

+

         loadVersionControlSystems();
         loadVersionControlSystems();

+
+        // Add "Show 'Delete' command" as service
+        KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
+        KConfigGroup configGroup(globalConfig, "KDE");
+        addRow("edit-delete",
+               i18nc("@option:check", "Delete"),
+               DeleteService,
+               configGroup.readEntry("ShowDeleteCommand", ShowDeleteDefault));
+
+        // Add "Show 'Copy To' and 'Move To' commands" as service
+        addRow("edit-copy",
+               i18nc("@option:check", "'Copy To' and 'Move To' commands"),
+               CopyToMoveToService,
+               GeneralSettings::showCopyMoveMenu());
+
+        m_sortModel->sort(Qt::DisplayRole);
+

         m_initialized = true;
     }
     SettingsPageBase::showEvent(event);
         m_initialized = true;
     }
     SettingsPageBase::showEvent(event);


@@ -156,15 +189,13 @@ void ServicesSettingsPage::showEvent(QShowEvent* event)
 
 void ServicesSettingsPage::loadServices()
 {
 
 void ServicesSettingsPage::loadServices()
 {

-    QAbstractItemModel* model = m_listView->model();
-

     const KConfig config("kservicemenurc", KConfig::NoGlobals);
     const KConfigGroup showGroup = config.group("Show");
 
     // Load generic services
     const KService::List entries = KServiceTypeTrader::self()->query("KonqPopupMenu/Plugin");
     const KConfig config("kservicemenurc", KConfig::NoGlobals);
     const KConfigGroup showGroup = config.group("Show");
 
     // Load generic services
     const KService::List entries = KServiceTypeTrader::self()->query("KonqPopupMenu/Plugin");

-    foreach (const KSharedPtr<KService>& service, entries) {
-        const QString file = KStandardDirs::locate("services", service->entryPath());
+    foreach (const KService::Ptr& service, entries) {
+        const QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kservices5/" % service->entryPath());

         const QList<KServiceAction> serviceActions =
                                     KDesktopFileActions::userDefinedServices(file, true);
 
         const QList<KServiceAction> serviceActions =
                                     KDesktopFileActions::userDefinedServices(file, true);
 


@@ -181,35 +212,23 @@ void ServicesSettingsPage::loadServices()
                 const QString itemName = subMenuName.isEmpty()
                                          ? action.text()
                                          : i18nc("@item:inmenu", "%1: %2", subMenuName, action.text());
                 const QString itemName = subMenuName.isEmpty()
                                          ? action.text()
                                          : i18nc("@item:inmenu", "%1: %2", subMenuName, action.text());

-                const bool show = showGroup.readEntry(serviceName, true);
-
-                model->insertRow(0);
-                const QModelIndex index = model->index(0, 0);
-                model->setData(index, action.icon(), Qt::DecorationRole);
-                model->setData(index, show, Qt::CheckStateRole);
-                model->setData(index, itemName, Qt::DisplayRole);
-                model->setData(index, serviceName, ServiceModel::DesktopEntryNameRole);
+                const bool checked = showGroup.readEntry(serviceName, true);
+                addRow(action.icon(), itemName, serviceName, checked);

             }
         }
     }
 
     // Load service plugins that implement the KFileItemActionPlugin interface
     const KService::List pluginServices = KServiceTypeTrader::self()->query("KFileItemAction/Plugin");
             }
         }
     }
 
     // Load service plugins that implement the KFileItemActionPlugin interface
     const KService::List pluginServices = KServiceTypeTrader::self()->query("KFileItemAction/Plugin");

-    foreach (const KSharedPtr<KService>& service, pluginServices) {
+    foreach (const KService::Ptr& service, pluginServices) {

         const QString desktopEntryName = service->desktopEntryName();
         if (!isInServicesList(desktopEntryName)) {
         const QString desktopEntryName = service->desktopEntryName();
         if (!isInServicesList(desktopEntryName)) {

-            const bool show = showGroup.readEntry(desktopEntryName, true);
-
-            model->insertRow(0);
-            const QModelIndex index = model->index(0, 0);
-            model->setData(index, service->icon(), Qt::DecorationRole);
-            model->setData(index, show, Qt::CheckStateRole);
-            model->setData(index, service->name(), Qt::DisplayRole);
-            model->setData(index, desktopEntryName, ServiceModel::DesktopEntryNameRole);
+            const bool checked = showGroup.readEntry(desktopEntryName, true);
+            addRow(service->icon(), service->name(), desktopEntryName, checked);

         }
     }
 
         }
     }
 

-    model->sort(Qt::DisplayRole);
+    m_sortModel->sort(Qt::DisplayRole);

 }
 
 void ServicesSettingsPage::loadVersionControlSystems()
 }
 
 void ServicesSettingsPage::loadVersionControlSystems()


@@ -220,39 +239,37 @@ void ServicesSettingsPage::loadVersionControlSystems()
     const KService::List pluginServices = KServiceTypeTrader::self()->query("FileViewVersionControlPlugin");
     for (KService::List::ConstIterator it = pluginServices.constBegin(); it != pluginServices.constEnd(); ++it) {
         const QString pluginName = (*it)->name();
     const KService::List pluginServices = KServiceTypeTrader::self()->query("FileViewVersionControlPlugin");
     for (KService::List::ConstIterator it = pluginServices.constBegin(); it != pluginServices.constEnd(); ++it) {
         const QString pluginName = (*it)->name();

-        QCheckBox* checkBox = new QCheckBox(pluginName, m_vcsGroupBox);
-        checkBox->setChecked(enabledPlugins.contains(pluginName));
-        connect(checkBox, SIGNAL(clicked()), this, SIGNAL(changed()));
-        m_vcsPluginsMap.insert(pluginName, checkBox);
-    }
-
-    // Add the checkboxes into a grid layout of 2 columns
-    QGridLayout* layout = new QGridLayout(m_vcsGroupBox);
-    const int maxRows = (m_vcsPluginsMap.count() + 1) / 2;
-
-    int index = 0;
-    QMap<QString, QCheckBox*>::const_iterator it = m_vcsPluginsMap.constBegin();
-    while (it != m_vcsPluginsMap.constEnd()) {
-        const int column = index / maxRows;
-        const int row = index % maxRows;
-        layout->addWidget(it.value(), row, column);
-        ++it;
-        ++index;
+        addRow("code-class",
+               pluginName,
+               VersionControlServicePrefix + pluginName,
+               enabledPlugins.contains(pluginName));

     }
 
     }
 

-    m_vcsGroupBox->setVisible(!m_vcsPluginsMap.isEmpty());
+    m_sortModel->sort(Qt::DisplayRole);

 }
 
 bool ServicesSettingsPage::isInServicesList(const QString& service) const
 {
 }
 
 bool ServicesSettingsPage::isInServicesList(const QString& service) const
 {

-    QAbstractItemModel* model = m_listView->model();
-    for (int i = 0; i < model->rowCount(); ++i) {
-        const QModelIndex index = model->index(i, 0);
-        if (model->data(index, ServiceModel::DesktopEntryNameRole).toString() == service) {
+    for (int i = 0; i < m_serviceModel->rowCount(); ++i) {
+        const QModelIndex index = m_serviceModel->index(i, 0);
+        if (m_serviceModel->data(index, ServiceModel::DesktopEntryNameRole).toString() == service) {

             return true;
         }
     }
     return false;
 }
 
             return true;
         }
     }
     return false;
 }
 

-#include "servicessettingspage.moc"
+void ServicesSettingsPage::addRow(const QString& icon,
+                                  const QString& text,
+                                  const QString& value,
+                                  bool checked)
+{
+    m_serviceModel->insertRow(0);
+
+    const QModelIndex index = m_serviceModel->index(0, 0);
+    m_serviceModel->setData(index, icon, Qt::DecorationRole);
+    m_serviceModel->setData(index, text, Qt::DisplayRole);
+    m_serviceModel->setData(index, value, ServiceModel::DesktopEntryNameRole);
+    m_serviceModel->setData(index, checked, Qt::CheckStateRole);
+}
+