From 01cca38a42d6fd408f982fc1660558c24f2e1a87 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 31 Mar 2020 14:53:05 +0100 Subject: [PATCH 1/3] Update version number for 5.18.4 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 60bcfb6873..c4d9558784 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) project(KWIN) -set(PROJECT_VERSION "5.18.3") +set(PROJECT_VERSION "5.18.4") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.12.0") From b3dad08dbdce3b9eef1731e56d4f201b9e012460 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 1 Apr 2020 11:06:32 +0200 Subject: [PATCH 2/3] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- kcmkwin/kwincompositing/kwincompositing.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop index ce5528db2f..613ae8e2e4 100644 --- a/kcmkwin/kwincompositing/kwincompositing.desktop +++ b/kcmkwin/kwincompositing/kwincompositing.desktop @@ -105,6 +105,7 @@ Comment[zh_TW]=桌面效果使用的組合器設定 X-KDE-Keywords=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects X-KDE-Keywords[ca]=kwin,finestra,gestor,composició,efecte,efectes 3D,efectes 2D,OpenGL,XRender,arranjament de vídeo,efectes gràfics,efectes de l'escriptori X-KDE-Keywords[da]=kwin,vindue,håndtering,window,manager,compositing,effekt,3D effekter,2D effekter,OpenGL,XRender,video-indstillinger,grafiske effekter,skrivebordseffekter,desktop effects +X-KDE-Keywords[en_GB]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects X-KDE-Keywords[es]=kwin,ventana,gestor,composición,efecto,efectos 3D,efectos 2D,OpenGL,XRender,preferencias de vídeo,efectos gráficos,efectos del escritorio X-KDE-Keywords[et]=kwin,aken,haldur,komposiit,komposiitor,efekt,3D efektid,ruumilised efektid,2D efektid,OpenGL,XRender,videoseadistused,graafilised efektid,töölauaefektid X-KDE-Keywords[eu]=kwin,leihoa,kudeatzailea,konposatzailea,efektua,3Dtako efektuak,2Dtako efektuak,OpenGL,XRender,bideo ezarpenak,efektu grafikoak,mahaigaineko efektuak From bee3afdd5194e0cf1fb72619b3d130514102e3cf Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Mon, 30 Mar 2020 17:27:11 +0100 Subject: [PATCH 3/3] [kcmkwin] Make dialog non blocking Summary: It's invoked from QML. Nested event loops invoked directly from QML is asking for crashes. BUG: 419118 Test Plan: Opened KCM Opened dialog for some settings Window was still modal as before Settings were saved (though they didn't seem to be applied..maybe another bug?) Reviewers: #kwin, apol Reviewed By: apol Subscribers: zzag, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D28293 --- kcmkwin/common/effectsmodel.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/kcmkwin/common/effectsmodel.cpp b/kcmkwin/common/effectsmodel.cpp index 47c264f163..492756757d 100644 --- a/kcmkwin/common/effectsmodel.cpp +++ b/kcmkwin/common/effectsmodel.cpp @@ -636,7 +636,7 @@ void EffectsModel::requestConfigure(const QModelIndex &index, QWindow *transient return; } - QPointer dialog = new QDialog(); + auto dialog = new QDialog(); KCModule *module = index.data(ScriptedRole).toBool() ? findScriptedConfig(index.data(ServiceNameRole).toString(), dialog) @@ -668,11 +668,13 @@ void EffectsModel::requestConfigure(const QModelIndex &index, QWindow *transient layout->addWidget(module); layout->addWidget(buttons); - if (dialog->exec() == QDialog::Accepted) { + connect(dialog, &QDialog::accepted, module, [module]() { module->save(); - } + }); - delete dialog; + dialog->setModal(true); + dialog->setAttribute(Qt::WA_DeleteOnClose); + dialog->show(); } bool EffectsModel::shouldStore(const EffectData &data) const