vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename kcmshell4 to kcmshell5

icc-effect-5.14.5
Burkhard Lück 2014-05-02 17:24:47 +02:00
parent 2f28437e24
commit 82b7804b0a
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

@ -477,7 +477,7 @@ and <guibutton>Move Down</guibutton> buttons effects on how they are applied.</p
</varlistentry>
<varlistentry><term><emphasis role="bold">Ignore global shortcuts</emphasis></term>
<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>kcmshell4 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>kcmshell5 keys</varname> in <guilabel>konsole</guilabel>) while the window is active.</para>
</listitem>
</varlistentry>
<varlistentry><term><emphasis role="bold">Closeable</emphasis></term>

4
scene_opengl.cpp
View File

@ -510,7 +510,7 @@ bool SceneOpenGL::viewportLimitsMatched(const QSize &size) const {
dialog.asyncCall(QStringLiteral("warn"), message, details, QString());
} else {
const QString args = QStringLiteral("warn ") + QString::fromUtf8(message.toLocal8Bit().toBase64()) + QStringLiteral(" details ") + QString::fromUtf8(details.toLocal8Bit().toBase64());
KProcess::startDetached(QStringLiteral("kcmshell4"), QStringList() << QStringLiteral("kwincompositing") << QStringLiteral("--args") << args);
KProcess::startDetached(QStringLiteral("kcmshell5"), QStringList() << QStringLiteral("kwincompositing") << QStringLiteral("--args") << args);
}
QDBusConnection::sessionBus().interface()->setTimeout(oldTimeout);
return false;
@ -542,7 +542,7 @@ bool SceneOpenGL::viewportLimitsMatched(const QSize &size) const {
} else {
const QString args = QStringLiteral("warn ") + QString::fromUtf8(message.toLocal8Bit().toBase64()) + QStringLiteral(" details ") +
QString::fromUtf8(details.toLocal8Bit().toBase64()) + QStringLiteral(" dontagain kwin_dialogsrc:max_tex_warning");
KProcess::startDetached(QStringLiteral("kcmshell4"), QStringList() << QStringLiteral("kwincompositing") << QStringLiteral("--args") << args);
KProcess::startDetached(QStringLiteral("kcmshell5"), QStringList() << QStringLiteral("kwincompositing") << QStringLiteral("--args") << args);
}
QDBusConnection::sessionBus().interface()->setTimeout(oldTimeout);
}