added contextmenu and hide tray icon

README.md

@@ -1 +1,26 @@
 # Headset Battery Widget
+
+## Requirements
+
+- [HeadsetControl](https://github.com/Sapd/HeadsetControl) v3.0.0 or newer
+
+## Install
+
+```
+git clone https://git.lat/Flummi/headsetcontrol-battery-widget.git
+cd headsetcontrol-battery-widget
+kpackagetool6 -t Plasma/Applet --install ./package
+```
+
+## Uninstall
+
+```
+kpackagetool6 -t Plasma/Applet --remove org.kde.plasma.headsetcontrol-battery-widget
+```
+
+## Development
+
+```
+cd headsetcontrol-battery-widget
+kpackagetool6 -t Plasma/Applet --upgrade ./package ; systemctl --user restart plasma-plasmashell
+```

package/contents/config/config.qml

@@ -0,0 +1,15 @@
+import QtQuick
+import org.kde.plasma.configuration
+
+ConfigModel {
+  ConfigCategory {
+    name: i18n("General")
+    icon: "configure"
+    source: "config/general.qml"
+  }
+  ConfigCategory {
+    name: i18n("Debug")
+    icon: "cab_view"
+    source: "config/debug.qml"
+  }
+}

package/contents/config/main.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
+      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
+  <kcfgfile name=""/>
+
+  <group name="General">
+    <entry name="pollingrate" type="Int">
+      <default>10</default>
+    </entry>
+    <entry name="batteryheight" type="Int">
+      <default>8</default>
+    </entry>
+    <entry name="colorEmpty" type="String">
+      <default>#ff0000</default>
+    </entry>
+    <entry name="colorHalf" type="String">
+      <default>#ffff00</default>
+    </entry>
+    <entry name="colorFull" type="String">
+      <default>#008800</default>
+    </entry>
+
+    <entry name="batteryThreshold" type="Int">
+      <default>10</default>
+    </entry>
+    <entry name="notifications" type="Bool">
+      <default>true</default>
+    </entry>
+
+
+    <entry name="debug_active" type="Bool">
+      <default>false</default>
+    </entry>
+    <entry name="debug_charge" type="Int">
+      <default>0</default>
+    </entry>
+  </group>
+</kcfg>

package/contents/ui/CompactRepresentation.qml

@@ -0,0 +1,50 @@
+import QtQuick
+import QtQuick.Layouts
+import org.kde.plasma.plasmoid
+import org.kde.kirigami as Kirigami
+
+import "./lib/helper.js" as Helper
+
+Item {
+  Rectangle { // battery
+    id: container
+    anchors.fill: parent
+    anchors.rightMargin: 1
+    anchors.topMargin: 10 - batteryheight
+    anchors.bottomMargin: 10 - batteryheight
+    color: "transparent"
+    border.color: Kirigami.Theme.textColor
+    radius: 4
+
+    Item {
+      anchors.fill: parent
+      anchors.margins: 2
+      Rectangle { // battery fill
+        anchors.left: parent.left
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        color: Helper.interpolateColor(batteryPercent / 100, [ colorEmpty, colorHalf, colorFull ])
+        width: parent.width * Math.max(0, Math.min(batteryPercent, 100)) / 100
+      }
+      Kirigami.Icon { // headphones icon
+        anchors.bottom: parent.bottom
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.topMargin: 1
+        anchors.bottomMargin: 1
+        source: Helper.batteryIcon(batteryStatus)
+        color: batteryPercent == -1 ? colorEmpty : Kirigami.Theme.textColor
+      }
+    }
+  }
+
+  Rectangle { // battery cap
+    anchors.left: container.right
+    anchors.leftMargin: 1
+    anchors.verticalCenter: parent.verticalCenter
+    radius: 4
+    height: parent.height / 3
+    width: 2
+    color: Kirigami.Theme.textColor
+  }
+}

package/contents/ui/config/debug.qml

@@ -0,0 +1,77 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.kde.plasma.core as PlasmaCore
+import org.kde.plasma.components as PlasmaComponents
+import org.kde.kirigami as Kirigami
+import org.kde.kquickcontrols as KQControls
+import org.kde.kcmutils as KCM
+
+import "../lib/helper.js" as Helper
+
+KCM.SimpleKCM {
+  id: root
+
+  property alias cfg_debug_active: debug_active.checked
+  property alias cfg_debug_charge: debug_charge.value
+
+  property bool debug_activeDefault
+  property int debug_chargeDefault
+
+  property int cfg_pollingrate
+  property int cfg_batteryheight
+  property string cfg_colorEmpty
+  property string cfg_colorHalf
+  property string cfg_colorFull
+  property bool cfg_notifications
+  property int cfg_batteryThreshold
+
+  property int cfg_pollingrateDefault
+  property int cfg_batteryheightDefault
+  property string cfg_colorEmptyDefault
+  property string cfg_colorHalfDefault
+  property string cfg_colorFullDefault
+  property bool cfg_notificationsDefault
+  property int cfg_batteryThresholdDefault
+
+  Kirigami.FormLayout {
+    anchors.fill: parent
+    wideMode: false
+
+    GridLayout {
+      columns: 3
+      rows: 2
+      rowSpacing: 10
+
+      // first row
+      Text {
+        text: "debug:"
+        color: PlasmaCore.Theme.textColor
+      }
+      PlasmaComponents.CheckBox {
+        id: debug_active
+      }
+      Text {
+        text: ""
+      }
+
+      // second row
+      Text {
+        text: "battery charge:"
+        color: PlasmaCore.Theme.textColor
+      }
+      Slider {
+        id: debug_charge
+        value: 0
+        from: 0
+        to: 100
+        stepSize: 1
+      }
+      Text {
+        text: cfg_debug_charge + "%"
+        color: PlasmaCore.Theme.textColor
+      }
+    }
+
+  }
+}

package/contents/ui/config/general.qml

@@ -0,0 +1,212 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.kde.plasma.core as PlasmaCore
+import org.kde.plasma.components as PlasmaComponents
+import org.kde.kirigami as Kirigami
+import org.kde.kquickcontrols as KQControls
+import org.kde.kcmutils as KCM
+
+import "../lib/helper.js" as Helper
+
+KCM.SimpleKCM {
+  id: root
+
+  property alias cfg_pollingrate: pollingrate.value
+  property alias cfg_batteryheight: batteryheight.value
+  property alias cfg_colorEmpty: colorEmpty.color
+  property alias cfg_colorHalf: colorHalf.color
+  property alias cfg_colorFull: colorFull.color
+  property alias cfg_notifications: notifications.checked
+  property alias cfg_batteryThreshold: batteryThreshold.value
+
+  property int cfg_pollingrateDefault
+  property int cfg_batteryheightDefault
+  property string cfg_colorEmptyDefault
+  property string cfg_colorHalfDefault
+  property string cfg_colorFullDefault
+  property bool cfg_notificationsDefault
+  property int cfg_batteryThresholdDefault
+
+  property bool cfg_debug_active
+  property int cfg_debug_charge
+  property bool cfg_debug_activeDefault
+  property int cfg_debug_chargeDefault
+
+  Kirigami.FormLayout {
+    anchors.fill: parent
+    wideMode: false
+
+    GridLayout {
+      columns: 3
+      rows: 2
+      rowSpacing: 10
+
+      // first row
+      Text {
+        text: "polling rate:"
+        color: PlasmaCore.Theme.textColor
+      }
+      Slider {
+        id: pollingrate
+        value: 10
+        from: 2
+        to: 60
+        stepSize: 2
+      }
+      Text {
+        text: cfg_pollingrate + " seconds"
+        color: PlasmaCore.Theme.textColor
+      }
+
+      // second row
+      Text {
+        text: "battery height:"
+        color: PlasmaCore.Theme.textColor
+      }
+      Slider {
+        id: batteryheight
+        value: 8.0
+        from: 1
+        to: 10
+        stepSize: 1
+      }
+      Text {
+        text: cfg_batteryheight
+        color: PlasmaCore.Theme.textColor
+      }
+    }
+
+    // color config
+    GridLayout {
+      columns: 3
+      rows: 3
+      rowSpacing: 1
+
+      // first row
+      Text {
+        text: "empty:"
+        color: PlasmaCore.Theme.textColor
+      }
+      KQControls.ColorButton {
+        id: colorEmpty
+        color: cfg_colorEmpty
+      }
+      Text {
+        text: cfg_colorEmpty
+        color: PlasmaCore.Theme.textColor
+      }
+
+      // secod row
+      Text {
+        text: "half:"
+        color: PlasmaCore.Theme.textColor
+      }
+      KQControls.ColorButton {
+        id: colorHalf
+        color: cfg_colorHalf
+      }
+      Text {
+        text: cfg_colorHalf
+        color: PlasmaCore.Theme.textColor
+      }
+
+      // third row
+      Text {
+        text: "full:"
+        color: PlasmaCore.Theme.textColor
+      }
+      KQControls.ColorButton {
+        id: colorFull
+        color: cfg_colorFull
+      }
+      Text {
+        text: cfg_colorFull
+        color: PlasmaCore.Theme.textColor
+      }
+    }
+
+    // color gradient example
+    GridLayout {
+      columns: 10
+      rows: 1
+      rowSpacing: 0
+
+      Text {
+        text: "█"
+        color: Helper.interpolateColor(.1, [ cfg_colorEmpty.toString(), cfg_colorHalf.toString(), cfg_colorFull.toString() ])
+      }
+      Text {
+        text: "█"
+        color: Helper.interpolateColor(.2, [ cfg_colorEmpty.toString(), cfg_colorHalf.toString(), cfg_colorFull.toString() ])
+      }
+      Text {
+        text: "█"
+        color: Helper.interpolateColor(.3, [ cfg_colorEmpty.toString(), cfg_colorHalf.toString(), cfg_colorFull.toString() ])
+      }
+      Text {
+        text: "█"
+        color: Helper.interpolateColor(.4, [ cfg_colorEmpty.toString(), cfg_colorHalf.toString(), cfg_colorFull.toString() ])
+      }
+      Text {
+        text: "█"
+        color: Helper.interpolateColor(.5, [ cfg_colorEmpty.toString(), cfg_colorHalf.toString(), cfg_colorFull.toString() ])
+      }
+      Text {
+        text: "█"
+        color: Helper.interpolateColor(.6, [ cfg_colorEmpty.toString(), cfg_colorHalf.toString(), cfg_colorFull.toString() ])
+      }
+      Text {
+        text: "█"
+        color: Helper.interpolateColor(.7, [ cfg_colorEmpty.toString(), cfg_colorHalf.toString(), cfg_colorFull.toString() ])
+      }
+      Text {
+        text: "█"
+        color: Helper.interpolateColor(.8, [ cfg_colorEmpty.toString(), cfg_colorHalf.toString(), cfg_colorFull.toString() ])
+      }
+      Text {
+        text: "█"
+        color: Helper.interpolateColor(.9, [ cfg_colorEmpty.toString(), cfg_colorHalf.toString(), cfg_colorFull.toString() ])
+      }
+      Text {
+        text: "█"
+        color: Helper.interpolateColor( 1, [ cfg_colorEmpty.toString(), cfg_colorHalf.toString(), cfg_colorFull.toString() ])
+      }
+    }
+
+    GridLayout {
+      columns: 3
+      rows: 2
+      rowSpacing: 10
+
+      // first row
+      Text {
+        text: "notifications:"
+        color: PlasmaCore.Theme.textColor
+      }
+      PlasmaComponents.CheckBox {
+        id: notifications
+      }
+      Text {
+        text: ""
+      }
+
+      // second row
+      Text {
+        text: "battery threshold:"
+        color: PlasmaCore.Theme.textColor
+      }
+      Slider {
+        id: batteryThreshold
+        value: 10
+        from: 1
+        to: 50
+        stepSize: 1
+      }
+      Text {
+        text: cfg_batteryThreshold
+        color: PlasmaCore.Theme.textColor
+      }
+    }
+  }
+}

package/contents/ui/lib/helper.js

@@ -0,0 +1,32 @@
+const batteryLevel = (batteryStatus, batteryPercent) => ({
+  "BATTERY_UNAVAILABLE": "not connected",
+  "BATTERY_CHARGING": "charging (" + batteryPercent + "%)",
+  "HEADSET_UNAVAILABLE": "no headset connected"
+})[batteryStatus] ?? batteryPercent + "%";
+
+const batteryIcon = batteryStatus => ({
+  "BATTERY_UNAVAILABLE": "action-unavailable",
+  "BATTERY_AVAILABLE": "audio-headphones-symbolic",
+  "BATTERY_CHARGING": "freon-voltage-symbolic",
+  "HEADSET_UNAVAILABLE": "dialog-error"
+})[batteryStatus] ?? "audio-headphones-symbolic";
+
+const hex2rgb = (hex, h = hex.replace('#', '0x')) => ({ r: h >> 16 & 255, g: h >> 8 & 255, b: h & 255 });
+const rgb2Hex = rgb => "#" + ((1 << 24) + (rgb.r << 16) + (rgb.g << 8) + rgb.b).toString(16).slice(1);
+
+const interpolateColor = (f, c) => {
+  if(!f)     return "transparent";
+  if(f >= 1) return c.pop();
+  if(f <= 0) return c.shift();
+
+  f *= c.length - 1;
+  const i = ~~f;
+  f -= i;
+  const [ c1, c2 ] = [ hex2rgb(c[i]), hex2rgb(c[i + 1]) ];
+
+  return rgb2Hex({
+    r: c1.r + ((c2.r - c1.r) * f) | 10,
+    g: c1.g + ((c2.g - c1.g) * f) | 10,
+    b: c1.b + ((c2.b - c1.b) * f) | 10
+  });
+};

package/contents/ui/main.qml

@@ -1,65 +1,128 @@
-import QtQuick 2.0
+import QtQuick
-import QtQuick.Layouts 1.3
+import QtQuick.Layouts
-import org.kde.plasma.plasmoid 2.0
+import org.kde.plasma.plasmoid
-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.kirigami as Kirigami
+import org.kde.plasma.plasma5support as Plasma5Support
+import org.kde.plasma.core as PlasmaCore
 
-Item {
+import org.kde.notification
-  id: main
 
-  property int batteryPercent: -2
+import "./lib/helper.js" as Helper
 
-  PlasmaCore.DataSource {
+PlasmoidItem {
+  id: root
+  Plasmoid.status: PlasmaCore.Types.ActiveStatus
+
+  readonly property int pollingrate: Plasmoid.configuration.pollingrate
+  readonly property int batteryheight: Plasmoid.configuration.batteryheight
+  readonly property string colorEmpty: Plasmoid.configuration.colorEmpty
+  readonly property string colorHalf: Plasmoid.configuration.colorHalf
+  readonly property string colorFull: Plasmoid.configuration.colorFull
+
+  readonly property bool notifications: Plasmoid.configuration.notifications
+  readonly property int batteryThreshold: Plasmoid.configuration.batteryThreshold
+
+  readonly property bool debug_active: Plasmoid.configuration.debug_active
+  readonly property int debug_charge: Plasmoid.configuration.debug_charge
+
+  property string batteryStatus: "BATTERY_UNAVAILABLE"
+  property int batteryPercent: 0
+  property bool notification_sent: false
+  property variant deviceList: []
+  property int activeDevice: 0
+
+  //property variant capabilities: []
+
+  Plasma5Support.DataSource {
     id: hsSource
     engine: "executable"
-    connectedSources: ["headsetcontrol -bc"]
+    connectedSources: ["headsetcontrol -o json"]
-    interval: 2000
+    interval: pollingrate * 1e3
-    onNewData: {
+    onNewData: (_, data) => {
-      if(data['exit_code'] > 0)
+      const res = JSON.parse(data.stdout);
-        return console.log('error lol');
+
-      batteryPercent = data['stdout'];
+      if(res.device_count === 0) {
+        batteryStatus = "HEADSET_UNAVAILABLE";
+        batteryPercent = 0;
+        root.Plasmoid.status = PlasmaCore.Types.PassiveStatus;
+        return;
+      }
+
+      //if(capabilities.length != res.devices[activeDevice].capabilities_str.length)
+      //  capabilities = res.devices[activeDevice].capabilities_str;
+
+      deviceList = res.devices.map(e => e.product);
+      batteryPercent = res.devices[activeDevice].battery.level;
+      batteryStatus = batteryPercent > 0 ? res.devices[activeDevice].battery.status : "BATTERY_UNAVAILABLE";
+
+      // debug deshmug
+      if(debug_active) {
+        batteryStatus = "BATTERY_AVAILABLE";
+        batteryPercent = debug_charge;
+      }
+
+      // hide trayicon if headset isn't connected
+      root.Plasmoid.status = batteryStatus == "BATTERY_UNAVAILABLE"
+        ? PlasmaCore.Types.PassiveStatus
+        : PlasmaCore.Types.ActiveStatus;
+
+      // send notification if necessary
+      if(batteryPercent <= batteryThreshold && batteryPercent >= 0 && !notification_sent && notifications) {
+        notification_sent = true;
+        notification.text = "Battery Level is low (" + batteryPercent + "%)";
+        notification.title = "Headset Battery Level Alert";
+        notification.iconName = "notification-battery-low";
+        notification.sendEvent();
+      }
+      // reset notifications if battery level is over batteryThreshold
+      if((batteryPercent > batteryThreshold || batteryPercent < 0) && notification_sent && notifications) {
+        notification_sent = false;
+      }
+
+      return;
     }
   }
 
-  Plasmoid.preferredRepresentation: Plasmoid.compactRepresentation
+  toolTipMainText: "battery level: " + Helper.batteryLevel(batteryStatus, batteryPercent)
+  toolTipSubText: "polling rate: " + pollingrate + " seconds"
 
-  Plasmoid.compactRepresentation: Item {
+  preferredRepresentation: compactRepresentation
-    Layout.minimumWidth: units.iconSizes.medium
+  compactRepresentation: CompactRepresentation{}
+  fullRepresentation: Item{} 
 
-    Image {
+  Notification {
-      anchors.fill: parent
+    id: notification
-      smooth: true
+    componentName: "plasma_workspace"
-      fillMode: Image.PreserveAspectFit
+    eventId: "notification"
-      source: batteryIcon()
+    flags: Notification.DefaultEvent
-      Plasmoid.toolTipMainText: "battery status:"
+    urgency: Notification.CriticalUrgency
-      Plasmoid.toolTipSubText: batteryStatus()
+  }
+
+  Instantiator {
+    model: deviceList
+    delegate: PlasmaCore.Action {
+      text: modelData
+      icon.name: "audio-headphones-symbolic"
+      /*onTriggered: {
+        console.log("headset lel");
+      }*/
     }
-
+    onObjectAdded: (index, object) => {
-    function batteryIcon() {
+      Plasmoid.contextualActions.splice(Plasmoid.contextualActions.indexOf(separator2), 0, object)
-      let iconName = "battery_100"
-      if(batteryPercent == -1) // charing
-        iconName = "battery_charging"
-      else if(batteryPercent == -2) // not connected
-        iconName = "battery_nc";
-      else if(batteryPercent > 80)
-        iconName = "battery_100";
-      else if(batteryPercent > 60)
-        iconName = "battery_80";
-      else if(batteryPercent > 40)
-        iconName = "battery_60";
-      else if(batteryPercent > 20)
-        iconName = "battery_40";
-      else
-        iconName = "battery_20";
-      return "../icons/" + iconName + ".png";
     }
-
+    onObjectRemoved: (index, object) => {
-    function batteryStatus() {
+      Plasmoid.contextualActions.splice(Plasmoid.contextualActions.indexOf(object), 1)
-      if(batteryPercent == -1)
-        return "charging";
-      else if(batteryPercent == -2)
-        return "not connected";
-      else
-        return batteryPercent + " %";
     }
   }
+
+  Plasmoid.contextualActions: [
+    PlasmaCore.Action {
+      id: separator1
+      isSeparator: true
+    },
+    PlasmaCore.Action {
+      id: separator2
+      isSeparator: true
+    }
+  ]
 }

package/metadata.json

@@ -1,21 +1,25 @@
 {
+  "KPackageStructure": "Plasma/Applet",
   "KPlugin": {
+    "Name": "Headset Battery Widget",
+    "Description": "Headset Battery Widget",
+    "Icon": "battery",
+    "Category": "System Information",
     "Authors": [{
       "Email": "flummi@srv.fail",
       "Name": "Flummi"
     }],
-    "Category": "System Information",
-    "Dependencies": [
-    ],
-    "Icon": "battery",
     "Id": "org.kde.plasma.headsetcontrol-battery-widget",
-    "Name": "Headset Battery Widget",
+    "License": "",
+    "Version": "1.7",
+    "EnabledByDefault": true,
+    "Website": "https://git.lat/Flummi/headsetcontrol-battery-widget",
+    "BugReportUrl": "https://git.lat/Flummi/headsetcontrol-battery-widget/issues",
     "ServiceTypes": [
       "Plasma/Applet"
-    ],
+    ]
-    "Version": "1",
-    "Website": "https://git.lat/Flummi/headsetcontrol-battery-widget"
   },
-  "X-Plasma-API": "declarativeappletscript",
+  "X-Plasma-NotificationArea": true,
-  "X-Plasma-MainScript": "ui/main.qml"
+  "X-Plasma-NotificationAreaCategory": "Hardware",
+  "X-Plasma-API-Minimum-Version": "6.0"
 }