From ed4a936315ea732c0906e2d2df7132b02228f29c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 25 Apr 2018 07:16:14 +0200 Subject: [PATCH 1/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" --- plugins/scenes/opengl/opengl.json | 1 + plugins/scenes/qpainter/qpainter.json | 1 + plugins/scenes/xrender/xrender.json | 1 + scripts/minimizeall/metadata.desktop | 1 + 4 files changed, 4 insertions(+) diff --git a/plugins/scenes/opengl/opengl.json b/plugins/scenes/opengl/opengl.json index 9ae3dc9b0e..f6f8a335e5 100644 --- a/plugins/scenes/opengl/opengl.json +++ b/plugins/scenes/opengl/opengl.json @@ -29,6 +29,7 @@ "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням OpenGL", "Description[x-test]": "xxKWin Compositor plugin rendering through OpenGLxx", "Description[zh_CN]": "使用 OpenGL 渲染的 KWin 混成插件", + "Description[zh_TW]": "透過 OpenGL 繪製 KWin 合成器附加元件", "Id": "KWinSceneOpenGL", "Name": "SceneOpenGL", "Name[pl]": "OpenGL sceny", diff --git a/plugins/scenes/qpainter/qpainter.json b/plugins/scenes/qpainter/qpainter.json index 6f12295ff1..779ebe2e97 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -31,6 +31,7 @@ "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням QPainter", "Description[x-test]": "xxKWin Compositor plugin rendering through QPainterxx", "Description[zh_CN]": "使用 QPainter 渲染的 KWin 混成插件", + "Description[zh_TW]": "透過 QPainter 繪製 KWin 合成器附加元件", "Id": "KWinSceneQPainter", "Name": "SceneQPainter", "Name[pl]": "QPainter sceny", diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index 818323b55a..68e9e6220e 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -31,6 +31,7 @@ "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням XRender", "Description[x-test]": "xxKWin Compositor plugin rendering through XRenderxx", "Description[zh_CN]": "使用 XRender 渲染的 KWin 混成插件", + "Description[zh_TW]": "透過 XRender 繪製 KWin 合成器附加元件", "Id": "KWinSceneXRender", "Name": "SceneXRender", "Name[pl]": "XRender sceny", diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index 635e61e8fa..7bad66a2f6 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -66,6 +66,7 @@ Comment[sv]=Lägger till en genväg för att minimera och återställa alla fön Comment[uk]=Додає скорочення мінімізації усіх вікон або скасування такої мінімізації для усіх вікон Comment[x-test]=xxAdds a shortcut to minimize and restore all windowsxx Comment[zh_CN]=添加最小化与恢复所有窗口的快捷方式 +Comment[zh_TW]=新增捷徑將所有視窗最小化或恢復原狀 Icon=preferences-system-windows-script-test Type=Service From 437a36a2bb86222f1c3d086c15a2f60eef898c1a Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Tue, 24 Apr 2018 23:20:14 +0200 Subject: [PATCH 2/3] [KScreen Effect] Fix fade to black Summary: When you have two windows ontop of each other and you turn them transparent, evidently you'll be able to see through them. Not only does it look unpolished if the desktop window flashes through your windows, it can pose a privacy risk as you'd be able to briefly look through the lock screen. This patch fades apps to black intead of to transparent. As this looks weird for panels, so windows are also faded to opaque (if relevant) at the same rate. BUG: 388384 Reviewers: #plasma, graesslin Subscribers: luebking, plasma-devel, kwin, #kwin Tags: #plasma Differential Revision: https://phabricator.kde.org/D9608 --- effects/kscreen/kscreen.cpp | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/effects/kscreen/kscreen.cpp b/effects/kscreen/kscreen.cpp index 2d167110b5..ee21ac5c20 100644 --- a/effects/kscreen/kscreen.cpp +++ b/effects/kscreen/kscreen.cpp @@ -105,19 +105,23 @@ void KscreenEffect::prePaintWindow(EffectWindow *w, WindowPrePaintData &data, in void KscreenEffect::paintWindow(EffectWindow *w, int mask, QRegion region, WindowPaintData &data) { + //fade to black and fully opaque switch (m_state) { - case StateFadingOut: - data.multiplyOpacity(1.0 - m_timeLine.currentValue()); - break; - case StateFadedOut: - data.multiplyOpacity(0.0); - break; - case StateFadingIn: - data.multiplyOpacity(m_timeLine.currentValue()); - break; - default: - // no adjustment - break; + case StateFadingOut: + data.setOpacity(data.opacity() + (1.0 - data.opacity()) * m_timeLine.currentValue()); + data.multiplyBrightness(1.0 - m_timeLine.currentValue()); + break; + case StateFadedOut: + data.multiplyOpacity(0.0); + data.multiplyBrightness(0.0); + break; + case StateFadingIn: + data.setOpacity(data.opacity() + (1.0 - data.opacity()) * (1.0 - m_timeLine.currentValue())); + data.multiplyBrightness(m_timeLine.currentValue()); + break; + default: + // no adjustment + break; } effects->paintWindow(w, mask, region, data); } From 86af84f13ece07600721070da7aa421cf4a06538 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Mon, 30 Apr 2018 23:37:10 +0200 Subject: [PATCH 3/3] Convert JS files to UTF-8 (from ISO-8859-15) --- effects/maximize/package/contents/code/maximize.js | 2 +- effects/morphingpopups/package/contents/code/morphingpopups.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/effects/maximize/package/contents/code/maximize.js b/effects/maximize/package/contents/code/maximize.js index d381a68102..4345c04fa9 100644 --- a/effects/maximize/package/contents/code/maximize.js +++ b/effects/maximize/package/contents/code/maximize.js @@ -1,7 +1,7 @@ /******************************************************************** This file is part of the KDE project. - Copyright (C) 2012 Martin Grlin + Copyright (C) 2012 Martin Gräßlin This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/effects/morphingpopups/package/contents/code/morphingpopups.js b/effects/morphingpopups/package/contents/code/morphingpopups.js index 9ae52847f6..16040dc2b0 100644 --- a/effects/morphingpopups/package/contents/code/morphingpopups.js +++ b/effects/morphingpopups/package/contents/code/morphingpopups.js @@ -1,7 +1,7 @@ /******************************************************************** This file is part of the KDE project. - Copyright (C) 2012 Martin Grlin + Copyright (C) 2012 Martin Gräßlin Copyright (C) 2016 Marco Martin This program is free software; you can redistribute it and/or modify