office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-09-12 20:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

operator+/- is disabled for QFlags in qt6

Browse source
This commit is contained in:
Laurent Montel 2020-12-09 08:34:49 +01:00
parent 5c3da77dcd
commit 3f58639e06
4 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
part/annotationactionhandler.cpp
View file

@ -684,17 +684,17 @@ AnnotationActionHandler::AnnotationActionHandler(PageViewAnnotator *parent, KAct
ac->addAction(QStringLiteral("annotation_settings_advanced"), d->aAdvancedSettings);
ac->setDefaultShortcut(d->aShowToolBar, Qt::Key_F6);
ac->setDefaultShortcut(aHighlighter, Qt::ALT + Qt::Key_1);
ac->setDefaultShortcut(aUnderline, Qt::ALT + Qt::Key_2);
ac->setDefaultShortcut(aSquiggle, Qt::ALT + Qt::Key_3);
ac->setDefaultShortcut(aStrikeout, Qt::ALT + Qt::Key_4);
ac->setDefaultShortcut(aTypewriter, Qt::ALT + Qt::Key_5);
ac->setDefaultShortcut(aInlineNote, Qt::ALT + Qt::Key_6);
ac->setDefaultShortcut(aPopupNote, Qt::ALT + Qt::Key_7);
ac->setDefaultShortcut(aFreehandLine, Qt::ALT + Qt::Key_8);
ac->setDefaultShortcut(aArrow, Qt::ALT + Qt::Key_9);
ac->setDefaultShortcut(aRectangle, Qt::ALT + Qt::Key_0);
ac->setDefaultShortcut(d->aAddToQuickTools, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_B));
ac->setDefaultShortcut(aHighlighter, Qt::ALT | Qt::Key_1);
ac->setDefaultShortcut(aUnderline, Qt::ALT | Qt::Key_2);
ac->setDefaultShortcut(aSquiggle, Qt::ALT | Qt::Key_3);
ac->setDefaultShortcut(aStrikeout, Qt::ALT | Qt::Key_4);
ac->setDefaultShortcut(aTypewriter, Qt::ALT | Qt::Key_5);
ac->setDefaultShortcut(aInlineNote, Qt::ALT | Qt::Key_6);
ac->setDefaultShortcut(aPopupNote, Qt::ALT | Qt::Key_7);
ac->setDefaultShortcut(aFreehandLine, Qt::ALT | Qt::Key_8);
ac->setDefaultShortcut(aArrow, Qt::ALT | Qt::Key_9);
ac->setDefaultShortcut(aRectangle, Qt::ALT | Qt::Key_0);
ac->setDefaultShortcut(d->aAddToQuickTools, QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_B));
d->updateConfigActions();
}

24
part/pageview.cpp
View file

