Merge pull request #5 from korapp/refactor/plasma6

Refactor/plasma6
korapp · Dec 16, 2023 · f6acd0b · f6acd0b
2 parents 8f85ca9 + 78d2212
commit f6acd0b
Show file tree

Hide file tree

Showing 10 changed files with 84 additions and 105 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Plasmoid for the official [Cloudflare WARP client][warp].
 ## Requirements
 
 * [Cloudflare WARP][warp]
-* Qt >= 5.14, KDE Frameworks >= 5.73, KDE Plasma >= 5.19 (Kubuntu 20.10 and newer)
+* KDE Plasma >= 6.0
 
 ## Installation
 
@@ -63,6 +63,6 @@ Say thank you with coffee ☕ if you'd like.
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/korapp)
 [<img src="https://img.shields.io/badge/Revolut-white?logo=Revolut&logoColor=black" height="30"/>](https://revolut.me/korapp)
 
-[kdestore]: https://store.kde.org/p/2081104/
+[kdestore]: https://store.kde.org/p/2113872/
 [releases]: https://github.com/korapp/plasma-cloudflare-warp/releases
 [warp]: https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp/download-warp/#linux
diff --git a/package/contents/ui/CompactRepresentation.qml b/package/contents/ui/CompactRepresentation.qml
@@ -1,6 +1,4 @@
-import QtQuick 2.0
-
-import org.kde.plasma.core 2.0 as PlasmaCore
+import QtQuick
 
 Icon {
     source: plasmoid.icon
@@ -13,7 +11,7 @@ Icon {
         acceptedButtons: Qt.LeftButton | Qt.MiddleButton
         anchors.fill: parent
 
-        onClicked: {
+        onClicked: function (mouse) {
             if (plasmoid.configuration.toggleConnectionOnMiddleButton && mouse.button === Qt.MiddleButton) {
                 toggleConnection()
             } else {
@@ -27,10 +25,6 @@ Icon {
     }
 
     function toggleExpanded() {
-        plasmoid.expanded = !plasmoid.expanded
+        root.expanded = !root.expanded
     }
-
-    Accessible.name: plasmoid.title
-    Accessible.description: plasmoid.toolTipSubText
-    Accessible.role: Accessible.Button
-}
+}
diff --git a/package/contents/ui/ConfigGeneral.qml b/package/contents/ui/ConfigGeneral.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.0
-import QtQuick.Controls 2.0
+import QtQuick
+import QtQuick.Controls
 
-import org.kde.kirigami 2.3 as Kirigami
+import org.kde.kirigami as Kirigami
 
 Kirigami.FormLayout {
     property alias cfg_toggleConnectionOnMiddleButton: toggleConnectionOnMiddleButton.checked

diff --git a/package/contents/ui/DetailsText.qml b/package/contents/ui/DetailsText.qml
@@ -1,7 +1,8 @@
-import QtQuick 2.0
+import QtQuick
 
-import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 3.0 as PlasmaComponents3
+import org.kde.plasma.components as PlasmaComponents3
+
+import org.kde.kirigami as Kirigami
 
 Column {
     property alias model: repeater.model
@@ -23,7 +24,7 @@ Column {
 
                 anchors {
                     left: parent.left
-                    leftMargin: repeater.longestString - paintedWidth + Math.round(PlasmaCore.Units.gridUnit / 2)
+                    leftMargin: repeater.longestString - paintedWidth + Math.round(Kirigami.Units.gridUnit / 2)
                 }
 
                 horizontalAlignment: Text.AlignRight
@@ -43,7 +44,7 @@ Column {
                 anchors {
                     left: parent.left
                     right: parent.right
-                    leftMargin: repeater.longestString + Math.round(PlasmaCore.Units.gridUnit / 2)
+                    leftMargin: repeater.longestString + Math.round(Kirigami.Units.gridUnit / 2)
                 }
 
                 elide: Text.ElideRight

diff --git a/package/contents/ui/FullRepresentation.qml b/package/contents/ui/FullRepresentation.qml
@@ -1,29 +1,29 @@
-import QtQuick 2.0
-import QtQuick.Layouts 1.0
+import QtQuick
+import QtQuick.Layouts
 
-import org.kde.plasma.components 3.0 as PlasmaComponents3
-import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components as PlasmaComponents3
+import org.kde.plasma.extras as PlasmaExtras
+import org.kde.kirigami as Kirigami
 
 PlasmaComponents3.Page {
     readonly property var appletInterface: plasmoid.self
 
     readonly property string mainText: client.status || client.errorMessage
     readonly property string icon: client.errorMessage ? "error" : plasmoid.icon
 
-    Layout.preferredWidth: PlasmaCore.Units.gridUnit * 24
-    Layout.preferredHeight: PlasmaCore.Units.gridUnit * 24
+    Layout.preferredWidth: Kirigami.Units.gridUnit * 24
+    Layout.preferredHeight: Kirigami.Units.gridUnit * 24
 
     ColumnLayout {
-        spacing: PlasmaCore.Units.largeSpacing
+        spacing: Kirigami.Units.largeSpacing
         width: parent.width
         enabled: !client.isBusy
         anchors.centerIn: parent
 
         Icon {
             opacity: 0.5
             source: icon
-            readonly property int size: Math.round(PlasmaCore.Units.iconSizes.huge * 1.5)
+            readonly property int size: Math.round(Kirigami.Units.iconSizes.huge * 1.5)
             Layout.alignment: Qt.AlignHCenter
             Layout.preferredWidth: size
             Layout.preferredHeight: size
@@ -50,7 +50,7 @@ PlasmaComponents3.Page {
             action: client.isConnected ? actionDisconnect : actionConnect
             visible: client.isServiceRunning
             Layout.alignment: Qt.AlignHCenter
-            Layout.topMargin: PlasmaCore.Units.gridUnit
+            Layout.topMargin: Kirigami.Units.gridUnit
         }
     }
 

diff --git a/package/contents/ui/Icon.qml b/package/contents/ui/Icon.qml
@@ -1,20 +1,20 @@
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
+import QtQuick
+import Qt5Compat.GraphicalEffects
 
-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.kirigami as Kirigami
 
 Item {
     property alias source: icon.source
     property alias active: icon.active
 
-    PlasmaCore.IconItem {
+    Kirigami.Icon {
         id: icon
         anchors.fill: parent
     }
 
     ColorOverlay {
         anchors.fill: icon
         source: icon
-        color: PlasmaCore.Theme.textColor
+        color: Kirigami.Theme.textColor
     }
 }
diff --git a/package/contents/ui/Notifications.qml b/package/contents/ui/Notifications.qml
diff --git a/package/contents/ui/Warp.qml b/package/contents/ui/Warp.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.0
+import QtQuick
 
-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.plasma5support as P5Support
 
 Item {
     property bool watchStats: false
@@ -16,7 +16,7 @@ Item {
     readonly property var disableDefaultApp: p.disableDefaultApp
     readonly property bool isBusy: p.isConnecting || p.isOperationInProgress
 
-    PlasmaCore.DataSource {
+    P5Support.DataSource {
         id: watcher
         readonly property string cmdStatus: "warp-cli status"
         readonly property string cmdStats: "warp-cli warp-stats"
@@ -27,13 +27,13 @@ Item {
         engine: "executable"
         connectedSources: [cmdStatus]
         interval: p.isServiceRunning ? 1000 : 5000
-        onNewData: handlers[sourceName](data)
+        onNewData: (sourceName, data) => handlers[sourceName](data)
     }
 
-    PlasmaCore.DataSource {
+    P5Support.DataSource {
         id: exec
         engine: "executable"
-        onNewData: disconnectSource(sourceName)
+        onNewData: disconnectSource
         readonly property var run: connectSource
     }
 
@@ -84,7 +84,7 @@ Item {
                 const statusMessage = parseStdoutProperties(data.stdout)[0][1]
                 const newStatus = statusMessage.replace(". Reason: ", "\n")
                 errorMessage = ""
-                if (status != newStatus) {                
+                if (status != newStatus) {
                     status = newStatus
                     isOperationInProgress = false
                 }

diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
@@ -1,38 +1,38 @@
-import QtQuick 2.7
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
 
-import org.kde.plasma.plasmoid 2.0
-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.plasmoid
+import org.kde.plasma.core as PlasmaCore
+import org.kde.kirigami as Kirigami
+import org.kde.notification
 
-Item {
+PlasmoidItem {
     id: root
-    Plasmoid.compactRepresentation: CompactRepresentation {}
-    Plasmoid.fullRepresentation: FullRepresentation {}
-    Plasmoid.toolTipSubText: {
+    compactRepresentation: CompactRepresentation {}
+    fullRepresentation: FullRepresentation {}
+    toolTipSubText: {
         if (plasmoid.configuration.toggleConnectionOnMiddleButton) {
             const hint = client.isConnected ? i18n("Middle-click to disconnect") : i18n("Middle-click to connect")
             return client.status + "\n" + hint
         }
         return client.status
     }
+    switchWidth: Kirigami.Units.gridUnit * 24
+    switchHeight: Kirigami.Units.gridUnit * 24
     Plasmoid.busy: client.isBusy
     Plasmoid.status: client.isServiceRunning && (client.isConnected || !plasmoid.configuration.hideWhenDisconnected)
         ? PlasmaCore.Types.ActiveStatus
         : PlasmaCore.Types.PassiveStatus
-
-    Plasmoid.switchWidth: PlasmaCore.Units.gridUnit * 24
-    Plasmoid.switchHeight: PlasmaCore.Units.gridUnit * 24
+    Plasmoid.contextualActions: [
+        mapAction(actionDisconnect, client.isConnected),
+        mapAction(actionConnect, !client.isConnected)
+    ]
 
     Warp {
         id: client
-        watchStats: plasmoid.expanded
-        onIsConnectedChanged: prepareContextualActions()
-
-        Component.onCompleted: {
-            disableDefaultApp()
-            prepareContextualActions()
-        }
+        watchStats: root.expanded
+        Component.onCompleted: disableDefaultApp()
     }
 
     Action {
@@ -49,33 +49,42 @@ Item {
         onTriggered: client.disconnect()
     }
 
-    function actionToContextual(action) {
-        return [action.text.toLowerCase(), action.text, action.icon.name]
-    }
-
-    Loader {
-        id: nLoader
-        active: plasmoid.configuration.showNotifications
-        source: "Notifications.qml"
+    Component {
+        id: actionComponent
+        PlasmaCore.Action {}
     }
 
     Connections {
         target: client
-        enabled: nLoader.status === Loader.Ready
-        onStatusChanged: nLoader.item.createNotification(client.status)
+        enabled: plasmoid.configuration.showNotifications
+        function onStatusChanged() {
+            createNotification(client.status)
+        }
     }
 
-    function prepareContextualActions() {
-        plasmoid.clearActions()
-        plasmoid.setAction(...actionToContextual(client.isConnected ? actionDisconnect : actionConnect))
+    function mapAction(action, visible) {
+        const ca = actionComponent.createObject(root, {
+            text: action.text,
+            'icon.name': action.icon.name,
+            visible
+        })
+        ca.onTriggered.connect(action.onTriggered)
+        return ca
     }
 
-    function action_disconnect() {
-        client.disconnect()
+    Component {
+        id: notifications
+        Notification {
+            componentName: "plasma_workspace"
+            eventId: "notification"
+            title: plasmoid.title
+            iconName: plasmoid.icon
+            autoDelete: true
+        }
     }
 
-    function action_connect() {
-        client.connect()
+    function createNotification(text) {        
+        notifications.createObject(parent, { text })?.sendEvent()
     }
 
     function nmI18n(...args) {

diff --git a/package/metadata.json b/package/metadata.json
@@ -1,4 +1,5 @@
 {
+    "KPackageStructure": "Plasma/Applet",
     "KPlugin": {
         "Authors": [
             {
@@ -14,18 +15,13 @@
         "Id": "com.github.korapp.cloudflare-warp",
         "License": "GPLv3",
         "Name": "Zero Trust",
-        "ServiceTypes": [
-            "Plasma/Applet"
-        ],
         "Version": "0.1",
         "Website": "https://github.com/korapp/plasma-cloudflare-warp",
         "BugReportUrl": "https://github.com/korapp/plasma-cloudflare-warp/issues/new"
     },
     "Keywords": "warp;zero;trust;cloudflare",
     "X-KDE-ParentApp": "warp-cli",
-    "X-KDE-Version": "5.19",
-    "X-Plasma-API": "declarativeappletscript",
-    "X-Plasma-MainScript": "ui/main.qml",
+    "X-KDE-Version": "6.0",
     "X-Plasma-NotificationArea": "true",
     "X-Plasma-NotificationAreaCategory": "ApplicationStatus",
     "X-Plasma-StandAloneApp": true