snapshot

Author: DataEraserC

home/linux/gui/base/noctalia/config/plugins/privacy-indicator/BarWidget.qml

@@ -2,10 +2,7 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
-import Quickshell.Io
-import Quickshell.Services.Pipewire
 import qs.Commons
-import qs.Modules.Bar.Extras
 import qs.Services.UI
 import qs.Widgets
 
@@ -26,22 +23,25 @@ Item {
   readonly property real capsuleHeight: Style.getCapsuleHeightForScreen(screenName)
   readonly property real barFontSize: Style.getBarFontSizeForScreen(screenName)
 
-  property bool micActive: false
-  property bool camActive: false
-  property bool scrActive: false
-  property var micApps: []
-  property var camApps: []
-  property var scrApps: []
+  // Access main instance for state
+  readonly property var mainInstance: pluginApi?.mainInstance
+  
+  property bool micActive: mainInstance ? mainInstance.micActive : false
+  property bool camActive: mainInstance ? mainInstance.camActive : false
+  property bool scrActive: mainInstance ? mainInstance.scrActive : false
+  property var micApps: mainInstance ? mainInstance.micApps : []
+  property var camApps: mainInstance ? mainInstance.camApps : []
+  property var scrApps: mainInstance ? mainInstance.scrApps : []
 
   property var cfg: pluginApi?.pluginSettings || ({})
   property var defaults: pluginApi?.manifest?.metadata?.defaultSettings || ({})
 
-  property bool hideInactive: cfg.hideInactive ?? defaults.hideInactive
-  property bool removeMargins: cfg.removeMargins ?? defaults.removeMargins
-  property int iconSpacing: cfg.iconSpacing || Style.marginXS
-
-  property string activeColorKey: cfg.activeColor ?? defaults.activeColor
-  property string inactiveColorKey: cfg.inactiveColor ?? defaults.inactiveColor
+  property bool hideInactive: cfg.hideInactive ?? defaults.hideInactive ?? false
+  property bool enableToast: cfg.enableToast ?? defaults.enableToast ?? true
+  property bool removeMargins: cfg.removeMargins ?? defaults.removeMargins ?? false
+  property int iconSpacing: cfg.iconSpacing ?? defaults.iconSpacing ?? 4
+  property string activeColorKey: cfg.activeColor ?? defaults.activeColor ?? "primary"
+  property string inactiveColorKey: cfg.inactiveColor ?? defaults.inactiveColor ?? "none"
 
   readonly property color activeColor: Color.resolveColorKey(activeColorKey)
   readonly property color inactiveColor: inactiveColorKey === "none" ? Qt.alpha(Color.mOnSurfaceVariant, 0.3) : Color.resolveColorKey(inactiveColorKey)
@@ -63,156 +63,6 @@ Item {
   visible: root.isVisible
   opacity: root.isVisible ? 1.0 : 0.0
 
-  PwObjectTracker {
-    objects: Pipewire.ready ? Pipewire.nodes.values : []
-  }
-
-  Process {
-    id: cameraCheckProcess
-    running: false
-
-    command: ["sh", "-c", "for dev in /dev/video*; do [ -e \"$dev\" ] && [ -n \"$(find /proc/[0-9]*/fd/ -lname \"$dev\" 2>/dev/null | head -n1)\" ] && echo \"active\" && exit 0; done; exit 1"]
-
-    onExited: (code, status) => {
-      var isActive = code === 0;
-      root.camActive = isActive;
-
-      if (isActive) {
-        cameraAppsProcess.running = true;
-      } else {
-        root.camApps = [];
-      }
-    }
-  }
-
-  Process {
-    id: cameraAppsProcess
-    running: false
-
-    command: ["sh", "-c", "for dev in /dev/video*; do [ -e \"$dev\" ] && for fd in /proc/[0-9]*/fd/*; do [ -L \"$fd\" ] && [ \"$(readlink \"$fd\" 2>/dev/null)\" = \"$dev\" ] && ps -p \"$(echo \"$fd\" | cut -d/ -f3)\" -o comm= 2>/dev/null; done; done | sort -u | tr '\\n' ',' | sed 's/,$//'"]
-
-    onExited: (code, status) => {
-      if (stdout) {
-        var appsString = stdout.trim();
-        var apps = appsString.length > 0 ? appsString.split(',') : [];
-        root.camApps = apps;
-      } else {
-        root.camApps = [];
-      }
-    }
-  }
-
-  Timer {
-    interval: 1000
-    repeat: true
-    running: true
-    triggeredOnStart: true
-    onTriggered: updatePrivacyState()
-  }
-
-  function hasNodeLinks(node, links) {
-    for (var i = 0; i < links.length; i++) {
-      var link = links[i];
-      if (link && (link.source === node || link.target === node)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  function getAppName(node) {
-    return node.properties["application.name"] || node.nickname || node.name || "";
-  }
-
-  function updateMicrophoneState(nodes, links) {
-    var appNames = [];
-    var isActive = false;
-
-    for (var i = 0; i < nodes.length; i++) {
-      var node = nodes[i];
-      if (!node || !node.isStream || !node.audio || node.isSink) continue;
-      if (!hasNodeLinks(node, links) || !node.properties) continue;
-
-      var mediaClass = node.properties["media.class"] || "";
-      if (mediaClass === "Stream/Input/Audio") {
-        if (node.properties["stream.capture.sink"] === "true") {
-          continue;
-        }
-
-        isActive = true;
-        var appName = getAppName(node);
-        if (appName && appNames.indexOf(appName) === -1) {
-          appNames.push(appName);
-        }
-      }
-    }
-
-    root.micActive = isActive;
-    root.micApps = appNames;
-  }
-
-  function updateCameraState() {
-    cameraCheckProcess.running = true;
-  }
-
-  function isScreenShareNode(node) {
-    if (!node.properties) {
-      return false;
-    }
-
-    var mediaClass = node.properties["media.class"] || "";
-
-    if (mediaClass.indexOf("Audio") >= 0) {
-      return false;
-    }
-
-    if (mediaClass.indexOf("Video") === -1) {
-      return false;
-    }
-
-    var mediaName = (node.properties["media.name"] || "").toLowerCase();
-
-    if (mediaName.match(/^(xdph-streaming|gsr-default|game capture|screen|desktop|display|cast|webrtc|v4l2)/) ||
-        mediaName === "gsr-default_output" ||
-        mediaName.match(/screen-cast|screen-capture|desktop-capture|monitor-capture|window-capture|game-capture/i)) {
-      return true;
-    }
-
-    return false;
-  }
-
-  function updateScreenShareState(nodes, links) {
-    var appNames = [];
-    var isActive = false;
-
-    for (var i = 0; i < nodes.length; i++) {
-      var node = nodes[i];
-      if (!node || !hasNodeLinks(node, links) || !node.properties) continue;
-
-      if (isScreenShareNode(node)) {
-        isActive = true;
-        var appName = getAppName(node);
-        if (appName && appNames.indexOf(appName) === -1) {
-          appNames.push(appName);
-        }
-      }
-    }
-
-    root.scrActive = isActive;
-    root.scrApps = appNames;
-  }
-
-  function updatePrivacyState() {
-    if (!Pipewire.ready) return;
-
-    var nodes = Pipewire.nodes.values || [];
-    var links = Pipewire.links.values || [];
-
-    updateMicrophoneState(nodes, links);
-    updateCameraState();
-    updateScreenShareState(nodes, links);
-  }
-
   function buildTooltip() {
     var parts = [];
 
@@ -301,12 +151,14 @@ Item {
 
   MouseArea {
     anchors.fill: parent
-    acceptedButtons: Qt.RightButton
+    acceptedButtons: Qt.RightButton | Qt.LeftButton
     hoverEnabled: true
 
     onClicked: function (mouse) {
       if (mouse.button === Qt.RightButton) {
         PanelService.showContextMenu(contextMenu, root, screen);
+      } else if (mouse.button === Qt.LeftButton) {
+        if (pluginApi) pluginApi.openPanel(root.screen, root);
       }
     }