yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port usage of kcmshell5 to kcmshell6

Browse source 
Just two instances:
- in useractions for the menu action "Configure Window Manager"
- in the docbook about the key shortcuts
This commit is contained in:
Ismael Asensio 2023-03-23 00:50:30 +01:00 committed by Vlad Zahorodnii
parent 7c91c4bad9
commit a9a58b1ed5
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/windowspecific/index.docbook
View file

@ -471,7 +471,7 @@ and <guibutton>Move Down</guibutton> buttons effects on how they are applied.</p
</varlistentry> </varlistentry>
<varlistentry><term><emphasis role="bold">Ignore global shortcuts</emphasis></term> <varlistentry><term><emphasis role="bold">Ignore global shortcuts</emphasis></term>
<listitem> <listitem>
<para>Toggle whether to ignore global shortcuts (as defined by <menuchoice><guimenu>System Settings</guimenu><guisubmenu>Shortcuts and Gestures</guisubmenu><guimenuitem>Global Shortcuts</guimenuitem></menuchoice> or by running <varname>kcmshell5 keys</varname> in <guilabel>konsole</guilabel>) while the window is active.</para> <para>Toggle whether to ignore global shortcuts (as defined by <menuchoice><guimenu>System Settings</guimenu><guisubmenu>Shortcuts and Gestures</guisubmenu><guimenuitem>Global Shortcuts</guimenuitem></menuchoice> or by running <varname>kcmshell6 keys</varname> in <guilabel>konsole</guilabel>) while the window is active.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry><term><emphasis role="bold">Closeable</emphasis></term> <varlistentry><term><emphasis role="bold">Closeable</emphasis></term>

4
src/useractions.cpp
View file

@ -304,11 +304,11 @@ void UserActionsMenu::init()
QProcess *p = new QProcess(this); QProcess *p = new QProcess(this);
p->setArguments(args); p->setArguments(args);
p->setProcessEnvironment(kwinApp()->processStartupEnvironment()); p->setProcessEnvironment(kwinApp()->processStartupEnvironment());
p->setProgram(QStringLiteral("kcmshell5")); p->setProgram(QStringLiteral("kcmshell6"));
connect(p, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), p, &QProcess::deleteLater); connect(p, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), p, &QProcess::deleteLater);
connect(p, &QProcess::errorOccurred, this, [](QProcess::ProcessError e) { connect(p, &QProcess::errorOccurred, this, [](QProcess::ProcessError e) {
if (e == QProcess::FailedToStart) { if (e == QProcess::FailedToStart) {
qCDebug(KWIN_CORE) << "Failed to start kcmshell5"; qCDebug(KWIN_CORE) << "Failed to start kcmshell6";
} }
}); });
p->start(); p->start();