Merge branch 'pop-os:master' into master

Author: feikedonia

Cargo.lock

@@ -49,8 +49,8 @@ lto = "thin"
 # smithay-client-toolkit = { git = "https://github.com/smithay/client-toolkit//", rev = "c583de8" }
 
 [patch.'https://github.com/pop-os/cosmic-protocols']
-cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "178eb0b" }
-cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "178eb0b" }
+cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "ed2a481" }
+cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "ed2a481" }
 
 # For development and testing purposes
 # [patch.'https://github.com/pop-os/libcosmic']

Cargo.toml

@@ -21,6 +21,7 @@ cosmic-config.workspace = true
 cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
 cosmic-idle-config.workspace = true
 cosmic-panel-config = { workspace = true, optional = true }
+cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", optional = true }
 cosmic-randr-shell.workspace = true
 cosmic-randr = { workspace = true, optional = true }
 cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", optional = true }
@@ -55,6 +56,7 @@ once_cell = "1.20.3"
 regex = "1.11.1"
 ron = "0.8"
 rust-embed = "8.5.0"
+sctk = { workspace = true, optional = true }
 secure-string = "0.3.0"
 serde = { version = "1.0.217", features = ["derive"] }
 slab = "0.4.9"
@@ -110,6 +112,7 @@ gettext = ["dep:gettext-rs"]
 
 # Default features for Linux
 linux = [
+    "page-accessibility",
     "page-about",
     "page-bluetooth",
     "page-date",
@@ -127,6 +130,7 @@ linux = [
 ]
 
 # Pages
+page-accessibility = ["dep:cosmic-protocols", "dep:sctk"]
 page-about = ["dep:cosmic-settings-system", "dep:hostname1-zbus", "dep:zbus"]
 page-bluetooth = ["dep:bluez-zbus", "dep:zbus", "dep:cosmic-settings-subscriptions"]
 page-date = ["dep:timedate-zbus", "dep:zbus"]

cosmic-settings/Cargo.toml

@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 use crate::config::Config;
+#[cfg(feature = "page-accessibility")]
+use crate::pages::accessibility;
 #[cfg(feature = "page-bluetooth")]
 use crate::pages::bluetooth;
 use crate::pages::desktop::{self, appearance};
@@ -74,6 +76,12 @@ pub struct SettingsApp {
 impl SettingsApp {
     fn subtask_to_page(&self, cmd: &PageCommands) -> Option<Entity> {
         match cmd {
+            #[cfg(feature = "page-accessibility")]
+            PageCommands::Accessibility => self.pages.page_id::<accessibility::Page>(),
+            #[cfg(feature = "page-accessibility")]
+            PageCommands::AccessibilityMagnifier => {
+                self.pages.page_id::<accessibility::magnifier::Page>()
+            }
             #[cfg(feature = "page-about")]
             PageCommands::About => self.pages.page_id::<system::about::Page>(),
             PageCommands::Appearance => self.pages.page_id::<desktop::appearance::Page>(),
@@ -194,6 +202,8 @@ impl cosmic::Application for SettingsApp {
         app.insert_page::<networking::Page>();
         #[cfg(feature = "page-bluetooth")]
         app.insert_page::<bluetooth::Page>();
+        #[cfg(feature = "page-accessibility")]
+        app.insert_page::<accessibility::Page>();
         let desktop_id = app.insert_page::<desktop::Page>().id();
         app.insert_page::<display::Page>();
         #[cfg(feature = "page-sound")]
@@ -368,6 +378,18 @@ impl cosmic::Application for SettingsApp {
             }
 
             Message::PageMessage(message) => match message {
+                #[cfg(feature = "page-accessibility")]
+                crate::pages::Message::Accessibility(message) => {
+                    if let Some(page) = self.pages.page_mut::<accessibility::Page>() {
+                        return page.update(message).map(Into::into);
+                    }
+                }
+                #[cfg(feature = "page-accessibility")]
+                crate::pages::Message::AccessibilityMagnifier(message) => {
+                    if let Some(page) = self.pages.page_mut::<accessibility::magnifier::Page>() {
+                        return page.update(self.active_page, message).map(Into::into);
+                    }
+                }
                 #[cfg(feature = "page-about")]
                 crate::pages::Message::About(message) => {
                     page::update!(self.pages, message, system::about::Page);

cosmic-settings/src/app.rs

@@ -38,6 +38,12 @@ pub struct Args {
 
 #[derive(Subcommand, Debug, Serialize, Deserialize, Clone)]
 pub enum PageCommands {
+    /// Accessibility settings page
+    #[cfg(feature = "page-accessibility")]
+    Accessibility,
+    /// Accessibility Magnifier settings page
+    #[cfg(feature = "page-accessibility")]
+    AccessibilityMagnifier,
     /// About settings page
     #[cfg(feature = "page-about")]
     About,