X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/879fa9fa7d82a14c934c7a1361b97d39ffd0a08b..c2ef0392e985988a248854523362c39824480d1e:/src/settings/contextmenu/contextmenusettingspage.cpp diff --git a/src/settings/contextmenu/contextmenusettingspage.cpp b/src/settings/contextmenu/contextmenusettingspage.cpp index c92bad43e..daf15bc1b 100644 --- a/src/settings/contextmenu/contextmenusettingspage.cpp +++ b/src/settings/contextmenu/contextmenusettingspage.cpp @@ -6,60 +6,67 @@ #include "contextmenusettingspage.h" +#include "dolphin_contextmenusettings.h" #include "dolphin_generalsettings.h" #include "dolphin_versioncontrolsettings.h" -#include "dolphin_contextmenusettings.h" +#include "global.h" #include "settings/serviceitemdelegate.h" #include "settings/servicemodel.h" #include +#include +#include #include #include -#include #include #include -#include -#include - #include +#include +#include +#include +#include +#include + +#include #include #include +#include #include #include #include #include -#include 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; } -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 " - "be shown in the context menu:"), this); + "be shown in the context menu:"), + 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){ + connect(m_searchLineEdit, &QLineEdit::textChanged, this, [this](const QString &filter) { m_sortModel->setFilterFixedString(filter); }); @@ -79,34 +86,31 @@ ContextMenuSettingsPage::ContextMenuSettingsPage(QWidget* parent, m_listView->setVerticalScrollMode(QListView::ScrollPerPixel); connect(m_listView, &QListView::clicked, this, &ContextMenuSettingsPage::changed); -#ifndef Q_OS_WIN - auto *downloadButton = new KNS3::Button(i18nc("@action:button", "Download New Services..."), - QStringLiteral("servicemenu.knsrc"), - this); - connect(downloadButton, &KNS3::Button::dialogFinished, this, [this](const KNS3::Entry::List &changedEntries) { - if (!changedEntries.isEmpty()) { - m_serviceModel->clear(); - loadServices(); - } - }); - -#endif - topLayout->addWidget(label); topLayout->addWidget(m_searchLineEdit); topLayout->addWidget(m_listView); + #ifndef Q_OS_WIN + using NewStuffButton = KNSWidgets::Button; + auto *downloadButton = new NewStuffButton(i18nc("@action:button", "Download New Services..."), QStringLiteral("servicemenu.knsrc"), this); + connect(downloadButton, &NewStuffButton::dialogFinished, this, [this](const auto &changedEntries) { + if (!changedEntries.isEmpty()) { + m_serviceModel->clear(); + loadServices(); + } + }); topLayout->addWidget(downloadButton); -#endif +#endif // Q_OS_WIN m_enabledVcsPlugins = VersionControlSettings::enabledPlugins(); 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(); @@ -122,13 +126,13 @@ bool ContextMenuSettingsPage::entryVisible(const QString& id) return ContextMenuSettings::showCopyLocation(); } else if (id == "duplicate") { return ContextMenuSettings::showDuplicateHere(); - } else if (id == "open_terminal") { + } else if (id == "open_terminal_here") { return ContextMenuSettings::showOpenTerminal(); } 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); @@ -144,7 +148,7 @@ void ContextMenuSettingsPage::setEntryVisible(const QString& id, bool visible) ContextMenuSettings::setShowCopyLocation(visible); } else if (id == "duplicate") { ContextMenuSettings::setShowDuplicateHere(visible); - } else if (id == "open_terminal") { + } else if (id == "open_terminal_here") { ContextMenuSettings::setShowOpenTerminal(visible); } } @@ -192,29 +196,48 @@ void ContextMenuSettingsPage::applySettings() VersionControlSettings::setEnabledPlugins(enabledPlugins); VersionControlSettings::self()->save(); - KMessageBox::information(window(), - i18nc("@info", "Dolphin must be restarted to apply the " - "updated version control systems settings."), - QString(), // default title - QStringLiteral("ShowVcsRestartInformation")); + if (!laterSelected) { +#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) + KMessageBox::ButtonCode promptRestart = + KMessageBox::questionTwoActions(window(), +#else + KMessageBox::ButtonCode promptRestart = + KMessageBox::questionYesNo(window(), +#endif + 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 KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) + if (promptRestart == KMessageBox::ButtonCode::PrimaryAction) { +#else + if (promptRestart == KMessageBox::ButtonCode::Yes) { +#endif + Dolphin::openNewWindow(); + qApp->quit(); + } else { + laterSelected = true; + } + } } } 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(); - const bool checked = !service.startsWith(VersionControlServicePrefix) - && service != QLatin1String(DeleteService) - && service != QLatin1String(CopyToMoveToService); + const bool checked = + !service.startsWith(VersionControlServicePrefix) && service != QLatin1String(DeleteService) && service != QLatin1String(CopyToMoveToService); model->setData(index, checked, Qt::CheckStateRole); } } -void ContextMenuSettingsPage::showEvent(QShowEvent* event) +void ContextMenuSettingsPage::showEvent(QShowEvent *event) { if (!event->spontaneous() && !m_initialized) { loadServices(); @@ -224,10 +247,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"); - 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"), @@ -235,10 +255,10 @@ void ContextMenuSettingsPage::showEvent(QShowEvent* event) CopyToMoveToService, ContextMenuSettings::showCopyMoveMenu()); - if (m_actions){ + if (m_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) { addRow(action->icon().name(), action->text(), id, entryVisible(id)); } @@ -258,10 +278,11 @@ void ContextMenuSettingsPage::loadServices() const KConfigGroup showGroup = config.group("Show"); // Load generic services - const KService::List entries = KServiceTypeTrader::self()->query(QStringLiteral("KonqPopupMenu/Plugin")); - for (const KService::Ptr &service : entries) { - const QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kservices5/" % service->entryPath()); - const QList serviceActions = KDesktopFileActions::userDefinedServices(file, true); + const auto locations = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kio/servicemenus"), QStandardPaths::LocateDirectory); + QStringList files = KFileUtils::findAllUniqueFiles(locations); + + for (const auto &file : qAsConst(files)) { + const QList serviceActions = KDesktopFileActions::userDefinedServices(KService(file), true); const KDesktopFile desktopFile(file); const QString subMenuName = desktopFile.desktopGroup().readEntry("X-KDE-Submenu"); @@ -271,29 +292,15 @@ void ContextMenuSettingsPage::loadServices() 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); } } } - // Load service plugins, this is deprecated in KIO 5.82 -#if KIO_VERSION < QT_VERSION_CHECK(6, 0, 0) - 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 - const auto jsonPlugins = KPluginLoader::findPlugins(QStringLiteral("kf5/kfileitemaction")); + const auto jsonPlugins = KPluginMetaData::findPlugins(QStringLiteral("kf" QT_STRINGIFY(QT_VERSION_MAJOR)) + QStringLiteral("/kfileitemaction")); for (const auto &jsonMetadata : jsonPlugins) { const QString desktopEntryName = jsonMetadata.pluginId(); @@ -314,28 +321,13 @@ void ContextMenuSettingsPage::loadVersionControlSystems() // Create a checkbox for each available version control plugin QSet loadedPlugins; - const QVector plugins = KPluginLoader::findPlugins(QStringLiteral("dolphin/vcs")); + const QVector 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; } - const KService::List pluginServices = KServiceTypeTrader::self()->query(QStringLiteral("FileViewVersionControlPlugin")); - for (const auto &plugin : pluginServices) { - const QString pluginName = plugin->name(); - if (loadedPlugins.contains(pluginName)) { - continue; - } - addRow(QStringLiteral("code-class"), - pluginName, - VersionControlServicePrefix + pluginName, - enabledPlugins.contains(pluginName)); - } - m_sortModel->sort(Qt::DisplayRole); } @@ -350,10 +342,7 @@ bool ContextMenuSettingsPage::isInServicesList(const QString &service) const 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);