From 66f064002782aeb910aa89599d2dbcbeba282c37 Mon Sep 17 00:00:00 2001 From: Simon Schneegans Date: Sat, 21 Jan 2023 12:51:32 +0100 Subject: [PATCH 1/6] :fire: Remove unused kwin apparition directory --- kwin/apparition/config.ui | 127 --------------------------- kwin/apparition/main.xml | 28 ------ kwin/apparition/onAnimationBegin.js | 7 -- kwin/apparition/onSettingsChanged.js | 11 --- 4 files changed, 173 deletions(-) delete mode 100755 kwin/apparition/config.ui delete mode 100755 kwin/apparition/main.xml delete mode 100644 kwin/apparition/onAnimationBegin.js delete mode 100644 kwin/apparition/onSettingsChanged.js diff --git a/kwin/apparition/config.ui b/kwin/apparition/config.ui deleted file mode 100755 index c05bea7..0000000 --- a/kwin/apparition/config.ui +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - BMWConfigForm - - - - 0 - 0 - 562 - 365 - - - - - - - 0.000000000000000 - - - 1.000000000000000 - - - - - - - milliseconds - - - 100 - - - 9999 - - - 100 - - - - - - - Suction: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Twirl: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Randomness: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Shake: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - 0.000000000000000 - - - 1.000000000000000 - - - - - - - Duration: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - -10.000000000000000 - - - 10.000000000000000 - - - - - - - 10.000000000000000 - - - - - - - - \ No newline at end of file diff --git a/kwin/apparition/main.xml b/kwin/apparition/main.xml deleted file mode 100755 index 5aa5f1d..0000000 --- a/kwin/apparition/main.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - 300 - - - 3 - - - 5 - - - 0.75 - - - 0.5 - - - \ No newline at end of file diff --git a/kwin/apparition/onAnimationBegin.js b/kwin/apparition/onAnimationBegin.js deleted file mode 100644 index dd56436..0000000 --- a/kwin/apparition/onAnimationBegin.js +++ /dev/null @@ -1,7 +0,0 @@ -// SPDX-FileCopyrightText: Simon Schneegans -// SPDX-License-Identifier: GPL-3.0-or-later - -// This part is automatically included in the effect's source during the build process. -// The code below is called whenever a window is closed or opened. - -effect.setUniform(this.shader, 'uSeed', [Math.random(), Math.random()]); diff --git a/kwin/apparition/onSettingsChanged.js b/kwin/apparition/onSettingsChanged.js deleted file mode 100644 index 97bace3..0000000 --- a/kwin/apparition/onSettingsChanged.js +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-FileCopyrightText: Simon Schneegans -// SPDX-License-Identifier: GPL-3.0-or-later - -// This part is automatically included in the effect's source during the build process. -// The code below is called whenever the user changes something in the configuration of -// the effect. - -effect.setUniform(this.shader, 'uShake', effect.readConfig('Shake', 1.0)); -effect.setUniform(this.shader, 'uTwirl', effect.readConfig('Twirl', 1.0)); -effect.setUniform(this.shader, 'uSuction', effect.readConfig('Suction', 1.0)); -effect.setUniform(this.shader, 'uRandomness', effect.readConfig('Randomness', 1.0)); From 73fc6820b8d9c48ca5b15d1e2ac9a7f864493ca2 Mon Sep 17 00:00:00 2001 From: Simon Schneegans Date: Sat, 21 Jan 2023 12:51:58 +0100 Subject: [PATCH 2/6] :wrench: Make fire effect translatable --- kwin/build.sh | 5 ++++- kwin/fire/config.ui | 13 +++++-------- kwin/metadata.json.in | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kwin/build.sh b/kwin/build.sh index d03034f..8adb113 100755 --- a/kwin/build.sh +++ b/kwin/build.sh @@ -48,6 +48,9 @@ generate() { mkdir -p "$BUILD_DIR/$DIR_NAME/contents/config" mkdir -p "$BUILD_DIR/$DIR_NAME/contents/ui" + # Copy the translations. + cp -r "../locale" "$BUILD_DIR/$DIR_NAME/contents" + # Copy the config file if it exists. if [ -f "$1/main.xml" ]; then cp "$1/main.xml" "$BUILD_DIR/$DIR_NAME/contents/config" @@ -123,9 +126,9 @@ generate() { } # Now run the above method for all supported effects. +generate "doom" "Doom [Burn-My-Windows]" "Melt your windows" generate "energize-a" "Energize A [Burn-My-Windows]" "Beam your windows away" generate "energize-b" "Energize B [Burn-My-Windows]" "Using different transporter technology results in an alternative visual effect" -generate "doom" "Doom [Burn-My-Windows]" "Melt your windows" generate "fire" "Fire [Burn-My-Windows]" "The classic effect inspired by Compiz" generate "glide" "Glide [Burn-My-Windows]" "Fade the window to transparency with subtle 3D effects" generate "glitch" "Glitch [Burn-My-Windows]" "This effect applies some intentional graphics issues to your windows" diff --git a/kwin/fire/config.ui b/kwin/fire/config.ui index a73aee0..509b83c 100755 --- a/kwin/fire/config.ui +++ b/kwin/fire/config.ui @@ -20,7 +20,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Gradient: + Gradient Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -29,9 +29,6 @@ SPDX-License-Identifier: GPL-3.0-or-later - - milliseconds - 100 @@ -56,7 +53,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Movement Speed: + Speed Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -76,7 +73,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Scale: + Scale Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -132,7 +129,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Duration: + Animation Time [ms] Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -150,4 +147,4 @@ SPDX-License-Identifier: GPL-3.0-or-later - \ No newline at end of file + diff --git a/kwin/metadata.json.in b/kwin/metadata.json.in index cb1b01d..395d580 100755 --- a/kwin/metadata.json.in +++ b/kwin/metadata.json.in @@ -21,7 +21,7 @@ }, "X-KDE-Ordering": "60", "X-KDE-PluginKeyword": "%DIR_NAME%", - "X-KWin-Config-TranslationDomain": "kwin_effects", + "X-KWin-Config-TranslationDomain": "burn-my-windows", "X-KWin-Exclusive-Category": "toplevel-open-close-animation", "X-Plasma-API": "javascript", "X-Plasma-MainScript": "code/main.js" From 492b16cd0cf3123408725a7d989d59ab2eb9bb30 Mon Sep 17 00:00:00 2001 From: Simon Schneegans Date: Sat, 21 Jan 2023 13:12:14 +0100 Subject: [PATCH 3/6] :wrench: Make KDE and GNOME strings more similar --- kwin/doom/config.ui | 5 +---- kwin/energize-a/config.ui | 9 +++------ kwin/energize-b/config.ui | 9 +++------ kwin/glide/config.ui | 7 ++----- kwin/glitch/config.ui | 9 +++------ kwin/hexagon/config.ui | 13 +++++-------- kwin/incinerate/config.ui | 11 ++++------- kwin/pixel-wheel/config.ui | 5 +---- kwin/pixel-wipe/config.ui | 5 +---- kwin/pixelate/config.ui | 5 +---- kwin/portal/config.ui | 7 ++----- kwin/tv/config.ui | 7 ++----- kwin/wisps/config.ui | 9 +++------ 13 files changed, 31 insertions(+), 70 deletions(-) diff --git a/kwin/doom/config.ui b/kwin/doom/config.ui index 76264cf..346e49c 100755 --- a/kwin/doom/config.ui +++ b/kwin/doom/config.ui @@ -33,7 +33,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Duration: + Animation Time [ms] Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -62,9 +62,6 @@ SPDX-License-Identifier: GPL-3.0-or-later - - milliseconds - 100 diff --git a/kwin/energize-a/config.ui b/kwin/energize-a/config.ui index 69664ab..1d2387b 100755 --- a/kwin/energize-a/config.ui +++ b/kwin/energize-a/config.ui @@ -20,7 +20,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Duration: + Animation Time [ms] Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -30,7 +30,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Color: + Color Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -50,7 +50,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Scale: + Scale Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -72,9 +72,6 @@ SPDX-License-Identifier: GPL-3.0-or-later - - milliseconds - 100 diff --git a/kwin/energize-b/config.ui b/kwin/energize-b/config.ui index 69664ab..1d2387b 100755 --- a/kwin/energize-b/config.ui +++ b/kwin/energize-b/config.ui @@ -20,7 +20,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Duration: + Animation Time [ms] Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -30,7 +30,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Color: + Color Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -50,7 +50,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Scale: + Scale Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -72,9 +72,6 @@ SPDX-License-Identifier: GPL-3.0-or-later - - milliseconds - 100 diff --git a/kwin/glide/config.ui b/kwin/glide/config.ui index 74d24b9..834ed38 100755 --- a/kwin/glide/config.ui +++ b/kwin/glide/config.ui @@ -29,9 +29,6 @@ SPDX-License-Identifier: GPL-3.0-or-later - - milliseconds - 100 @@ -46,7 +43,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Scale: + Scale Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -56,7 +53,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Duration: + Animation Time [ms] Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/kwin/glitch/config.ui b/kwin/glitch/config.ui index 41764fa..84ba445 100755 --- a/kwin/glitch/config.ui +++ b/kwin/glitch/config.ui @@ -20,7 +20,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Scale: + Scale Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -33,7 +33,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Color: + Color Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -46,7 +46,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Duration: + Animation Time [ms] Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -62,9 +62,6 @@ SPDX-License-Identifier: GPL-3.0-or-later - - milliseconds - 100 diff --git a/kwin/hexagon/config.ui b/kwin/hexagon/config.ui index 3f0dfde..b234e59 100755 --- a/kwin/hexagon/config.ui +++ b/kwin/hexagon/config.ui @@ -20,7 +20,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Line Color: + Line Color Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -49,9 +49,6 @@ SPDX-License-Identifier: GPL-3.0-or-later - - milliseconds - 100 @@ -66,7 +63,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Glow Color: + Glow Color Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -76,7 +73,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Line Width: + Line Width Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -86,7 +83,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Duration: + Animation Time [ms] Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -96,7 +93,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Scale: + Scale Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/kwin/incinerate/config.ui b/kwin/incinerate/config.ui index 1a3dd76..2daf0f7 100755 --- a/kwin/incinerate/config.ui +++ b/kwin/incinerate/config.ui @@ -20,7 +20,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Scale: + Scale Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -32,9 +32,6 @@ SPDX-License-Identifier: GPL-3.0-or-later - - milliseconds - 100 @@ -59,7 +56,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Duration: + Animation Time [ms] Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -69,7 +66,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Turbulence: + Turbulence Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -92,7 +89,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Color: + Color Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/kwin/pixel-wheel/config.ui b/kwin/pixel-wheel/config.ui index 8464824..57cda72 100755 --- a/kwin/pixel-wheel/config.ui +++ b/kwin/pixel-wheel/config.ui @@ -20,7 +20,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Duration: + Animation Time [ms] Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -39,9 +39,6 @@ SPDX-License-Identifier: GPL-3.0-or-later - - milliseconds - 100 diff --git a/kwin/pixel-wipe/config.ui b/kwin/pixel-wipe/config.ui index 7a643c2..b7320e9 100755 --- a/kwin/pixel-wipe/config.ui +++ b/kwin/pixel-wipe/config.ui @@ -20,7 +20,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Duration: + Animation Time [ms] Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -39,9 +39,6 @@ SPDX-License-Identifier: GPL-3.0-or-later - - milliseconds - 100 diff --git a/kwin/pixelate/config.ui b/kwin/pixelate/config.ui index aba0f9e..318929a 100755 --- a/kwin/pixelate/config.ui +++ b/kwin/pixelate/config.ui @@ -20,7 +20,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Duration: + Animation Time [ms] Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -39,9 +39,6 @@ SPDX-License-Identifier: GPL-3.0-or-later - - milliseconds - 100 diff --git a/kwin/portal/config.ui b/kwin/portal/config.ui index 44eae06..7bda2d6 100755 --- a/kwin/portal/config.ui +++ b/kwin/portal/config.ui @@ -20,7 +20,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Color: + Color Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -33,7 +33,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Duration: + Animation Time [ms] Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -52,9 +52,6 @@ SPDX-License-Identifier: GPL-3.0-or-later - - milliseconds - 500 diff --git a/kwin/tv/config.ui b/kwin/tv/config.ui index e170acc..bde7727 100755 --- a/kwin/tv/config.ui +++ b/kwin/tv/config.ui @@ -19,9 +19,6 @@ SPDX-License-Identifier: GPL-3.0-or-later - - milliseconds - 100 @@ -43,7 +40,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Duration: + Animation Time [ms] Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -53,7 +50,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Color: + Color Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/kwin/wisps/config.ui b/kwin/wisps/config.ui index 1499614..87c9a7f 100755 --- a/kwin/wisps/config.ui +++ b/kwin/wisps/config.ui @@ -29,9 +29,6 @@ SPDX-License-Identifier: GPL-3.0-or-later - - milliseconds - 100 @@ -46,7 +43,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Color: + Color Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -56,7 +53,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Duration: + Animation Time [ms] Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -66,7 +63,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Scale: + Scale Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter From 8c88adcb194ede94b9ffac06e802cdbd90be2496 Mon Sep 17 00:00:00 2001 From: Simon Schneegans Date: Sat, 21 Jan 2023 13:34:39 +0100 Subject: [PATCH 4/6] :wrench: Compile translations with kwin build script --- kwin/build.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/kwin/build.sh b/kwin/build.sh index 8adb113..7dba2b4 100755 --- a/kwin/build.sh +++ b/kwin/build.sh @@ -30,6 +30,14 @@ BUILD_DIR="_build" # Create it if it's not there yet. mkdir -p "$BUILD_DIR" +# Compile the translations. +for file in ../po/*.po; do + echo "Compiling $file" + lang=$(basename "$file" .po) + mkdir -p "$BUILD_DIR/locale/$lang/LC_MESSAGES" + msgfmt "$file" -o "$BUILD_DIR/locale/$lang/LC_MESSAGES/burn-my-windows.mo" +done + # This method is called one for each effect. The parameters are as follows: # $1: The nick of the effect (e.g. "energize-a") # $2: The name of the effect (e.g. "Energize A") @@ -49,7 +57,7 @@ generate() { mkdir -p "$BUILD_DIR/$DIR_NAME/contents/ui" # Copy the translations. - cp -r "../locale" "$BUILD_DIR/$DIR_NAME/contents" + cp -r "$BUILD_DIR/locale" "$BUILD_DIR/$DIR_NAME/contents" # Copy the config file if it exists. if [ -f "$1/main.xml" ]; then From d73bab1cb11b5a67c4936ab6e3c2f666f4b76737 Mon Sep 17 00:00:00 2001 From: Simon Schneegans Date: Sat, 21 Jan 2023 13:45:55 +0100 Subject: [PATCH 5/6] :wrench: Fix some KDE strings --- kwin/hexagon/config.ui | 4 ++-- kwin/incinerate/config.ui | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kwin/hexagon/config.ui b/kwin/hexagon/config.ui index b234e59..c4b85ae 100755 --- a/kwin/hexagon/config.ui +++ b/kwin/hexagon/config.ui @@ -73,7 +73,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Line Width + Mesh Line Width Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -132,4 +132,4 @@ SPDX-License-Identifier: GPL-3.0-or-later - \ No newline at end of file + diff --git a/kwin/incinerate/config.ui b/kwin/incinerate/config.ui index 2daf0f7..6746404 100755 --- a/kwin/incinerate/config.ui +++ b/kwin/incinerate/config.ui @@ -109,7 +109,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Start from Pointer Location + Start at Pointer @@ -124,4 +124,4 @@ SPDX-License-Identifier: GPL-3.0-or-later - \ No newline at end of file + From b05e935f6237c45379f5a30e7d80f3bbdd0ceef3 Mon Sep 17 00:00:00 2001 From: Simon Schneegans Date: Sat, 21 Jan 2023 13:54:00 +0100 Subject: [PATCH 6/6] :memo: Add changelog entry --- docs/changelog.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/changelog.md b/docs/changelog.md index b1f002d..e636b19 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -5,6 +5,15 @@ SPDX-License-Identifier: CC-BY-4.0 # Changelog of the Burn-My-Windows Extension +## [Burn My Windows 26](https://github.com/schneegans/Burn-My-Windows/releases/tag/v26) + +**Release Date:** TBD + +#### Enhancements + +* On KDE, the effect configuration dialogs can now be translated. The translations for GNOME are re-used, so we already have many translations! + + ## [Burn My Windows 25](https://github.com/schneegans/Burn-My-Windows/releases/tag/v25) **Release Date:** 2023-01-17