From df317bf4880d961928b5f2069525e3b0ebdcab76 Mon Sep 17 00:00:00 2001 From: Natalie Clarius Date: Sun, 27 Nov 2022 02:55:13 +0100 Subject: [PATCH] port metadata to JSON format --- CHANGELOG.bbcode | 19 --------------- CHANGELOG.md | 15 ------------ README.bbcode | 2 +- README.md | 2 +- ...pt => application-switcher_v1.5.kwinscript | Bin 18987 -> 18341 bytes install.sh | 2 +- metadata.desktop | 20 --------------- metadata.json | 23 ++++++++++++++++++ 8 files changed, 26 insertions(+), 57 deletions(-) delete mode 100644 CHANGELOG.bbcode delete mode 100644 CHANGELOG.md rename application-switcher_v1.4.kwinscript => application-switcher_v1.5.kwinscript (71%) delete mode 100644 metadata.desktop create mode 100644 metadata.json diff --git a/CHANGELOG.bbcode b/CHANGELOG.bbcode deleted file mode 100644 index 8990eef..0000000 --- a/CHANGELOG.bbcode +++ /dev/null @@ -1,19 +0,0 @@ -[h2]v1.4[/h2] -[list]\n[*] fix lag - -[h2]v1.3[/h2] -[list]\n[*] fix order among windows of an application group sometimes not applied correctly -[/list] - -[h2]v1.2[/h2] -[list]\n[*] fix application group sometimes not raised -[/list] - -[h2]v1.1[/h2] -[list]\n[*] fix some special windows not opening correctly -[*] refactoring -[/list] - -[h1]v1.0[/h1] -[list]\n[*] initial release -[/list] diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index e2ab6c2..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,15 +0,0 @@ -## v1.4 -- fix lag - -## v1.3 -- fix order among windows of an application group sometimes not applied correctly - -## v1.2 -- fix application group sometimes not raised - -## v1.1 -- fix some special windows not opening correctly -- refactoring - -# v1.0 -- initial release diff --git a/README.bbcode b/README.bbcode index 6bc773d..1d10325 100644 --- a/README.bbcode +++ b/README.bbcode @@ -1,6 +1,6 @@ Automatically raises all other visible windows of the same application together when activating one of them, effectively creating application groups to task-switch between. -[b]Please make sure to install the most recent version (v1.4) and to not use Discover for installation.[/b] For more information on installation, setup and usage as well as any requests, please visit [url=https://github.com/nclarius/kwin-application-switcher]the GitHub page[/url]. +[b]Please make sure to install the most recent version (v1.5) and to not use Discover for installation.[/b] For more information on installation, setup and usage as well as any requests, please visit [url=https://github.com/nclarius/kwin-application-switcher]the GitHub page[/url]. This extension gives rise to an application-centric task switching workflow as known from environments such as GNOME or MacOS, where an application’s windows are treated as a group, and task switching can take place at two levels: one mode for switching applications and one mode for switching between windows of an application. diff --git a/README.md b/README.md index 1647042..03bda62 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Seen in the screencast: Switching from Konsole back to Dolphin also brings the o ### Installation via graphical interface -**Please make sure to select the most recent version (v1.4)** in the installation process. +**Please make sure to select the most recent version (v1.5)** in the installation process. A [bug](https://bugs.kde.org/show_bug.cgi?id=453521) in Discover causes a wrong version to be installed, so using the installation module in System Settings instead is recommended. diff --git a/application-switcher_v1.4.kwinscript b/application-switcher_v1.5.kwinscript similarity index 71% rename from application-switcher_v1.4.kwinscript rename to application-switcher_v1.5.kwinscript index 6296e892588213c18729a004d33e8868f84dbedb..5076e7a54c31b16f68ed7d5858c1831da085b863 100644 GIT binary patch delta 3262 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 diff --git a/install.sh b/install.sh index b558916..460763c 100755 --- a/install.sh +++ b/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -name=$(grep -oP '(?<=X-KDE-PluginInfo-Name=).*' ./metadata.desktop) +name=$(grep -oP '"Id":\s*"[^"]*' ./metadata.json | grep -oP '[^"]*$') kpackagetool5 --type=KWin/Script --install . || kpackagetool5 --type=KWin/Script --upgrade . kwriteconfig5 --file kwinrc --group Plugins --key "$name"Enabled true qdbus org.kde.KWin /KWin reconfigure diff --git a/metadata.desktop b/metadata.desktop deleted file mode 100644 index 9353dcf..0000000 --- a/metadata.desktop +++ /dev/null @@ -1,20 +0,0 @@ -# KWin Script Application Switcher -# (C) 2022 Natalie Clarius -# GNU General Public License v3.0 - -[Desktop Entry] -Name=Application Switcher -Comment=Collectively raises all windows of the same application when switching tasks -Icon=preferences-system-windows - -X-KDE-PluginInfo-Name=applicationswitcher -X-KDE-PluginInfo-Version=1.4 -X-KDE-PluginInfo-Author=Natalie Clarius -X-KDE-PluginInfo-Email=natalie_clarius@yahoo.de -X-KDE-PluginInfo-License=GPLv3.0 -X-KDE-PluginInfo-Website= - -Type=Service -X-Plasma-API=javascript -X-Plasma-MainScript=code/main.js -X-KDE-ServiceTypes=KWin/Script,KCModule diff --git a/metadata.json b/metadata.json new file mode 100644 index 0000000..9f4beb3 --- /dev/null +++ b/metadata.json @@ -0,0 +1,23 @@ +{ + "KPlugin": { + "Authors": [ + { + "Email": "natalie_clarius@yahoo.de", + "Name": "Natalie Clarius" + } + ], + "Description": "Collectively raises all windows of the same application when switching tasks", + "Icon": "preferences-system-windows", + "Id": "applicationswitcher", + "License": "GPLv3.0", + "Name": "Application Switcher", + "ServiceTypes": [ + "KWin/Script", + "KCModule" + ], + "Version": "1.5", + "Website": "" + }, + "X-Plasma-API": "javascript", + "X-Plasma-MainScript": "code/main.js" +}