Merge remote-tracking branch 'origin/master' into kf6

[dolphin.git] / src / settings / contextmenu / contextmenusettingspage.cpp

diff --git a/src/settings/contextmenu/contextmenusettingspage.cpp b/src/settings/contextmenu/contextmenusettingspage.cpp
index fa4ba11a75c6b494c8ac869f46e2a4b0e255dc74..1c83e477ea43305d559b85fd805705c6a8752182 100644 (file)
--- a/src/settings/contextmenu/contextmenusettingspage.cpp
+++ b/src/settings/contextmenu/contextmenusettingspage.cpp
@@ -6,12 +6,10 @@
 
 #include "contextmenusettingspage.h"
 
 
 #include "contextmenusettingspage.h"
 

-#include "dolphin_generalsettings.h"
-#include "dolphin_versioncontrolsettings.h"

 #include "dolphin_contextmenusettings.h"
 #include "dolphin_contextmenusettings.h"

-#include "settings/serviceitemdelegate.h"
-#include "settings/servicemodel.h"
+#include "dolphin_versioncontrolsettings.h"

 #include "global.h"
 #include "global.h"

+#include "settings/servicemodel.h"

 
 #include <KDesktopFile>
 #include <KDesktopFileActions>
 
 #include <KDesktopFile>
 #include <KDesktopFileActions>


@@ -20,61 +18,58 @@
 #include <KMessageBox>
 #include <KPluginMetaData>
 #include <KService>
 #include <KMessageBox>
 #include <KPluginMetaData>
 #include <KService>

-#include <KServiceTypeTrader>
-#include <kio_version.h>

 #include <kiocore_export.h>
 #include <kservice_export.h>
 #include <kiocore_export.h>
 #include <kservice_export.h>

+#include <kwidgetsaddons_version.h>

 
 

-#include <QtGlobal>

 #include <KNSWidgets/Button>
 #include <KNSWidgets/Button>

+#include <QtGlobal>

 
 

+#include <QApplication>

 #include <QGridLayout>
 #include <QLabel>
 #include <QGridLayout>
 #include <QLabel>

+#include <QLineEdit>

 #include <QListWidget>
 #include <QScroller>
 #include <QShowEvent>
 #include <QSortFilterProxyModel>
 #include <QListWidget>
 #include <QScroller>
 #include <QShowEvent>
 #include <QSortFilterProxyModel>

-#include <QLineEdit>
-#include <QApplication>

 
 namespace
 {
 
 namespace
 {

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

 
 

-    bool laterSelected = false;
+bool laterSelected = false;

 }
 
 }
 