@ -542,8 +542,8 @@ void PageView::setupViewerActions(KActionCollection *ac)
{
d->actionCollection = ac;
ac->setDefaultShortcut(d->aZoomIn, QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_Plus));
ac->setDefaultShortcut(d->aZoomOut, QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_Minus));
ac->setDefaultShortcut(d->aZoomIn, QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_Plus));
ac->setDefaultShortcut(d->aZoomOut, QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_Minus));
// orientation menu actions
d->aRotateClockwise = new QAction(QIcon::fromTheme(QStringLiteral("object-rotate-right")), i18n("Rotate &Right"), this);
@ -593,7 +593,7 @@ void PageView::setupViewerActions(KActionCollection *ac)
d->aFitWindowToPage = new QAction(QIcon::fromTheme(QStringLiteral("zoom-fit-width")), i18n("Fit Wi&ndow to Page"), this);
d->aFitWindowToPage->setEnabled(Okular::Settings::viewMode() == (int)Okular::Settings::EnumViewMode::Single);
ac->setDefaultShortcut(d->aFitWindowToPage, QKeySequence(Qt::CTRL + Qt::Key_J));
ac->setDefaultShortcut(d->aFitWindowToPage, QKeySequence(Qt::CTRL | Qt::Key_J));
ac->addAction(QStringLiteral("fit_window_to_page"), d->aFitWindowToPage);
connect(d->aFitWindowToPage, &QAction::triggered, this, &PageView::slotFitWindowToPage);
@ -647,7 +647,7 @@ void PageView::setupViewerActions(KActionCollection *ac)
ac->addAction(QStringLiteral("mouse_drag"), d->aMouseNormal);
connect(d->aMouseNormal, &QAction::toggled, this, &PageView::slotMouseNormalToggled);
d->aMouseNormal->setCheckable(true);
ac->setDefaultShortcut(d->aMouseNormal, QKeySequence(Qt::CTRL + Qt::Key_1));
ac->setDefaultShortcut(d->aMouseNormal, QKeySequence(Qt::CTRL | Qt::Key_1));
d->aMouseNormal->setActionGroup(d->mouseModeActionGroup);
d->aMouseNormal->setChecked(Okular::Settings::mouseMode() == Okular::Settings::EnumMouseMode::Browse);
@ -655,7 +655,7 @@ void PageView::setupViewerActions(KActionCollection *ac)
ac->addAction(QStringLiteral("mouse_zoom"), mz);
connect(mz, &QAction::triggered, this, &PageView::slotSetMouseZoom);
mz->setCheckable(true);
ac->setDefaultShortcut(mz, QKeySequence(Qt::CTRL + Qt::Key_2));
ac->setDefaultShortcut(mz, QKeySequence(Qt::CTRL | Qt::Key_2));
mz->setActionGroup(d->mouseModeActionGroup);
mz->setChecked(Okular::Settings::mouseMode() == Okular::Settings::EnumMouseMode::Zoom);
@ -677,7 +677,7 @@ void PageView::setupActions(KActionCollection *ac)
ac->addAction(QStringLiteral("mouse_select"), d->aMouseSelect);
connect(d->aMouseSelect, &QAction::triggered, this, &PageView::slotSetMouseSelect);
d->aMouseSelect->setCheckable(true);
ac->setDefaultShortcut(d->aMouseSelect, Qt::CTRL + Qt::Key_3);
ac->setDefaultShortcut(d->aMouseSelect, Qt::CTRL | Qt::Key_3);
d->aMouseSelect->setActionGroup(d->mouseModeActionGroup);
d->aMouseSelect->setChecked(Okular::Settings::mouseMode() == Okular::Settings::EnumMouseMode::RectSelect);
@ -686,7 +686,7 @@ void PageView::setupActions(KActionCollection *ac)
ac->addAction(QStringLiteral("mouse_textselect"), d->aMouseTextSelect);
connect(d->aMouseTextSelect, &QAction::triggered, this, &PageView::slotSetMouseTextSelect);
d->aMouseTextSelect->setCheckable(true);
ac->setDefaultShortcut(d->aMouseTextSelect, Qt::CTRL + Qt::Key_4);
ac->setDefaultShortcut(d->aMouseTextSelect, Qt::CTRL | Qt::Key_4);
d->aMouseTextSelect->setActionGroup(d->mouseModeActionGroup);
d->aMouseTextSelect->setChecked(Okular::Settings::mouseMode() == Okular::Settings::EnumMouseMode::TextSelect);
@ -694,7 +694,7 @@ void PageView::setupActions(KActionCollection *ac)
ac->addAction(QStringLiteral("mouse_tableselect"), d->aMouseTableSelect);
connect(d->aMouseTableSelect, &QAction::triggered, this, &PageView::slotSetMouseTableSelect);
d->aMouseTableSelect->setCheckable(true);
ac->setDefaultShortcut(d->aMouseTableSelect, Qt::CTRL + Qt::Key_5);
ac->setDefaultShortcut(d->aMouseTableSelect, Qt::CTRL | Qt::Key_5);
d->aMouseTableSelect->setActionGroup(d->mouseModeActionGroup);
d->aMouseTableSelect->setChecked(Okular::Settings::mouseMode() == Okular::Settings::EnumMouseMode::TableSelect);
@ -702,7 +702,7 @@ void PageView::setupActions(KActionCollection *ac)
ac->addAction(QStringLiteral("mouse_magnifier"), d->aMouseMagnifier);
connect(d->aMouseMagnifier, &QAction::triggered, this, &PageView::slotSetMouseMagnifier);
d->aMouseMagnifier->setCheckable(true);
ac->setDefaultShortcut(d->aMouseMagnifier, Qt::CTRL + Qt::Key_6);
ac->setDefaultShortcut(d->aMouseMagnifier, Qt::CTRL | Qt::Key_6);
d->aMouseMagnifier->setActionGroup(d->mouseModeActionGroup);
d->aMouseMagnifier->setChecked(Okular::Settings::mouseMode() == Okular::Settings::EnumMouseMode::Magnifier);
@ -747,19 +747,19 @@ void PageView::setupActions(KActionCollection *ac)
QAction *su = new QAction(i18n("Scroll Up"), this);
ac->addAction(QStringLiteral("view_scroll_up"), su);
connect(su, &QAction::triggered, this, &PageView::slotAutoScrollUp);
ac->setDefaultShortcut(su, QKeySequence(Qt::SHIFT + Qt::Key_Up));
ac->setDefaultShortcut(su, QKeySequence(Qt::SHIFT | Qt::Key_Up));
addAction(su);
QAction *sd = new QAction(i18n("Scroll Down"), this);
ac->addAction(QStringLiteral("view_scroll_down"), sd);
connect(sd, &QAction::triggered, this, &PageView::slotAutoScrollDown);
ac->setDefaultShortcut(sd, QKeySequence(Qt::SHIFT + Qt::Key_Down));
ac->setDefaultShortcut(sd, QKeySequence(Qt::SHIFT | Qt::Key_Down));
addAction(sd);
QAction *spu = new QAction(i18n("Scroll Page Up"), this);
ac->addAction(QStringLiteral("view_scroll_page_up"), spu);
connect(spu, &QAction::triggered, this, &PageView::slotScrollUp);
ac->setDefaultShortcut(spu, QKeySequence(Qt::SHIFT + Qt::Key_Space));
ac->setDefaultShortcut(spu, QKeySequence(Qt::SHIFT | Qt::Key_Space));
addAction(spu);
QAction *spd = new QAction(i18n("Scroll Page Down"), this);

