sankalp
e97311e2b0
New Features - Introduce `get_battery_icon_file` to generate battery icons based on percentage and charging state. - Add fallback Bluetooth control using `rfkill` when Fabric Bluetooth fails. Enhancements - Refactor layout management with `_rebuild_layout_from_config` and dynamic indicator instantiation. - Replace large `EnergyModeButton` class with lightweight utility functions. - Simplify notification icon updates using `dynamic_file`. Bug Fixes - No explicit bug fixes; changes focus on feature additions and refactoring.
454 lines
16 KiB
Python
454 lines
16 KiB
Python
from fabric.bluetooth import BluetoothClient
|
|
from fabric.widgets.box import Box
|
|
from fabric.widgets.button import Button
|
|
from fabric.widgets.label import Label
|
|
from fabric.widgets.wayland import WaylandWindow as Window
|
|
from utils.utils import setup_cursor_hover, svg_file
|
|
from widgets.battery_widget import BatteryControl
|
|
|
|
from modules.controlcenter.bluetooth import BluetoothConnections
|
|
from modules.controlcenter.wifi import WifiConnections
|
|
from services.battery import BatteryService, DeviceState
|
|
from services.network import NetworkClient
|
|
from utils.functions import format_duration, get_wifi_icon_for_strength
|
|
from utils.roam import modus_service
|
|
from widgets.mousecapture import DropDownMouseCapture
|
|
|
|
|
|
def create_control_window(name_prefix):
|
|
return Window(
|
|
layer="overlay",
|
|
title="modus",
|
|
anchor="top right",
|
|
margin="2px 10px 0px 0px",
|
|
exclusivity="auto",
|
|
keyboard_mode="on-demand",
|
|
name=f"{name_prefix}-window",
|
|
visible=False,
|
|
)
|
|
|
|
|
|
def create_mouse_capture(window):
|
|
return DropDownMouseCapture(layer="top", child_window=window)
|
|
|
|
|
|
def setup_control_center(
|
|
show_window, name_prefix, widget_class, parent, **widget_kwargs
|
|
):
|
|
if not show_window:
|
|
return None, None, None
|
|
|
|
window = create_control_window(name_prefix)
|
|
widget = widget_class(parent, **widget_kwargs)
|
|
window.children = [widget]
|
|
mouse_capture = create_mouse_capture(window)
|
|
|
|
return window, widget, mouse_capture
|
|
|
|
|
|
def handle_indicator_click(mouse_capture):
|
|
if mouse_capture:
|
|
mouse_capture.toggle_mousecapture()
|
|
|
|
|
|
def hide_control_center(mouse_capture):
|
|
if mouse_capture:
|
|
mouse_capture.hide_child_window()
|
|
|
|
|
|
class BluetoothIndicator(Box):
|
|
def __init__(self, show_window=True, **kwargs):
|
|
super().__init__(name="bluetooth-indicator", orientation="h", **kwargs)
|
|
self.show_window = show_window
|
|
|
|
self.bluetooth = BluetoothClient()
|
|
self.bt_icon = svg_file("applets/bluetooth-clear.svg", size=22)
|
|
|
|
self.bt_button = Button(
|
|
name="bt-button", child=self.bt_icon, on_clicked=self.on_bluetooth_clicked
|
|
)
|
|
|
|
self.add(self.bt_button)
|
|
|
|
# Set pointer cursor on hover
|
|
setup_cursor_hover(self.bt_button, "pointer")
|
|
|
|
# Setup control center using shared function
|
|
(
|
|
self.bluetooth_window,
|
|
self.bluetooth_widget,
|
|
self.bluetooth_mousecapture,
|
|
) = setup_control_center(
|
|
self.show_window,
|
|
"bluetooth",
|
|
BluetoothConnections,
|
|
self,
|
|
show_back_button=False,
|
|
)
|
|
|
|
modus_service.connect("bluetooth-changed", self.on_bluetooth_changed)
|
|
self.bluetooth.connect("changed", self.on_bluetooth_direct_changed)
|
|
self.bluetooth.connect("device-added", self.on_device_added)
|
|
self.bluetooth.connect("device-removed", self.on_device_removed)
|
|
|
|
self.update_modus_service_bluetooth_state()
|
|
self.update_state()
|
|
|
|
def update_state(self):
|
|
if not self.bluetooth.enabled:
|
|
self.bt_icon.dynamic_file("applets/bluetooth-off-clear.svg")
|
|
tooltip = "Bluetooth disabled"
|
|
else:
|
|
connected_devices = self.bluetooth.connected_devices
|
|
if connected_devices:
|
|
self.bt_icon.dynamic_file("applets/bluetooth-clear.svg")
|
|
if len(connected_devices) >= 1:
|
|
self.bt_icon.dynamic_file("applets/bluetooth-paired.svg")
|
|
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:
|
|
self.bt_icon.dynamic_file("applets/bluetooth-clear.svg")
|
|
tooltip = "No devices connected"
|
|
|
|
self.bt_button.set_tooltip_text(tooltip)
|
|
|
|
def on_bluetooth_changed(self, service, new_bluetooth_state):
|
|
self.update_state()
|
|
|
|
def on_bluetooth_direct_changed(self, *args):
|
|
self.update_modus_service_bluetooth_state()
|
|
self.update_state()
|
|
|
|
def on_device_added(self, _, address):
|
|
self.update_modus_service_bluetooth_state()
|
|
self.update_state()
|
|
|
|
def on_device_removed(self, _, address):
|
|
self.update_modus_service_bluetooth_state()
|
|
self.update_state()
|
|
|
|
def update_modus_service_bluetooth_state(self):
|
|
if not self.bluetooth.enabled:
|
|
bluetooth_state = "disabled"
|
|
else:
|
|
connected_devices = self.bluetooth.connected_devices
|
|
if connected_devices:
|
|
if len(connected_devices) == 1:
|
|
device = connected_devices[0]
|
|
bluetooth_state = f"connected:{device.alias}"
|
|
if (
|
|
hasattr(device, "battery_percentage")
|
|
and device.battery_percentage > 0
|
|
):
|
|
bluetooth_state += f":{device.battery_percentage:.0f}%"
|
|
else:
|
|
bluetooth_state = f"connected:{len(connected_devices)}_devices"
|
|
else:
|
|
bluetooth_state = "enabled"
|
|
|
|
modus_service.bluetooth = bluetooth_state
|
|
|
|
def on_bluetooth_clicked(self, *args):
|
|
handle_indicator_click(self.bluetooth_mousecapture)
|
|
|
|
def close_bluetooth(self, *args):
|
|
hide_control_center(self.bluetooth_mousecapture)
|
|
|
|
def hide_controlcenter(self, *args):
|
|
hide_control_center(self.bluetooth_mousecapture)
|
|
|
|
|
|
class NetworkIndicator(Box):
|
|
def __init__(self, show_window=True, **kwargs):
|
|
super().__init__(name="network-indicator", orientation="h", **kwargs)
|
|
self.show_window = show_window
|
|
|
|
self.network_service = NetworkClient()
|
|
|
|
self.network_icon = svg_file("applets/wifi-clear.svg", size=22)
|
|
|
|
self.network_button = Button(
|
|
name="network-button",
|
|
child=self.network_icon,
|
|
on_clicked=self.on_wifi_clicked,
|
|
)
|
|
|
|
self.add(self.network_button)
|
|
|
|
# Set pointer cursor on hover
|
|
setup_cursor_hover(self.network_button, "pointer")
|
|
|
|
# Setup control center using shared function
|
|
(
|
|
self.wifi_window,
|
|
self.wifi_widget,
|
|
self.wifi_mousecapture,
|
|
) = setup_control_center(
|
|
self.show_window,
|
|
"wifi",
|
|
WifiConnections,
|
|
self,
|
|
show_back_button=False,
|
|
)
|
|
|
|
modus_service.connect("wlan-changed", self.on_wlan_changed)
|
|
self.network_service.connect("wifi-device-added", self.on_wifi_device_added)
|
|
self.network_service.connect(
|
|
"ethernet-device-added", self.on_ethernet_device_added
|
|
)
|
|
self.network_service.connect("changed", self.on_network_changed)
|
|
|
|
self.update_modus_service_wlan_state()
|
|
self.update_state()
|
|
|
|
def on_wlan_changed(self, service, new_wlan_state):
|
|
self.update_state()
|
|
|
|
def on_wifi_device_added(self, *args):
|
|
"""Called when WiFi device is added"""
|
|
if self.network_service.wifi_device:
|
|
self.network_service.wifi_device.connect(
|
|
"changed", self.on_network_direct_changed
|
|
)
|
|
self.update_modus_service_wlan_state()
|
|
self.update_state()
|
|
|
|
def on_ethernet_device_added(self, *args):
|
|
if self.network_service.ethernet_device:
|
|
self.network_service.ethernet_device.connect(
|
|
"changed", self.on_network_direct_changed
|
|
)
|
|
self.update_modus_service_wlan_state()
|
|
self.update_state()
|
|
|
|
def on_network_direct_changed(self, *args):
|
|
self.update_modus_service_wlan_state()
|
|
self.update_state()
|
|
|
|
def on_network_changed(self, *args):
|
|
self.update_modus_service_wlan_state()
|
|
self.update_state()
|
|
|
|
def update_modus_service_wlan_state(self):
|
|
wlan_state = "disconnected"
|
|
|
|
if self.network_service.wifi_device:
|
|
wifi = self.network_service.wifi_device
|
|
if not wifi.wireless_enabled:
|
|
wlan_state = "disabled"
|
|
elif wifi.active_access_point:
|
|
ap = wifi.active_access_point
|
|
wlan_state = f"connected:{ap.ssid}"
|
|
if ap.strength >= 0:
|
|
wlan_state += f":{ap.strength}%"
|
|
else:
|
|
wlan_state = "enabled"
|
|
|
|
# Check Ethernet if WiFi is not connected
|
|
elif self.network_service.ethernet_device:
|
|
ethernet = self.network_service.ethernet_device
|
|
if ethernet.internet == "activated":
|
|
wlan_state = "ethernet:connected"
|
|
if hasattr(ethernet, "speed") and ethernet.speed:
|
|
wlan_state += f":{ethernet.speed}"
|
|
elif ethernet.internet == "activating":
|
|
wlan_state = "ethernet:connecting"
|
|
else:
|
|
wlan_state = "ethernet:disconnected"
|
|
|
|
modus_service.wlan = wlan_state
|
|
|
|
def update_state(self):
|
|
tooltip = "No network connection"
|
|
icon_file = "wifi-off-clear.svg"
|
|
|
|
# Check WiFi first (prioritize WiFi over Ethernet)
|
|
if self.network_service.wifi_device:
|
|
wifi = self.network_service.wifi_device
|
|
if not wifi.wireless_enabled:
|
|
icon_file = "wifi-off-clear.svg"
|
|
tooltip = "WiFi disabled"
|
|
elif wifi.active_access_point:
|
|
ap = wifi.active_access_point
|
|
# Use dynamic WiFi icon based on signal strength
|
|
wifi_icon_path = get_wifi_icon_for_strength(ap.strength)
|
|
self.network_icon.set_from_file(wifi_icon_path)
|
|
tooltip = f"Connected to {ap.ssid}"
|
|
if ap.strength >= 0:
|
|
tooltip += f" ({ap.strength}%)"
|
|
self.network_button.set_tooltip_text(tooltip)
|
|
return # Early return to avoid setting icon again
|
|
else:
|
|
icon_file = "wifi-off-clear.svg"
|
|
tooltip = "WiFi disconnected"
|
|
|
|
# Check Ethernet if WiFi is not connected
|
|
elif self.network_service.ethernet_device:
|
|
ethernet = self.network_service.ethernet_device
|
|
if ethernet.internet == "activated":
|
|
icon_file = "network-wired.svg"
|
|
tooltip = "Ethernet connected"
|
|
if hasattr(ethernet, "speed") and ethernet.speed:
|
|
tooltip += f" ({ethernet.speed})"
|
|
elif ethernet.internet == "activating":
|
|
icon_file = "network-wired.svg"
|
|
tooltip = "Ethernet connecting..."
|
|
else:
|
|
icon_file = "network-wired-offline.svg"
|
|
tooltip = "Ethernet disconnected"
|
|
|
|
self.network_icon.dynamic_file(f"applets/{icon_file}")
|
|
self.network_button.set_tooltip_text(tooltip)
|
|
|
|
def on_wifi_clicked(self, *args):
|
|
handle_indicator_click(self.wifi_mousecapture)
|
|
|
|
def close_wifi(self, *args):
|
|
hide_control_center(self.wifi_mousecapture)
|
|
|
|
def hide_controlcenter(self, *args):
|
|
hide_control_center(self.wifi_mousecapture)
|
|
|
|
|
|
class BatteryIndicator(Box):
|
|
def __init__(self, show_window=True, **kwargs):
|
|
super().__init__(name="battery-indicator", orientation="h", **kwargs)
|
|
self.show_window = show_window
|
|
|
|
self.battery_service = BatteryService()
|
|
|
|
self.battery_icon = svg_file("battery/battery-100.svg", size=23)
|
|
|
|
self.battery_button = Button(
|
|
name="battery-button",
|
|
child=self.battery_icon,
|
|
on_clicked=self.on_battery_clicked,
|
|
)
|
|
|
|
self.battery_label = Label(name="battery-label", label="--- %")
|
|
|
|
self.add(self.battery_label)
|
|
self.add(self.battery_button)
|
|
|
|
# Set pointer cursor on hover
|
|
setup_cursor_hover(self.battery_button, "pointer")
|
|
|
|
(
|
|
self.battery_window,
|
|
self.battery_widget,
|
|
self.battery_mousecapture,
|
|
) = setup_control_center(
|
|
self.show_window,
|
|
"battery",
|
|
BatteryControl,
|
|
self,
|
|
show_back_button=False,
|
|
)
|
|
|
|
modus_service.connect("battery-changed", self.on_battery_changed)
|
|
self.battery_service.connect("changed", self.on_battery_direct_changed)
|
|
|
|
self.update_modus_service_battery_state()
|
|
self.update_state()
|
|
|
|
def on_battery_changed(self, service, new_battery_state):
|
|
self.update_state()
|
|
|
|
def on_battery_direct_changed(self, *args):
|
|
self.update_modus_service_battery_state()
|
|
self.update_state()
|
|
|
|
def _get_percentage(self):
|
|
return int(self.battery_service.get_property("Percentage") or 0)
|
|
|
|
def _get_state(self):
|
|
state_value = self.battery_service.get_property("State")
|
|
return DeviceState.get(state_value, "UNKNOWN")
|
|
|
|
def _is_present(self):
|
|
return bool(self.battery_service.get_property("IsPresent"))
|
|
|
|
def _get_time_to_empty(self):
|
|
return int(self.battery_service.get_property("TimeToEmpty") or 0)
|
|
|
|
def _get_time_to_full(self):
|
|
return int(self.battery_service.get_property("TimeToFull") or 0)
|
|
|
|
def _format_time(self, seconds: int) -> str:
|
|
return format_duration(seconds)
|
|
|
|
def _get_battery_icon_file(self, percentage: int, is_charging: bool) -> str:
|
|
clamped = max(0, min(100, percentage))
|
|
step = (clamped // 10) * 10
|
|
filename = f"battery-{step:03d}{'-charging' if is_charging else ''}.svg"
|
|
return f"battery/{filename}"
|
|
|
|
def update_modus_service_battery_state(self):
|
|
if not self._is_present():
|
|
battery_state = "not_present"
|
|
else:
|
|
percentage = self._get_percentage()
|
|
state_str = self._get_state().lower()
|
|
|
|
battery_state = f"{state_str}:{percentage}%"
|
|
|
|
if state_str == "discharging":
|
|
time_to_empty = self._format_time(self._get_time_to_empty())
|
|
if time_to_empty != "N/A":
|
|
battery_state += f":{time_to_empty}"
|
|
elif state_str == "charging":
|
|
time_to_full = self._format_time(self._get_time_to_full())
|
|
if time_to_full != "N/A":
|
|
battery_state += f":{time_to_full}"
|
|
|
|
modus_service.battery = battery_state
|
|
|
|
def get_battery_tooltip(self, percentage, state):
|
|
tooltip = f"Battery: {percentage}%"
|
|
|
|
if state == "CHARGING":
|
|
tooltip += " (Charging)"
|
|
time_to_full = self._format_time(self._get_time_to_full())
|
|
if time_to_full != "N/A":
|
|
tooltip += f" - {time_to_full} until full"
|
|
elif state == "DISCHARGING":
|
|
time_to_empty = self._format_time(self._get_time_to_empty())
|
|
if time_to_empty != "N/A":
|
|
tooltip += f" - {time_to_empty} remaining"
|
|
elif state == "FULLY_CHARGED":
|
|
tooltip += " (Fully charged)"
|
|
|
|
return tooltip
|
|
|
|
def update_state(self):
|
|
if not self._is_present():
|
|
self.set_visible(False)
|
|
return
|
|
else:
|
|
self.set_visible(True)
|
|
|
|
percentage = self._get_percentage()
|
|
state = self._get_state()
|
|
is_charging = state in ["CHARGING", "FULLY_CHARGED"]
|
|
|
|
icon_file = self._get_battery_icon_file(percentage, is_charging)
|
|
tooltip = self.get_battery_tooltip(percentage, state)
|
|
percentage_text = f"{percentage}%"
|
|
|
|
self.battery_icon.dynamic_file(icon_file)
|
|
self.battery_button.set_tooltip_text(tooltip)
|
|
self.battery_label.set_label(percentage_text)
|
|
|
|
def on_battery_clicked(self, *args):
|
|
handle_indicator_click(self.battery_mousecapture)
|
|
|
|
def close_battery(self, *args):
|
|
hide_control_center(self.battery_mousecapture)
|
|
|
|
def hide_controlcenter(self, *args):
|
|
hide_control_center(self.battery_mousecapture)
|