diff options
Diffstat (limited to 'src/settings')
50 files changed, 764 insertions, 842 deletions
diff --git a/src/settings/applyviewpropsjob.cpp b/src/settings/applyviewpropsjob.cpp index 430b51121..9de2affe6 100644 --- a/src/settings/applyviewpropsjob.cpp +++ b/src/settings/applyviewpropsjob.cpp @@ -11,12 +11,11 @@ #include "views/viewproperties.h" -ApplyViewPropsJob::ApplyViewPropsJob(const QUrl& dir, - const ViewProperties& viewProps) : - KIO::Job(), - m_viewProps(nullptr), - m_progress(0), - m_dir(dir) +ApplyViewPropsJob::ApplyViewPropsJob(const QUrl &dir, const ViewProperties &viewProps) + : KIO::Job() + , m_viewProps(nullptr) + , m_progress(0) + , m_dir(dir) { m_viewProps = new ViewProperties(dir); m_viewProps->setViewMode(viewProps.viewMode()); @@ -25,21 +24,20 @@ ApplyViewPropsJob::ApplyViewPropsJob(const QUrl& dir, m_viewProps->setSortRole(viewProps.sortRole()); m_viewProps->setSortOrder(viewProps.sortOrder()); - KIO::ListJob* listJob = KIO::listRecursive(dir, KIO::HideProgressInfo); - connect(listJob, &KIO::ListJob::entries, - this, &ApplyViewPropsJob::slotEntries); + KIO::ListJob *listJob = KIO::listRecursive(dir, KIO::HideProgressInfo); + connect(listJob, &KIO::ListJob::entries, this, &ApplyViewPropsJob::slotEntries); addSubjob(listJob); } ApplyViewPropsJob::~ApplyViewPropsJob() { - delete m_viewProps; // the properties are written by the destructor + delete m_viewProps; // the properties are written by the destructor m_viewProps = nullptr; } -void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list) +void ApplyViewPropsJob::slotEntries(KIO::Job *, const KIO::UDSEntryList &list) { - for (const KIO::UDSEntry& entry : list) { + for (const KIO::UDSEntry &entry : list) { const QString name = entry.stringValue(KIO::UDSEntry::UDS_NAME); if (name != QLatin1Char('.') && name != QLatin1String("..") && entry.isDir()) { ++m_progress; @@ -56,7 +54,7 @@ void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list) } } -void ApplyViewPropsJob::slotResult(KJob* job) +void ApplyViewPropsJob::slotResult(KJob *job) { if (job->error()) { setError(job->error()); @@ -64,4 +62,3 @@ void ApplyViewPropsJob::slotResult(KJob* job) } emitResult(); } - diff --git a/src/settings/applyviewpropsjob.h b/src/settings/applyviewpropsjob.h index 0e5b83f7a..60432c12d 100644 --- a/src/settings/applyviewpropsjob.h +++ b/src/settings/applyviewpropsjob.h @@ -47,16 +47,16 @@ public: * @param viewProps View properties for the directory \a dir including its * sub directories. */ - ApplyViewPropsJob(const QUrl& dir, const ViewProperties& viewProps); + ApplyViewPropsJob(const QUrl &dir, const ViewProperties &viewProps); ~ApplyViewPropsJob() override; int progress() const; private Q_SLOTS: - void slotResult(KJob* job) override; - void slotEntries(KIO::Job*, const KIO::UDSEntryList&); + void slotResult(KJob *job) override; + void slotEntries(KIO::Job *, const KIO::UDSEntryList &); private: - ViewProperties* m_viewProps; + ViewProperties *m_viewProps; int m_progress; QUrl m_dir; }; 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; } diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp index eed2f5155..ec92cb635 100644 --- a/src/settings/dolphinsettingsdialog.cpp +++ b/src/settings/dolphinsettingsdialog.cpp @@ -6,15 +6,15 @@ #include "dolphinsettingsdialog.h" +#include "config-dolphin.h" +#include "contextmenu/contextmenusettingspage.h" #include "dolphin_generalsettings.h" #include "dolphinmainwindow.h" #include "general/generalsettingspage.h" #include "navigation/navigationsettingspage.h" -#include "contextmenu/contextmenusettingspage.h" #include "startup/startupsettingspage.h" #include "trash/trashsettingspage.h" #include "viewmodes/viewsettingspage.h" -#include "config-dolphin.h" #if HAVE_KUSERFEEDBACK #include "userfeedback/dolphinfeedbackprovider.h" #include "userfeedback/userfeedbacksettingspage.h" @@ -22,18 +22,18 @@ #include <KAuthorized> #include <KLocalizedString> -#include <KWindowConfig> #include <KMessageBox> +#include <KWindowConfig> #include <kwidgetsaddons_version.h> #include <QCloseEvent> #include <QPushButton> -DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, KActionCollection* actions) : - KPageDialog(parent), - m_pages(), - m_unsavedChanges(false) +DolphinSettingsDialog::DolphinSettingsDialog(const QUrl &url, QWidget *parent, KActionCollection *actions) + : KPageDialog(parent) + , m_pages() + , m_unsavedChanges(false) { const QSize minSize = minimumSize(); @@ -41,8 +41,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, K setFaceType(List); setWindowTitle(i18nc("@title:window", "Configure")); - QDialogButtonBox* box = new QDialogButtonBox(QDialogButtonBox::Ok - | QDialogButtonBox::Apply | QDialogButtonBox::Cancel | QDialogButtonBox::RestoreDefaults); + QDialogButtonBox *box = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Apply | QDialogButtonBox::Cancel | QDialogButtonBox::RestoreDefaults); box->button(QDialogButtonBox::Apply)->setEnabled(false); box->button(QDialogButtonBox::Ok)->setDefault(true); setButtonBox(box); @@ -52,64 +51,58 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, K connect(box->button(QDialogButtonBox::RestoreDefaults), &QAbstractButton::clicked, this, &DolphinSettingsDialog::restoreDefaults); // General - GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(url, this); - KPageWidgetItem* generalSettingsFrame = addPage(generalSettingsPage, - i18nc("@title:group General settings", "General")); + GeneralSettingsPage *generalSettingsPage = new GeneralSettingsPage(url, this); + KPageWidgetItem *generalSettingsFrame = addPage(generalSettingsPage, i18nc("@title:group General settings", "General")); generalSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"))); connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); // Startup - StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(url, this); - KPageWidgetItem* startupSettingsFrame = addPage(startupSettingsPage, - i18nc("@title:group", "Startup")); + StartupSettingsPage *startupSettingsPage = new StartupSettingsPage(url, this); + KPageWidgetItem *startupSettingsFrame = addPage(startupSettingsPage, i18nc("@title:group", "Startup")); startupSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-launch-feedback"))); connect(startupSettingsPage, &StartupSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); // View Modes - ViewSettingsPage* viewSettingsPage = new ViewSettingsPage(this); - KPageWidgetItem* viewSettingsFrame = addPage(viewSettingsPage, - i18nc("@title:group", "View Modes")); + ViewSettingsPage *viewSettingsPage = new ViewSettingsPage(this); + KPageWidgetItem *viewSettingsFrame = addPage(viewSettingsPage, i18nc("@title:group", "View Modes")); viewSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-icons"))); connect(viewSettingsPage, &ViewSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); // Navigation - NavigationSettingsPage* navigationSettingsPage = new NavigationSettingsPage(this); - KPageWidgetItem* navigationSettingsFrame = addPage(navigationSettingsPage, - i18nc("@title:group", "Navigation")); + NavigationSettingsPage *navigationSettingsPage = new NavigationSettingsPage(this); + KPageWidgetItem *navigationSettingsFrame = addPage(navigationSettingsPage, i18nc("@title:group", "Navigation")); navigationSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-navigation"))); connect(navigationSettingsPage, &NavigationSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); // Context Menu - auto contextMenuSettingsPage = new ContextMenuSettingsPage(this, actions, { - QStringLiteral("add_to_places"), - QStringLiteral("sort"), - QStringLiteral("view_mode"), - QStringLiteral("open_in_new_tab"), - QStringLiteral("open_in_new_window"), - QStringLiteral("copy_location"), - QStringLiteral("duplicate"), - QStringLiteral("open_terminal_here") - }); - KPageWidgetItem* contextMenuSettingsFrame = addPage(contextMenuSettingsPage, - i18nc("@title:group", "Context Menu")); + auto contextMenuSettingsPage = new ContextMenuSettingsPage(this, + actions, + {QStringLiteral("add_to_places"), + QStringLiteral("sort"), + QStringLiteral("view_mode"), + QStringLiteral("open_in_new_tab"), + QStringLiteral("open_in_new_window"), + QStringLiteral("copy_location"), + QStringLiteral("duplicate"), + QStringLiteral("open_terminal_here")}); + KPageWidgetItem *contextMenuSettingsFrame = addPage(contextMenuSettingsPage, i18nc("@title:group", "Context Menu")); contextMenuSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-menu-edit"))); connect(contextMenuSettingsPage, &ContextMenuSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); // Trash - SettingsPageBase* trashSettingsPage = nullptr; + SettingsPageBase *trashSettingsPage = nullptr; #ifndef Q_OS_WIN trashSettingsPage = createTrashSettingsPage(this); #endif if (trashSettingsPage) { - trashSettings = addPage(trashSettingsPage, - i18nc("@title:group", "Trash")); + trashSettings = addPage(trashSettingsPage, i18nc("@title:group", "Trash")); trashSettings->setIcon(QIcon::fromTheme(QStringLiteral("user-trash"))); connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); } #if HAVE_KUSERFEEDBACK // User Feedback - UserFeedbackSettingsPage* feedbackSettingsPage = nullptr; + UserFeedbackSettingsPage *feedbackSettingsPage = nullptr; if (DolphinFeedbackProvider::instance()->isEnabled()) { feedbackSettingsPage = new UserFeedbackSettingsPage(this); auto feedbackSettingsFrame = addPage(feedbackSettingsPage, i18nc("@title:group", "User Feedback")); @@ -150,13 +143,13 @@ void DolphinSettingsDialog::enableApply() void DolphinSettingsDialog::applySettings() { - for (SettingsPageBase* page : qAsConst(m_pages)) { + for (SettingsPageBase *page : qAsConst(m_pages)) { page->applySettings(); } Q_EMIT settingsChanged(); - GeneralSettings* settings = GeneralSettings::self(); + GeneralSettings *settings = GeneralSettings::self(); if (settings->modifiedStartupSettings()) { // Reset the modified startup settings hint. The changed startup settings // have been applied already due to emitting settingsChanged(). @@ -169,12 +162,12 @@ void DolphinSettingsDialog::applySettings() void DolphinSettingsDialog::restoreDefaults() { - for (SettingsPageBase* page : qAsConst(m_pages)) { + for (SettingsPageBase *page : qAsConst(m_pages)) { page->restoreDefaults(); } } -void DolphinSettingsDialog::closeEvent(QCloseEvent* event) +void DolphinSettingsDialog::closeEvent(QCloseEvent *event) { if (!m_unsavedChanges) { event->accept(); @@ -186,35 +179,34 @@ void DolphinSettingsDialog::closeEvent(QCloseEvent* event) #else const auto response = KMessageBox::warningYesNoCancel(this, #endif - i18n("You have unsaved changes. Do you want to apply the changes or discard them?"), - i18n("Warning"), - KStandardGuiItem::save(), - KStandardGuiItem::discard(), - KStandardGuiItem::cancel()); + i18n("You have unsaved changes. Do you want to apply the changes or discard them?"), + i18n("Warning"), + KStandardGuiItem::save(), + KStandardGuiItem::discard(), + KStandardGuiItem::cancel()); switch (response) { #if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) - case KMessageBox::PrimaryAction: + case KMessageBox::PrimaryAction: #else - case KMessageBox::Yes: + case KMessageBox::Yes: #endif - applySettings(); - Q_FALLTHROUGH(); + applySettings(); + Q_FALLTHROUGH(); #if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) - case KMessageBox::SecondaryAction: + case KMessageBox::SecondaryAction: #else - case KMessageBox::No: + case KMessageBox::No: #endif - event->accept(); - break; - case KMessageBox::Cancel: - event->ignore(); - break; - default: - break; + event->accept(); + break; + case KMessageBox::Cancel: + event->ignore(); + break; + default: + break; } } - SettingsPageBase *DolphinSettingsDialog::createTrashSettingsPage(QWidget *parent) { if (!KAuthorized::authorizeControlModule(QStringLiteral("kcmtrash.desktop"))) { diff --git a/src/settings/dolphinsettingsdialog.h b/src/settings/dolphinsettingsdialog.h index f9a5652ea..f0322c5f0 100644 --- a/src/settings/dolphinsettingsdialog.h +++ b/src/settings/dolphinsettingsdialog.h @@ -7,8 +7,8 @@ #ifndef DOLPHINSETTINGSDIALOG_H #define DOLPHINSETTINGSDIALOG_H -#include <KPageDialog> #include <KActionCollection> +#include <KPageDialog> class QUrl; class SettingsPageBase; @@ -23,10 +23,10 @@ class DolphinSettingsDialog : public KPageDialog Q_OBJECT public: - explicit DolphinSettingsDialog(const QUrl& url, QWidget* parent = nullptr, KActionCollection* actions = {}); + explicit DolphinSettingsDialog(const QUrl &url, QWidget *parent = nullptr, KActionCollection *actions = {}); ~DolphinSettingsDialog() override; - KPageWidgetItem* trashSettings; + KPageWidgetItem *trashSettings; Q_SIGNALS: void settingsChanged(); @@ -38,12 +38,12 @@ private Q_SLOTS: void restoreDefaults(); protected: - void closeEvent(QCloseEvent* event) override; + void closeEvent(QCloseEvent *event) override; private: static SettingsPageBase *createTrashSettingsPage(QWidget *parent); - QList<SettingsPageBase*> m_pages; + QList<SettingsPageBase *> m_pages; bool m_unsavedChanges; }; diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp index 4e78447c7..33f65b599 100644 --- a/src/settings/general/behaviorsettingspage.cpp +++ b/src/settings/general/behaviorsettingspage.cpp @@ -17,43 +17,40 @@ #include <QRadioButton> #include <QSpacerItem> -BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) : - SettingsPageBase(parent), - m_url(url), - m_localViewProps(nullptr), - m_globalViewProps(nullptr), - m_showToolTips(nullptr), - m_showSelectionToggle(nullptr), - m_naturalSorting(nullptr), - m_caseSensitiveSorting(nullptr), - m_caseInsensitiveSorting(nullptr), - m_renameInline(nullptr), - m_useTabForSplitViewSwitch(nullptr) +BehaviorSettingsPage::BehaviorSettingsPage(const QUrl &url, QWidget *parent) + : SettingsPageBase(parent) + , m_url(url) + , m_localViewProps(nullptr) + , m_globalViewProps(nullptr) + , m_showToolTips(nullptr) + , m_showSelectionToggle(nullptr) + , m_naturalSorting(nullptr) + , m_caseSensitiveSorting(nullptr) + , m_caseInsensitiveSorting(nullptr) + , m_renameInline(nullptr) + , m_useTabForSplitViewSwitch(nullptr) { - QFormLayout* topLayout = new QFormLayout(this); - + QFormLayout *topLayout = new QFormLayout(this); // View properties m_globalViewProps = new QRadioButton(i18nc("@option:radio", "Use common display style for all folders")); m_localViewProps = new QRadioButton(i18nc("@option:radio", "Remember display style for each folder")); m_localViewProps->setToolTip(i18nc("@info", "Dolphin will create a hidden .directory file in each folder you change view properties for.")); - QButtonGroup* viewGroup = new QButtonGroup(this); + QButtonGroup *viewGroup = new QButtonGroup(this); viewGroup->addButton(m_globalViewProps); viewGroup->addButton(m_localViewProps); topLayout->addRow(i18nc("@title:group", "View: "), m_globalViewProps); topLayout->addRow(QString(), m_localViewProps); - topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed)); - // Sorting properties m_naturalSorting = new QRadioButton(i18nc("option:radio", "Natural")); m_caseInsensitiveSorting = new QRadioButton(i18nc("option:radio", "Alphabetical, case insensitive")); m_caseSensitiveSorting = new QRadioButton(i18nc("option:radio", "Alphabetical, case sensitive")); - QButtonGroup* sortingModeGroup = new QButtonGroup(this); + QButtonGroup *sortingModeGroup = new QButtonGroup(this); sortingModeGroup->addButton(m_naturalSorting); sortingModeGroup->addButton(m_caseInsensitiveSorting); sortingModeGroup->addButton(m_caseSensitiveSorting); @@ -61,10 +58,8 @@ BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) : topLayout->addRow(QString(), m_caseInsensitiveSorting); topLayout->addRow(QString(), m_caseSensitiveSorting); - topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed)); - #if HAVE_BALOO // 'Show tooltips' m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips")); @@ -114,8 +109,8 @@ BehaviorSettingsPage::~BehaviorSettingsPage() void BehaviorSettingsPage::applySettings() { - GeneralSettings* settings = GeneralSettings::self(); - ViewProperties props(m_url); // read current view properties + GeneralSettings *settings = GeneralSettings::self(); + ViewProperties props(m_url); // read current view properties const bool useGlobalViewProps = m_globalViewProps->isChecked(); settings->setGlobalViewProps(useGlobalViewProps); @@ -141,7 +136,7 @@ void BehaviorSettingsPage::applySettings() void BehaviorSettingsPage::restoreDefaults() { - GeneralSettings* settings = GeneralSettings::self(); + GeneralSettings *settings = GeneralSettings::self(); settings->useDefaults(true); loadSettings(); settings->useDefaults(false); diff --git a/src/settings/general/behaviorsettingspage.h b/src/settings/general/behaviorsettingspage.h index b054e6d35..ba8ce6384 100644 --- a/src/settings/general/behaviorsettingspage.h +++ b/src/settings/general/behaviorsettingspage.h @@ -23,7 +23,7 @@ class BehaviorSettingsPage : public SettingsPageBase Q_OBJECT public: - BehaviorSettingsPage(const QUrl &url, QWidget* parent); + BehaviorSettingsPage(const QUrl &url, QWidget *parent); ~BehaviorSettingsPage() override; /** @see SettingsPageBase::applySettings() */ @@ -34,26 +34,26 @@ public: private: void loadSettings(); - void setSortingChoiceValue(GeneralSettings* settings); + void setSortingChoiceValue(GeneralSettings *settings); void loadSortingChoiceSettings(); private: QUrl m_url; - QRadioButton* m_localViewProps; - QRadioButton* m_globalViewProps; + QRadioButton *m_localViewProps; + QRadioButton *m_globalViewProps; - QCheckBox* m_showToolTips; - QLabel* m_configureToolTips; - QCheckBox* m_showSelectionToggle; + QCheckBox *m_showToolTips; + QLabel *m_configureToolTips; + QCheckBox *m_showSelectionToggle; - QRadioButton* m_naturalSorting; - QRadioButton* m_caseSensitiveSorting; - QRadioButton* m_caseInsensitiveSorting; + QRadioButton *m_naturalSorting; + QRadioButton *m_caseSensitiveSorting; + QRadioButton *m_caseInsensitiveSorting; - QCheckBox* m_renameInline; - QCheckBox* m_useTabForSplitViewSwitch; - QCheckBox* m_closeActiveSplitView; + QCheckBox *m_renameInline; + QCheckBox *m_useTabForSplitViewSwitch; + QCheckBox *m_closeActiveSplitView; }; #endif diff --git a/src/settings/general/configurepreviewplugindialog.cpp b/src/settings/general/configurepreviewplugindialog.cpp index 5aa3f9d39..a391812df 100644 --- a/src/settings/general/configurepreviewplugindialog.cpp +++ b/src/settings/general/configurepreviewplugindialog.cpp @@ -21,17 +21,15 @@ #include <QUrl> #include <QVBoxLayout> -ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString& pluginName, - const QString& desktopEntryName, - QWidget* parent) : - QDialog(parent) +ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString &pluginName, const QString &desktopEntryName, QWidget *parent) + : QDialog(parent) { QSharedPointer<ThumbCreator> previewPlugin; const QString pluginPath = QPluginLoader(desktopEntryName).fileName(); if (!pluginPath.isEmpty()) { newCreator create = (newCreator)QLibrary::resolve(pluginPath, "new_creator"); if (create) { - previewPlugin.reset(dynamic_cast<ThumbCreator*>(create())); + previewPlugin.reset(dynamic_cast<ThumbCreator *>(create())); } } diff --git a/src/settings/general/configurepreviewplugindialog.h b/src/settings/general/configurepreviewplugindialog.h index 2da7a3afd..66504cce2 100644 --- a/src/settings/general/configurepreviewplugindialog.h +++ b/src/settings/general/configurepreviewplugindialog.h @@ -28,9 +28,7 @@ public: * widget. * @param parent Parent widget. */ - ConfigurePreviewPluginDialog(const QString& pluginName, - const QString& desktopEntryName, - QWidget* parent); + ConfigurePreviewPluginDialog(const QString &pluginName, const QString &desktopEntryName, QWidget *parent); ~ConfigurePreviewPluginDialog() override = default; }; #endif // KIOWIDGETS_BUILD_DEPRECATED_SINCE diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp index af4e2877f..106a42058 100644 --- a/src/settings/general/confirmationssettingspage.cpp +++ b/src/settings/general/confirmationssettingspage.cpp @@ -13,61 +13,55 @@ #include <QCheckBox> #include <QComboBox> -#include <QLabel> #include <QHBoxLayout> +#include <QLabel> #include <QVBoxLayout> -namespace { - enum ScriptExecution - { - AlwaysAsk = 0, - Open = 1, - Execute = 2 - }; +namespace +{ +enum ScriptExecution { AlwaysAsk = 0, Open = 1, Execute = 2 }; - const bool ConfirmEmptyTrash = true; - const bool ConfirmTrash = false; - const bool ConfirmDelete = true; - const int ConfirmScriptExecution = ScriptExecution::AlwaysAsk; +const bool ConfirmEmptyTrash = true; +const bool ConfirmTrash = false; +const bool ConfirmDelete = true; +const int ConfirmScriptExecution = ScriptExecution::AlwaysAsk; } -ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) : - SettingsPageBase(parent), - m_confirmMoveToTrash(nullptr), - m_confirmEmptyTrash(nullptr), - m_confirmDelete(nullptr), +ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget *parent) + : SettingsPageBase(parent) + , m_confirmMoveToTrash(nullptr) + , m_confirmEmptyTrash(nullptr) + , m_confirmDelete(nullptr) + , #if HAVE_TERMINAL - m_confirmClosingTerminalRunningProgram(nullptr), + m_confirmClosingTerminalRunningProgram(nullptr) + , #endif m_confirmClosingMultipleTabs(nullptr) { - QVBoxLayout* topLayout = new QVBoxLayout(this); + QVBoxLayout *topLayout = new QVBoxLayout(this); - QLabel* confirmLabelKde = new QLabel(i18nc("@title:group", "Ask for confirmation in all KDE applications when:"), this); + QLabel *confirmLabelKde = new QLabel(i18nc("@title:group", "Ask for confirmation in all KDE applications when:"), this); confirmLabelKde->setWordWrap(true); - 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_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); - QLabel* confirmLabelDolphin = new QLabel(i18nc("@title:group", "Ask for confirmation in Dolphin when:"), this); + QLabel *confirmLabelDolphin = new QLabel(i18nc("@title:group", "Ask for confirmation in Dolphin when:"), this); confirmLabelDolphin->setWordWrap(true); - m_confirmClosingMultipleTabs = new QCheckBox(i18nc("@option:check Ask for confirmation in Dolphin when", - "Closing windows with multiple tabs"), this); + m_confirmClosingMultipleTabs = new QCheckBox(i18nc("@option:check Ask for confirmation in Dolphin when", "Closing windows with multiple tabs"), this); #if HAVE_TERMINAL - m_confirmClosingTerminalRunningProgram = new QCheckBox(i18nc("@option:check Ask for confirmation when", - "Closing windows with a program running in the Terminal panel"), this); + m_confirmClosingTerminalRunningProgram = + new QCheckBox(i18nc("@option:check Ask for confirmation when", "Closing windows with a program running in the Terminal panel"), this); #endif - QHBoxLayout* executableScriptLayout = new QHBoxLayout(); - QLabel* executableScriptLabel = new QLabel(i18nc("@title:group", "When opening an executable file:"), this); + QHBoxLayout *executableScriptLayout = new QHBoxLayout(); + QLabel *executableScriptLabel = new QLabel(i18nc("@title:group", "When opening an executable file:"), this); confirmLabelKde->setWordWrap(true); executableScriptLayout->addWidget(executableScriptLabel); @@ -132,7 +126,7 @@ void ConfirmationsSettingsPage::applySettings() } kioConfig->sync(); - GeneralSettings* settings = GeneralSettings::self(); + GeneralSettings *settings = GeneralSettings::self(); settings->setConfirmClosingMultipleTabs(m_confirmClosingMultipleTabs->isChecked()); #if HAVE_TERMINAL @@ -144,7 +138,7 @@ void ConfirmationsSettingsPage::applySettings() void ConfirmationsSettingsPage::restoreDefaults() { - GeneralSettings* settings = GeneralSettings::self(); + GeneralSettings *settings = GeneralSettings::self(); settings->useDefaults(true); loadSettings(); settings->useDefaults(false); @@ -179,4 +173,3 @@ void ConfirmationsSettingsPage::loadSettings() m_confirmClosingTerminalRunningProgram->setChecked(GeneralSettings::confirmClosingTerminalRunningProgram()); #endif } - diff --git a/src/settings/general/confirmationssettingspage.h b/src/settings/general/confirmationssettingspage.h index 09ba56886..56dd1a78c 100644 --- a/src/settings/general/confirmationssettingspage.h +++ b/src/settings/general/confirmationssettingspage.h @@ -20,7 +20,7 @@ class ConfirmationsSettingsPage : public SettingsPageBase Q_OBJECT public: - explicit ConfirmationsSettingsPage(QWidget* parent); + explicit ConfirmationsSettingsPage(QWidget *parent); ~ConfirmationsSettingsPage() override; /** @see SettingsPageBase::applySettings() */ @@ -33,16 +33,16 @@ private: void loadSettings(); private: - QCheckBox* m_confirmMoveToTrash; - QCheckBox* m_confirmEmptyTrash; - QCheckBox* m_confirmDelete; + QCheckBox *m_confirmMoveToTrash; + QCheckBox *m_confirmEmptyTrash; + QCheckBox *m_confirmDelete; #if HAVE_TERMINAL - QCheckBox* m_confirmClosingTerminalRunningProgram; + QCheckBox *m_confirmClosingTerminalRunningProgram; #endif - QCheckBox* m_confirmClosingMultipleTabs; - QComboBox* m_confirmScriptExecution; + QCheckBox *m_confirmClosingMultipleTabs; + QComboBox *m_confirmScriptExecution; }; #endif diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp index 16650ff9e..c40e45274 100644 --- a/src/settings/general/generalsettingspage.cpp +++ b/src/settings/general/generalsettingspage.cpp @@ -16,32 +16,32 @@ #include <QTabWidget> #include <QVBoxLayout> -GeneralSettingsPage::GeneralSettingsPage(const QUrl& url, QWidget* parent) : - SettingsPageBase(parent), - m_pages() +GeneralSettingsPage::GeneralSettingsPage(const QUrl &url, QWidget *parent) + : SettingsPageBase(parent) + , m_pages() { - QVBoxLayout* topLayout = new QVBoxLayout(this); + QVBoxLayout *topLayout = new QVBoxLayout(this); topLayout->setContentsMargins(0, 0, 0, 0); - QTabWidget* tabWidget = new QTabWidget(this); + QTabWidget *tabWidget = new QTabWidget(this); // initialize 'Behavior' tab - BehaviorSettingsPage* behaviorPage = new BehaviorSettingsPage(url, tabWidget); + BehaviorSettingsPage *behaviorPage = new BehaviorSettingsPage(url, tabWidget); tabWidget->addTab(behaviorPage, i18nc("@title:tab Behavior settings", "Behavior")); connect(behaviorPage, &BehaviorSettingsPage::changed, this, &GeneralSettingsPage::changed); // initialize 'Previews' tab - PreviewsSettingsPage* previewsPage = new PreviewsSettingsPage(tabWidget); + PreviewsSettingsPage *previewsPage = new PreviewsSettingsPage(tabWidget); tabWidget->addTab(previewsPage, i18nc("@title:tab Previews settings", "Previews")); connect(previewsPage, &PreviewsSettingsPage::changed, this, &GeneralSettingsPage::changed); // initialize 'Context Menu' tab - ConfirmationsSettingsPage* confirmationsPage = new ConfirmationsSettingsPage(tabWidget); + ConfirmationsSettingsPage *confirmationsPage = new ConfirmationsSettingsPage(tabWidget); tabWidget->addTab(confirmationsPage, i18nc("@title:tab Confirmations settings", "Confirmations")); connect(confirmationsPage, &ConfirmationsSettingsPage::changed, this, &GeneralSettingsPage::changed); // initialize 'Status Bar' tab - StatusBarSettingsPage* statusBarPage = new StatusBarSettingsPage(tabWidget); + StatusBarSettingsPage *statusBarPage = new StatusBarSettingsPage(tabWidget); tabWidget->addTab(statusBarPage, i18nc("@title:tab Status Bar settings", "Status Bar")); connect(statusBarPage, &StatusBarSettingsPage::changed, this, &GeneralSettingsPage::changed); @@ -59,15 +59,14 @@ GeneralSettingsPage::~GeneralSettingsPage() void GeneralSettingsPage::applySettings() { - for (SettingsPageBase* page : qAsConst(m_pages)) { + for (SettingsPageBase *page : qAsConst(m_pages)) { page->applySettings(); } } void GeneralSettingsPage::restoreDefaults() { - for (SettingsPageBase* page : qAsConst(m_pages)) { + for (SettingsPageBase *page : qAsConst(m_pages)) { page->restoreDefaults(); } } - diff --git a/src/settings/general/generalsettingspage.h b/src/settings/general/generalsettingspage.h index 5e79216d5..bb9099af0 100644 --- a/src/settings/general/generalsettingspage.h +++ b/src/settings/general/generalsettingspage.h @@ -27,7 +27,7 @@ class GeneralSettingsPage : public SettingsPageBase Q_OBJECT public: - GeneralSettingsPage(const QUrl& url, QWidget* parent); + GeneralSettingsPage(const QUrl &url, QWidget *parent); ~GeneralSettingsPage() override; /** @see SettingsPageBase::applySettings() */ @@ -37,7 +37,7 @@ public: void restoreDefaults() override; private: - QList<SettingsPageBase*> m_pages; + QList<SettingsPageBase *> m_pages; }; #endif diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp index b30d1940a..358798f58 100644 --- a/src/settings/general/previewssettingspage.cpp +++ b/src/settings/general/previewssettingspage.cpp @@ -6,8 +6,8 @@ #include "previewssettingspage.h" -#include "dolphin_generalsettings.h" #include "configurepreviewplugindialog.h" +#include "dolphin_generalsettings.h" #include "settings/serviceitemdelegate.h" #include "settings/servicemodel.h" @@ -24,35 +24,35 @@ #include <QSpinBox> // default settings -namespace { - const int DefaultMaxLocalPreviewSize = 0; // 0 MB - const int DefaultMaxRemotePreviewSize = 0; // 0 MB +namespace +{ +const int DefaultMaxLocalPreviewSize = 0; // 0 MB +const int DefaultMaxRemotePreviewSize = 0; // 0 MB } -PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) : - SettingsPageBase(parent), - m_initialized(false), - m_listView(nullptr), - m_enabledPreviewPlugins(), - m_localFileSizeBox(nullptr), - m_remoteFileSizeBox(nullptr) +PreviewsSettingsPage::PreviewsSettingsPage(QWidget *parent) + : SettingsPageBase(parent) + , m_initialized(false) + , m_listView(nullptr) + , m_enabledPreviewPlugins() + , m_localFileSizeBox(nullptr) + , m_remoteFileSizeBox(nullptr) { - QVBoxLayout* topLayout = new QVBoxLayout(this); + QVBoxLayout *topLayout = new QVBoxLayout(this); - QLabel* showPreviewsLabel = new QLabel(i18nc("@title:group", "Show previews in the view for:"), this); + QLabel *showPreviewsLabel = new QLabel(i18nc("@title:group", "Show previews in the view for:"), this); m_listView = new QListView(this); QScroller::grabGesture(m_listView->viewport(), QScroller::TouchGesture); #if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 87) - ServiceItemDelegate* delegate = new ServiceItemDelegate(m_listView, m_listView); - connect(delegate, &ServiceItemDelegate::requestServiceConfiguration, - this, &PreviewsSettingsPage::configureService); + ServiceItemDelegate *delegate = new ServiceItemDelegate(m_listView, m_listView); + connect(delegate, &ServiceItemDelegate::requestServiceConfiguration, this, &PreviewsSettingsPage::configureService); m_listView->setItemDelegate(delegate); #endif - ServiceModel* serviceModel = new ServiceModel(this); - QSortFilterProxyModel* proxyModel = new QSortFilterProxyModel(this); + ServiceModel *serviceModel = new ServiceModel(this); + QSortFilterProxyModel *proxyModel = new QSortFilterProxyModel(this); proxyModel->setSourceModel(serviceModel); proxyModel->setSortRole(Qt::DisplayRole); proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive); @@ -61,7 +61,7 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) : m_listView->setVerticalScrollMode(QListView::ScrollPerPixel); m_listView->setUniformItemSizes(true); - QLabel* localFileSizeLabel = new QLabel(i18n("Skip previews for local files above:"), this); + QLabel *localFileSizeLabel = new QLabel(i18n("Skip previews for local files above:"), this); m_localFileSizeBox = new QSpinBox(this); m_localFileSizeBox->setSingleStep(1); @@ -69,12 +69,12 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) : m_localFileSizeBox->setRange(0, 9999999); /* MB */ m_localFileSizeBox->setSpecialValueText(i18n("No limit")); - QHBoxLayout* localFileSizeBoxLayout = new QHBoxLayout(); + QHBoxLayout *localFileSizeBoxLayout = new QHBoxLayout(); localFileSizeBoxLayout->addWidget(localFileSizeLabel); localFileSizeBoxLayout->addStretch(0); localFileSizeBoxLayout->addWidget(m_localFileSizeBox); - QLabel* remoteFileSizeLabel = new QLabel(i18nc("@label", "Skip previews for remote files above:"), this); + QLabel *remoteFileSizeLabel = new QLabel(i18nc("@label", "Skip previews for remote files above:"), this); m_remoteFileSizeBox = new QSpinBox(this); m_remoteFileSizeBox->setSingleStep(1); @@ -82,7 +82,7 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) : m_remoteFileSizeBox->setRange(0, 9999999); /* MB */ m_remoteFileSizeBox->setSpecialValueText(i18n("No previews")); - QHBoxLayout* remoteFileSizeBoxLayout = new QHBoxLayout(); + QHBoxLayout *remoteFileSizeBoxLayout = new QHBoxLayout(); remoteFileSizeBoxLayout->addWidget(remoteFileSizeLabel); remoteFileSizeBoxLayout->addStretch(0); remoteFileSizeBoxLayout->addWidget(m_remoteFileSizeBox); @@ -105,7 +105,7 @@ PreviewsSettingsPage::~PreviewsSettingsPage() void PreviewsSettingsPage::applySettings() { - const QAbstractItemModel* model = m_listView->model(); + const QAbstractItemModel *model = m_listView->model(); const int rowCount = model->rowCount(); if (rowCount > 0) { m_enabledPreviewPlugins.clear(); @@ -126,15 +126,11 @@ void PreviewsSettingsPage::applySettings() globalConfig.deleteEntry("MaximumSize", KConfigBase::Normal | KConfigBase::Global); } else { const qulonglong maximumLocalSize = static_cast<qulonglong>(m_localFileSizeBox->value()) * 1024 * 1024; - globalConfig.writeEntry("MaximumSize", - maximumLocalSize, - KConfigBase::Normal | KConfigBase::Global); + globalConfig.writeEntry("MaximumSize", maximumLocalSize, KConfigBase::Normal | KConfigBase::Global); } const qulonglong maximumRemoteSize = static_cast<qulonglong>(m_remoteFileSizeBox->value()) * 1024 * 1024; - globalConfig.writeEntry("MaximumRemoteSize", - maximumRemoteSize, - KConfigBase::Normal | KConfigBase::Global); + globalConfig.writeEntry("MaximumRemoteSize", maximumRemoteSize, KConfigBase::Normal | KConfigBase::Global); globalConfig.sync(); } @@ -145,7 +141,7 @@ void PreviewsSettingsPage::restoreDefaults() m_remoteFileSizeBox->setValue(DefaultMaxRemotePreviewSize); } -void PreviewsSettingsPage::showEvent(QShowEvent* event) +void PreviewsSettingsPage::showEvent(QShowEvent *event) { if (!event->spontaneous() && !m_initialized) { loadPreviewPlugins(); @@ -155,13 +151,13 @@ void PreviewsSettingsPage::showEvent(QShowEvent* event) } #if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 87) -void PreviewsSettingsPage::configureService(const QModelIndex& index) +void PreviewsSettingsPage::configureService(const QModelIndex &index) { - const QAbstractItemModel* model = index.model(); + const QAbstractItemModel *model = index.model(); const QString pluginName = model->data(index).toString(); const QString desktopEntryName = model->data(index, ServiceModel::DesktopEntryNameRole).toString(); - ConfigurePreviewPluginDialog* dialog = new ConfigurePreviewPluginDialog(pluginName, desktopEntryName, this); + ConfigurePreviewPluginDialog *dialog = new ConfigurePreviewPluginDialog(pluginName, desktopEntryName, this); dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->show(); } @@ -169,7 +165,7 @@ void PreviewsSettingsPage::configureService(const QModelIndex& index) void PreviewsSettingsPage::loadPreviewPlugins() { - QAbstractItemModel* model = m_listView->model(); + QAbstractItemModel *model = m_listView->model(); const QVector<KPluginMetaData> plugins = KIO::PreviewJob::availableThumbnailerPlugins(); for (const KPluginMetaData &plugin : plugins) { diff --git a/src/settings/general/previewssettingspage.h b/src/settings/general/previewssettingspage.h index 4dee27ada..2c3e4dfef 100644 --- a/src/settings/general/previewssettingspage.h +++ b/src/settings/general/previewssettingspage.h @@ -7,7 +7,6 @@ #ifndef PREVIEWSSETTINGSPAGE_H #define PREVIEWSSETTINGSPAGE_H - #include <kiowidgets_export.h> #include "settings/settingspagebase.h" @@ -24,7 +23,7 @@ class PreviewsSettingsPage : public SettingsPageBase Q_OBJECT public: - explicit PreviewsSettingsPage(QWidget* parent); + explicit PreviewsSettingsPage(QWidget *parent); ~PreviewsSettingsPage() override; /** @@ -38,11 +37,11 @@ public: void restoreDefaults() override; protected: - void showEvent(QShowEvent* event) override; + void showEvent(QShowEvent *event) override; private Q_SLOTS: #if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 87) - void configureService(const QModelIndex& index); + void configureService(const QModelIndex &index); #endif private: @@ -53,8 +52,8 @@ private: bool m_initialized; QListView *m_listView; QStringList m_enabledPreviewPlugins; - QSpinBox* m_localFileSizeBox; - QSpinBox* m_remoteFileSizeBox; + QSpinBox *m_localFileSizeBox; + QSpinBox *m_remoteFileSizeBox; }; #endif diff --git a/src/settings/general/statusbarsettingspage.cpp b/src/settings/general/statusbarsettingspage.cpp index 9d90a64fd..0d5be04bf 100644 --- a/src/settings/general/statusbarsettingspage.cpp +++ b/src/settings/general/statusbarsettingspage.cpp @@ -13,17 +13,17 @@ #include <QCheckBox> #include <QVBoxLayout> -StatusBarSettingsPage::StatusBarSettingsPage(QWidget* parent) : - SettingsPageBase(parent), - m_showStatusBar(nullptr), - m_showZoomSlider(nullptr), - m_showSpaceInfo(nullptr) +StatusBarSettingsPage::StatusBarSettingsPage(QWidget *parent) + : SettingsPageBase(parent) + , m_showStatusBar(nullptr) + , m_showZoomSlider(nullptr) + , m_showSpaceInfo(nullptr) { m_showStatusBar = new QCheckBox(i18nc("@option:check", "Show status bar"), this); m_showZoomSlider = new QCheckBox(i18nc("@option:check", "Show zoom slider"), this); m_showSpaceInfo = new QCheckBox(i18nc("@option:check", "Show space information"), this); - QVBoxLayout* topLayout = new QVBoxLayout(this); + QVBoxLayout *topLayout = new QVBoxLayout(this); topLayout->addWidget(m_showStatusBar); topLayout->addWidget(m_showZoomSlider); topLayout->addWidget(m_showSpaceInfo); @@ -50,7 +50,7 @@ void StatusBarSettingsPage::onShowStatusBarToggled() void StatusBarSettingsPage::applySettings() { - GeneralSettings* settings = GeneralSettings::self(); + GeneralSettings *settings = GeneralSettings::self(); settings->setShowStatusBar(m_showStatusBar->isChecked()); settings->setShowZoomSlider(m_showZoomSlider->isChecked()); settings->setShowSpaceInfo(m_showSpaceInfo->isChecked()); @@ -59,7 +59,7 @@ void StatusBarSettingsPage::applySettings() void StatusBarSettingsPage::restoreDefaults() { - GeneralSettings* settings = GeneralSettings::self(); + GeneralSettings *settings = GeneralSettings::self(); settings->useDefaults(true); loadSettings(); settings->useDefaults(false); @@ -73,4 +73,3 @@ void StatusBarSettingsPage::loadSettings() onShowStatusBarToggled(); } - diff --git a/src/settings/general/statusbarsettingspage.h b/src/settings/general/statusbarsettingspage.h index af8e06164..adff05dc1 100644 --- a/src/settings/general/statusbarsettingspage.h +++ b/src/settings/general/statusbarsettingspage.h @@ -18,7 +18,7 @@ class StatusBarSettingsPage : public SettingsPageBase Q_OBJECT public: - explicit StatusBarSettingsPage(QWidget* parent); + explicit StatusBarSettingsPage(QWidget *parent); ~StatusBarSettingsPage() override; /** @see SettingsPageBase::applySettings() */ @@ -32,9 +32,9 @@ private: void onShowStatusBarToggled(); private: - QCheckBox* m_showStatusBar; - QCheckBox* m_showZoomSlider; - QCheckBox* m_showSpaceInfo; + QCheckBox *m_showStatusBar; + QCheckBox *m_showZoomSlider; + QCheckBox *m_showSpaceInfo; }; #endif diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp index 5e38c2409..25e3b6876 100644 --- a/src/settings/kcm/kcmdolphingeneral.cpp +++ b/src/settings/kcm/kcmdolphingeneral.cpp @@ -7,8 +7,8 @@ #include "kcmdolphingeneral.h" #include "settings/general/behaviorsettingspage.h" -#include "settings/general/previewssettingspage.h" #include "settings/general/confirmationssettingspage.h" +#include "settings/general/previewssettingspage.h" #include <KLocalizedString> #include <KPluginFactory> @@ -19,30 +19,30 @@ K_PLUGIN_CLASS_WITH_JSON(DolphinGeneralConfigModule, "kcmdolphingeneral.json") -DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget *parent, const QVariantList &args) : - KCModule(parent, args), - m_pages() +DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget *parent, const QVariantList &args) + : KCModule(parent, args) + , m_pages() { setButtons(KCModule::Default | KCModule::Help | KCModule::Apply); - QVBoxLayout* topLayout = new QVBoxLayout(this); + QVBoxLayout *topLayout = new QVBoxLayout(this); topLayout->setContentsMargins(0, 0, 0, 0); - QTabWidget* tabWidget = new QTabWidget(this); + QTabWidget *tabWidget = new QTabWidget(this); // initialize 'Behavior' tab - BehaviorSettingsPage* behaviorPage = new BehaviorSettingsPage(QUrl::fromLocalFile(QDir::homePath()), tabWidget); + BehaviorSettingsPage *behaviorPage = new BehaviorSettingsPage(QUrl::fromLocalFile(QDir::homePath()), tabWidget); tabWidget->addTab(behaviorPage, i18nc("@title:tab Behavior settings", "Behavior")); connect(behaviorPage, &BehaviorSettingsPage::changed, this, &DolphinGeneralConfigModule::markAsChanged); // initialize 'Previews' tab - PreviewsSettingsPage* previewsPage = new PreviewsSettingsPage(tabWidget); + PreviewsSettingsPage *previewsPage = new PreviewsSettingsPage(tabWidget); tabWidget->addTab(previewsPage, i18nc("@title:tab Previews settings", "Previews")); connect(previewsPage, &PreviewsSettingsPage::changed, this, &DolphinGeneralConfigModule::markAsChanged); // initialize 'Confirmations' tab - ConfirmationsSettingsPage* confirmationsPage = new ConfirmationsSettingsPage(tabWidget); - tabWidget->addTab(confirmationsPage, i18nc("@title:tab Confirmations settings", "Confirmations")); + ConfirmationsSettingsPage *confirmationsPage = new ConfirmationsSettingsPage(tabWidget); + tabWidget->addTab(confirmationsPage, i18nc("@title:tab Confirmations settings", "Confirmations")); connect(confirmationsPage, &ConfirmationsSettingsPage::changed, this, &DolphinGeneralConfigModule::markAsChanged); m_pages.append(behaviorPage); m_pages.append(previewsPage); @@ -57,14 +57,14 @@ DolphinGeneralConfigModule::~DolphinGeneralConfigModule() void DolphinGeneralConfigModule::save() { - for (SettingsPageBase* page : qAsConst(m_pages)) { + for (SettingsPageBase *page : qAsConst(m_pages)) { page->applySettings(); } } void DolphinGeneralConfigModule::defaults() { - for (SettingsPageBase* page : qAsConst(m_pages)) { + for (SettingsPageBase *page : qAsConst(m_pages)) { page->applySettings(); } } diff --git a/src/settings/kcm/kcmdolphingeneral.h b/src/settings/kcm/kcmdolphingeneral.h index d4040cc8d..889317738 100644 --- a/src/settings/kcm/kcmdolphingeneral.h +++ b/src/settings/kcm/kcmdolphingeneral.h @@ -28,7 +28,7 @@ public: void defaults() override; private: - QList<SettingsPageBase*> m_pages; + QList<SettingsPageBase *> m_pages; }; #endif diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp index 223b6dcf1..63591f4fd 100644 --- a/src/settings/kcm/kcmdolphinnavigation.cpp +++ b/src/settings/kcm/kcmdolphinnavigation.cpp @@ -15,13 +15,13 @@ K_PLUGIN_CLASS_WITH_JSON(DolphinNavigationConfigModule, "kcmdolphinnavigation.json") -DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget *parent, const QVariantList &args) : - KCModule(parent, args), - m_navigation(nullptr) +DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget *parent, const QVariantList &args) + : KCModule(parent, args) + , m_navigation(nullptr) { setButtons(KCModule::Default | KCModule::Help | KCModule::Apply); - QVBoxLayout* topLayout = new QVBoxLayout(this); + QVBoxLayout *topLayout = new QVBoxLayout(this); topLayout->setContentsMargins(0, 0, 0, 0); m_navigation = new NavigationSettingsPage(this); diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp index b8b350c10..50ee13618 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.cpp +++ b/src/settings/kcm/kcmdolphinviewmodes.cpp @@ -19,29 +19,29 @@ K_PLUGIN_CLASS_WITH_JSON(DolphinViewModesConfigModule, "kcmdolphinviewmodes.json") -DolphinViewModesConfigModule::DolphinViewModesConfigModule(QWidget *parent, const QVariantList &args) : - KCModule(parent, args), - m_tabs() +DolphinViewModesConfigModule::DolphinViewModesConfigModule(QWidget *parent, const QVariantList &args) + : KCModule(parent, args) + , m_tabs() { setButtons(KCModule::Default | KCModule::Help | KCModule::Apply); - QVBoxLayout* topLayout = new QVBoxLayout(this); + QVBoxLayout *topLayout = new QVBoxLayout(this); topLayout->setContentsMargins(0, 0, 0, 0); - QTabWidget* tabWidget = new QTabWidget(this); + QTabWidget *tabWidget = new QTabWidget(this); // Initialize 'Icons' tab - ViewSettingsTab* iconsTab = new ViewSettingsTab(ViewSettingsTab::IconsMode, tabWidget); + ViewSettingsTab *iconsTab = new ViewSettingsTab(ViewSettingsTab::IconsMode, tabWidget); tabWidget->addTab(iconsTab, QIcon::fromTheme(QStringLiteral("view-list-icons")), i18nc("@title:tab", "Icons")); connect(iconsTab, &ViewSettingsTab::changed, this, &DolphinViewModesConfigModule::viewModeChanged); // Initialize 'Compact' tab - ViewSettingsTab* compactTab = new ViewSettingsTab(ViewSettingsTab::CompactMode, tabWidget); + ViewSettingsTab *compactTab = new ViewSettingsTab(ViewSettingsTab::CompactMode, tabWidget); tabWidget->addTab(compactTab, QIcon::fromTheme(QStringLiteral("view-list-details")), i18nc("@title:tab", "Compact")); connect(compactTab, &ViewSettingsTab::changed, this, &DolphinViewModesConfigModule::viewModeChanged); // Initialize 'Details' tab - ViewSettingsTab* detailsTab = new ViewSettingsTab(ViewSettingsTab::DetailsMode, tabWidget); + ViewSettingsTab *detailsTab = new ViewSettingsTab(ViewSettingsTab::DetailsMode, tabWidget); tabWidget->addTab(detailsTab, QIcon::fromTheme(QStringLiteral("view-list-tree")), i18nc("@title:tab", "Details")); connect(detailsTab, &ViewSettingsTab::changed, this, &DolphinViewModesConfigModule::viewModeChanged); @@ -74,9 +74,8 @@ void DolphinViewModesConfigModule::defaults() void DolphinViewModesConfigModule::reparseConfiguration() { - QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KonqMain"), - QStringLiteral("org.kde.Konqueror.Main"), - QStringLiteral("reparseConfiguration")); + QDBusMessage message = + QDBusMessage::createSignal(QStringLiteral("/KonqMain"), QStringLiteral("org.kde.Konqueror.Main"), QStringLiteral("reparseConfiguration")); QDBusConnection::sessionBus().send(message); } diff --git a/src/settings/kcm/kcmdolphinviewmodes.h b/src/settings/kcm/kcmdolphinviewmodes.h index ea61bcf89..33c0b77a5 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.h +++ b/src/settings/kcm/kcmdolphinviewmodes.h @@ -29,10 +29,10 @@ private: void reparseConfiguration(); private Q_SLOTS: - void viewModeChanged(); + void viewModeChanged(); private: - QList<ViewSettingsTab*> m_tabs; + QList<ViewSettingsTab *> m_tabs; }; #endif diff --git a/src/settings/navigation/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp index 48f5062a0..956d25fdf 100644 --- a/src/settings/navigation/navigationsettingspage.cpp +++ b/src/settings/navigation/navigationsettingspage.cpp @@ -6,8 +6,8 @@ #include "navigationsettingspage.h" -#include "global.h" #include "dolphin_generalsettings.h" +#include "global.h" #include <KLocalizedString> @@ -16,19 +16,19 @@ #include <QFormLayout> #include <QRadioButton> -NavigationSettingsPage::NavigationSettingsPage(QWidget* parent) : - SettingsPageBase(parent), - m_openArchivesAsFolder(nullptr), - m_autoExpandFolders(nullptr), - m_openNewTabAfterLastTab(nullptr), - m_openNewTabAfterCurrentTab(nullptr) +NavigationSettingsPage::NavigationSettingsPage(QWidget *parent) + : SettingsPageBase(parent) + , m_openArchivesAsFolder(nullptr) + , m_autoExpandFolders(nullptr) + , m_openNewTabAfterLastTab(nullptr) + , m_openNewTabAfterCurrentTab(nullptr) { - QFormLayout* topLayout = new QFormLayout(this); + QFormLayout *topLayout = new QFormLayout(this); // Tabs properties m_openNewTabAfterCurrentTab = new QRadioButton(i18nc("option:radio", "After current tab")); m_openNewTabAfterLastTab = new QRadioButton(i18nc("option:radio", "At end of tab bar")); - QButtonGroup* tabsBehaviorGroup = new QButtonGroup(this); + QButtonGroup *tabsBehaviorGroup = new QButtonGroup(this); tabsBehaviorGroup->addButton(m_openNewTabAfterCurrentTab); tabsBehaviorGroup->addButton(m_openNewTabAfterLastTab); topLayout->addRow(i18nc("@title:group", "Open new tabs: "), m_openNewTabAfterCurrentTab); @@ -55,7 +55,7 @@ NavigationSettingsPage::~NavigationSettingsPage() void NavigationSettingsPage::applySettings() { - GeneralSettings* settings = GeneralSettings::self(); + GeneralSettings *settings = GeneralSettings::self(); settings->setBrowseThroughArchives(m_openArchivesAsFolder->isChecked()); settings->setAutoExpandFolders(m_autoExpandFolders->isChecked()); settings->setOpenNewTabAfterLastTab(m_openNewTabAfterLastTab->isChecked()); @@ -65,7 +65,7 @@ void NavigationSettingsPage::applySettings() void NavigationSettingsPage::restoreDefaults() { - GeneralSettings* settings = GeneralSettings::self(); + GeneralSettings *settings = GeneralSettings::self(); settings->useDefaults(true); loadSettings(); settings->useDefaults(false); @@ -78,4 +78,3 @@ void NavigationSettingsPage::loadSettings() m_openNewTabAfterLastTab->setChecked(GeneralSettings::openNewTabAfterLastTab()); m_openNewTabAfterCurrentTab->setChecked(!m_openNewTabAfterLastTab->isChecked()); } - diff --git a/src/settings/navigation/navigationsettingspage.h b/src/settings/navigation/navigationsettingspage.h index a0c75e7f5..e0f92884f 100644 --- a/src/settings/navigation/navigationsettingspage.h +++ b/src/settings/navigation/navigationsettingspage.h @@ -19,7 +19,7 @@ class NavigationSettingsPage : public SettingsPageBase Q_OBJECT public: - explicit NavigationSettingsPage(QWidget* parent); + explicit NavigationSettingsPage(QWidget *parent); ~NavigationSettingsPage() override; /** @see SettingsPageBase::applySettings() */ @@ -32,10 +32,10 @@ private: void loadSettings(); private: - QCheckBox* m_openArchivesAsFolder; - QCheckBox* m_autoExpandFolders; - QRadioButton* m_openNewTabAfterLastTab; - QRadioButton* m_openNewTabAfterCurrentTab; + QCheckBox *m_openArchivesAsFolder; + QCheckBox *m_autoExpandFolders; + QRadioButton *m_openNewTabAfterLastTab; + QRadioButton *m_openNewTabAfterCurrentTab; }; #endif diff --git a/src/settings/serviceitemdelegate.cpp b/src/settings/serviceitemdelegate.cpp index cd3499d03..d8f446a37 100644 --- a/src/settings/serviceitemdelegate.cpp +++ b/src/settings/serviceitemdelegate.cpp @@ -13,8 +13,8 @@ #include <QPainter> #include <QPushButton> -ServiceItemDelegate::ServiceItemDelegate(QAbstractItemView* itemView, QObject* parent) : - KWidgetItemDelegate(itemView, parent) +ServiceItemDelegate::ServiceItemDelegate(QAbstractItemView *itemView, QObject *parent) + : KWidgetItemDelegate(itemView, parent) { } @@ -22,20 +22,17 @@ ServiceItemDelegate::~ServiceItemDelegate() { } -QSize ServiceItemDelegate::sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const +QSize ServiceItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const { Q_UNUSED(index) const QStyle *style = itemView()->style(); - const int buttonHeight = style->pixelMetric(QStyle::PM_ButtonMargin) * 2 + - style->pixelMetric(QStyle::PM_ButtonIconSize); + const int buttonHeight = style->pixelMetric(QStyle::PM_ButtonMargin) * 2 + style->pixelMetric(QStyle::PM_ButtonIconSize); const int fontHeight = option.fontMetrics.height(); return QSize(100, qMax(buttonHeight, fontHeight)); } -void ServiceItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, - const QModelIndex& index) const +void ServiceItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const { Q_UNUSED(index) painter->save(); @@ -49,31 +46,29 @@ void ServiceItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& o painter->restore(); } -QList<QWidget*> ServiceItemDelegate::createItemWidgets(const QModelIndex&) const +QList<QWidget *> ServiceItemDelegate::createItemWidgets(const QModelIndex &) const { - QCheckBox* checkBox = new QCheckBox(); + QCheckBox *checkBox = new QCheckBox(); QPalette palette = checkBox->palette(); palette.setColor(QPalette::WindowText, palette.color(QPalette::Text)); checkBox->setPalette(palette); connect(checkBox, &QCheckBox::clicked, this, &ServiceItemDelegate::slotCheckBoxClicked); - QPushButton* configureButton = new QPushButton(); + QPushButton *configureButton = new QPushButton(); connect(configureButton, &QPushButton::clicked, this, &ServiceItemDelegate::slotConfigureButtonClicked); return {checkBox, configureButton}; } -void ServiceItemDelegate::updateItemWidgets(const QList<QWidget*> widgets, - const QStyleOptionViewItem& option, - const QPersistentModelIndex& index) const +void ServiceItemDelegate::updateItemWidgets(const QList<QWidget *> widgets, const QStyleOptionViewItem &option, const QPersistentModelIndex &index) const { - QCheckBox* checkBox = static_cast<QCheckBox*>(widgets[0]); - QPushButton *configureButton = static_cast<QPushButton*>(widgets[1]); + QCheckBox *checkBox = static_cast<QCheckBox *>(widgets[0]); + QPushButton *configureButton = static_cast<QPushButton *>(widgets[1]); const int itemHeight = sizeHint(option, index).height(); // Update the checkbox showing the service name and icon - const QAbstractItemModel* model = index.model(); + const QAbstractItemModel *model = index.model(); checkBox->setText(model->data(index).toString()); const QString iconName = model->data(index, Qt::DecorationRole).toString(); if (!iconName.isEmpty()) { @@ -95,15 +90,14 @@ void ServiceItemDelegate::updateItemWidgets(const QList<QWidget*> widgets, configureButton->setEnabled(checkBox->isChecked()); configureButton->setIcon(QIcon::fromTheme(QStringLiteral("configure"))); configureButton->resize(configureButton->sizeHint()); - configureButton->move(option.rect.right() - configureButton->width(), - (itemHeight - configureButton->height()) / 2); + configureButton->move(option.rect.right() - configureButton->width(), (itemHeight - configureButton->height()) / 2); } configureButton->setVisible(configurable); } void ServiceItemDelegate::slotCheckBoxClicked(bool checked) { - QAbstractItemModel* model = const_cast<QAbstractItemModel*>(focusedIndex().model()); + QAbstractItemModel *model = const_cast<QAbstractItemModel *>(focusedIndex().model()); model->setData(focusedIndex(), checked, Qt::CheckStateRole); } @@ -111,4 +105,3 @@ void ServiceItemDelegate::slotConfigureButtonClicked() { Q_EMIT requestServiceConfiguration(focusedIndex()); } - diff --git a/src/settings/serviceitemdelegate.h b/src/settings/serviceitemdelegate.h index 5c516916f..74f7dfd6a 100644 --- a/src/settings/serviceitemdelegate.h +++ b/src/settings/serviceitemdelegate.h @@ -20,23 +20,19 @@ class ServiceItemDelegate : public KWidgetItemDelegate Q_OBJECT public: - explicit ServiceItemDelegate(QAbstractItemView* itemView, QObject* parent = nullptr); + explicit ServiceItemDelegate(QAbstractItemView *itemView, QObject *parent = nullptr); ~ServiceItemDelegate() override; - QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const override; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; - void paint(QPainter* painter, const QStyleOptionViewItem& option, - const QModelIndex& index) const override; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; - QList<QWidget*> createItemWidgets(const QModelIndex&) const override; + QList<QWidget *> createItemWidgets(const QModelIndex &) const override; - void updateItemWidgets(const QList<QWidget*> widgets, - const QStyleOptionViewItem& option, - const QPersistentModelIndex& index) const override; + void updateItemWidgets(const QList<QWidget *> widgets, const QStyleOptionViewItem &option, const QPersistentModelIndex &index) const override; Q_SIGNALS: - void requestServiceConfiguration(const QModelIndex& index); + void requestServiceConfiguration(const QModelIndex &index); private Q_SLOTS: void slotCheckBoxClicked(bool checked); diff --git a/src/settings/servicemodel.cpp b/src/settings/servicemodel.cpp index 9bfe1dad3..6caafdd77 100644 --- a/src/settings/servicemodel.cpp +++ b/src/settings/servicemodel.cpp @@ -6,9 +6,9 @@ #include "servicemodel.h" -ServiceModel::ServiceModel(QObject* parent) : - QAbstractListModel(parent), - m_items() +ServiceModel::ServiceModel(QObject *parent) + : QAbstractListModel(parent) + , m_items() { } @@ -16,7 +16,7 @@ ServiceModel::~ServiceModel() { } -bool ServiceModel::insertRows(int row, int count, const QModelIndex& parent) +bool ServiceModel::insertRows(int row, int count, const QModelIndex &parent) { if (row > rowCount()) { return false; @@ -38,7 +38,7 @@ bool ServiceModel::insertRows(int row, int count, const QModelIndex& parent) return true; } -bool ServiceModel::setData(const QModelIndex& index, const QVariant& value, int role) +bool ServiceModel::setData(const QModelIndex &index, const QVariant &value, int role) { const int row = index.row(); if (row >= rowCount()) { @@ -69,24 +69,30 @@ bool ServiceModel::setData(const QModelIndex& index, const QVariant& value, int return true; } -QVariant ServiceModel::data(const QModelIndex& index, int role) const +QVariant ServiceModel::data(const QModelIndex &index, int role) const { const int row = index.row(); if (row < rowCount()) { switch (role) { - case ConfigurableRole: return m_items[row].configurable; - case Qt::CheckStateRole: return m_items[row].checked; - case Qt::DecorationRole: return m_items[row].icon; - case Qt::DisplayRole: return m_items[row].text; - case DesktopEntryNameRole: return m_items[row].desktopEntryName; - default: break; + case ConfigurableRole: + return m_items[row].configurable; + case Qt::CheckStateRole: + return m_items[row].checked; + case Qt::DecorationRole: + return m_items[row].icon; + case Qt::DisplayRole: + return m_items[row].text; + case DesktopEntryNameRole: + return m_items[row].desktopEntryName; + default: + break; } } return QVariant(); } -int ServiceModel::rowCount(const QModelIndex& parent) const +int ServiceModel::rowCount(const QModelIndex &parent) const { Q_UNUSED(parent) return m_items.count(); @@ -98,4 +104,3 @@ void ServiceModel::clear() m_items.clear(); endRemoveRows(); } - diff --git a/src/settings/servicemodel.h b/src/settings/servicemodel.h index 150159137..23c752e93 100644 --- a/src/settings/servicemodel.h +++ b/src/settings/servicemodel.h @@ -25,24 +25,19 @@ class ServiceModel : public QAbstractListModel Q_OBJECT public: - enum Role - { - DesktopEntryNameRole = Qt::UserRole, - ConfigurableRole - }; + enum Role { DesktopEntryNameRole = Qt::UserRole, ConfigurableRole }; - explicit ServiceModel(QObject* parent = nullptr); + explicit ServiceModel(QObject *parent = nullptr); ~ServiceModel() override; - bool insertRows(int row, int count, const QModelIndex & parent = QModelIndex()) override; - bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override; - QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; - int rowCount(const QModelIndex& parent = QModelIndex()) const override; + bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; void clear(); - private: - struct ServiceItem - { +private: + struct ServiceItem { bool checked; bool configurable; QString icon; diff --git a/src/settings/settingspagebase.cpp b/src/settings/settingspagebase.cpp index 963966a4e..8e1bede2a 100644 --- a/src/settings/settingspagebase.cpp +++ b/src/settings/settingspagebase.cpp @@ -6,11 +6,11 @@ #include "settingspagebase.h" -SettingsPageBase::SettingsPageBase(QWidget* parent) : - QWidget(parent) -{} +SettingsPageBase::SettingsPageBase(QWidget *parent) + : QWidget(parent) +{ +} SettingsPageBase::~SettingsPageBase() -{} - - +{ +} diff --git a/src/settings/settingspagebase.h b/src/settings/settingspagebase.h index c6842dec4..d331b7d35 100644 --- a/src/settings/settingspagebase.h +++ b/src/settings/settingspagebase.h @@ -17,7 +17,7 @@ class SettingsPageBase : public QWidget Q_OBJECT public: - explicit SettingsPageBase(QWidget* parent = nullptr); + explicit SettingsPageBase(QWidget *parent = nullptr); ~SettingsPageBase() override; /** diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp index a7fcec4fa..689b43cfb 100644 --- a/src/settings/startup/startupsettingspage.cpp +++ b/src/settings/startup/startupsettingspage.cpp @@ -18,73 +18,69 @@ #include <QButtonGroup> #include <QCheckBox> #include <QFileDialog> -#include <QLineEdit> -#include <QPushButton> -#include <QRadioButton> #include <QFormLayout> #include <QGridLayout> #include <QHBoxLayout> +#include <QLineEdit> +#include <QPushButton> +#include <QRadioButton> -StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) : - SettingsPageBase(parent), - m_url(url), - m_homeUrl(nullptr), - m_homeUrlBoxLayoutContainer(nullptr), - m_buttonBoxLayoutContainer(nullptr), - m_rememberOpenedTabsRadioButton(nullptr), - m_homeUrlRadioButton(nullptr), - m_splitView(nullptr), - m_editableUrl(nullptr), - m_showFullPath(nullptr), - m_filterBar(nullptr), - m_showFullPathInTitlebar(nullptr), - m_openExternallyCalledFolderInNewTab(nullptr) +StartupSettingsPage::StartupSettingsPage(const QUrl &url, QWidget *parent) + : SettingsPageBase(parent) + , m_url(url) + , m_homeUrl(nullptr) + , m_homeUrlBoxLayoutContainer(nullptr) + , m_buttonBoxLayoutContainer(nullptr) + , m_rememberOpenedTabsRadioButton(nullptr) + , m_homeUrlRadioButton(nullptr) + , m_splitView(nullptr) + , m_editableUrl(nullptr) + , m_showFullPath(nullptr) + , m_filterBar(nullptr) + , m_showFullPathInTitlebar(nullptr) + , m_openExternallyCalledFolderInNewTab(nullptr) { - QFormLayout* topLayout = new QFormLayout(this); + QFormLayout *topLayout = new QFormLayout(this); m_rememberOpenedTabsRadioButton = new QRadioButton(i18nc("@option:radio Startup Settings", "Folders, tabs, and window state from last time")); m_homeUrlRadioButton = new QRadioButton(); // HACK: otherwise the radio button has too much spacing in a grid layout m_homeUrlRadioButton->setMaximumWidth(24); - QButtonGroup* initialViewGroup = new QButtonGroup(this); + QButtonGroup *initialViewGroup = new QButtonGroup(this); initialViewGroup->addButton(m_rememberOpenedTabsRadioButton); initialViewGroup->addButton(m_homeUrlRadioButton); - // create 'Home URL' editor m_homeUrlBoxLayoutContainer = new QWidget(this); - QHBoxLayout* homeUrlBoxLayout = new QHBoxLayout(m_homeUrlBoxLayoutContainer); + QHBoxLayout *homeUrlBoxLayout = new QHBoxLayout(m_homeUrlBoxLayoutContainer); homeUrlBoxLayout->setContentsMargins(0, 0, 0, 0); m_homeUrl = new QLineEdit(); m_homeUrl->setClearButtonEnabled(true); homeUrlBoxLayout->addWidget(m_homeUrl); - QPushButton* selectHomeUrlButton = new QPushButton(QIcon::fromTheme(QStringLiteral("folder-open")), QString()); + QPushButton *selectHomeUrlButton = new QPushButton(QIcon::fromTheme(QStringLiteral("folder-open")), QString()); homeUrlBoxLayout->addWidget(selectHomeUrlButton); #ifndef QT_NO_ACCESSIBILITY selectHomeUrlButton->setAccessibleName(i18nc("@action:button", "Select Home Location")); #endif - connect(selectHomeUrlButton, &QPushButton::clicked, - this, &StartupSettingsPage::selectHomeUrl); + connect(selectHomeUrlButton, &QPushButton::clicked, this, &StartupSettingsPage::selectHomeUrl); m_buttonBoxLayoutContainer = new QWidget(this); - QHBoxLayout* buttonBoxLayout = new QHBoxLayout(m_buttonBoxLayoutContainer); + QHBoxLayout *buttonBoxLayout = new QHBoxLayout(m_buttonBoxLayoutContainer); buttonBoxLayout->setContentsMargins(0, 0, 0, 0); - QPushButton* useCurrentButton = new QPushButton(i18nc("@action:button", "Use Current Location")); + QPushButton *useCurrentButton = new QPushButton(i18nc("@action:button", "Use Current Location")); buttonBoxLayout->addWidget(useCurrentButton); - connect(useCurrentButton, &QPushButton::clicked, - this, &StartupSettingsPage::useCurrentLocation); - QPushButton* useDefaultButton = new QPushButton(i18nc("@action:button", "Use Default Location")); + connect(useCurrentButton, &QPushButton::clicked, this, &StartupSettingsPage::useCurrentLocation); + QPushButton *useDefaultButton = new QPushButton(i18nc("@action:button", "Use Default Location")); buttonBoxLayout->addWidget(useDefaultButton); - connect(useDefaultButton, &QPushButton::clicked, - this, &StartupSettingsPage::useDefaultLocation); + connect(useDefaultButton, &QPushButton::clicked, this, &StartupSettingsPage::useDefaultLocation); - QGridLayout* startInLocationLayout = new QGridLayout(); + QGridLayout *startInLocationLayout = new QGridLayout(); startInLocationLayout->setHorizontalSpacing(0); startInLocationLayout->setContentsMargins(0, 0, 0, 0); startInLocationLayout->addWidget(m_homeUrlRadioButton, 0, 0); @@ -94,7 +90,6 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) : topLayout->addRow(i18nc("@label:textbox", "Show on startup:"), m_rememberOpenedTabsRadioButton); topLayout->addRow(QString(), startInLocationLayout); - topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed)); m_splitView = new QCheckBox(i18nc("@option:check Startup Settings", "Begin in split view mode")); @@ -121,9 +116,9 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) : connect(m_rememberOpenedTabsRadioButton, &QRadioButton::toggled, this, &StartupSettingsPage::slotSettingsChanged); connect(m_homeUrlRadioButton, &QRadioButton::toggled, this, &StartupSettingsPage::slotSettingsChanged); - connect(m_splitView, &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged); - connect(m_editableUrl, &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged); - connect(m_filterBar, &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged); + connect(m_splitView, &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged); + connect(m_editableUrl, &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged); + connect(m_filterBar, &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged); connect(m_openExternallyCalledFolderInNewTab, &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged); connect(m_showFullPath, &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged); @@ -136,13 +131,13 @@ StartupSettingsPage::~StartupSettingsPage() void StartupSettingsPage::applySettings() { - GeneralSettings* settings = GeneralSettings::self(); + GeneralSettings *settings = GeneralSettings::self(); const QUrl url(QUrl::fromUserInput(m_homeUrl->text(), QString(), QUrl::AssumeLocalFile)); if (url.isValid() && KProtocolManager::supportsListing(url)) { - KIO::StatJob* job = KIO::statDetails(url, KIO::StatJob::SourceSide, KIO::StatDetail::StatBasic, KIO::JobFlag::HideProgressInfo); - connect(job, &KJob::result, this, [this, settings, url](KJob* job) { - if (job->error() == 0 && qobject_cast<KIO::StatJob*>(job)->statResult().isDir()) { + KIO::StatJob *job = KIO::statDetails(url, KIO::StatJob::SourceSide, KIO::StatDetail::StatBasic, KIO::JobFlag::HideProgressInfo); + connect(job, &KJob::result, this, [this, settings, url](KJob *job) { + if (job->error() == 0 && qobject_cast<KIO::StatJob *>(job)->statResult().isDir()) { settings->setHomeUrl(url.toDisplayString(QUrl::PreferLocalFile)); } else { showSetDefaultDirectoryError(); @@ -172,7 +167,7 @@ void StartupSettingsPage::applySettings() void StartupSettingsPage::restoreDefaults() { - GeneralSettings* settings = GeneralSettings::self(); + GeneralSettings *settings = GeneralSettings::self(); settings->useDefaults(true); loadSettings(); settings->useDefaults(false); diff --git a/src/settings/startup/startupsettingspage.h b/src/settings/startup/startupsettingspage.h index 51e7e90c9..b1cf387fa 100644 --- a/src/settings/startup/startupsettingspage.h +++ b/src/settings/startup/startupsettingspage.h @@ -25,7 +25,7 @@ class StartupSettingsPage : public SettingsPageBase Q_OBJECT public: - StartupSettingsPage(const QUrl& url, QWidget* parent); + StartupSettingsPage(const QUrl &url, QWidget *parent); ~StartupSettingsPage() override; /** @see SettingsPageBase::applySettings() */ @@ -47,18 +47,18 @@ private: private: QUrl m_url; - QLineEdit* m_homeUrl; - QWidget* m_homeUrlBoxLayoutContainer; - QWidget* m_buttonBoxLayoutContainer; - QRadioButton* m_rememberOpenedTabsRadioButton; - QRadioButton* m_homeUrlRadioButton; + QLineEdit *m_homeUrl; + QWidget *m_homeUrlBoxLayoutContainer; + QWidget *m_buttonBoxLayoutContainer; + QRadioButton *m_rememberOpenedTabsRadioButton; + QRadioButton *m_homeUrlRadioButton; - QCheckBox* m_splitView; - QCheckBox* m_editableUrl; - QCheckBox* m_showFullPath; - QCheckBox* m_filterBar; - QCheckBox* m_showFullPathInTitlebar; - QCheckBox* m_openExternallyCalledFolderInNewTab; + QCheckBox *m_splitView; + QCheckBox *m_editableUrl; + QCheckBox *m_showFullPath; + QCheckBox *m_filterBar; + QCheckBox *m_showFullPathInTitlebar; + QCheckBox *m_openExternallyCalledFolderInNewTab; }; #endif diff --git a/src/settings/trash/trashsettingspage.cpp b/src/settings/trash/trashsettingspage.cpp index 734762ada..511d6b353 100644 --- a/src/settings/trash/trashsettingspage.cpp +++ b/src/settings/trash/trashsettingspage.cpp @@ -11,10 +11,10 @@ #include <QFormLayout> -TrashSettingsPage::TrashSettingsPage(QWidget* parent) : - SettingsPageBase(parent) +TrashSettingsPage::TrashSettingsPage(QWidget *parent) + : SettingsPageBase(parent) { - QFormLayout* topLayout = new QFormLayout(this); + QFormLayout *topLayout = new QFormLayout(this); m_proxy = new KCModuleProxy(KPluginMetaData(QStringLiteral("kcm_trash"))); topLayout->addRow(m_proxy); @@ -42,4 +42,3 @@ void TrashSettingsPage::loadSettings() { m_proxy->load(); } - diff --git a/src/settings/trash/trashsettingspage.h b/src/settings/trash/trashsettingspage.h index 0a158fb08..b0e48a018 100644 --- a/src/settings/trash/trashsettingspage.h +++ b/src/settings/trash/trashsettingspage.h @@ -18,7 +18,7 @@ class TrashSettingsPage : public SettingsPageBase Q_OBJECT public: - explicit TrashSettingsPage(QWidget* parent); + explicit TrashSettingsPage(QWidget *parent); ~TrashSettingsPage() override; /** @see SettingsPageBase::applySettings() */ diff --git a/src/settings/userfeedback/userfeedbacksettingspage.cpp b/src/settings/userfeedback/userfeedbacksettingspage.cpp index 479c46226..e51f2e41a 100644 --- a/src/settings/userfeedback/userfeedbacksettingspage.cpp +++ b/src/settings/userfeedback/userfeedbacksettingspage.cpp @@ -12,8 +12,8 @@ #include <QVBoxLayout> -UserFeedbackSettingsPage::UserFeedbackSettingsPage(QWidget* parent) : - SettingsPageBase(parent) +UserFeedbackSettingsPage::UserFeedbackSettingsPage(QWidget *parent) + : SettingsPageBase(parent) { auto layout = new QVBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0); @@ -43,5 +43,3 @@ void UserFeedbackSettingsPage::restoreDefaults() feedbackProvider->setTelemetryMode(KUserFeedback::Provider::NoTelemetry); feedbackProvider->setSurveyInterval(-1); } - - diff --git a/src/settings/userfeedback/userfeedbacksettingspage.h b/src/settings/userfeedback/userfeedbacksettingspage.h index d9b608615..b990652ff 100644 --- a/src/settings/userfeedback/userfeedbacksettingspage.h +++ b/src/settings/userfeedback/userfeedbacksettingspage.h @@ -9,7 +9,8 @@ #include "settings/settingspagebase.h" -namespace KUserFeedback { +namespace KUserFeedback +{ class FeedbackConfigWidget; } @@ -21,7 +22,7 @@ class UserFeedbackSettingsPage : public SettingsPageBase Q_OBJECT public: - explicit UserFeedbackSettingsPage(QWidget* parent); + explicit UserFeedbackSettingsPage(QWidget *parent); ~UserFeedbackSettingsPage() override; /** @see SettingsPageBase::applySettings() */ diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp index a4663e94a..68ffa4f00 100644 --- a/src/settings/viewmodes/dolphinfontrequester.cpp +++ b/src/settings/viewmodes/dolphinfontrequester.cpp @@ -14,25 +14,23 @@ #include <QHBoxLayout> #include <QPushButton> -DolphinFontRequester::DolphinFontRequester(QWidget* parent) : - QWidget(parent), - m_modeCombo(nullptr), - m_chooseFontButton(nullptr), - m_mode(SystemFont), - m_customFont() +DolphinFontRequester::DolphinFontRequester(QWidget *parent) + : QWidget(parent) + , m_modeCombo(nullptr) + , m_chooseFontButton(nullptr) + , m_mode(SystemFont) + , m_customFont() { - QHBoxLayout* topLayout = new QHBoxLayout(this); + QHBoxLayout *topLayout = new QHBoxLayout(this); topLayout->setContentsMargins(0, 0, 0, 0); m_modeCombo = new QComboBox(this); m_modeCombo->addItem(i18nc("@item:inlistbox Font", "System Font")); m_modeCombo->addItem(i18nc("@item:inlistbox Font", "Custom Font")); - connect(m_modeCombo, &QComboBox::activated, - this, &DolphinFontRequester::changeMode); + connect(m_modeCombo, &QComboBox::activated, this, &DolphinFontRequester::changeMode); m_chooseFontButton = new QPushButton(i18nc("@action:button Choose font", "Choose..."), this); - connect(m_chooseFontButton, &QPushButton::clicked, - this, &DolphinFontRequester::openFontDialog); + connect(m_chooseFontButton, &QPushButton::clicked, this, &DolphinFontRequester::openFontDialog); changeMode(m_modeCombo->currentIndex()); @@ -61,7 +59,7 @@ QFont DolphinFontRequester::currentFont() const return (m_mode == CustomFont) ? m_customFont : QFontDatabase::systemFont(QFontDatabase::GeneralFont); } -void DolphinFontRequester::setCustomFont(const QFont& font) +void DolphinFontRequester::setCustomFont(const QFont &font) { m_customFont = font; } @@ -87,4 +85,3 @@ void DolphinFontRequester::changeMode(int index) setMode((index == CustomFont) ? CustomFont : SystemFont); Q_EMIT changed(); } - diff --git a/src/settings/viewmodes/dolphinfontrequester.h b/src/settings/viewmodes/dolphinfontrequester.h index 56b28f9b6..10587d774 100644 --- a/src/settings/viewmodes/dolphinfontrequester.h +++ b/src/settings/viewmodes/dolphinfontrequester.h @@ -21,13 +21,9 @@ class DolphinFontRequester : public QWidget Q_OBJECT public: - enum Mode - { - SystemFont = 0, - CustomFont = 1 - }; + enum Mode { SystemFont = 0, CustomFont = 1 }; - explicit DolphinFontRequester(QWidget* parent); + explicit DolphinFontRequester(QWidget *parent); ~DolphinFontRequester() override; void setMode(Mode mode); @@ -40,7 +36,7 @@ public: */ QFont currentFont() const; - void setCustomFont(const QFont& font); + void setCustomFont(const QFont &font); QFont customFont() const; Q_SIGNALS: @@ -52,8 +48,8 @@ private Q_SLOTS: void changeMode(int index); private: - QComboBox* m_modeCombo; - QPushButton* m_chooseFontButton; + QComboBox *m_modeCombo; + QPushButton *m_chooseFontButton; Mode m_mode; QFont m_customFont; diff --git a/src/settings/viewmodes/viewmodesettings.cpp b/src/settings/viewmodes/viewmodesettings.cpp index 5936e2970..0cfc0634d 100644 --- a/src/settings/viewmodes/viewmodesettings.cpp +++ b/src/settings/viewmodes/viewmodesettings.cpp @@ -51,9 +51,15 @@ ViewModeSettings::ViewModeSettings(DolphinView::Mode mode) : ViewModeSettings() { switch (mode) { - case DolphinView::IconsView: m_viewModeSettingsVariant = IconsModeSettings::self(); return; - case DolphinView::CompactView: m_viewModeSettingsVariant = CompactModeSettings::self(); return; - case DolphinView::DetailsView: m_viewModeSettingsVariant = DetailsModeSettings::self(); return; + case DolphinView::IconsView: + m_viewModeSettingsVariant = IconsModeSettings::self(); + return; + case DolphinView::CompactView: + m_viewModeSettingsVariant = CompactModeSettings::self(); + return; + case DolphinView::DetailsView: + m_viewModeSettingsVariant = DetailsModeSettings::self(); + return; default: Q_UNREACHABLE(); } @@ -63,9 +69,15 @@ ViewModeSettings::ViewModeSettings(ViewSettingsTab::Mode mode) : ViewModeSettings() { switch (mode) { - case ViewSettingsTab::IconsMode: m_viewModeSettingsVariant = IconsModeSettings::self(); return; - case ViewSettingsTab::CompactMode: m_viewModeSettingsVariant = CompactModeSettings::self(); return; - case ViewSettingsTab::DetailsMode: m_viewModeSettingsVariant = DetailsModeSettings::self(); return; + case ViewSettingsTab::IconsMode: + m_viewModeSettingsVariant = IconsModeSettings::self(); + return; + case ViewSettingsTab::CompactMode: + m_viewModeSettingsVariant = CompactModeSettings::self(); + return; + case ViewSettingsTab::DetailsMode: + m_viewModeSettingsVariant = DetailsModeSettings::self(); + return; default: Q_UNREACHABLE(); } @@ -75,9 +87,15 @@ ViewModeSettings::ViewModeSettings(KStandardItemListView::ItemLayout itemLayout) : ViewModeSettings() { switch (itemLayout) { - case KStandardItemListView::IconsLayout: m_viewModeSettingsVariant = IconsModeSettings::self(); return; - case KStandardItemListView::CompactLayout: m_viewModeSettingsVariant = CompactModeSettings::self(); return; - case KStandardItemListView::DetailsLayout: m_viewModeSettingsVariant = DetailsModeSettings::self(); return; + case KStandardItemListView::IconsLayout: + m_viewModeSettingsVariant = IconsModeSettings::self(); + return; + case KStandardItemListView::CompactLayout: + m_viewModeSettingsVariant = CompactModeSettings::self(); + return; + case KStandardItemListView::DetailsLayout: + m_viewModeSettingsVariant = DetailsModeSettings::self(); + return; default: Q_UNREACHABLE(); } @@ -85,77 +103,99 @@ ViewModeSettings::ViewModeSettings(KStandardItemListView::ItemLayout itemLayout) void ViewModeSettings::setIconSize(int iconSize) { - std::visit([iconSize](auto &&v) { - v->setIconSize(iconSize); - }, m_viewModeSettingsVariant); + std::visit( + [iconSize](auto &&v) { + v->setIconSize(iconSize); + }, + m_viewModeSettingsVariant); } int ViewModeSettings::iconSize() const { - return std::visit([](auto &&v) { - return v->iconSize(); - }, m_viewModeSettingsVariant); + return std::visit( + [](auto &&v) { + return v->iconSize(); + }, + m_viewModeSettingsVariant); } void ViewModeSettings::setPreviewSize(int previewSize) { - std::visit([previewSize](auto &&v) { - v->setPreviewSize(previewSize); - }, m_viewModeSettingsVariant); + std::visit( + [previewSize](auto &&v) { + v->setPreviewSize(previewSize); + }, + m_viewModeSettingsVariant); } int ViewModeSettings::previewSize() const { - return std::visit([](auto &&v) { - return v->previewSize(); - }, m_viewModeSettingsVariant); + return std::visit( + [](auto &&v) { + return v->previewSize(); + }, + m_viewModeSettingsVariant); } void ViewModeSettings::setUseSystemFont(bool useSystemFont) { - std::visit([useSystemFont](auto &&v) { - v->setUseSystemFont(useSystemFont); - }, m_viewModeSettingsVariant); + std::visit( + [useSystemFont](auto &&v) { + v->setUseSystemFont(useSystemFont); + }, + m_viewModeSettingsVariant); } bool ViewModeSettings::useSystemFont() const { - return std::visit([](auto &&v) { - return v->useSystemFont(); - }, m_viewModeSettingsVariant); + return std::visit( + [](auto &&v) { + return v->useSystemFont(); + }, + m_viewModeSettingsVariant); } void ViewModeSettings::setViewFont(const QFont &font) { - std::visit([&font](auto &&v) { - v->setViewFont(font); - }, m_viewModeSettingsVariant); + std::visit( + [&font](auto &&v) { + v->setViewFont(font); + }, + m_viewModeSettingsVariant); } QFont ViewModeSettings::viewFont() const { - return std::visit([](auto &&v) { - return v->viewFont(); - }, m_viewModeSettingsVariant); + return std::visit( + [](auto &&v) { + return v->viewFont(); + }, + m_viewModeSettingsVariant); } void ViewModeSettings::useDefaults(bool useDefaults) { - std::visit([useDefaults](auto &&v) { - v->useDefaults(useDefaults); - }, m_viewModeSettingsVariant); + std::visit( + [useDefaults](auto &&v) { + v->useDefaults(useDefaults); + }, + m_viewModeSettingsVariant); } void ViewModeSettings::readConfig() { - std::visit([](auto &&v) { - v->load(); - }, m_viewModeSettingsVariant); + std::visit( + [](auto &&v) { + v->load(); + }, + m_viewModeSettingsVariant); } void ViewModeSettings::save() { - std::visit([](auto &&v) { - return v->save(); - }, m_viewModeSettingsVariant); + std::visit( + [](auto &&v) { + return v->save(); + }, + m_viewModeSettingsVariant); } diff --git a/src/settings/viewmodes/viewmodesettings.h b/src/settings/viewmodes/viewmodesettings.h index d50c1cfb3..6193c9526 100644 --- a/src/settings/viewmodes/viewmodesettings.h +++ b/src/settings/viewmodes/viewmodesettings.h @@ -8,8 +8,8 @@ #define VIEWMODESETTINGS_H #include "kitemviews/kstandarditemlistview.h" -#include "viewsettingstab.h" #include "views/dolphinview.h" +#include "viewsettingstab.h" #include <variant> diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp index 2e8c5b7da..cb0b5ecee 100644 --- a/src/settings/viewmodes/viewsettingspage.cpp +++ b/src/settings/viewmodes/viewsettingspage.cpp @@ -14,27 +14,27 @@ #include <QTabWidget> #include <QVBoxLayout> -ViewSettingsPage::ViewSettingsPage(QWidget* parent) : - SettingsPageBase(parent), - m_tabs() +ViewSettingsPage::ViewSettingsPage(QWidget *parent) + : SettingsPageBase(parent) + , m_tabs() { - QVBoxLayout* topLayout = new QVBoxLayout(this); + QVBoxLayout *topLayout = new QVBoxLayout(this); topLayout->setContentsMargins(0, 0, 0, 0); - QTabWidget* tabWidget = new QTabWidget(this); + QTabWidget *tabWidget = new QTabWidget(this); // Initialize 'Icons' tab - ViewSettingsTab* iconsTab = new ViewSettingsTab(ViewSettingsTab::IconsMode, tabWidget); + ViewSettingsTab *iconsTab = new ViewSettingsTab(ViewSettingsTab::IconsMode, tabWidget); tabWidget->addTab(iconsTab, QIcon::fromTheme(QStringLiteral("view-list-icons")), i18nc("@title:tab", "Icons")); connect(iconsTab, &ViewSettingsTab::changed, this, &ViewSettingsPage::changed); // Initialize 'Compact' tab - ViewSettingsTab* compactTab = new ViewSettingsTab(ViewSettingsTab::CompactMode, tabWidget); + ViewSettingsTab *compactTab = new ViewSettingsTab(ViewSettingsTab::CompactMode, tabWidget); tabWidget->addTab(compactTab, QIcon::fromTheme(QStringLiteral("view-list-details")), i18nc("@title:tab", "Compact")); connect(compactTab, &ViewSettingsTab::changed, this, &ViewSettingsPage::changed); // Initialize 'Details' tab - ViewSettingsTab* detailsTab = new ViewSettingsTab(ViewSettingsTab::DetailsMode, tabWidget); + ViewSettingsTab *detailsTab = new ViewSettingsTab(ViewSettingsTab::DetailsMode, tabWidget); tabWidget->addTab(detailsTab, QIcon::fromTheme(QStringLiteral("view-list-tree")), i18nc("@title:tab", "Details")); connect(detailsTab, &ViewSettingsTab::changed, this, &ViewSettingsPage::changed); @@ -51,15 +51,14 @@ ViewSettingsPage::~ViewSettingsPage() void ViewSettingsPage::applySettings() { - for (ViewSettingsTab* tab : qAsConst(m_tabs)) { + for (ViewSettingsTab *tab : qAsConst(m_tabs)) { tab->applySettings(); } } void ViewSettingsPage::restoreDefaults() { - for (ViewSettingsTab* tab : qAsConst(m_tabs)) { + for (ViewSettingsTab *tab : qAsConst(m_tabs)) { tab->restoreDefaultSettings(); } } - diff --git a/src/settings/viewmodes/viewsettingspage.h b/src/settings/viewmodes/viewsettingspage.h index 1016527e0..797c0b712 100644 --- a/src/settings/viewmodes/viewsettingspage.h +++ b/src/settings/viewmodes/viewsettingspage.h @@ -22,7 +22,7 @@ class ViewSettingsPage : public SettingsPageBase Q_OBJECT public: - explicit ViewSettingsPage(QWidget* parent); + explicit ViewSettingsPage(QWidget *parent); ~ViewSettingsPage() override; /** @see SettingsPageBase::applySettings() */ @@ -32,7 +32,7 @@ public: void restoreDefaults() override; private: - QList<ViewSettingsTab*> m_tabs; + QList<ViewSettingsTab *> m_tabs; }; #endif diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp index 6ac280e7b..bc465c02f 100644 --- a/src/settings/viewmodes/viewsettingstab.cpp +++ b/src/settings/viewmodes/viewsettingstab.cpp @@ -14,8 +14,8 @@ #include "settings/viewmodes/viewmodesettings.h" #include "views/zoomlevelinfo.h" -#include <KLocalizedString> #include <KFormat> +#include <KLocalizedString> #include <QApplication> #include <QButtonGroup> @@ -26,20 +26,20 @@ #include <QRadioButton> #include <QSpinBox> -ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) : - QWidget(parent), - m_mode(mode), - m_defaultSizeSlider(nullptr), - m_previewSizeSlider(nullptr), - m_fontRequester(nullptr), - m_widthBox(nullptr), - m_maxLinesBox(nullptr), - m_expandableFolders(nullptr), - m_recursiveDirectorySizeLimit(nullptr), - m_useRelatetiveDates(nullptr), - m_useShortDates(nullptr) +ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget *parent) + : QWidget(parent) + , m_mode(mode) + , m_defaultSizeSlider(nullptr) + , m_previewSizeSlider(nullptr) + , m_fontRequester(nullptr) + , m_widthBox(nullptr) + , m_maxLinesBox(nullptr) + , m_expandableFolders(nullptr) + , m_recursiveDirectorySizeLimit(nullptr) + , m_useRelatetiveDates(nullptr) + , m_useShortDates(nullptr) { - QFormLayout* topLayout = new QFormLayout(this); + QFormLayout *topLayout = new QFormLayout(this); // Create "Icon Size" section const int minRange = ZoomLevelInfo::minimumLevel(); @@ -49,22 +49,18 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) : m_defaultSizeSlider->setPageStep(1); m_defaultSizeSlider->setTickPosition(QSlider::TicksBelow); m_defaultSizeSlider->setRange(minRange, maxRange); - connect(m_defaultSizeSlider, &QSlider::valueChanged, - this, &ViewSettingsTab::slotDefaultSliderMoved); + connect(m_defaultSizeSlider, &QSlider::valueChanged, this, &ViewSettingsTab::slotDefaultSliderMoved); topLayout->addRow(i18nc("@label:listbox", "Default icon size:"), m_defaultSizeSlider); m_previewSizeSlider = new QSlider(Qt::Horizontal); m_previewSizeSlider->setPageStep(1); m_previewSizeSlider->setTickPosition(QSlider::TicksBelow); m_previewSizeSlider->setRange(minRange, maxRange); - connect(m_previewSizeSlider, &QSlider::valueChanged, - this, &ViewSettingsTab::slotPreviewSliderMoved); + connect(m_previewSizeSlider, &QSlider::valueChanged, this, &ViewSettingsTab::slotPreviewSliderMoved); topLayout->addRow(i18nc("@label:listbox", "Preview icon size:"), m_previewSizeSlider); - topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed)); - // Create "Label" section m_fontRequester = new DolphinFontRequester(this); topLayout->addRow(i18nc("@label:listbox", "Label font:"), m_fontRequester); @@ -109,17 +105,18 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) : itemActivationAreaGroup->addButton(m_entireRow); itemActivationAreaGroup->addButton(m_iconAndNameOnly); + // clang-format off // i18n: Users can choose here if items are opened by clicking on their name/icon or by clicking in the row. topLayout->addRow(i18nc("@title:group", "Open files and folders:"), m_entireRow); + // clang-format on topLayout->addRow(QString(), m_iconAndNameOnly); - #ifndef Q_OS_WIN // Sorting properties m_numberOfItems = new QRadioButton(i18nc("option:radio", "Number of items")); m_sizeOfContents = new QRadioButton(i18nc("option:radio", "Size of contents, up to ")); - QButtonGroup* sortingModeGroup = new QButtonGroup(this); + QButtonGroup *sortingModeGroup = new QButtonGroup(this); sortingModeGroup->addButton(m_numberOfItems); sortingModeGroup->addButton(m_sizeOfContents); @@ -142,14 +139,12 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) : QLocale local; KFormat formatter(local); - m_useRelatetiveDates = new QRadioButton(i18nc( - "option:radio as in relative date", "Relative (e.g. '%1')", formatter.formatRelativeDateTime(thirtyMinutesAgo, QLocale::ShortFormat)) - ); - m_useShortDates = new QRadioButton( - i18nc("option:radio as in absolute date", "Absolute (e.g. '%1')", local.toString(thirtyMinutesAgo, QLocale::ShortFormat)) - ); + m_useRelatetiveDates = new QRadioButton( + i18nc("option:radio as in relative date", "Relative (e.g. '%1')", formatter.formatRelativeDateTime(thirtyMinutesAgo, QLocale::ShortFormat))); + m_useShortDates = + new QRadioButton(i18nc("option:radio as in absolute date", "Absolute (e.g. '%1')", local.toString(thirtyMinutesAgo, QLocale::ShortFormat))); - QButtonGroup* dateFormatGroup = new QButtonGroup(this); + QButtonGroup *dateFormatGroup = new QButtonGroup(this); dateFormatGroup->addButton(m_useRelatetiveDates); dateFormatGroup->addButton(m_useShortDates); @@ -271,16 +266,16 @@ void ViewSettingsTab::loadSettings() m_entireRow->setChecked(DetailsModeSettings::highlightEntireRow()); m_iconAndNameOnly->setChecked(!m_entireRow->isChecked()); m_expandableFolders->setChecked(DetailsModeSettings::expandableFolders()); - #ifndef Q_OS_WIN - if (DetailsModeSettings::directorySizeCount()) { - m_numberOfItems->setChecked(true); - m_recursiveDirectorySizeLimit->setEnabled(false); - } else { - m_sizeOfContents->setChecked(true); - m_recursiveDirectorySizeLimit->setEnabled(true); - } - m_recursiveDirectorySizeLimit->setValue(DetailsModeSettings::recursiveDirectorySizeLimit()); - #endif +#ifndef Q_OS_WIN + if (DetailsModeSettings::directorySizeCount()) { + m_numberOfItems->setChecked(true); + m_recursiveDirectorySizeLimit->setEnabled(false); + } else { + m_sizeOfContents->setChecked(true); + m_recursiveDirectorySizeLimit->setEnabled(true); + } + m_recursiveDirectorySizeLimit->setValue(DetailsModeSettings::recursiveDirectorySizeLimit()); +#endif m_useRelatetiveDates->setChecked(DetailsModeSettings::useShortRelativeDates()); m_useShortDates->setChecked(!DetailsModeSettings::useShortRelativeDates()); break; @@ -296,9 +291,7 @@ void ViewSettingsTab::loadSettings() const QSize previewSize(settings.previewSize(), settings.previewSize()); m_previewSizeSlider->setValue(ZoomLevelInfo::zoomLevelForIconSize(previewSize)); - m_fontRequester->setMode(settings.useSystemFont() - ? DolphinFontRequester::SystemFont - : DolphinFontRequester::CustomFont); + m_fontRequester->setMode(settings.useSystemFont() ? DolphinFontRequester::SystemFont : DolphinFontRequester::CustomFont); QFont font(settings.viewFont()); m_fontRequester->setCustomFont(font); @@ -314,7 +307,7 @@ void ViewSettingsTab::slotPreviewSliderMoved(int value) showToolTip(m_previewSizeSlider, value); } -void ViewSettingsTab::showToolTip(QSlider* slider, int value) +void ViewSettingsTab::showToolTip(QSlider *slider, int value) { const int size = ZoomLevelInfo::iconSizeForZoomLevel(value); slider->setToolTip(i18ncp("@info:tooltip", "Size: 1 pixel", "Size: %1 pixels", size)); @@ -326,4 +319,3 @@ void ViewSettingsTab::showToolTip(QSlider* slider, int value) QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), slider->mapToGlobal(global)); QApplication::sendEvent(slider, &toolTipEvent); } - diff --git a/src/settings/viewmodes/viewsettingstab.h b/src/settings/viewmodes/viewsettingstab.h index 4a4dc5694..88bdd944b 100644 --- a/src/settings/viewmodes/viewsettingstab.h +++ b/src/settings/viewmodes/viewsettingstab.h @@ -24,14 +24,9 @@ class ViewSettingsTab : public QWidget Q_OBJECT public: - enum Mode - { - IconsMode, - CompactMode, - DetailsMode - }; + enum Mode { IconsMode, CompactMode, DetailsMode }; - explicit ViewSettingsTab(Mode mode, QWidget* parent = nullptr); + explicit ViewSettingsTab(Mode mode, QWidget *parent = nullptr); ~ViewSettingsTab() override; void applySettings(); @@ -44,26 +39,27 @@ private Q_SLOTS: void slotDefaultSliderMoved(int value); void slotPreviewSliderMoved(int value); + private: void loadSettings(); - void showToolTip(QSlider* slider, int value); + void showToolTip(QSlider *slider, int value); private: Mode m_mode; - QSlider* m_defaultSizeSlider; - QSlider* m_previewSizeSlider; + QSlider *m_defaultSizeSlider; + QSlider *m_previewSizeSlider; - DolphinFontRequester* m_fontRequester; - QComboBox* m_widthBox; - QComboBox* m_maxLinesBox; - QRadioButton* m_entireRow; - QRadioButton* m_iconAndNameOnly; - QCheckBox* m_expandableFolders; - QRadioButton* m_numberOfItems; - QRadioButton* m_sizeOfContents; - QSpinBox* m_recursiveDirectorySizeLimit; - QRadioButton* m_useRelatetiveDates; - QRadioButton* m_useShortDates; + DolphinFontRequester *m_fontRequester; + QComboBox *m_widthBox; + QComboBox *m_maxLinesBox; + QRadioButton *m_entireRow; + QRadioButton *m_iconAndNameOnly; + QCheckBox *m_expandableFolders; + QRadioButton *m_numberOfItems; + QRadioButton *m_sizeOfContents; + QSpinBox *m_recursiveDirectorySizeLimit; + QRadioButton *m_useRelatetiveDates; + QRadioButton *m_useShortDates; }; #endif diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp index 30995f1f7..d0828422f 100644 --- a/src/settings/viewpropertiesdialog.cpp +++ b/src/settings/viewpropertiesdialog.cpp @@ -21,7 +21,7 @@ #include <kwidgetsaddons_version.h> #if HAVE_BALOO - #include <Baloo/IndexerConfig> +#include <Baloo/IndexerConfig> #endif #include <QButtonGroup> @@ -36,30 +36,30 @@ #include <views/viewproperties.h> -ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : - QDialog(dolphinView), - m_isDirty(false), - m_dolphinView(dolphinView), - m_viewProps(nullptr), - m_viewMode(nullptr), - m_sortOrder(nullptr), - m_sorting(nullptr), - m_sortFoldersFirst(nullptr), - m_sortHiddenLast(nullptr), - m_previewsShown(nullptr), - m_showInGroups(nullptr), - m_showHiddenFiles(nullptr), - m_applyToCurrentFolder(nullptr), - m_applyToSubFolders(nullptr), - m_applyToAllFolders(nullptr), - m_useAsDefault(nullptr) +ViewPropertiesDialog::ViewPropertiesDialog(DolphinView *dolphinView) + : QDialog(dolphinView) + , m_isDirty(false) + , m_dolphinView(dolphinView) + , m_viewProps(nullptr) + , m_viewMode(nullptr) + , m_sortOrder(nullptr) + , m_sorting(nullptr) + , m_sortFoldersFirst(nullptr) + , m_sortHiddenLast(nullptr) + , m_previewsShown(nullptr) + , m_showInGroups(nullptr) + , m_showHiddenFiles(nullptr) + , m_applyToCurrentFolder(nullptr) + , m_applyToSubFolders(nullptr) + , m_applyToAllFolders(nullptr) + , m_useAsDefault(nullptr) { Q_ASSERT(dolphinView); const bool useGlobalViewProps = GeneralSettings::globalViewProps(); setWindowTitle(i18nc("@title:window", "View Display Style")); - const QUrl& url = dolphinView->url(); + const QUrl &url = dolphinView->url(); m_viewProps = new ViewProperties(url); m_viewProps->setAutoSaveEnabled(false); @@ -79,7 +79,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_sorting = new QComboBox(); const QList<KFileItemModel::RoleInfo> rolesInfo = KFileItemModel::rolesInformation(); - for (const KFileItemModel::RoleInfo& info : rolesInfo) { + for (const KFileItemModel::RoleInfo &info : rolesInfo) { m_sorting->addItem(info.translation, info.role); } @@ -118,24 +118,23 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : connect(m_listWidget, &QListWidget::itemChanged, this, &ViewPropertiesDialog::slotItemChanged); m_listWidget->setSelectionMode(QAbstractItemView::NoSelection); const QList<KFileItemModel::RoleInfo> rolesInfo = KFileItemModel::rolesInformation(); - for (const KFileItemModel::RoleInfo& info : rolesInfo) { - QListWidgetItem* item = new QListWidgetItem(info.translation, m_listWidget); + for (const KFileItemModel::RoleInfo &info : rolesInfo) { + QListWidgetItem *item = new QListWidgetItem(info.translation, m_listWidget); item->setCheckState(visibleRoles.contains(info.role) ? Qt::Checked : Qt::Unchecked); - const bool enable = ((!info.requiresBaloo && !info.requiresIndexer) || - (info.requiresBaloo) || - (info.requiresIndexer && indexingEnabled)) && info.role != "text"; + const bool enable = + ((!info.requiresBaloo && !info.requiresIndexer) || (info.requiresBaloo) || (info.requiresIndexer && indexingEnabled)) && info.role != "text"; if (!enable) { item->setFlags(item->flags() & ~Qt::ItemIsEnabled); } } - QLabel* additionalViewOptionsLabel = new QLabel(i18n("Choose what to see on each file or folder:")); + QLabel *additionalViewOptionsLabel = new QLabel(i18n("Choose what to see on each file or folder:")); innerLayout->addWidget(additionalViewOptionsLabel); innerLayout->addWidget(m_listWidget); } - QHBoxLayout* sortingLayout = new QHBoxLayout(); + QHBoxLayout *sortingLayout = new QHBoxLayout(); sortingLayout->setContentsMargins(0, 0, 0, 0); sortingLayout->addWidget(m_sortOrder); sortingLayout->addWidget(m_sorting); @@ -151,36 +150,25 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : layout->addRow(QString(), m_showHiddenFiles); layout->addRow(QString(), m_sortHiddenLast); - connect(m_viewMode, &QComboBox::currentIndexChanged, - this, &ViewPropertiesDialog::slotViewModeChanged); - connect(m_sorting, &QComboBox::currentIndexChanged, - this, &ViewPropertiesDialog::slotSortingChanged); - connect(m_sortOrder, &QComboBox::currentIndexChanged, - this, &ViewPropertiesDialog::slotSortOrderChanged); - connect(m_sortFoldersFirst, &QCheckBox::clicked, - this, &ViewPropertiesDialog::slotSortFoldersFirstChanged); - connect(m_sortHiddenLast, &QCheckBox::clicked, - this, &ViewPropertiesDialog::slotSortHiddenLastChanged); - connect(m_previewsShown, &QCheckBox::clicked, - this, &ViewPropertiesDialog::slotShowPreviewChanged); - connect(m_showInGroups, &QCheckBox::clicked, - this, &ViewPropertiesDialog::slotGroupedSortingChanged); - connect(m_showHiddenFiles, &QCheckBox::clicked, - this, &ViewPropertiesDialog::slotShowHiddenFilesChanged); + connect(m_viewMode, &QComboBox::currentIndexChanged, this, &ViewPropertiesDialog::slotViewModeChanged); + connect(m_sorting, &QComboBox::currentIndexChanged, this, &ViewPropertiesDialog::slotSortingChanged); + connect(m_sortOrder, &QComboBox::currentIndexChanged, this, &ViewPropertiesDialog::slotSortOrderChanged); + connect(m_sortFoldersFirst, &QCheckBox::clicked, this, &ViewPropertiesDialog::slotSortFoldersFirstChanged); + connect(m_sortHiddenLast, &QCheckBox::clicked, this, &ViewPropertiesDialog::slotSortHiddenLastChanged); + connect(m_previewsShown, &QCheckBox::clicked, this, &ViewPropertiesDialog::slotShowPreviewChanged); + connect(m_showInGroups, &QCheckBox::clicked, this, &ViewPropertiesDialog::slotGroupedSortingChanged); + connect(m_showHiddenFiles, &QCheckBox::clicked, this, &ViewPropertiesDialog::slotShowHiddenFilesChanged); // Only show the following settings if the view properties are remembered // for each directory: if (!useGlobalViewProps) { // create 'Apply View Properties To' group - m_applyToCurrentFolder = new QRadioButton(i18nc("@option:radio Apply View Properties To", - "Current folder")); + m_applyToCurrentFolder = new QRadioButton(i18nc("@option:radio Apply View Properties To", "Current folder")); m_applyToCurrentFolder->setChecked(true); - m_applyToSubFolders = new QRadioButton(i18nc("@option:radio Apply View Properties To", - "Current folder and sub-folders")); - m_applyToAllFolders = new QRadioButton(i18nc("@option:radio Apply View Properties To", - "All folders")); + m_applyToSubFolders = new QRadioButton(i18nc("@option:radio Apply View Properties To", "Current folder and sub-folders")); + m_applyToAllFolders = new QRadioButton(i18nc("@option:radio Apply View Properties To", "All folders")); - QButtonGroup* applyGroup = new QButtonGroup(this); + QButtonGroup *applyGroup = new QButtonGroup(this); applyGroup->addButton(m_applyToCurrentFolder); applyGroup->addButton(m_applyToSubFolders); applyGroup->addButton(m_applyToAllFolders); @@ -195,14 +183,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_useAsDefault = new QCheckBox(i18nc("@option:check", "Use as default view settings"), this); layout->addRow(QString(), m_useAsDefault); - connect(m_applyToCurrentFolder, &QRadioButton::clicked, - this, &ViewPropertiesDialog::markAsDirty); - connect(m_applyToSubFolders, &QRadioButton::clicked, - this, &ViewPropertiesDialog::markAsDirty); - connect(m_applyToAllFolders, &QRadioButton::clicked, - this, &ViewPropertiesDialog::markAsDirty); - connect(m_useAsDefault, &QCheckBox::clicked, - this, &ViewPropertiesDialog::markAsDirty); + connect(m_applyToCurrentFolder, &QRadioButton::clicked, this, &ViewPropertiesDialog::markAsDirty); + connect(m_applyToSubFolders, &QRadioButton::clicked, this, &ViewPropertiesDialog::markAsDirty); + connect(m_applyToAllFolders, &QRadioButton::clicked, this, &ViewPropertiesDialog::markAsDirty); + connect(m_useAsDefault, &QCheckBox::clicked, this, &ViewPropertiesDialog::markAsDirty); } layout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed)); @@ -335,9 +319,9 @@ void ViewPropertiesDialog::applyViewProperties() QList<QByteArray> visibleRoles; int index = 0; const QList<KFileItemModel::RoleInfo> rolesInfo = KFileItemModel::rolesInformation(); - for (const KFileItemModel::RoleInfo& info : rolesInfo) { - const QListWidgetItem* item = m_listWidget->item(index); - if (item->checkState() == Qt::Checked) { + for (const KFileItemModel::RoleInfo &info : rolesInfo) { + const QListWidgetItem *item = m_listWidget->item(index); + if (item->checkState() == Qt::Checked) { visibleRoles.append(info.role); } ++index; @@ -350,20 +334,14 @@ void ViewPropertiesDialog::applyViewProperties() if (applyToSubFolders) { const QString text(i18nc("@info", "The view properties of all sub-folders will be changed. Do you want to continue?")); #if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) - if (KMessageBox::questionTwoActions(this, text, {}, - KStandardGuiItem::cont(), - KStandardGuiItem::cancel()) == KMessageBox::SecondaryAction) { + if (KMessageBox::questionTwoActions(this, text, {}, KStandardGuiItem::cont(), KStandardGuiItem::cancel()) == KMessageBox::SecondaryAction) { #else - if (KMessageBox::questionYesNo(this, text, {}, - KStandardGuiItem::cont(), - KStandardGuiItem::cancel()) == KMessageBox::No) { + if (KMessageBox::questionYesNo(this, text, {}, KStandardGuiItem::cont(), KStandardGuiItem::cancel()) == KMessageBox::No) { #endif return; } - ViewPropsProgressInfo* info = new ViewPropsProgressInfo(m_dolphinView, - m_dolphinView->url(), - *m_viewProps); + ViewPropsProgressInfo *info = new ViewPropsProgressInfo(m_dolphinView, m_dolphinView->url(), *m_viewProps); info->setAttribute(Qt::WA_DeleteOnClose); info->setWindowModality(Qt::NonModal); info->show(); @@ -390,20 +368,16 @@ void ViewPropertiesDialog::applyViewProperties() if (applyToAllFolders) { const QString text(i18nc("@info", "The view properties of all folders will be changed. Do you want to continue?")); #if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) - if (KMessageBox::questionTwoActions(this, text, {}, - KStandardGuiItem::cont(), - KStandardGuiItem::cancel()) == KMessageBox::SecondaryAction) { + if (KMessageBox::questionTwoActions(this, text, {}, KStandardGuiItem::cont(), KStandardGuiItem::cancel()) == KMessageBox::SecondaryAction) { #else - if (KMessageBox::questionYesNo(this, text, {}, - KStandardGuiItem::cont(), - KStandardGuiItem::cancel()) == KMessageBox::No) { + if (KMessageBox::questionYesNo(this, text, {}, KStandardGuiItem::cont(), KStandardGuiItem::cancel()) == KMessageBox::No) { #endif return; } // Updating the global view properties time stamp in the general settings makes // all existing viewproperties invalid, as they have a smaller time stamp. - GeneralSettings* settings = GeneralSettings::self(); + GeneralSettings *settings = GeneralSettings::self(); settings->setViewPropsTimestamp(QDateTime::currentDateTime()); settings->save(); } @@ -427,10 +401,17 @@ void ViewPropertiesDialog::loadSettings() { // Load view mode switch (m_viewProps->viewMode()) { - case DolphinView::IconsView: m_viewMode->setCurrentIndex(0); break; - case DolphinView::CompactView: m_viewMode->setCurrentIndex(1); break; - case DolphinView::DetailsView: m_viewMode->setCurrentIndex(2); break; - default: break; + case DolphinView::IconsView: + m_viewMode->setCurrentIndex(0); + break; + case DolphinView::CompactView: + m_viewMode->setCurrentIndex(1); + break; + case DolphinView::DetailsView: + m_viewMode->setCurrentIndex(2); + break; + default: + break; } // Load sort order and sorting @@ -456,4 +437,3 @@ void ViewPropertiesDialog::loadSettings() m_showHiddenFiles->setChecked(m_viewProps->hiddenFilesShown()); markAsDirty(false); } - diff --git a/src/settings/viewpropertiesdialog.h b/src/settings/viewpropertiesdialog.h index c58fda5c0..d1f056fbb 100644 --- a/src/settings/viewpropertiesdialog.h +++ b/src/settings/viewpropertiesdialog.h @@ -33,7 +33,7 @@ class DOLPHIN_EXPORT ViewPropertiesDialog : public QDialog Q_OBJECT public: - explicit ViewPropertiesDialog(DolphinView* dolphinView); + explicit ViewPropertiesDialog(DolphinView *dolphinView); ~ViewPropertiesDialog() override; public Q_SLOTS: @@ -61,22 +61,22 @@ private: private: bool m_isDirty; - DolphinView* m_dolphinView; - ViewProperties* m_viewProps; + DolphinView *m_dolphinView; + ViewProperties *m_viewProps; - QComboBox* m_viewMode; - QComboBox* m_sortOrder; - QComboBox* m_sorting; - QCheckBox* m_sortFoldersFirst; - QCheckBox* m_sortHiddenLast; - QCheckBox* m_previewsShown; - QCheckBox* m_showInGroups; - QCheckBox* m_showHiddenFiles; - QRadioButton* m_applyToCurrentFolder; - QRadioButton* m_applyToSubFolders; - QRadioButton* m_applyToAllFolders; - QCheckBox* m_useAsDefault; - QListWidget* m_listWidget; + QComboBox *m_viewMode; + QComboBox *m_sortOrder; + QComboBox *m_sorting; + QCheckBox *m_sortFoldersFirst; + QCheckBox *m_sortHiddenLast; + QCheckBox *m_previewsShown; + QCheckBox *m_showInGroups; + QCheckBox *m_showHiddenFiles; + QRadioButton *m_applyToCurrentFolder; + QRadioButton *m_applyToSubFolders; + QRadioButton *m_applyToAllFolders; + QCheckBox *m_useAsDefault; + QListWidget *m_listWidget; }; #endif diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp index 894e7ff64..a3692be51 100644 --- a/src/settings/viewpropsprogressinfo.cpp +++ b/src/settings/viewpropsprogressinfo.cpp @@ -18,17 +18,15 @@ #include <QTimer> #include <QVBoxLayout> -ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent, - const QUrl& dir, - const ViewProperties& viewProps) : - QDialog(parent), - m_dir(dir), - m_viewProps(nullptr), - m_label(nullptr), - m_progressBar(nullptr), - m_dirSizeJob(nullptr), - m_applyViewPropsJob(nullptr), - m_timer(nullptr) +ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget *parent, const QUrl &dir, const ViewProperties &viewProps) + : QDialog(parent) + , m_dir(dir) + , m_viewProps(nullptr) + , m_label(nullptr) + , m_progressBar(nullptr) + , m_dirSizeJob(nullptr) + , m_applyViewPropsJob(nullptr) + , m_timer(nullptr) { const QSize minSize = minimumSize(); setMinimumSize(QSize(320, minSize.height())); @@ -64,15 +62,13 @@ ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent, // allows to give a progress indication for the user when applying the view // properties later. m_dirSizeJob = KIO::directorySize(dir); - connect(m_dirSizeJob, &KIO::DirectorySizeJob::result, - this, &ViewPropsProgressInfo::applyViewProperties); + connect(m_dirSizeJob, &KIO::DirectorySizeJob::result, this, &ViewPropsProgressInfo::applyViewProperties); // The directory size job cannot emit any progress signal, as it is not aware // about the total number of directories. Therefor a timer is triggered, which // periodically updates the current directory count. m_timer = new QTimer(this); - connect(m_timer, &QTimer::timeout, - this, &ViewPropsProgressInfo::updateProgress); + connect(m_timer, &QTimer::timeout, this, &ViewPropsProgressInfo::updateProgress); m_timer->start(300); } @@ -82,7 +78,7 @@ ViewPropsProgressInfo::~ViewPropsProgressInfo() m_viewProps = nullptr; } -void ViewPropsProgressInfo::closeEvent(QCloseEvent* event) +void ViewPropsProgressInfo::closeEvent(QCloseEvent *event) { m_timer->stop(); m_applyViewPropsJob = nullptr; @@ -130,7 +126,5 @@ void ViewPropsProgressInfo::applyViewProperties() m_dirSizeJob = nullptr; m_applyViewPropsJob = new ApplyViewPropsJob(m_dir, *m_viewProps); - connect(m_applyViewPropsJob, &ApplyViewPropsJob::result, - this, &ViewPropsProgressInfo::close); + connect(m_applyViewPropsJob, &ApplyViewPropsJob::result, this, &ViewPropsProgressInfo::close); } - diff --git a/src/settings/viewpropsprogressinfo.h b/src/settings/viewpropsprogressinfo.h index 61c358f39..577178870 100644 --- a/src/settings/viewpropsprogressinfo.h +++ b/src/settings/viewpropsprogressinfo.h @@ -36,14 +36,12 @@ public: * @param viewProps View properties for the directory \a dir including its * sub directories. */ - ViewPropsProgressInfo(QWidget* parent, - const QUrl& dir, - const ViewProperties& viewProps); + ViewPropsProgressInfo(QWidget *parent, const QUrl &dir, const ViewProperties &viewProps); ~ViewPropsProgressInfo() override; protected: - void closeEvent(QCloseEvent* event) override; + void closeEvent(QCloseEvent *event) override; public Q_SLOTS: void reject() override; @@ -54,14 +52,14 @@ private Q_SLOTS: private: QUrl m_dir; - ViewProperties* m_viewProps; + ViewProperties *m_viewProps; - QLabel* m_label; - QProgressBar* m_progressBar; + QLabel *m_label; + QProgressBar *m_progressBar; - KIO::DirectorySizeJob* m_dirSizeJob; - ApplyViewPropsJob* m_applyViewPropsJob; - QTimer* m_timer; + KIO::DirectorySizeJob *m_dirSizeJob; + ApplyViewPropsJob *m_applyViewPropsJob; + QTimer *m_timer; }; #endif |