14
part/part.cpp
View file

@ -746,7 +746,7 @@ void Part::setupViewerActions()
m_showProperties = ac->addAction(QStringLiteral("properties"));
m_showProperties->setText(i18n("&Properties"));
m_showProperties->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")));
ac->setDefaultShortcuts(m_showProperties, {QKeySequence(Qt::ALT + Qt::Key_Return)});
ac->setDefaultShortcuts(m_showProperties, {QKeySequence(Qt::ALT | Qt::Key_Return)});
connect(m_showProperties, &QAction::triggered, this, &Part::slotShowProperties);
m_showProperties->setEnabled(false);
@ -793,20 +793,20 @@ void Part::setViewerShortcuts()
{
KActionCollection *ac = actionCollection();
ac->setDefaultShortcut(m_gotoPage, QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_G));
ac->setDefaultShortcut(m_gotoPage, QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_G));
ac->setDefaultShortcut(m_find, QKeySequence());
ac->setDefaultShortcut(m_findNext, QKeySequence());
ac->setDefaultShortcut(m_findPrev, QKeySequence());
ac->setDefaultShortcut(m_addBookmark, QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_B));
ac->setDefaultShortcut(m_addBookmark, QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_B));
ac->setDefaultShortcut(m_beginningOfDocument, QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_Home));
ac->setDefaultShortcut(m_endOfDocument, QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_End));
ac->setDefaultShortcut(m_beginningOfDocument, QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_Home));
ac->setDefaultShortcut(m_endOfDocument, QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_End));
QAction *action = static_cast<QAction *>(ac->action(QStringLiteral("file_reload")));
if (action) {
ac->setDefaultShortcut(action, QKeySequence(Qt::ALT + Qt::Key_F5));
ac->setDefaultShortcut(action, QKeySequence(Qt::ALT | Qt::Key_F5));
}
}
@ -887,7 +887,7 @@ void Part::setupActions()
m_showPresentation->setText(i18n("P&resentation"));
m_showPresentation->setIcon(QIcon::fromTheme(QStringLiteral("view-presentation")));
connect(m_showPresentation, &QAction::triggered, this, &Part::slotShowPresentation);
ac->setDefaultShortcut(m_showPresentation, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_P));
ac->setDefaultShortcut(m_showPresentation, QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_P));
m_showPresentation->setEnabled(false);
m_openContainingFolder = ac->addAction(QStringLiteral("open_containing_folder"));

2
shell/shell.cpp
View file

@ -364,7 +364,7 @@ void Shell::setupActions()
m_undoCloseTab = actionCollection()->addAction(QStringLiteral("undo-close-tab"));
m_undoCloseTab->setText(i18n("Undo close tab"));
actionCollection()->setDefaultShortcut(m_undoCloseTab, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_T));
actionCollection()->setDefaultShortcut(m_undoCloseTab, QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_T));
m_undoCloseTab->setIcon(QIcon::fromTheme(QStringLiteral("edit-undo")));
m_undoCloseTab->setEnabled(false);
connect(m_undoCloseTab, &QAction::triggered, this, &Shell::undoCloseTab);