updates

modules/dock/components/indicators.py

@@ -0,0 +1,196 @@
+from fabric.widgets.box import Box
+from fabric.widgets.button import Button
+from fabric.widgets.label import Label
+from fabric.widgets.overlay import Overlay
+from fabric.widgets.circularprogressbar import CircularProgressBar
+from gi.repository import Gdk, GLib
+
+
+import config.data as data
+import utils.icons as icons
+from services.network import NetworkClient
+from fabric.bluetooth import BluetoothClient
+
+
+class WifiIndicator(Button):
+    def __init__(self, **kwargs):
+        super().__init__(name="button-bar-network", **kwargs)
+        
+        # Initialize NetworkClient
+        self.network = NetworkClient()        
+        # Create progress bar and wifi label
+        self.progress_bar = CircularProgressBar(
+            name="button-network",
+            size=28,
+            line_width=2,
+            start_angle=150,
+            end_angle=390,
+        )
+        self.wifi_label = Label(name="network-label", markup=icons.loader)
+        
+        # Create overlay with progress bar and label
+        self.add(Overlay(
+            child=self.progress_bar,
+            overlays=self.wifi_label
+        ))
+
+        # Connect signals
+        self.network.connect("ready", self.on_network_ready)
+        
+        # If already ready, set up signals immediately
+        if self.network.is_ready:
+            self.setup_signals()
+
+    def on_network_ready(self, *args):
+        self.setup_signals()
+
+    def setup_signals(self):
+        # Connect to NetworkClient signals
+        self.network.connect("changed", self.on_network_changed)
+        self.network.connect("wifi-device-added", self.on_wifi_device_added)
+        self.network.connect("wifi-device-removed", self.on_wifi_device_removed)
+        self.network.connect("ethernet-device-added", self.on_ethernet_device_added)
+        self.network.connect("ethernet-device-removed", self.on_ethernet_device_removed)
+        
+        # Connect to WiFi device if available
+        if self.network.wifi_device:
+            self.network.wifi_device.connect("changed", self.on_wifi_changed)
+            self.network.wifi_device.connect("ap-added", self.on_wifi_changed)
+            self.network.wifi_device.connect("ap-removed", self.on_wifi_changed)
+        
+        # Connect to Ethernet device if available
+        if self.network.ethernet_device:
+            self.network.ethernet_device.connect("changed", self.on_ethernet_changed)
+        
+        self.update_state()
+
+    def update_state(self):
+        # Check ethernet first
+        if self.network.ethernet_device and self.network.ethernet_device.state == "activated":
+            self.wifi_label.set_markup(icons.world)
+            self.progress_bar.value = 1.0  # Full circle for ethernet
+            tooltip = f"Connected to Ethernet ({self.network.ethernet_device.speed})"
+            self.set_tooltip_text(tooltip)
+            return
+
+        # Then check wifi
+        if not self.network.wifi_device:
+            self.wifi_label.set_markup(icons.cloud_off)
+            self.progress_bar.value = 0
+            tooltip = "No WiFi device found"
+        elif not self.network.wifi_device.wireless_enabled:
+            self.wifi_label.set_markup(icons.cloud_off)
+            self.progress_bar.value = 0
+            tooltip = "WiFi disabled"
+        else:
+            active_ap = self.network.wifi_device.active_access_point
+            if active_ap:
+                strength = active_ap.strength
+                self.progress_bar.value = strength / 100
+                if strength >= 75:
+                    self.wifi_label.set_markup(icons.wifi_3)
+                elif strength >= 50:
+                    self.wifi_label.set_markup(icons.wifi_2)
+                elif strength >= 25:
+                    self.wifi_label.set_markup(icons.wifi_1)
+                else:
+                    self.wifi_label.set_markup(icons.wifi_0)
+                tooltip = f"Connected to {active_ap.ssid} ({strength}%)"
+            else:
+                self.wifi_label.set_markup(icons.world_off)
+                self.progress_bar.value = 0
+                tooltip = "Not connected"
+
+        self.set_tooltip_text(tooltip)
+
+    def on_wifi_device_added(self, *args):
+        self.network.wifi_device.connect("changed", self.on_wifi_changed)
+        self.network.wifi_device.connect("ap-added", self.on_wifi_changed)
+        self.network.wifi_device.connect("ap-removed", self.on_wifi_changed)
+        self.update_state()
+
+    def on_wifi_device_removed(self, *args):
+        self.update_state()
+
+    def on_network_changed(self, *args):
+        self.update_state()
+
+    def on_wifi_changed(self, *args):
+        self.update_state()
+
+    def on_ethernet_device_added(self, *args):
+        if self.network.ethernet_device:
+            self.network.ethernet_device.connect("changed", self.on_ethernet_changed)
+        self.update_state()
+
+    def on_ethernet_device_removed(self, *args):
+        self.update_state()
+
+    def on_ethernet_changed(self, *args):
+        self.update_state()
+
+
+class BluetoothIndicator(Button):
+    def __init__(self, **kwargs):
+        super().__init__(name="button-bar-bluetooth", **kwargs)
+        
+        # Initialize BluetoothClient
+        self.bluetooth = BluetoothClient()
+        
+        # Create bluetooth label
+        self.bt_label = Label(name="bluetooth-label", markup=icons.loader)
+        self.add(self.bt_label)
+        
+        # Connect signals
+        self.bluetooth.connect("changed", self.on_bluetooth_changed)
+        self.bluetooth.connect("device-added", self.on_device_added)
+        self.bluetooth.connect("device-removed", self.on_device_removed)
+        
+        # Initial state update
+        self.update_state()
+
+    def update_state(self):
+        if not self.bluetooth.enabled:
+            self.bt_label.set_markup(icons.bluetooth_off)
+            tooltip = "Bluetooth disabled"
+        else:
+            connected_devices = self.bluetooth.connected_devices
+            if connected_devices:
+                self.bt_label.set_markup(icons.bluetooth_connected)
+                if len(connected_devices) == 1:
+                    device = connected_devices[0]
+                    tooltip = f"Connected to {device.alias}"
+                    if device.battery_percentage > 0:
+                        tooltip += f" ({device.battery_percentage:.0f}%)"
+                else:
+                    tooltip = f"Connected to {len(connected_devices)} devices"
+            else:
+                if self.bluetooth.scanning:
+                    self.bt_label.set_markup(icons.loader)
+                    tooltip = "Scanning for devices..."
+                else:
+                    self.bt_label.set_markup(icons.bluetooth)
+                    tooltip = "No devices connected"
+
+        self.set_tooltip_text(tooltip)
+
+    def on_bluetooth_changed(self, *args):
+        self.update_state()
+
+    def on_device_added(self, _, address):
+        self.update_state()
+
+    def on_device_removed(self, _, address):
+        self.update_state()
+
+
+class Indicators(Box):
+    def __init__(self, **kwargs):
+        super().__init__(
+            name="indicator",
+            orientation="h" if not data.VERTICAL else "v",
+            spacing=4,
+            children=[WifiIndicator(), BluetoothIndicator()],
+            **kwargs,
+        )
+        self.show_all()