Put indented alerts volume below output volume

Author: cgevans

cosmic-settings/src/pages/sound/mod.rs

@@ -120,7 +120,6 @@ impl page::Page<crate::pages::Message> for Page {
         sections: &mut SlotMap<section::Entity, Section<crate::pages::Message>>,
     ) -> Option<page::Content> {
         Some(vec![
-            sections.insert(alerts()),
             sections.insert(output()),
             sections.insert(input()),
             sections.insert(device_profiles()),
@@ -345,6 +344,7 @@ fn output() -> Section<crate::pages::Message> {
     let mut descriptions = Slab::new();
 
     let volume = descriptions.insert(fl!("sound-output", "volume"));
+    let alerts_volume = descriptions.insert(format!("\t{}", fl!("sound-alerts", "volume")));
     let device = descriptions.insert(fl!("sound-output", "device"));
     let _level = descriptions.insert(fl!("sound-output", "level"));
     let balance = descriptions.insert(fl!("sound-output", "balance"));
@@ -387,6 +387,35 @@ fn output() -> Section<crate::pages::Message> {
                 .push(widget::horizontal_space().width(8))
                 .push(slider);
 
+            let alerts_slider = if page.amplification_sink {
+                widget::slider(0..=150, page.model.notification_volume, |change| {
+                    Message::SetNotificationVolume(change).into()
+                })
+                .breakpoints(&[100])
+            } else {
+                widget::slider(0..=100, page.model.notification_volume, |change| {
+                    Message::SetNotificationVolume(change).into()
+                })
+            };
+
+            let alerts_volume_control = widget::row::with_capacity(4)
+                .align_y(Alignment::Center)
+                .push(
+                    widget::button::icon(if page.model.notification_mute {
+                        widget::icon::from_name("audio-volume-muted-symbolic")
+                    } else {
+                        widget::icon::from_name("audio-volume-high-symbolic")
+                    })
+                    .on_press(Message::ToggleNotificationMute.into()),
+                )
+                .push(
+                    widget::text::body(&page.model.notification_volume_text)
+                        .width(Length::Fixed(22.0))
+                        .align_x(Alignment::Center),
+                )
+                .push(widget::horizontal_space().width(8))
+                .push(alerts_slider);
+
             let devices = widget::dropdown::popup_dropdown(
                 page.model.sinks(),
                 Some(page.model.active_sink().unwrap_or(0)),
@@ -404,6 +433,10 @@ fn output() -> Section<crate::pages::Message> {
                     &*section.descriptions[volume],
                     volume_control,
                 ))
+                .add(settings::flex_item(
+                    &*section.descriptions[alerts_volume],
+                    alerts_volume_control,
+                ))
                 .add(settings::item(&*section.descriptions[device], devices))
                 .add(settings::item(
                     &*section.descriptions[balance],
@@ -473,54 +506,6 @@ fn device_profiles() -> Section<crate::pages::Message> {
         })
 }
 
-fn alerts() -> Section<crate::pages::Message> {
-    let mut descriptions = Slab::new();
-    let volume = descriptions.insert(fl!("sound-alerts", "volume"));
-    let sound = descriptions.insert(fl!("sound-alerts", "sound"));
-
-    Section::default()
-        .title(fl!("sound-alerts"))
-        .descriptions(descriptions)
-        .view::<Page>(move |_binder, page, section| {
-            let slider = if page.amplification_sink {
-                widget::slider(0..=150, page.model.notification_volume, |change| {
-                    Message::SetNotificationVolume(change).into()
-                })
-                .breakpoints(&[100])
-            } else {
-                widget::slider(0..=100, page.model.notification_volume, |change| {
-                    Message::SetNotificationVolume(change).into()
-                })
-            };
-
-            let volume_control = widget::row::with_capacity(4)
-                .align_y(Alignment::Center)
-                .push(
-                    widget::button::icon(if page.model.notification_mute {
-                        widget::icon::from_name("audio-volume-muted-symbolic")
-                    } else {
-                        widget::icon::from_name("audio-volume-high-symbolic")
-                    })
-                    .on_press(Message::ToggleNotificationMute.into()),
-                )
-                .push(
-                    widget::text::body(&page.model.notification_volume_text)
-                        .width(Length::Fixed(22.0))
-                        .align_x(Alignment::Center),
-                )
-                .push(widget::horizontal_space().width(8))
-                .push(slider);
-
-            settings::section()
-                .title(&section.title)
-                .add(settings::flex_item(
-                    &*section.descriptions[volume],
-                    volume_control,
-                ))
-                .into()
-        })
-}
-
 // fn applications() -> Section<crate::pages::Message> {
 //     let mut descriptions = Slab::new();
 

cosmic-settings/src/pages/system/info.rs

@@ -116,10 +116,10 @@ impl Info {
                     continue;
                 }
             }
-            
+
             // AMD parsing to append codename to specific name
             let is_amd_gpu = gpu_name.starts_with("AMD");
-            
+
             if is_amd_gpu {
                 if adapter_info.device != 0 {
                     let lspci_gpus = get_lspci_gpu_names();
@@ -404,7 +404,9 @@ fn get_lspci_gpu_names() -> HashMap<u32, String> {
                         // Extract the GPU name between ": " and the last "["
                         if let Some(name_start) = line.find(": ") {
                             let full_name = line[name_start + 2..ids_start].trim();
-                            let gpu_name = full_name.replace(" Corporation", "").replace(" [Intel Graphics]", "");
+                            let gpu_name = full_name
+                                .replace(" Corporation", "")
+                                .replace(" [Intel Graphics]", "");
                             if !gpu_name.is_empty() {
                                 gpu_map.insert(device_id, gpu_name);
                             }

crates/cosmic-pipewire/src/lib.rs

@@ -383,9 +383,9 @@ fn run_service(
 
                                     "restore.stream.Output/Audio.media.role:Notification" => {
                                         if let Ok(metadata) =
-                                            serde_json::de::from_str::<NotificationRouteSettingsMetadata>(
-                                                value,
-                                            )
+                                            serde_json::de::from_str::<
+                                                NotificationRouteSettingsMetadata,
+                                            >(value)
                                         {
                                             if let Some(state) = state.upgrade() {
                                                 let volume = metadata
@@ -394,9 +394,12 @@ fn run_service(
                                                     .copied()
                                                     .unwrap_or(1.0)
                                                     .powf(1.0 / 3.0);
-                                                state.borrow_mut().on_event(Event::NotificationVolume(
-                                                    volume, metadata.mute,
-                                                ));
+                                                state.borrow_mut().on_event(
+                                                    Event::NotificationVolume(
+                                                        volume,
+                                                        metadata.mute,
+                                                    ),
+                                                );
                                             }
                                         }
                                     }