-ContextMenuSettingsPage::ContextMenuSettingsPage(QWidget* parent,
-                                                 const KActionCollection* actions,
-                                                 const QStringList& actionIds) :
-    SettingsPageBase(parent),
-    m_initialized(false),
-    m_serviceModel(nullptr),
-    m_sortModel(nullptr),
-    m_listView(nullptr),
-    m_enabledVcsPlugins(),
-    m_actions(actions),
-    m_actionIds(actionIds)
+ContextMenuSettingsPage::ContextMenuSettingsPage(QWidget *parent, const KActionCollection *actions, const QStringList &actionIds)
+    : SettingsPageBase(parent)
+    , m_initialized(false)
+    , m_serviceModel(nullptr)
+    , m_sortModel(nullptr)
+    , m_listView(nullptr)
+    , m_enabledVcsPlugins()
+    , m_actions(actions)
+    , m_actionIds(actionIds)

 {
 {

-    QVBoxLayout* topLayout = new QVBoxLayout(this);
+    QVBoxLayout *topLayout = new QVBoxLayout(this);

 
 

-    QLabel* label = new QLabel(i18nc("@label:textbox",
+    QLabel *label = new QLabel(i18nc("@label:textbox",

                                      "Select which services should "
                                      "Select which services should "

-                                     "be shown in the context menu:"), this);
+                                     "be shown in the context menu:"),
+                               this);

     label->setWordWrap(true);
     m_searchLineEdit = new QLineEdit(this);
     label->setWordWrap(true);
     m_searchLineEdit = new QLineEdit(this);

-    m_searchLineEdit->setPlaceholderText(i18nc("@label:textbox", "Search..."));
-    connect(m_searchLineEdit, &QLineEdit::textChanged, this, [this](const QString &filter){
+    m_searchLineEdit->setPlaceholderText(i18nc("@label:textbox", "Search…"));
+    connect(m_searchLineEdit, &QLineEdit::textChanged, this, [this](const QString &filter) {

         m_sortModel->setFilterFixedString(filter);
     });
 
     m_listView = new QListView(this);
     QScroller::grabGesture(m_listView->viewport(), QScroller::TouchGesture);
 
         m_sortModel->setFilterFixedString(filter);
     });
 
     m_listView = new QListView(this);
     QScroller::grabGesture(m_listView->viewport(), QScroller::TouchGesture);
 

-    auto *delegate = new ServiceItemDelegate(m_listView, m_listView);

     m_serviceModel = new ServiceModel(this);
     m_sortModel = new QSortFilterProxyModel(this);
     m_sortModel->setSourceModel(m_serviceModel);
     m_serviceModel = new ServiceModel(this);
     m_sortModel = new QSortFilterProxyModel(this);
     m_sortModel->setSourceModel(m_serviceModel);


@@ -83,7 +78,6 @@ ContextMenuSettingsPage::ContextMenuSettingsPage(QWidget* parent,
     m_sortModel->setFilterRole(Qt::DisplayRole);
     m_sortModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
     m_listView->setModel(m_sortModel);
     m_sortModel->setFilterRole(Qt::DisplayRole);
     m_sortModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
     m_listView->setModel(m_sortModel);

-    m_listView->setItemDelegate(delegate);

     m_listView->setVerticalScrollMode(QListView::ScrollPerPixel);
     connect(m_listView, &QListView::clicked, this, &ContextMenuSettingsPage::changed);
 
     m_listView->setVerticalScrollMode(QListView::ScrollPerPixel);
     connect(m_listView, &QListView::clicked, this, &ContextMenuSettingsPage::changed);
 


@@ -93,14 +87,12 @@ ContextMenuSettingsPage::ContextMenuSettingsPage(QWidget* parent,
 
 #ifndef Q_OS_WIN
     using NewStuffButton = KNSWidgets::Button;
 
 #ifndef Q_OS_WIN
     using NewStuffButton = KNSWidgets::Button;

-    auto *downloadButton = new NewStuffButton(i18nc("@action:button", "Download New Services..."),
-                                              QStringLiteral("servicemenu.knsrc"),
-                                              this);
+    auto *downloadButton = new NewStuffButton(i18nc("@action:button", "Download New Services…"), QStringLiteral("servicemenu.knsrc"), this);

     connect(downloadButton, &NewStuffButton::dialogFinished, this, [this](const auto &changedEntries) {
     connect(downloadButton, &NewStuffButton::dialogFinished, this, [this](const auto &changedEntries) {

-           if (!changedEntries.isEmpty()) {
-               m_serviceModel->clear();
-               loadServices();
-           }
+        if (!changedEntries.isEmpty()) {
+            m_serviceModel->clear();
+            loadServices();
+        }

     });
     topLayout->addWidget(downloadButton);
 #endif // Q_OS_WIN
     });
     topLayout->addWidget(downloadButton);
 #endif // Q_OS_WIN


@@ -109,10 +101,11 @@ ContextMenuSettingsPage::ContextMenuSettingsPage(QWidget* parent,
     std::sort(m_enabledVcsPlugins.begin(), m_enabledVcsPlugins.end());
 }
 
     std::sort(m_enabledVcsPlugins.begin(), m_enabledVcsPlugins.end());
 }
 

-ContextMenuSettingsPage::~ContextMenuSettingsPage() {
+ContextMenuSettingsPage::~ContextMenuSettingsPage()
+{

 }
 
 }
 

-bool ContextMenuSettingsPage::entryVisible(const QString& id)
+bool ContextMenuSettingsPage::entryVisible(const QString &id)

 {
     if (id == "add_to_places") {
         return ContextMenuSettings::showAddToPlaces();
 {
     if (id == "add_to_places") {
         return ContextMenuSettings::showAddToPlaces();


@@ -124,17 +117,23 @@ bool ContextMenuSettingsPage::entryVisible(const QString& id)
         return ContextMenuSettings::showOpenInNewTab();
     } else if (id == "open_in_new_window") {
         return ContextMenuSettings::showOpenInNewWindow();
         return ContextMenuSettings::showOpenInNewTab();
     } else if (id == "open_in_new_window") {
         return ContextMenuSettings::showOpenInNewWindow();

+    } else if (id == "open_in_split_view") {
+        return ContextMenuSettings::showOpenInSplitView();

     } else if (id == "copy_location") {
         return ContextMenuSettings::showCopyLocation();
     } else if (id == "duplicate") {
         return ContextMenuSettings::showDuplicateHere();
     } else if (id == "open_terminal_here") {
         return ContextMenuSettings::showOpenTerminal();
     } else if (id == "copy_location") {
         return ContextMenuSettings::showCopyLocation();
     } else if (id == "duplicate") {
         return ContextMenuSettings::showDuplicateHere();
     } else if (id == "open_terminal_here") {
         return ContextMenuSettings::showOpenTerminal();

+    } else if (id == "copy_to_inactive_split_view") {
+        return ContextMenuSettings::showCopyToOtherSplitView();
+    } else if (id == "move_to_inactive_split_view") {
+        return ContextMenuSettings::showMoveToOtherSplitView();

     }
     return false;
 }
 
     }
     return false;
 }
 

-void ContextMenuSettingsPage::setEntryVisible(const QString& id, bool visible)
+void ContextMenuSettingsPage::setEntryVisible(const QString &id, bool visible)

 {
     if (id == "add_to_places") {
         ContextMenuSettings::setShowAddToPlaces(visible);
 {
     if (id == "add_to_places") {
         ContextMenuSettings::setShowAddToPlaces(visible);


@@ -146,12 +145,18 @@ void ContextMenuSettingsPage::setEntryVisible(const QString& id, bool visible)
         ContextMenuSettings::setShowOpenInNewTab(visible);
     } else if (id == "open_in_new_window") {
         ContextMenuSettings::setShowOpenInNewWindow(visible);
         ContextMenuSettings::setShowOpenInNewTab(visible);
     } else if (id == "open_in_new_window") {
         ContextMenuSettings::setShowOpenInNewWindow(visible);

+    } else if (id == "open_in_split_view") {
+        return ContextMenuSettings::setShowOpenInSplitView(visible);

     } else if (id == "copy_location") {
         ContextMenuSettings::setShowCopyLocation(visible);
     } else if (id == "duplicate") {
         ContextMenuSettings::setShowDuplicateHere(visible);
     } else if (id == "open_terminal_here") {
         ContextMenuSettings::setShowOpenTerminal(visible);
     } else if (id == "copy_location") {
         ContextMenuSettings::setShowCopyLocation(visible);
     } else if (id == "duplicate") {
         ContextMenuSettings::setShowDuplicateHere(visible);
     } else if (id == "open_terminal_here") {
         ContextMenuSettings::setShowOpenTerminal(visible);

+    } else if (id == "copy_to_inactive_split_view") {
+        ContextMenuSettings::setShowCopyToOtherSplitView(visible);
+    } else if (id == "move_to_inactive_split_view") {
+        ContextMenuSettings::setShowMoveToOtherSplitView(visible);

     }
 }
 
     }
 }
 


@@ -170,7 +175,7 @@ void ContextMenuSettingsPage::applySettings()
     for (int i = 0; i < model->rowCount(); ++i) {
         const QModelIndex index = model->index(i, 0);
         const QString service = model->data(index, ServiceModel::DesktopEntryNameRole).toString();
     for (int i = 0; i < model->rowCount(); ++i) {
         const QModelIndex index = model->index(i, 0);
         const QString service = model->data(index, ServiceModel::DesktopEntryNameRole).toString();

-        const bool checked = model->data(index, Qt::CheckStateRole).toBool();
+        const bool checked = model->data(index, Qt::CheckStateRole).value<Qt::CheckState>() == Qt::Checked;

 
         if (service.startsWith(VersionControlServicePrefix)) {
             if (checked) {
 
         if (service.startsWith(VersionControlServicePrefix)) {
             if (checked) {


@@ -199,14 +204,15 @@ void ContextMenuSettingsPage::applySettings()
         VersionControlSettings::self()->save();
 
         if (!laterSelected) {
         VersionControlSettings::self()->save();
 
         if (!laterSelected) {

-            KMessageBox::ButtonCode promptRestart = KMessageBox::questionYesNo(window(),
-                                    i18nc("@info", "Dolphin must be restarted to apply the "
-                                                "updated version control system settings."),
-                                    i18nc("@info", "Restart now?"),
-                                    KGuiItem(QApplication::translate("KStandardGuiItem", "&Restart"), QStringLiteral("dialog-restart")),
-                                    KGuiItem(QApplication::translate("KStandardGuiItem", "&Later"), QStringLiteral("dialog-later"))
-                        );
-            if (promptRestart == KMessageBox::ButtonCode::Yes) {
+            KMessageBox::ButtonCode promptRestart =
+                KMessageBox::questionTwoActions(window(),
+                                                i18nc("@info",
+                                                      "Dolphin must be restarted to apply the "
+                                                      "updated version control system settings."),
+                                                i18nc("@info", "Restart now?"),
+                                                KGuiItem(QApplication::translate("KStandardGuiItem", "&Restart"), QStringLiteral("dialog-restart")),
+                                                KGuiItem(QApplication::translate("KStandardGuiItem", "&Later"), QStringLiteral("dialog-later")));
+            if (promptRestart == KMessageBox::ButtonCode::PrimaryAction) {

                 Dolphin::openNewWindow();
                 qApp->quit();
             } else {
                 Dolphin::openNewWindow();
                 qApp->quit();
             } else {


@@ -218,19 +224,18 @@ void ContextMenuSettingsPage::applySettings()
 
 void ContextMenuSettingsPage::restoreDefaults()
 {
 
 void ContextMenuSettingsPage::restoreDefaults()
 {

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

     for (int i = 0; i < model->rowCount(); ++i) {
         const QModelIndex index = model->index(i, 0);
         const QString service = model->data(index, ServiceModel::DesktopEntryNameRole).toString();
 
     for (int i = 0; i < model->rowCount(); ++i) {
         const QModelIndex index = model->index(i, 0);
         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);
+        const bool checked =
+            !service.startsWith(VersionControlServicePrefix) && service != QLatin1String(DeleteService) && service != QLatin1String(CopyToMoveToService);
+        model->setData(index, checked ? Qt::Checked : Qt::Unchecked, Qt::CheckStateRole);

     }
 }
 
     }
 }
 

-void ContextMenuSettingsPage::showEvent(QShowEvent* event)
+void ContextMenuSettingsPage::showEvent(QShowEvent *event)

 {
     if (!event->spontaneous() && !m_initialized) {
         loadServices();
 {
     if (!event->spontaneous() && !m_initialized) {
         loadServices();


@@ -240,10 +245,7 @@ void ContextMenuSettingsPage::showEvent(QShowEvent* event)
         // Add "Show 'Delete' command" as service
         KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::IncludeGlobals);
         KConfigGroup configGroup(globalConfig, "KDE");
         // Add "Show 'Delete' command" as service
         KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::IncludeGlobals);
         KConfigGroup configGroup(globalConfig, "KDE");

-        addRow(QStringLiteral("edit-delete"),
-               i18nc("@option:check", "Delete"),
-               DeleteService,
-               configGroup.readEntry("ShowDeleteCommand", ShowDeleteDefault));
+        addRow(QStringLiteral("edit-delete"), i18nc("@option:check", "Delete"), DeleteService, configGroup.readEntry("ShowDeleteCommand", ShowDeleteDefault));

 
         // Add "Show 'Copy To' and 'Move To' commands" as service
         addRow(QStringLiteral("edit-copy"),
 
         // Add "Show 'Copy To' and 'Move To' commands" as service
         addRow(QStringLiteral("edit-copy"),


@@ -251,12 +253,12 @@ void ContextMenuSettingsPage::showEvent(QShowEvent* event)
                CopyToMoveToService,
                ContextMenuSettings::showCopyMoveMenu());
 
                CopyToMoveToService,
                ContextMenuSettings::showCopyMoveMenu());
 

-        if (m_actions){
+        if (m_actions) {

             // Add other built-in actions
             // Add other built-in actions

-            for (const QString& id : m_actionIds) {
-                const QAction* action = m_actions->action(id);
+            for (const QString &id : m_actionIds) {
+                const QAction *action = m_actions->action(id);

                 if (action) {
                 if (action) {

-                    addRow(action->icon().name(), action->text(), id, entryVisible(id));
+                    addRow(action->icon().name(), KLocalizedString::removeAcceleratorMarker(action->text()), id, entryVisible(id));

                 }
             }
         }
                 }
             }
         }


@@ -277,14 +279,7 @@ void ContextMenuSettingsPage::loadServices()
     const auto locations = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kio/servicemenus"), QStandardPaths::LocateDirectory);
     QStringList files = KFileUtils::findAllUniqueFiles(locations);
 
     const auto locations = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kio/servicemenus"), QStandardPaths::LocateDirectory);
     QStringList files = KFileUtils::findAllUniqueFiles(locations);
 

-#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 90)
-    const KService::List services = KServiceTypeTrader::self()->query(QStringLiteral("KonqPopupMenu/Plugin"));
-    for (const KService::Ptr &service : services) {
-        files << QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kservices5/" % service->entryPath());
-    }
-#endif
-
-    for (const auto &file : qAsConst(files)) {
+    for (const auto &file : std::as_const(files)) {

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


@@ -295,29 +290,15 @@ void ContextMenuSettingsPage::loadServices()
             const bool addService = !action.noDisplay() && !action.isSeparator() && !isInServicesList(serviceName);
 
             if (addService) {
             const bool addService = !action.noDisplay() && !action.isSeparator() && !isInServicesList(serviceName);
 
             if (addService) {

-                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 checked = showGroup.readEntry(serviceName, true);
                 addRow(action.icon(), itemName, serviceName, checked);
             }
         }
     }
 
                 const bool checked = showGroup.readEntry(serviceName, true);
                 addRow(action.icon(), itemName, serviceName, checked);
             }
         }
     }
 

-    // Load service plugins, this is deprecated in KIO 5.82
-#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 82)
-    const KService::List pluginServices = KServiceTypeTrader::self()->query(QStringLiteral("KFileItemAction/Plugin"));
-    for (const KService::Ptr &service : pluginServices) {
-        const QString desktopEntryName = service->desktopEntryName();
-        if (!isInServicesList(desktopEntryName)) {
-            const bool checked = showGroup.readEntry(desktopEntryName, true);
-            addRow(service->icon(), service->name(), desktopEntryName, checked);
-        }
-    }
-#endif
-

     // Load JSON-based plugins that implement the KFileItemActionPlugin interface
     // Load JSON-based plugins that implement the KFileItemActionPlugin interface

-    const auto jsonPlugins = KPluginMetaData::findPlugins(QStringLiteral("kf5/kfileitemaction"));
+    const auto jsonPlugins = KPluginMetaData::findPlugins(QStringLiteral("kf6/kfileitemaction"));

 
     for (const auto &jsonMetadata : jsonPlugins) {
         const QString desktopEntryName = jsonMetadata.pluginId();
 
     for (const auto &jsonMetadata : jsonPlugins) {
         const QString desktopEntryName = jsonMetadata.pluginId();


@@ -341,10 +322,7 @@ void ContextMenuSettingsPage::loadVersionControlSystems()
     const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("dolphin/vcs"));
     for (const auto &plugin : plugins) {
         const QString pluginName = plugin.name();
     const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("dolphin/vcs"));
     for (const auto &plugin : plugins) {
         const QString pluginName = plugin.name();

-        addRow(QStringLiteral("code-class"),
-               pluginName,
-               VersionControlServicePrefix + pluginName,
-               enabledPlugins.contains(pluginName));
+        addRow(QStringLiteral("code-class"), pluginName, VersionControlServicePrefix + pluginName, enabledPlugins.contains(pluginName));

         loadedPlugins += pluginName;
     }
 
         loadedPlugins += pluginName;
     }
 


@@ -362,10 +340,7 @@ bool ContextMenuSettingsPage::isInServicesList(const QString &service) const
     return false;
 }
 
     return false;
 }
 

-void ContextMenuSettingsPage::addRow(const QString &icon,
-                                     const QString &text,
-                                     const QString &value,
-                                     bool checked)
+void ContextMenuSettingsPage::addRow(const QString &icon, const QString &text, const QString &value, bool checked)

 {
     m_serviceModel->insertRow(0);
 
 {
     m_serviceModel->insertRow(0);
 


@@ -373,5 +348,7 @@ void ContextMenuSettingsPage::addRow(const QString &icon,
     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, icon, Qt::DecorationRole);
     m_serviceModel->setData(index, text, Qt::DisplayRole);
     m_serviceModel->setData(index, value, ServiceModel::DesktopEntryNameRole);

-    m_serviceModel->setData(index, checked, Qt::CheckStateRole);
+    m_serviceModel->setData(index, checked ? Qt::Checked : Qt::Unchecked, Qt::CheckStateRole);

 }
 }

+
+#include "moc_contextmenusettingspage.cpp"