Merge branch 'master' into bulgarian

cosmic-applet-a11y/Cargo.toml

@@ -1,14 +1,9 @@
 [package]
 name = "cosmic-applet-a11y"
-version = "0.1.0"
+version = "1.0.2"
 edition = "2024"
 
 [dependencies]
-# cosmic-dbus-a11y = { git = "https://github.com/pop-os/dbus-settings-bindings" }
-cosmic-settings-subscriptions = { workspace = true, features = [
-    "accessibility",
-    "cosmic_a11y_manager",
-] }
 anyhow.workspace = true
 cctk.workspace = true
 cosmic-protocols.workspace = true
@@ -21,3 +16,9 @@ tokio.workspace = true
 tracing-log.workspace = true
 tracing-subscriber.workspace = true
 tracing.workspace = true
+
+[dependencies.cosmic-settings-a11y-manager-subscription]
+git = "https://github.com/pop-os/cosmic-settings"
+
+[dependencies.cosmic-settings-accessibility-subscription]
+git = "https://github.com/pop-os/cosmic-settings"

cosmic-applet-a11y/data/com.system76.CosmicAppletA11y.desktop

@@ -12,6 +12,7 @@ Name[de]= Zugänglichkeit
 Name[sk]=Zjednodušenie ovládania
 Name[sv]=Tillgänglighet
 Name[es]=Accesibilidad
+Name[it]=Accessibilità
 Type=Application
 Exec=cosmic-applet-a11y
 Terminal=false
@@ -22,6 +23,7 @@ Icon=preferences-desktop-accessibility-symbolic
 StartupNotify=true
 NoDisplay=true
 X-CosmicApplet=true
+X-CosmicShrinkable=true
 # Indicates that the auto-hover click should go to the "end" of the hover popup
 X-CosmicHoverPopup=Auto
 X-OverflowPriority=10

cosmic-applet-a11y/i18n/fr/cosmic_applet_a11y.ftl

@@ -0,0 +1,6 @@
+screen-reader = Lecteur d'écran
+invert-colors = Inverser les couleurs
+high-contrast = Contraste élevé
+filter-colors = Filtre de couleurs
+settings = Paramètres d'accessibilité...
+magnifier = Loupe

cosmic-applet-a11y/i18n/ga/cosmic_applet_a11y.ftl

@@ -3,4 +3,4 @@ magnifier = Formhéadaitheoir
 invert-colors = Inbhéartaigh dathanna
 settings = Socruithe inrochtaineachta...
 filter-colors = Dathanna scagaire
-high-contrast = Ardchodarsnacht
+high-contrast = Ard chodarsnacht

cosmic-applet-a11y/i18n/hu/cosmic_applet_a11y.ftl

@@ -1,6 +1,6 @@
 screen-reader = Képernyőolvasó
 magnifier = Nagyító
 invert-colors = Színek invertálása
-settings = Akadálymentességi beállítások...
+settings = Akadálymentességi beállítások…
 filter-colors = Színek szűrése
 high-contrast = Magas kontraszt

cosmic-applet-a11y/i18n/kk/cosmic_applet_a11y.ftl

@@ -0,0 +1,6 @@
+screen-reader = Экраннан оқу қолданбасы
+magnifier = Экрандық ұлғайтқыш
+invert-colors = Түстерді терістеу
+settings = Қолжетімділік баптаулары...
+filter-colors = Түстерді сүзгілеу
+high-contrast = Жоғары контраст

cosmic-applet-a11y/i18n/ko/cosmic_applet_a11y.ftl

@@ -0,0 +1,6 @@
+screen-reader = 스크린 리더
+invert-colors = 색상 반전
+high-contrast = 고대비
+filter-colors = 색상 필터
+settings = 접근성 설정...
+magnifier = 돋보기

cosmic-applet-a11y/i18n/lt/cosmic_applet_a11y.ftl

@@ -0,0 +1,6 @@
+screen-reader = Ekrano skaitytuvas
+invert-colors = Invertuoti spalvas
+high-contrast = Didelis kontrastas
+filter-colors = Spalvų filtras
+settings = Pritaikomumo nustatymai...
+magnifier = Didinamasis Stiklas

cosmic-applet-a11y/i18n/nl/cosmic_applet_a11y.ftl

@@ -1,6 +1,6 @@
-screen-reader = Schermverteller
+screen-reader = Schermlezer
 magnifier = Vergrootglas
