diff options
| author | Serg Podtynnyi <[email protected]> | 2023-02-04 00:14:53 +0700 |
|---|---|---|
| committer | Serg Podtynnyi <[email protected]> | 2023-02-05 12:45:38 +0700 |
| commit | 38c34eeca315c7be58e65d4d3fb72aaf7b866719 (patch) | |
| tree | 886e53f20c9c43edc3eb7fe04789716a9bc98ebe /src/settings/contextmenu | |
| parent | ffff8af851e3a386c44438337779d0ce7ca98a61 (diff) | |
Add clang-format and format code as in Frameworks
Diffstat (limited to 'src/settings/contextmenu')
3 files changed, 143 insertions, 159 deletions
diff --git a/src/settings/contextmenu/contextmenusettingspage.cpp b/src/settings/contextmenu/contextmenusettingspage.cpp index 974ddb531..2205fadd0 100644 --- a/src/settings/contextmenu/contextmenusettingspage.cpp +++ b/src/settings/contextmenu/contextmenusettingspage.cpp @@ -6,12 +6,12 @@ #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 "global.h" #include <KDesktopFile> #include <KDesktopFileActions> @@ -26,49 +26,48 @@ #include <kservice_export.h> #include <kwidgetsaddons_version.h> -#include <QtGlobal> #include <KNSWidgets/Button> +#include <QtGlobal> +#include <QApplication> #include <QGridLayout> #include <QLabel> +#include <QLineEdit> #include <QListWidget> #include <QScroller> #include <QShowEvent> #include <QSortFilterProxyModel> -#include <QLineEdit> -#include <QApplication> 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 " - "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); }); @@ -94,14 +93,12 @@ ContextMenuSettingsPage::ContextMenuSettingsPage(QWidget* parent, #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) { - if (!changedEntries.isEmpty()) { - m_serviceModel->clear(); - loadServices(); - } + if (!changedEntries.isEmpty()) { + m_serviceModel->clear(); + loadServices(); + } }); topLayout->addWidget(downloadButton); #endif // Q_OS_WIN @@ -110,10 +107,11 @@ ContextMenuSettingsPage::ContextMenuSettingsPage(QWidget* parent, 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(); @@ -135,7 +133,7 @@ bool ContextMenuSettingsPage::entryVisible(const QString& id) 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); @@ -201,16 +199,18 @@ void ContextMenuSettingsPage::applySettings() if (!laterSelected) { #if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) - KMessageBox::ButtonCode promptRestart = KMessageBox::questionTwoActions(window(), + KMessageBox::ButtonCode promptRestart = + KMessageBox::questionTwoActions(window(), #else - KMessageBox::ButtonCode promptRestart = KMessageBox::questionYesNo(window(), + 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")) - ); + 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 @@ -227,19 +227,18 @@ void ContextMenuSettingsPage::applySettings() 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(); @@ -249,10 +248,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"), @@ -260,10 +256,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)); } @@ -304,9 +300,7 @@ 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); } @@ -350,10 +344,7 @@ void ContextMenuSettingsPage::loadVersionControlSystems() 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; } @@ -371,10 +362,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); diff --git a/src/settings/contextmenu/contextmenusettingspage.h b/src/settings/contextmenu/contextmenusettingspage.h index a8fae08f6..6bdda1eaf 100644 --- a/src/settings/contextmenu/contextmenusettingspage.h +++ b/src/settings/contextmenu/contextmenusettingspage.h @@ -25,9 +25,7 @@ class ContextMenuSettingsPage : public SettingsPageBase Q_OBJECT public: - explicit ContextMenuSettingsPage(QWidget* parent, - const KActionCollection* actions, - const QStringList& actionIds); + explicit ContextMenuSettingsPage(QWidget *parent, const KActionCollection *actions, const QStringList &actionIds); ~ContextMenuSettingsPage() override; /** @see SettingsPageBase::applySettings() */ @@ -37,7 +35,7 @@ public: void restoreDefaults() override; protected: - void showEvent(QShowEvent* event) override; + void showEvent(QShowEvent *event) override; private Q_SLOTS: /** @@ -56,21 +54,18 @@ private: /** * Adds a row to the model of m_listView. */ - void addRow(const QString &icon, - const QString &text, - const QString &value, - bool checked); - bool entryVisible(const QString& id); - void setEntryVisible(const QString& id, bool visible); + void addRow(const QString &icon, const QString &text, const QString &value, bool checked); + bool entryVisible(const QString &id); + void setEntryVisible(const QString &id, bool visible); private: bool m_initialized; ServiceModel *m_serviceModel; QSortFilterProxyModel *m_sortModel; - QListView* m_listView; + QListView *m_listView; QLineEdit *m_searchLineEdit; QStringList m_enabledVcsPlugins; - const KActionCollection* m_actions; + const KActionCollection *m_actions; const QStringList m_actionIds; }; diff --git a/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp b/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp index 9a6d2f6d6..acee97cf1 100644 --- a/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp +++ b/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp @@ -4,30 +4,29 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ +#include <KLocalizedString> +#include <KShell> +#include <QCommandLineParser> #include <QDebug> -#include <QProcess> -#include <QTimer> -#include <QStandardPaths> #include <QDir> #include <QDirIterator> -#include <QCommandLineParser> +#include <QGuiApplication> #include <QMimeDatabase> +#include <QProcess> +#include <QStandardPaths> +#include <QTimer> #include <QUrl> -#include <QGuiApplication> -#include <KLocalizedString> -#include <KShell> #include "../../../config-dolphin.h" -Q_GLOBAL_STATIC_WITH_ARGS(QStringList, binaryPackages, ({QLatin1String("application/vnd.debian.binary-package"), - QLatin1String("application/x-rpm"), - QLatin1String("application/x-xz"), - QLatin1String("application/zstd")})) +Q_GLOBAL_STATIC_WITH_ARGS(QStringList, + binaryPackages, + ({QLatin1String("application/vnd.debian.binary-package"), + QLatin1String("application/x-rpm"), + QLatin1String("application/x-xz"), + QLatin1String("application/zstd")})) -enum PackageOperation { - Install, - Uninstall -}; +enum PackageOperation { Install, Uninstall }; #if HAVE_PACKAGEKIT #include <PackageKit/Daemon> @@ -41,7 +40,7 @@ enum PackageOperation { Q_NORETURN void fail(const QString &str) { qCritical() << str; - const QStringList args = {"--detailederror" ,i18n("Dolphin service menu installation failed"), str}; + const QStringList args = {"--detailederror", i18n("Dolphin service menu installation failed"), str}; QProcess::startDetached("kdialog", args); exit(1); @@ -59,20 +58,18 @@ void packageKitInstall(const QString &fileName) PackageKit::Transaction *transaction = PackageKit::Daemon::installFile(fileName, PackageKit::Transaction::TransactionFlagNone); const auto exitWithError = [=](PackageKit::Transaction::Error, const QString &details) { - fail(details); + fail(details); }; - QObject::connect(transaction, &PackageKit::Transaction::finished, - [=](PackageKit::Transaction::Exit status, uint) { - if (status == PackageKit::Transaction::ExitSuccess) { - exit(0); - } - // Fallback error handling - QTimer::singleShot(500, [=](){ - fail(i18n("Failed to install \"%1\", exited with status \"%2\"", - fileName, QVariant::fromValue(status).toString())); - }); - }); + QObject::connect(transaction, &PackageKit::Transaction::finished, [=](PackageKit::Transaction::Exit status, uint) { + if (status == PackageKit::Transaction::ExitSuccess) { + exit(0); + } + // Fallback error handling + QTimer::singleShot(500, [=]() { + fail(i18n("Failed to install \"%1\", exited with status \"%2\"", fileName, QVariant::fromValue(status).toString())); + }); + }); QObject::connect(transaction, &PackageKit::Transaction::errorCode, exitWithError); } @@ -88,25 +85,22 @@ void packageKitUninstall(const QString &fileName) }; PackageKit::Transaction *transaction = PackageKit::Daemon::getDetailsLocal(fileName); - QObject::connect(transaction, &PackageKit::Transaction::details, - [=](const PackageKit::Details &details) { - PackageKit::Transaction *transaction = PackageKit::Daemon::removePackage(details.packageId()); - QObject::connect(transaction, &PackageKit::Transaction::finished, uninstallLambda); - QObject::connect(transaction, &PackageKit::Transaction::errorCode, exitWithError); - }); + QObject::connect(transaction, &PackageKit::Transaction::details, [=](const PackageKit::Details &details) { + PackageKit::Transaction *transaction = PackageKit::Daemon::removePackage(details.packageId()); + QObject::connect(transaction, &PackageKit::Transaction::finished, uninstallLambda); + QObject::connect(transaction, &PackageKit::Transaction::errorCode, exitWithError); + }); QObject::connect(transaction, &PackageKit::Transaction::errorCode, exitWithError); // Fallback error handling - QObject::connect(transaction, &PackageKit::Transaction::finished, - [=](PackageKit::Transaction::Exit status, uint) { - if (status != PackageKit::Transaction::ExitSuccess) { - QTimer::singleShot(500, [=]() { - fail(i18n("Failed to uninstall \"%1\", exited with status \"%2\"", - fileName, QVariant::fromValue(status).toString())); - }); - } - }); - } + QObject::connect(transaction, &PackageKit::Transaction::finished, [=](PackageKit::Transaction::Exit status, uint) { + if (status != PackageKit::Transaction::ExitSuccess) { + QTimer::singleShot(500, [=]() { + fail(i18n("Failed to uninstall \"%1\", exited with status \"%2\"", fileName, QVariant::fromValue(status).toString())); + }); + } + }); +} #endif Q_NORETURN void packageKit(PackageOperation operation, const QString &fileName) @@ -131,41 +125,49 @@ Q_NORETURN void packageKit(PackageOperation operation, const QString &fileName) #endif } -struct UncompressCommand -{ +struct UncompressCommand { QString command; QStringList args1; QStringList args2; }; -enum ScriptExecution{ - Process, - Konsole -}; +enum ScriptExecution { Process, Konsole }; void runUncompress(const QString &inputPath, const QString &outputPath) { QVector<QPair<QStringList, UncompressCommand>> mimeTypeToCommand; - mimeTypeToCommand.append({{"application/x-tar", "application/tar", "application/x-gtar", "multipart/x-tar"}, - UncompressCommand({"tar", {"-xf"}, {"-C"}})}); - mimeTypeToCommand.append({{"application/x-gzip", "application/gzip", - "application/x-gzip-compressed-tar", "application/gzip-compressed-tar", - "application/x-gzip-compressed", "application/gzip-compressed", - "application/tgz", "application/x-compressed-tar", - "application/x-compressed-gtar", "file/tgz", - "multipart/x-tar-gz", "application/x-gunzip", "application/gzipped", + mimeTypeToCommand.append({{"application/x-tar", "application/tar", "application/x-gtar", "multipart/x-tar"}, UncompressCommand({"tar", {"-xf"}, {"-C"}})}); + mimeTypeToCommand.append({{"application/x-gzip", + "application/gzip", + "application/x-gzip-compressed-tar", + "application/gzip-compressed-tar", + "application/x-gzip-compressed", + "application/gzip-compressed", + "application/tgz", + "application/x-compressed-tar", + "application/x-compressed-gtar", + "file/tgz", + "multipart/x-tar-gz", + "application/x-gunzip", + "application/gzipped", "gzip/document"}, UncompressCommand({"tar", {"-zxf"}, {"-C"}})}); - mimeTypeToCommand.append({{"application/bzip", "application/bzip2", "application/x-bzip", - "application/x-bzip2", "application/bzip-compressed", - "application/bzip2-compressed", "application/x-bzip-compressed", - "application/x-bzip2-compressed", "application/bzip-compressed-tar", - "application/bzip2-compressed-tar", "application/x-bzip-compressed-tar", - "application/x-bzip2-compressed-tar", "application/x-bz2"}, + mimeTypeToCommand.append({{"application/bzip", + "application/bzip2", + "application/x-bzip", + "application/x-bzip2", + "application/bzip-compressed", + "application/bzip2-compressed", + "application/x-bzip-compressed", + "application/x-bzip2-compressed", + "application/bzip-compressed-tar", + "application/bzip2-compressed-tar", + "application/x-bzip-compressed-tar", + "application/x-bzip2-compressed-tar", + "application/x-bz2"}, UncompressCommand({"tar", {"-jxf"}, {"-C"}})}); - mimeTypeToCommand.append({{"application/zip", "application/x-zip", "application/x-zip-compressed", - "multipart/x-zip"}, - UncompressCommand({"unzip", {}, {"-d"}})}); + mimeTypeToCommand.append( + {{"application/zip", "application/x-zip", "application/x-zip-compressed", "multipart/x-zip"}, UncompressCommand({"unzip", {}, {"-d"}})}); const auto mime = QMimeDatabase().mimeTypeForFile(inputPath).name(); @@ -182,17 +184,13 @@ void runUncompress(const QString &inputPath, const QString &outputPath) } QProcess process; - process.start( - command.command, - QStringList() << command.args1 << inputPath << command.args2 << outputPath, - QIODevice::NotOpen); + process.start(command.command, QStringList() << command.args1 << inputPath << command.args2 << outputPath, QIODevice::NotOpen); if (!process.waitForStarted()) { fail(i18n("Failed to run uncompressor command for %1", inputPath)); } if (!process.waitForFinished()) { - fail( - i18n("Process did not finish in reasonable time: %1 %2", process.program(), process.arguments().join(" "))); + fail(i18n("Process did not finish in reasonable time: %1 %2", process.program(), process.arguments().join(" "))); } if (process.exitStatus() != QProcess::NormalExit || process.exitCode() != 0) { @@ -224,7 +222,11 @@ bool runScriptOnce(const QString &path, const QStringList &args, ScriptExecution bashCommand.append("|| $SHELL"); // If the install script fails a shell opens and the user can fix the problem // without an error konsole closes - process.start("konsole", QStringList() << "-e" << "bash" << "-c" << bashCommand, QIODevice::NotOpen); + process.start("konsole", + QStringList() << "-e" + << "bash" + << "-c" << bashCommand, + QIODevice::NotOpen); } else { process.start(path, args, QIODevice::NotOpen); } @@ -267,9 +269,10 @@ bool runScriptVariants(const QString &path, bool hasArgVariants, const QStringLi return true; } - errorText = i18nc( - "%2 = comma separated list of arguments", - "Installer script %1 failed, tried arguments \"%2\".", path, argVariants.join(i18nc("Separator between arguments", "\", \""))); + errorText = i18nc("%2 = comma separated list of arguments", + "Installer script %1 failed, tried arguments \"%2\".", + path, + argVariants.join(i18nc("Separator between arguments", "\", \""))); return false; } @@ -396,8 +399,7 @@ bool cmdUninstall(const QString &archive, QString &errorText) } else { // If "deinstall" is missing, try "install --uninstall" QString installerPath; - const QStringList basenames2 = {"install-it.sh", "install-it", "installKDE4.sh", - "installKDE4", "install.sh", "install"}; + const QStringList basenames2 = {"install-it.sh", "install-it", "installKDE4.sh", "installKDE4", "install.sh", "install"}; for (const auto &basename : basenames2) { const auto path = findRecursive(dir, basename); if (!path.isEmpty()) { @@ -407,8 +409,7 @@ bool cmdUninstall(const QString &archive, QString &errorText) } if (!installerPath.isEmpty()) { - const bool ok = runScriptVariants(installerPath, true, - {"--remove", "--delete", "--uninstall", "--deinstall"}, errorText); + const bool ok = runScriptVariants(installerPath, true, {"--remove", "--delete", "--uninstall", "--deinstall"}, errorText); if (!ok) { return ok; } |
