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
30c39e23
Commit
30c39e23
authored
Dec 10, 2020
by
Laurent Montel
Browse files
operator+/- is disabled for QFlags in qt6
parent
133df341
Changes
3
Hide whitespace changes
Inline
Side-by-side
components/shellprivate/interactiveconsole/interactiveconsole.cpp
View file @
30c39e23
...
...
@@ -189,7 +189,7 @@ InteractiveConsole::InteractiveConsole(QWidget *parent)
scriptTextChanged
();
connect
(
m_executeAction
,
&
QAction
::
triggered
,
this
,
&
InteractiveConsole
::
evaluateScript
);
m_executeAction
->
setShortcut
(
Qt
::
CTRL
+
Qt
::
Key_E
);
m_executeAction
->
setShortcut
(
Qt
::
CTRL
|
Qt
::
Key_E
);
const
QString
autosave
=
QStandardPaths
::
writableLocation
(
QStandardPaths
::
AppDataLocation
)
+
"/"
+
s_autosaveFileName
;
if
(
QFile
::
exists
(
autosave
))
{
...
...
shell/shellcorona.cpp
View file @
30c39e23
...
...
@@ -164,7 +164,7 @@ ShellCorona::ShellCorona(QObject *parent)
dashboardAction
->
setCheckable
(
true
);
dashboardAction
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"dashboard-show"
)));
dashboardAction
->
setData
(
Plasma
::
Types
::
ControlAction
);
KGlobalAccel
::
self
()
->
setGlobalShortcut
(
dashboardAction
,
Qt
::
CTRL
+
Qt
::
Key_F12
);
KGlobalAccel
::
self
()
->
setGlobalShortcut
(
dashboardAction
,
Qt
::
CTRL
|
Qt
::
Key_F12
);
checkAddPanelAction
();
connect
(
KSycoca
::
self
(),
SIGNAL
(
databaseChanged
(
QStringList
)),
this
,
SLOT
(
checkAddPanelAction
(
QStringList
)));
...
...
@@ -180,7 +180,7 @@ ShellCorona::ShellCorona(QObject *parent)
activityAction
->
setShortcut
(
QKeySequence
(
QStringLiteral
(
"alt+d, alt+a"
)));
activityAction
->
setShortcutContext
(
Qt
::
ApplicationShortcut
);
KGlobalAccel
::
self
()
->
setGlobalShortcut
(
activityAction
,
Qt
::
META
+
Qt
::
Key_Q
);
KGlobalAccel
::
self
()
->
setGlobalShortcut
(
activityAction
,
Qt
::
META
|
Qt
::
Key_Q
);
QAction
*
stopActivityAction
=
actions
()
->
addAction
(
QStringLiteral
(
"stop current activity"
));
QObject
::
connect
(
stopActivityAction
,
&
QAction
::
triggered
,
...
...
@@ -190,7 +190,7 @@ ShellCorona::ShellCorona(QObject *parent)
stopActivityAction
->
setData
(
Plasma
::
Types
::
ControlAction
);
stopActivityAction
->
setVisible
(
false
);
KGlobalAccel
::
self
()
->
setGlobalShortcut
(
stopActivityAction
,
Qt
::
META
+
Qt
::
Key_S
);
KGlobalAccel
::
self
()
->
setGlobalShortcut
(
stopActivityAction
,
Qt
::
META
|
Qt
::
Key_S
);
QAction
*
previousActivityAction
=
actions
()
->
addAction
(
QStringLiteral
(
"switch to previous activity"
));
connect
(
previousActivityAction
,
&
QAction
::
triggered
,
...
...
systemmonitor/kdedksysguard.cpp
View file @
30c39e23
...
...
@@ -52,7 +52,7 @@ void KDEDKSysGuard::init()
action
->
setText
(
i18n
(
"Show System Activity"
));
connect
(
action
,
&
QAction
::
triggered
,
this
,
&
KDEDKSysGuard
::
showTaskManager
);
KGlobalAccel
::
self
()
->
setGlobalShortcut
(
action
,
QKeySequence
(
Qt
::
CTRL
+
Qt
::
Key_Escape
));
KGlobalAccel
::
self
()
->
setGlobalShortcut
(
action
,
QKeySequence
(
Qt
::
CTRL
|
Qt
::
Key_Escape
));
}
void
KDEDKSysGuard
::
showTaskManager
()
...
...
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