feat(sound): redesign with separate device profiles page (#1500)

Author: mmstick

Cargo.lock

@@ -1,5 +1,5 @@
 [workspace]
-members = ["cosmic-settings", "page", "pages/*", "subscriptions/*"]
+members = ["cosmic-settings", "crates/*", "page", "pages/*", "subscriptions/*"]
 default-members = ["cosmic-settings"]
 resolver = "3"
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cosmic-settings"
-version = "0.1.0"
+version = "1.0.0-beta6"
 edition = "2024"
 license = "GPL-3.0-only"
 publish = false
@@ -72,7 +72,7 @@ tachyonix = "0.3.1"
 timedate-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
 tokio = { workspace = true, features = ["fs", "io-util", "sync"] }
 tracing = "0.1.41"
-tracing-subscriber = "0.3.20"
+tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
 udev = { version = "0.9.3", optional = true }
 upower_dbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
 bluez-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }

cosmic-settings/Cargo.toml

@@ -550,6 +550,13 @@ impl cosmic::Application for SettingsApp {
                     }
                 }
 
+                #[cfg(feature = "page-sound")]
+                crate::pages::Message::SoundDeviceProfiles(message) => {
+                    if let Some(page) = self.pages.page_mut::<sound::device_profiles::Page>() {
+                        return page.update(message).map(Into::into);
+                    }
+                }
+
                 crate::pages::Message::StartupApps(message) => {
                     if let Some(page) = self.pages.page_mut::<applications::startup_apps::Page>() {
                         return page.update(message).map(Into::into);

cosmic-settings/src/app.rs

@@ -201,11 +201,6 @@ fn init_localizer() {
 }
 
 fn init_logger() {
-    let log_level = std::env::var("RUST_LOG")
-        .ok()
-        .and_then(|level| level.parse::<tracing::Level>().ok())
-        .unwrap_or(tracing::Level::INFO);
-
     let log_format = tracing_subscriber::fmt::format()
         .pretty()
         .without_time()
@@ -214,17 +209,14 @@ fn init_logger() {
         .with_target(false)
         .with_thread_names(true);
 
-    let log_filter = tracing_subscriber::fmt::Layer::default()
+    let log_layer = tracing_subscriber::fmt::Layer::default()
         .with_writer(std::io::stderr)
-        .event_format(log_format)
-        .with_filter(tracing_subscriber::filter::filter_fn(move |metadata| {
-            let target = metadata.target();
-            metadata.level() == &tracing::Level::ERROR
-                || ((target.starts_with("cosmic_settings") || target.starts_with("cosmic_bg"))
-                    && metadata.level() <= &log_level)
-        }));
-
-    tracing_subscriber::registry().with(log_filter).init();
+        .event_format(log_format);
+
+    tracing_subscriber::registry()
+        .with(tracing_subscriber::EnvFilter::from_env("RUST_LOG"))
+        .with(log_layer)
+        .init();
 }
 
 #[macro_export]

cosmic-settings/src/main.rs

@@ -84,6 +84,8 @@ pub enum Message {
     Region(time::region::Message),
     #[cfg(feature = "page-sound")]
     Sound(sound::Message),
+    #[cfg(feature = "page-sound")]
+    SoundDeviceProfiles(sound::device_profiles::Message),
     StartupApps(applications::startup_apps::Message),
     #[cfg(feature = "page-users")]
     User(system::users::Message),

cosmic-settings/src/pages/mod.rs

@@ -0,0 +1,96 @@
+// Copyright 2025 System76 <[email protected]>
+// SPDX-License-Identifier: GPL-3.0-only
+
+use cosmic::{Apply, widget};
+use cosmic_settings_page::{self as page, Section, section};
+use cosmic_settings_sound_subscription::{self as subscription};
+use slotmap::SlotMap;
+
+#[derive(Clone, Debug)]
+pub enum Message {}
+
+impl From<Message> for crate::pages::Message {
+    fn from(message: Message) -> Self {
+        crate::pages::Message::SoundDeviceProfiles(message)
+    }
+}
+
+impl From<Message> for crate::Message {
+    fn from(message: Message) -> Self {
+        crate::Message::PageMessage(message.into())
+    }
+}
+
+#[derive(Default)]
+pub struct Page {
+    entity: page::Entity,
+}
+
+impl page::AutoBind<crate::pages::Message> for Page {}
+
+impl page::Page<crate::pages::Message> for Page {
+    fn info(&self) -> page::Info {
+        page::Info::new("sound-device-profiles", "preferences-sound-symbolic")
+            .title(fl!("sound-device-profiles"))
+    }
+
+    fn content(
+        &self,
+        sections: &mut SlotMap<section::Entity, Section<crate::pages::Message>>,
+    ) -> Option<page::Content> {
+        Some(vec![sections.insert(view())])
+    }
+
+    fn on_leave(&mut self) -> cosmic::Task<crate::pages::Message> {
+        cosmic::Task::done(crate::pages::Message::Sound(super::Message::Reload))
+    }
+
+    fn set_id(&mut self, entity: cosmic_settings_page::Entity) {
+        self.entity = entity;
+    }
+
+    fn subscription(
+        &self,
+        _core: &cosmic::Core,
+    ) -> cosmic::iced::Subscription<crate::pages::Message> {
+        cosmic::iced::Subscription::run(subscription::watch)
+            .map(|message| super::Message::Subscription(message).into())
+    }
+}
+
+impl Page {
+    pub fn update(&mut self, _message: Message) -> cosmic::Task<crate::app::Message> {
+        cosmic::Task::none()
+    }
+}
+
+pub fn view() -> Section<crate::pages::Message> {
+    Section::default().view::<Page>(move |binder, _page, _section| {
+        let sound_page_id = binder.find_page_by_id("sound").unwrap().0;
+        let sound_page = binder.page[sound_page_id]
+            .downcast_ref::<super::Page>()
+            .unwrap();
+
+        let devices = sound_page
+            .model
+            .device_profile_dropdowns
+            .iter()
+            .cloned()
+            .map(|(device_id, name, active_profile, indexes, descriptions)| {
+                let dropdown = widget::dropdown::popup_dropdown(
+                    descriptions,
+                    active_profile,
+                    move |id| super::Message::SetProfile(device_id, indexes[id]),
+                    cosmic::iced::window::Id::RESERVED,
+                    super::Message::Surface,
+                    crate::Message::from,
+                )
+                .apply(cosmic::Element::from)
+                .map(crate::pages::Message::from);
+
+                widget::settings::item::builder(name).control(dropdown)
+            });
+
+        widget::settings::section().extend(devices).into()
+    })
+}