From 5d9d07076686221cd27c3b9b1a9afcb633936236 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Wed, 28 Feb 2024 20:24:56 -0300 Subject: [PATCH 1/4] Update for KDE Plasma 6 and Qt6 --- build | 4 ++-- install | 2 +- package/contents/ui/main.qml | 19 ++++++++++--------- package/metadata.desktop | 19 ------------------- package/metadata.json | 25 +++++++++++++++++++++++++ 5 files changed, 38 insertions(+), 31 deletions(-) delete mode 100644 package/metadata.desktop create mode 100644 package/metadata.json diff --git a/build b/build index 03fb8f3..6ff6214 100755 --- a/build +++ b/build @@ -1,9 +1,9 @@ #!/bin/bash # Version 4 -plasmoidName=$(kreadconfig5 --file="$PWD/package/metadata.desktop" --group="Desktop Entry" --key="X-KDE-PluginInfo-Name") +plasmoidName=$(jq -r '.KPlugin.Id' "$PWD/package/metadata.json") plasmoidName="${plasmoidName##*.}" # Strip namespace (Eg: "org.kde.plasma.") -plasmoidVersion=$(kreadconfig5 --file="$PWD/package/metadata.desktop" --group="Desktop Entry" --key="X-KDE-PluginInfo-Version") +plasmoidVersion=$(jq -r '.KPlugin.Version' "$PWD/package/metadata.json") rm ${plasmoidName}-v*.plasmoid cd package filename=${plasmoidName}-v${plasmoidVersion}.plasmoid diff --git a/install b/install index bf76ea5..4bb0ee6 100755 --- a/install +++ b/install @@ -1,4 +1,4 @@ #!/bin/bash # Version 2 -kpackagetool5 -t Plasma/Applet -i package +kpackagetool6 -t Plasma/Applet -i package diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml index 1609ac4..ce94e30 100644 --- a/package/contents/ui/main.qml +++ b/package/contents/ui/main.qml @@ -17,20 +17,21 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * ***************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.15 import QtQuick.Layouts 1.1 -import QtQuick.Controls 1.2 +import QtQuick.Controls -import org.kde.plasma.plasmoid 2.0 -import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.plasmoid +import org.kde.plasma.core as PlasmaCore +import org.kde.plasma.components as PlasmaComponents +import org.kde.plasma.plasma5support as Plasma5Support -import QMLTermWidget 1.0 +import QMLTermWidget import "../code/utils.js" as Utils -Item{ +PlasmoidItem { id: main width: plasmoid.configuration.width @@ -39,10 +40,10 @@ Item{ Layout.minimumWidth: units.gridUnit * 10 Layout.minimumHeight: units.gridUnit * 10 - Plasmoid.preferredRepresentation: Plasmoid.fullRepresentation + preferredRepresentation: fullRepresentation Plasmoid.backgroundHints: plasmoid.configuration.showBackground ? PlasmaCore.Types.DefaultBackground : PlasmaCore.Types.NoBackground - PlasmaCore.DataSource { + Plasma5Support.DataSource { id: executeSource engine: "executable" connectedSources: [] diff --git a/package/metadata.desktop b/package/metadata.desktop deleted file mode 100644 index f6e4b5a..0000000 --- a/package/metadata.desktop +++ /dev/null @@ -1,19 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Termoid -Comment=Terminal in a plasmoid -Type=Service -Icon=utilities-terminal - -X-KDE-PluginInfo-Author=Bhaskar Divya -X-KDE-PluginInfo-Email= -X-KDE-PluginInfo-Name=com.koldbyte.kde.termoid -X-KDE-PluginInfo-Version=0.4 -X-KDE-PluginInfo-Website=https://github.com/koldbyte/termoid -X-KDE-PluginInfo-Category=Utilities -X-KDE-PluginInfo-Depends=qtermwidget -X-KDE-PluginInfo-License=GPL v2+ -X-KDE-ServiceTypes=Plasma/Applet -X-Plasma-API=declarativeappletscript -X-Plasma-MainScript=ui/main.qml -X-KDE-PluginInfo-KdeStoreId=1169451 \ No newline at end of file diff --git a/package/metadata.json b/package/metadata.json new file mode 100644 index 0000000..9fa2b21 --- /dev/null +++ b/package/metadata.json @@ -0,0 +1,25 @@ +{ + "KPlugin": { + "Authors": [ + { + "Email": "", + "Name": "Bhaskar Divya" + } + ], + "Category": "Utilities", + "Dependencies": [ + "qtermwidget" + ], + "Description": "Terminal in a plasmoid", + "Icon": "utilities-terminal", + "Id": "com.koldbyte.kde.termoid", + "License": "GPL v2+", + "Name": "Termoid", + "ServiceTypes": [ + "Plasma/Applet" + ], + "Version": "0.4", + "Website": "https://github.com/koldbyte/termoid" + }, + "X-Plasma-API-Minimum-Version": "6.0" +} From c31eeaa7b3d1858c6bfba5d60635215790f1e0b2 Mon Sep 17 00:00:00 2001 From: cyberpelican <62749885+dhay3@users.noreply.github.com> Date: Mon, 20 May 2024 17:21:31 +0800 Subject: [PATCH 2/4] fix:Configuration panel --- package/contents/config/config.qml | 4 ++-- package/contents/ui/config/ConfigGeneral.qml | 20 ++++++++++---------- package/contents/ui/config/ConfigPage.qml | 4 ++-- package/contents/ui/main.qml | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package/contents/config/config.qml b/package/contents/config/config.qml index 0f64988..75b1cb9 100644 --- a/package/contents/config/config.qml +++ b/package/contents/config/config.qml @@ -17,9 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * ***************************************************************************/ -import QtQuick 2.0 +import QtQuick -import org.kde.plasma.configuration 2.0 +import org.kde.plasma.configuration ConfigModel { ConfigCategory { diff --git a/package/contents/ui/config/ConfigGeneral.qml b/package/contents/ui/config/ConfigGeneral.qml index fc83cb4..1658e1a 100644 --- a/package/contents/ui/config/ConfigGeneral.qml +++ b/package/contents/ui/config/ConfigGeneral.qml @@ -1,8 +1,8 @@ -import QtQuick 2.0 -import QtQuick.Controls 1.0 -import QtQuick.Layouts 1.0 -import QtQuick.Dialogs 1.2 -import org.kde.plasma.components 2.0 as PlasmaComponents +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Dialogs +import org.kde.plasma.components as PlasmaComponents import ".." @@ -93,9 +93,9 @@ ConfigPage { SpinBox { id: fontsize - suffix: i18n(" px") + property string suffix: i18n(" px") value: plasmoid.configuration.fontsize - maximumValue: 1000 + to: 1000 } PlasmaComponents.Label { @@ -127,9 +127,9 @@ ConfigPage { SpinBox { id: opacity_spin value: plasmoid.configuration.opacity - suffix: i18n(" %") - minimumValue: 0 - maximumValue: 100 + property string suffix: i18n(" %") + from: 0 + to: 100 stepSize: 1 } diff --git a/package/contents/ui/config/ConfigPage.qml b/package/contents/ui/config/ConfigPage.qml index 95a52b1..41fa381 100644 --- a/package/contents/ui/config/ConfigPage.qml +++ b/package/contents/ui/config/ConfigPage.qml @@ -1,5 +1,5 @@ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick +import QtQuick.Layouts ColumnLayout { id: page diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml index ce94e30..a59b81f 100644 --- a/package/contents/ui/main.qml +++ b/package/contents/ui/main.qml @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * ***************************************************************************/ -import QtQuick 2.15 -import QtQuick.Layouts 1.1 +import QtQuick +import QtQuick.Layouts import QtQuick.Controls import org.kde.plasma.plasmoid From 639f0ec3dec1c1f2cc3c234586b6f8c4c79202a5 Mon Sep 17 00:00:00 2001 From: cyberpelican <62749885+dhay3@users.noreply.github.com> Date: Mon, 20 May 2024 17:46:11 +0800 Subject: [PATCH 3/4] fix:suffix --- package/contents/ui/config/ConfigGeneral.qml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/contents/ui/config/ConfigGeneral.qml b/package/contents/ui/config/ConfigGeneral.qml index 1658e1a..4161a3c 100644 --- a/package/contents/ui/config/ConfigGeneral.qml +++ b/package/contents/ui/config/ConfigGeneral.qml @@ -96,6 +96,10 @@ ConfigPage { property string suffix: i18n(" px") value: plasmoid.configuration.fontsize to: 1000 + property string valuews: textFromValue(value) + textFromValue: function(value) { + return Number(value) + suffix + } } PlasmaComponents.Label { @@ -131,6 +135,9 @@ ConfigPage { from: 0 to: 100 stepSize: 1 + textFromValue: function(value) { + return Number(value) + suffix + } } PlasmaComponents.Label { From aa78f813e83daea0d1dab21585c8da835890763e Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 20 May 2024 11:28:03 -0300 Subject: [PATCH 4/4] Update metadata.json and reinstall script --- package/metadata.json | 4 +--- reinstall | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/metadata.json b/package/metadata.json index 9fa2b21..3e3cddb 100644 --- a/package/metadata.json +++ b/package/metadata.json @@ -15,9 +15,7 @@ "Id": "com.koldbyte.kde.termoid", "License": "GPL v2+", "Name": "Termoid", - "ServiceTypes": [ - "Plasma/Applet" - ], + "KPackageStructure": "Plasma/Applet", "Version": "0.4", "Website": "https://github.com/koldbyte/termoid" }, diff --git a/reinstall b/reinstall index c96ede7..2a5039e 100755 --- a/reinstall +++ b/reinstall @@ -1,6 +1,6 @@ #!/bin/bash # Version 2 -kpackagetool5 -t Plasma/Applet -u package +kpackagetool6 -t Plasma/Applet -u package killall plasmashell -kstart5 plasmashell +kstart plasmashell