From 32bd8efc7f08a30622deaa3a80b7b26ceaea9f29 Mon Sep 17 00:00:00 2001 From: Roman Inflianskas Date: Sat, 3 Mar 2018 11:46:14 +0300 Subject: Modernize the syntax of shortcuts Reviewers: #dolphin, markg Reviewed By: markg Subscribers: markg, elvisangelaccio, #dolphin Differential Revision: https://phabricator.kde.org/D10986 --- src/settings/additionalinfodialog.cpp | 2 +- src/settings/general/configurepreviewplugindialog.cpp | 2 +- src/settings/viewpropertiesdialog.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/settings') diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp index 3eacd522f..6b838fc18 100644 --- a/src/settings/additionalinfodialog.cpp +++ b/src/settings/additionalinfodialog.cpp @@ -85,7 +85,7 @@ AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent, layout->addWidget(buttonBox); auto okButton = buttonBox->button(QDialogButtonBox::Ok); - okButton->setShortcut(Qt::CTRL | Qt::Key_Return); + okButton->setShortcut(Qt::CTRL + Qt::Key_Return); okButton->setDefault(true); const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "AdditionalInfoDialog"); diff --git a/src/settings/general/configurepreviewplugindialog.cpp b/src/settings/general/configurepreviewplugindialog.cpp index f0ac54984..629718705 100644 --- a/src/settings/general/configurepreviewplugindialog.cpp +++ b/src/settings/general/configurepreviewplugindialog.cpp @@ -79,6 +79,6 @@ ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString& plugin layout->addWidget(buttonBox); auto okButton = buttonBox->button(QDialogButtonBox::Ok); - okButton->setShortcut(Qt::CTRL | Qt::Key_Return); + okButton->setShortcut(Qt::CTRL + Qt::Key_Return); okButton->setDefault(true); } diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp index 980ab0bba..8c5fccdef 100644 --- a/src/settings/viewpropertiesdialog.cpp +++ b/src/settings/viewpropertiesdialog.cpp @@ -198,7 +198,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : layout->addWidget(buttonBox); auto okButton = buttonBox->button(QDialogButtonBox::Ok); - okButton->setShortcut(Qt::CTRL | Qt::Key_Return); + okButton->setShortcut(Qt::CTRL + Qt::Key_Return); okButton->setDefault(true); auto applyButton = buttonBox->button(QDialogButtonBox::Apply); -- cgit v1.3