Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
Plasma Desktop
Commits
39decafa
Commit
39decafa
authored
Dec 10, 2020
by
Laurent Montel
Browse files
operator+/- is disabled for QFlags in qt6
parent
0b423e78
Changes
3
Hide whitespace changes
Inline
Side-by-side
containments/desktop/plugins/folder/foldermodel.cpp
View file @
39decafa
...
...
@@ -1859,7 +1859,7 @@ void FolderModel::openContextMenu(QQuickItem *visualParent, Qt::KeyboardModifier
if
(
KPropertiesDialog
::
canDisplay
(
items
))
{
menu
->
addSeparator
();
QAction
*
act
=
new
QAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"document-properties"
)),
i18n
(
"&Properties"
),
menu
);
act
->
setShortcuts
({
Qt
::
ALT
+
Qt
::
Key_Return
,
Qt
::
ALT
+
Qt
::
Key_Enter
});
act
->
setShortcuts
({
Qt
::
ALT
|
Qt
::
Key_Return
,
Qt
::
ALT
|
Qt
::
Key_Enter
});
QObject
::
connect
(
act
,
&
QAction
::
triggered
,
this
,
&
FolderModel
::
openPropertiesDialog
);
menu
->
addAction
(
act
);
}
...
...
imports/activitymanager/switcherbackend.cpp
View file @
39decafa
...
...
@@ -255,12 +255,12 @@ SwitcherBackend::SwitcherBackend(QObject *parent)
{
registerShortcut
(
ACTION_NAME_NEXT_ACTIVITY
,
i18n
(
"Walk through activities"
),
Qt
::
META
+
Qt
::
Key_Tab
,
Qt
::
META
|
Qt
::
Key_Tab
,
&
SwitcherBackend
::
keybdSwitchToNextActivity
);
registerShortcut
(
ACTION_NAME_PREVIOUS_ACTIVITY
,
i18n
(
"Walk through activities (Reverse)"
),
Qt
::
META
+
Qt
::
SHIFT
+
Qt
::
Key_Tab
,
Qt
::
META
|
Qt
::
SHIFT
|
Qt
::
Key_Tab
,
&
SwitcherBackend
::
keybdSwitchToPreviousActivity
);
connect
(
this
,
&
SwitcherBackend
::
shouldShowSwitcherChanged
,
...
...
kcms/activities/SwitchingTab.cpp
View file @
39decafa
...
...
@@ -68,10 +68,10 @@ SwitchingTab::SwitchingTab(QWidget *parent)
d
->
createAction
(
QStringLiteral
(
"next activity"
),
i18nc
(
"@action"
,
"Walk through activities"
),
{
Qt
::
META
+
Qt
::
Key_Tab
});
{
Qt
::
META
|
Qt
::
Key_Tab
});
d
->
createAction
(
QStringLiteral
(
"previous activity"
),
i18nc
(
"@action"
,
"Walk through activities (Reverse)"
),
{
Qt
::
META
+
Qt
::
SHIFT
+
Qt
::
Key_Tab
}
);
{
Qt
::
META
|
Qt
::
SHIFT
|
Qt
::
Key_Tab
}
);
d
->
scActivities
->
setActionTypes
(
KShortcutsEditor
::
GlobalAction
);
d
->
scActivities
->
addCollection
(
d
->
mainActionCollection
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment