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 Workspace
Commits
b6ccb5cf
Commit
b6ccb5cf
authored
Mar 06, 2022
by
Volker Krause
Browse files
Use | rather than + for combining flags
The plus operator is no longer available for flags in Qt6.
parent
ae871853
Pipeline
#146323
passed with stage
in 8 minutes and 53 seconds
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
klipper/klipper.cpp
View file @
b6ccb5cf
...
...
@@ -133,7 +133,7 @@ Klipper::Klipper(QObject *parent, const KSharedConfigPtr &config, KlipperMode mo
m_toggleURLGrabAction
=
new
KToggleAction
(
this
);
m_collection
->
addAction
(
QStringLiteral
(
"clipboard_action"
),
m_toggleURLGrabAction
);
m_toggleURLGrabAction
->
setText
(
i18n
(
"Enable Clipboard Actions"
));
KGlobalAccel
::
setGlobalShortcut
(
m_toggleURLGrabAction
,
QKeySequence
(
Qt
::
ALT
+
Qt
::
CTRL
+
Qt
::
Key_X
));
KGlobalAccel
::
setGlobalShortcut
(
m_toggleURLGrabAction
,
QKeySequence
(
Qt
::
ALT
|
Qt
::
CTRL
|
Qt
::
Key_X
));
connect
(
m_toggleURLGrabAction
,
&
QAction
::
toggled
,
this
,
&
Klipper
::
setURLGrabberEnabled
);
/*
...
...
@@ -174,7 +174,7 @@ Klipper::Klipper(QObject *parent, const KSharedConfigPtr &config, KlipperMode mo
m_repeatAction
=
m_collection
->
addAction
(
QStringLiteral
(
"repeat_action"
));
m_repeatAction
->
setText
(
i18n
(
"Manually Invoke Action on Current Clipboard"
));
KGlobalAccel
::
setGlobalShortcut
(
m_repeatAction
,
QKeySequence
(
Qt
::
ALT
+
Qt
::
CTRL
+
Qt
::
Key_R
));
KGlobalAccel
::
setGlobalShortcut
(
m_repeatAction
,
QKeySequence
(
Qt
::
ALT
|
Qt
::
CTRL
|
Qt
::
Key_R
));
connect
(
m_repeatAction
,
&
QAction
::
triggered
,
this
,
&
Klipper
::
slotRepeatAction
);
// add an edit-possibility
...
...
@@ -207,7 +207,7 @@ Klipper::Klipper(QObject *parent, const KSharedConfigPtr &config, KlipperMode mo
// Action to show Klipper popup on mouse position
m_showOnMousePos
=
m_collection
->
addAction
(
QStringLiteral
(
"show-on-mouse-pos"
));
m_showOnMousePos
->
setText
(
i18n
(
"Open Klipper at Mouse Position"
));
KGlobalAccel
::
setGlobalShortcut
(
m_showOnMousePos
,
QKeySequence
(
Qt
::
META
+
Qt
::
Key_V
));
KGlobalAccel
::
setGlobalShortcut
(
m_showOnMousePos
,
QKeySequence
(
Qt
::
META
|
Qt
::
Key_V
));
connect
(
m_showOnMousePos
,
&
QAction
::
triggered
,
this
,
&
Klipper
::
slotPopupMenu
);
connect
(
history
(),
&
History
::
topChanged
,
this
,
&
Klipper
::
slotHistoryTopChanged
);
...
...
ksmserver/server.cpp
View file @
b6ccb5cf
...
...
@@ -870,7 +870,7 @@ void KSMServer::setupShortcuts()
QAction
*
a
;
a
=
actionCollection
->
addAction
(
QStringLiteral
(
"Log Out"
));
a
->
setText
(
i18n
(
"Log Out"
));
KGlobalAccel
::
self
()
->
setGlobalShortcut
(
a
,
QList
<
QKeySequence
>
()
<<
Qt
::
ALT
+
Qt
::
CTRL
+
Qt
::
Key_Delete
);
KGlobalAccel
::
self
()
->
setGlobalShortcut
(
a
,
QList
<
QKeySequence
>
()
<<
(
Qt
::
ALT
|
Qt
::
CTRL
|
Qt
::
Key_Delete
)
)
;
connect
(
a
,
&
QAction
::
triggered
,
this
,
&
KSMServer
::
defaultLogout
);
a
=
actionCollection
->
addAction
(
QStringLiteral
(
"Log Out Without Confirmation"
));
...
...
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