-invert-colors = Kleuren omkeren
+invert-colors = Keer kleuren om
 settings = Toegankelijkheidsinstellingen...
 filter-colors = filterkleuren
 high-contrast = Hoog contrast

cosmic-applet-a11y/i18n/uk/cosmic_applet_a11y.ftl

@@ -2,5 +2,5 @@ screen-reader = Читач екрана
 magnifier = Лупа
 invert-colors = Інверсія кольорів
 settings = Налаштування доступності...
-filter-colors = Виправлення кольорової сліпоти
+filter-colors = Фільтрувати кольори
 high-contrast = Висока контрастність

cosmic-applet-a11y/i18n/zh-CN/cosmic_applet_a11y.ftl

@@ -1,6 +1,6 @@
 screen-reader = 屏幕阅读器
 magnifier = 放大镜
-invert-colors = 反转颜色
+invert-colors = 颜色反转
 settings = 无障碍设置...
-filter-colors = 滤镜颜色
-high-contrast = 高对比度
+filter-colors = 颜色滤镜
+high-contrast = 高对比度模式

cosmic-applet-a11y/src/app.rs

@@ -24,10 +24,11 @@ use cosmic::{
     theme::{self, CosmicTheme},
     widget::{Column, divider, text},
 };
-use cosmic_settings_subscriptions::{
-    accessibility::{self, DBusRequest, DBusUpdate},
-    cosmic_a11y_manager::{AccessibilityEvent, AccessibilityRequest, ColorFilter},
+
+use cosmic_settings_a11y_manager_subscription::{
+    self as cosmic_a11y_manager, AccessibilityEvent, AccessibilityRequest, ColorFilter,
 };
+use cosmic_settings_accessibility_subscription::{self as accessibility};
 use cosmic_time::{Instant, Timeline, anim, chain, id};
 use std::sync::LazyLock;
 use tokio::sync::mpsc::UnboundedSender;
@@ -50,7 +51,7 @@ struct CosmicA11yApplet {
     magnifier_enabled: bool,
     inverted_colors_enabled: bool,
     popup: Option<window::Id>,
-    dbus_sender: Option<UnboundedSender<DBusRequest>>,
+    dbus_sender: Option<UnboundedSender<accessibility::Request>>,
     wayland_sender: Option<calloop::channel::Sender<AccessibilityRequest>>,
     wayland_protocol_version: Option<u32>,
     timeline: Timeline,
@@ -70,7 +71,7 @@ enum Message {
     Frame(Instant),
     Token(TokenUpdate),
     OpenSettings,
-    DBusUpdate(DBusUpdate),
+    DBusUpdate(accessibility::Response),
     WaylandUpdate(WaylandUpdate),
     Surface(surface::Action),
 }
@@ -108,7 +109,7 @@ impl cosmic::Application for CosmicA11yApplet {
                 if let Some(tx) = &self.dbus_sender {
                     self.timeline.set_chain(chain).start();
                     self.reader_enabled = enabled;
-                    let _ = tx.send(DBusRequest::Status(enabled));
+                    let _ = tx.send(accessibility::Request::ScreenReader(enabled));
                 } else {
                     self.reader_enabled = false;
                 }
@@ -255,18 +256,19 @@ impl cosmic::Application for CosmicA11yApplet {
                 }
             },
             Message::DBusUpdate(update) => match update {
-                DBusUpdate::Error(err) => {
+                accessibility::Response::Error(err) => {
                     tracing::error!("{err}");
                     let _ = self.dbus_sender.take();
                     self.reader_enabled = false;
                 }
-                DBusUpdate::Status(enabled) => {
+                accessibility::Response::ScreenReader(enabled) => {
                     self.reader_enabled = enabled;
                 }
-                DBusUpdate::Init(enabled, tx) => {
+                accessibility::Response::Init(enabled, tx) => {
                     self.reader_enabled = enabled;
                     self.dbus_sender = Some(tx);
                 }
+                _ => (),
             },
             Message::WaylandUpdate(update) => match update {
                 WaylandUpdate::Errored => {

cosmic-applet-a11y/src/backend/wayland/mod.rs

@@ -9,7 +9,7 @@ use cosmic::iced::{
     stream,
 };
 use cosmic_protocols::a11y::v1::client::cosmic_a11y_manager_v1::Filter;
-use cosmic_settings_subscriptions::cosmic_a11y_manager::{
+use cosmic_settings_a11y_manager_subscription::{
     self as thread, AccessibilityEvent, AccessibilityRequest,
 };
 use std::sync::LazyLock;