sankalp
c22ea5dfda
Enhancements: - Add optimized night‑variant detection for weather icons using a predefined list - Replace `Svg` usage with direct `svg_file` calls throughout the todo widget, removing redundant relative‑path logic - Update dock and battery modules to load assets via direct paths, eliminating unnecessary `get_relative_path` calls- Introduce `WEATHER_CACHE_TIMEOUT` constant and tidy up unused imports (`WEATHER_EMOJI_MAP` removed) - Minor formatting and structural clean‑ups that improve code readability Bug Fixes: - Remove dead import of `WEATHER_EMOJI_MAP` and unused constant `WEATHER_EMOJI_MAP` - Correct syntax of `condition_em` initialization to avoid potential rendering issues New Features: - None.
101 lines
3.1 KiB
Python
101 lines
3.1 KiB
Python
import math
|
|
from fabric.audio import Audio
|
|
from utils.utils import svg_file
|
|
from fabric.widgets.scale import ScaleMark
|
|
from .animated_scale import AnimatedScale
|
|
from .base import BaseOSDContainer
|
|
|
|
|
|
class AudioOSDContainer(BaseOSDContainer):
|
|
def __init__(self, window, **kwargs):
|
|
super().__init__(window, **kwargs)
|
|
self.audio = Audio()
|
|
self._last_volume = None
|
|
self._last_muted = None
|
|
self._setup_specific_components()
|
|
self._connect_specific_signals()
|
|
|
|
def _setup_specific_components(self):
|
|
self.osd_window_image = svg_file(
|
|
"volume/audio-volume.svg",
|
|
size=(100, 100),
|
|
name="osd-image",
|
|
h_align="center",
|
|
v_align="center",
|
|
h_expand=True,
|
|
v_expand=True,
|
|
)
|
|
self.scale = AnimatedScale(
|
|
marks=(ScaleMark(value=i) for i in range(1, 100, 10)),
|
|
value=70,
|
|
min_value=0,
|
|
max_value=100,
|
|
increments=(1, 1),
|
|
orientation="h",
|
|
)
|
|
self.add(self.osd_window_image)
|
|
self.add(self.scale)
|
|
|
|
def _connect_specific_signals(self):
|
|
self.audio.connect("notify::speaker", self._on_speaker_changed)
|
|
if self.audio.speaker:
|
|
self._connect_speaker_signals()
|
|
|
|
def _connect_speaker_signals(self):
|
|
if self.audio.speaker:
|
|
self.audio.speaker.connect("changed", self._on_speaker_stream_changed)
|
|
self._sync_with_audio()
|
|
|
|
def _on_speaker_changed(self, *_):
|
|
self._connect_speaker_signals()
|
|
self.update()
|
|
|
|
def _on_speaker_stream_changed(self, *_):
|
|
if self.audio.speaker:
|
|
current_volume = round(self.audio.speaker.volume)
|
|
current_muted = self.audio.speaker.muted
|
|
if self._last_volume != current_volume or self._last_muted != current_muted:
|
|
self._last_volume = current_volume
|
|
self._last_muted = current_muted
|
|
self.update()
|
|
|
|
def _sync_with_audio(self):
|
|
if self.audio.speaker:
|
|
self._last_volume = round(self.audio.speaker.volume)
|
|
self._last_muted = self.audio.speaker.muted
|
|
self.scale.set_value(self._last_volume)
|
|
self._update_display()
|
|
|
|
def _update_display(self):
|
|
if not self.audio.speaker:
|
|
return
|
|
|
|
volume = (
|
|
self._last_volume
|
|
if self._last_volume is not None
|
|
else round(self.audio.speaker.volume)
|
|
)
|
|
muted = (
|
|
self._last_muted
|
|
if self._last_muted is not None
|
|
else self.audio.speaker.muted
|
|
)
|
|
|
|
display_volume = 0 if (volume == 0 or muted) else volume
|
|
level = (
|
|
0 if display_volume == 0 else min(int(math.ceil(display_volume / 33)), 3)
|
|
)
|
|
|
|
self.osd_window_image.set_from_file(f"volume/audio-volume-{level}.svg")
|
|
|
|
if muted or volume == 0:
|
|
self.scale.add_style_class("muted")
|
|
else:
|
|
self.scale.remove_style_class("muted")
|
|
|
|
self.scale.animate_value(volume)
|
|
|
|
def update(self, *_):
|
|
self._update_display()
|
|
super().update()
|