Commit ee81d2b6 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

operator+/- is disabled for QFlags in qt6

parent 2215d14d
Pipeline #43367 passed with stage
in 45 minutes and 31 seconds
......@@ -571,7 +571,7 @@ void AttachmentControllerBase::createActions()
collection->addAction(QStringLiteral("attach_public_key"), d->attachPublicKeyAction);
collection->addAction(QStringLiteral("attach_my_public_key"), d->attachMyPublicKeyAction);
collection->addAction(QStringLiteral("attach"), d->addAttachmentFileAction);
collection->setDefaultShortcut(d->addAttachmentFileAction, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_A));
collection->setDefaultShortcut(d->addAttachmentFileAction, QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_A));
collection->addAction(QStringLiteral("attach_directory"), d->addAttachmentDirectoryAction);
collection->addAction(QStringLiteral("remove"), d->removeAction);
......
......@@ -215,7 +215,7 @@ void Pane::setXmlGuiClient(KXMLGUIClient *xmlGuiClient)
d->mXmlGuiClient = xmlGuiClient;
KToggleAction *const showHideQuicksearch = new KToggleAction(i18n("Show Quick Search Bar"), this);
d->mXmlGuiClient->actionCollection()->setDefaultShortcut(showHideQuicksearch, Qt::CTRL + Qt::Key_H);
d->mXmlGuiClient->actionCollection()->setDefaultShortcut(showHideQuicksearch, Qt::CTRL | Qt::Key_H);
showHideQuicksearch->setChecked(MessageListSettings::showQuickSearch());
d->mXmlGuiClient->actionCollection()->addAction(QStringLiteral("show_quick_search"), showHideQuicksearch);
......@@ -243,7 +243,7 @@ void Pane::setXmlGuiClient(KXMLGUIClient *xmlGuiClient)
QAction *action = new QAction(i18n("Create New Tab"), this);
d->mXmlGuiClient->actionCollection()->addAction(QStringLiteral("create_new_tab"), action);
d->mXmlGuiClient->actionCollection()->setDefaultShortcut(action, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_O));
d->mXmlGuiClient->actionCollection()->setDefaultShortcut(action, QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_O));
connect(action, &QAction::triggered, this, [this]() {
d->onNewTabClicked();
});
......@@ -313,7 +313,7 @@ void Pane::setXmlGuiClient(KXMLGUIClient *xmlGuiClient)
d->mCloseTabAction = new QAction(i18n("Close Tab"), this);
d->mXmlGuiClient->actionCollection()->addAction(QStringLiteral("close_current_tab"), d->mCloseTabAction);
d->mXmlGuiClient->actionCollection()->setDefaultShortcuts(d->mCloseTabAction, QList<QKeySequence>() << QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_W) << QKeySequence(Qt::CTRL + Qt::Key_W));
d->mXmlGuiClient->actionCollection()->setDefaultShortcuts(d->mCloseTabAction, QList<QKeySequence>() << QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_W) << QKeySequence(Qt::CTRL | Qt::Key_W));
connect(d->mCloseTabAction, &QAction::triggered, this, [this]() {
d->onCloseTabClicked();
});
......
......@@ -1587,7 +1587,7 @@ void ViewerPrivate::createActions()
mSelectAllAction = new QAction(i18n("Select All Text"), this);
ac->addAction(QStringLiteral("mark_all_text"), mSelectAllAction);
connect(mSelectAllAction, &QAction::triggered, this, &ViewerPrivate::selectAll);
ac->setDefaultShortcut(mSelectAllAction, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_A));
ac->setDefaultShortcut(mSelectAllAction, QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_A));
// copy Email address to clipboard
mCopyURLAction = new QAction(QIcon::fromTheme(QStringLiteral("edit-copy")),
......@@ -1612,7 +1612,7 @@ void ViewerPrivate::createActions()
ac->addAction(QStringLiteral("toggle_mimeparttree"), mToggleMimePartTreeAction);
connect(mToggleMimePartTreeAction, &QAction::toggled,
this, &ViewerPrivate::slotToggleMimePartTree);
ac->setDefaultShortcut(mToggleMimePartTreeAction, QKeySequence(Qt::Key_D + Qt::CTRL + Qt::ALT));
ac->setDefaultShortcut(mToggleMimePartTreeAction, QKeySequence(Qt::Key_D | Qt::CTRL | Qt::ALT));
mViewSourceAction = new QAction(i18n("&View Source"), this);
ac->addAction(QStringLiteral("view_source"), mViewSourceAction);
......@@ -1625,7 +1625,7 @@ void ViewerPrivate::createActions()
ac->addAction(QStringLiteral("save_message"), mSaveMessageAction);
connect(mSaveMessageAction, &QAction::triggered, this, &ViewerPrivate::slotSaveMessage);
//Laurent: conflict with kmail shortcut
//mSaveMessageAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_S));
//mSaveMessageAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_S));
mSaveMessageDisplayFormat = new QAction(i18n("&Save Display Format"), this);
ac->addAction(QStringLiteral("save_message_display_format"), mSaveMessageDisplayFormat);
......@@ -1671,7 +1671,7 @@ void ViewerPrivate::createActions()
// Toggle HTML display mode.
mToggleDisplayModeAction = new KToggleAction(i18n("Toggle HTML Display Mode"), this);
ac->addAction(QStringLiteral("toggle_html_display_mode"), mToggleDisplayModeAction);
ac->setDefaultShortcut(mToggleDisplayModeAction, QKeySequence(Qt::SHIFT + Qt::Key_H));
ac->setDefaultShortcut(mToggleDisplayModeAction, QKeySequence(Qt::SHIFT | Qt::Key_H));
connect(mToggleDisplayModeAction, &QAction::triggered,
this, &ViewerPrivate::slotToggleHtmlMode);
MessageViewer::Util::addHelpTextAction(mToggleDisplayModeAction,
......@@ -1681,7 +1681,7 @@ void ViewerPrivate::createActions()
QAction *loadExternalReferenceAction = new QAction(i18n("Load external references"), this);
ac->addAction(QStringLiteral("load_external_reference"), loadExternalReferenceAction);
ac->setDefaultShortcut(loadExternalReferenceAction,
QKeySequence(Qt::SHIFT + Qt::CTRL + Qt::Key_R));
QKeySequence(Qt::SHIFT | Qt::CTRL | Qt::Key_R));
connect(loadExternalReferenceAction, &QAction::triggered,
this, &ViewerPrivate::slotLoadExternalReference);
MessageViewer::Util::addHelpTextAction(loadExternalReferenceAction,
......@@ -1727,7 +1727,7 @@ void ViewerPrivate::createActions()
mDevelopmentToolsAction = new QAction(QStringLiteral("Development Tools"), this);
ac->addAction(QStringLiteral("development_tools"), mDevelopmentToolsAction);
ac->setDefaultShortcut(mDevelopmentToolsAction,
QKeySequence(Qt::SHIFT + Qt::CTRL + Qt::Key_I));
QKeySequence(Qt::SHIFT | Qt::CTRL | Qt::Key_I));
connect(mDevelopmentToolsAction, &QAction::triggered, this, &ViewerPrivate::slotShowDevelopmentTools);
}
......
......@@ -77,7 +77,7 @@ MailSourceViewTextBrowserWidget::MailSourceViewTextBrowserWidget(const QString &
lay->addWidget(mSliderContainer);
auto *shortcut = new QShortcut(this);
shortcut->setKey(Qt::Key_F + Qt::CTRL);
shortcut->setKey(Qt::Key_F | Qt::CTRL);
connect(shortcut, &QShortcut::activated, this, &MailSourceViewTextBrowserWidget::slotFind);
}
......
......@@ -65,7 +65,7 @@ MailSourceWebEngineViewer::MailSourceWebEngineViewer(QWidget *parent)
shortcut->setKey(Qt::Key_Escape);
connect(shortcut, &QShortcut::activated, this, &MailSourceWebEngineViewer::close);
shortcut = new QShortcut(this);
shortcut->setKey(Qt::Key_W + Qt::CTRL);
shortcut->setKey(Qt::Key_W | Qt::CTRL);
connect(shortcut, &QShortcut::activated, this, &MailSourceWebEngineViewer::close);
mRawBrowser->textBrowser()->setFocus();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment