Add python files to the plasmoid package

rbn42 · Oct 29, 2019 · 3f0e424 · 3f0e424
1 parent f6c74ec
commit 3f0e424
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 10 deletions.
diff --git a/kde/install.sh b/kde/install.sh
@@ -1,5 +1,6 @@
 python build.py
 
+rm ../panon/__pycache__ -r
 
 kpackagetool5 -t Plasma/Applet --install plasmoid
 kpackagetool5 -t Plasma/Applet --upgrade plasmoid

diff --git a/kde/plasmoid/contents/config/main.xml b/kde/plasmoid/contents/config/main.xml
@@ -6,8 +6,11 @@
   <kcfgfile name=""/>
 
   <group name="General">
-    <entry name="panonServer" type="String">
-      <default>ws://localhost:8765</default>
+    <entry name="serverPort" type="Int">
+      <default>8738</default>
+    </entry>
+    <entry name="startServer" type="Bool">
+      <default>true</default>
     </entry>
     <entry name="reduceBass" type="Bool">
       <default>true</default>
@@ -20,7 +23,7 @@
       <default>true</default>
     </entry>
     <entry name="preferredWidth" type="Int">
-      <default>400</default>
+      <default>700</default>
     </entry>
 
     <entry name="colorSpaceHSL" type="Bool">

diff --git a/kde/plasmoid/contents/server/panon b/kde/plasmoid/contents/server/panon
@@ -0,0 +1 @@
+../../../../panon/
diff --git a/kde/plasmoid/contents/server/run-server.sh b/kde/plasmoid/contents/server/run-server.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+wid=$(pgrep -a python | grep panon.server | cut -d" " -f1)
+echo $wid
+kill $wid
+
+cd "$(dirname "$0")"
+port=$1
+exec python3 -m panon.server $port
diff --git a/kde/plasmoid/contents/ui/ConfigGeneral.qml b/kde/plasmoid/contents/ui/ConfigGeneral.qml
@@ -13,7 +13,8 @@ Kirigami.FormLayout {
 
     readonly property bool vertical: plasmoid.formFactor == PlasmaCore.Types.Vertical || (plasmoid.formFactor == PlasmaCore.Types.Planar && plasmoid.height > plasmoid.width)
 
-    property alias cfg_panonServer: panonServer.text
+    property alias cfg_serverPort: serverPort.text
+    property alias cfg_startServer: startServer.checked
     property alias cfg_reduceBass: reduceBass.checked
     property alias cfg_fps: fps.value
 
@@ -33,15 +34,21 @@ Kirigami.FormLayout {
     property alias cfg_hsluvLightness   :hsluvLightness.value
 
     RowLayout {
-        Kirigami.FormData.label: i18nc("@title:group", "Panon server:")
+        Kirigami.FormData.label: i18nc("@title:group", "Panon server: ws://localhost:")
         Layout.fillWidth: true
 
         QQC2.TextField {
-            id: panonServer
+            id: serverPort
             Layout.fillWidth: true
+            validator: IntValidator {bottom: 1; top: 30000;}
         }
     }
 
+    QQC2.CheckBox {
+        id: startServer
+        text: i18nc("@option:check", "Start a server along with this widget")
+    }
+
     QQC2.CheckBox {
         id: reduceBass
         text: i18nc("@option:check", "Reduce the weight of bass")

diff --git a/kde/plasmoid/contents/ui/Spectrum.qml b/kde/plasmoid/contents/ui/Spectrum.qml
@@ -6,6 +6,7 @@ import Qt3D.Render 2.0
 import QtQuick.Layouts 1.1
 
 import org.kde.plasma.plasmoid 2.0
+import org.kde.plasma.core 2.0 as PlasmaCore
 
 Item{
     Layout.preferredWidth: plasmoid.configuration.preferredWidth
@@ -367,7 +368,7 @@ void main()
 
     WebSocket {
         id: socket
-        url:plasmoid.configuration.panonServer
+        url:"ws://localhost:"+plasmoid.configuration.serverPort
         onTextMessageReceived: {
             messageBox= message
         }
@@ -425,5 +426,23 @@ void main()
             }
         }
     }
+
+    function startServer(){
+        if(plasmoid.configuration.startServer){
+            var p_ui=plasmoid.file("ui");
+            p_ui=p_ui.split('/')
+            p_ui.pop(-1)
+            p_ui.push('server')
+            p_ui.push('run-server.sh')
+            return 'sh '+'"'+p_ui.join('/')+'" '+plasmoid.configuration.serverPort;
+        }else{
+            return "echo do nothing";
+        }
+    }
+
+    PlasmaCore.DataSource {
+        engine: 'executable'
+        connectedSources: [startServer()]
+    }
 }
 
diff --git a/kde/plasmoid/contents/ui/Spectrum.template.qml b/kde/plasmoid/contents/ui/Spectrum.template.qml
@@ -5,6 +5,7 @@ import Qt3D.Render 2.0
 import QtQuick.Layouts 1.1
 
 import org.kde.plasma.plasmoid 2.0
+import org.kde.plasma.core 2.0 as PlasmaCore
 
 Item{
     Layout.preferredWidth: plasmoid.configuration.preferredWidth
@@ -34,7 +35,7 @@ Item{
 
     WebSocket {
         id: socket
-        url:plasmoid.configuration.panonServer
+        url:"ws://localhost:"+plasmoid.configuration.serverPort
         onTextMessageReceived: {
             messageBox= message
         }
@@ -92,4 +93,22 @@ Item{
             }
         }
     }
+
+    function startServer(){
+        if(plasmoid.configuration.startServer){
+            var p_ui=plasmoid.file("ui");
+            p_ui=p_ui.split('/')
+            p_ui.pop(-1)
+            p_ui.push('server')
+            p_ui.push('run-server.sh')
+            return 'sh '+'"'+p_ui.join('/')+'" '+plasmoid.configuration.serverPort;
+        }else{
+            return "echo do nothing";
+        }
+    }
+
+    PlasmaCore.DataSource {
+        engine: 'executable'
+        connectedSources: [startServer()]
+    }
 }
diff --git a/kde/plasmoid/metadata.desktop b/kde/plasmoid/metadata.desktop
@@ -8,7 +8,7 @@ X-KDE-ServiceTypes=Plasma/Applet
 X-KDE-PluginInfo-Author=rbn42
 X-KDE-PluginInfo-Email=
 X-KDE-PluginInfo-Name=panon
-X-KDE-PluginInfo-Version=0.2.5
+X-KDE-PluginInfo-Version=0.2.6
 X-KDE-PluginInfo-Website=github.com/rbn42/panon
 X-KDE-PluginInfo-Category=Multimedia
 X-KDE-PluginInfo-Depends=

diff --git a/kde/plasmoid/metadata.json b/kde/plasmoid/metadata.json
@@ -18,7 +18,7 @@
         "ServiceTypes": [
             "Plasma/Applet"
         ],
-        "Version": "0.2.5",
+        "Version": "0.2.6",
         "Website": "github.com/rbn42/panon"
     },
     "X-Plasma-API": "declarativeappletscript",