diff --git a/cosmic-settings/src/pages/power/backend/mod.rs b/cosmic-settings/src/pages/power/backend/mod.rs index 470e46e..ba7f63d 100644 --- a/cosmic-settings/src/pages/power/backend/mod.rs +++ b/cosmic-settings/src/pages/power/backend/mod.rs @@ -54,42 +54,42 @@ pub async fn get_backend() -> Option { #[derive(Clone, Debug, PartialEq)] pub enum PowerProfile { - Performance, - Balanced, Battery, + Balanced, + Performance, } impl PowerProfile { fn from_string(s: &str) -> PowerProfile { match s { - "Performance" | "performance" => Self::Performance, "Battery" | "power-saver" => Self::Battery, + "Performance" | "performance" => Self::Performance, _ => Self::Balanced, } } pub fn title(&self) -> String { match self { - Self::Performance => fl!("power-profiles", "performance"), - Self::Balanced => fl!("power-profiles", "balanced"), - Self::Battery => fl!("power-profiles", "battery"), + Self::Battery => fl!("power-mode", "battery"), + Self::Balanced => fl!("power-mode", "balanced"), + Self::Performance => fl!("power-mode", "performance"), } } pub fn description(&self) -> String { match self { - Self::Performance => fl!("power-profiles", "performance-desc"), - Self::Balanced => fl!("power-profiles", "balanced-desc"), - Self::Battery => fl!("power-profiles", "battery-desc"), + Self::Battery => fl!("power-mode", "battery-desc"), + Self::Balanced => fl!("power-mode", "balanced-desc"), + Self::Performance => fl!("power-mode", "performance-desc"), } } } pub fn get_power_profiles() -> Vec { vec![ - PowerProfile::Performance, - PowerProfile::Balanced, PowerProfile::Battery, + PowerProfile::Balanced, + PowerProfile::Performance, ] } @@ -108,16 +108,16 @@ impl SetPowerProfile for S76Backend { }; match profile { - PowerProfile::Performance => match daemon.performance().await { - Ok(x) => tracing::info!("Performance mode activated."), + PowerProfile::Battery => match daemon.battery().await { + Ok(x) => tracing::info!("Battery mode activated."), Err(e) => tracing::error!("{e}"), }, PowerProfile::Balanced => match daemon.balanced().await { Ok(x) => tracing::info!("Balanced mode activated."), Err(e) => tracing::error!("{e}"), }, - PowerProfile::Battery => match daemon.battery().await { - Ok(x) => tracing::info!("Battery mode activated."), + PowerProfile::Performance => match daemon.performance().await { + Ok(x) => tracing::info!("Performance mode activated."), Err(e) => tracing::error!("{e}"), }, } @@ -159,7 +159,7 @@ async fn get_s76power_daemon_proxy<'a>() -> Result Ok(d), Err(e) => { - tracing::error!("Power daemon proxy can't created. Is it installed? {e}"); + tracing::error!("Power daemon proxy can't be created. Is it installed? {e}"); Err(()) } } @@ -180,16 +180,16 @@ impl SetPowerProfile for PPBackend { }; match profile { - PowerProfile::Performance => match daemon.set_active_profile("performance").await { - Ok(x) => tracing::info!("Performance mode activated."), + PowerProfile::Battery => match daemon.set_active_profile("power-saver").await { + Ok(x) => tracing::info!("Battery mode activated."), Err(e) => tracing::error!("{e}"), }, PowerProfile::Balanced => match daemon.set_active_profile("balanced").await { Ok(x) => tracing::info!("Balanced mode activated."), Err(e) => tracing::error!("{e}"), }, - PowerProfile::Battery => match daemon.set_active_profile("power-saver").await { - Ok(x) => tracing::info!("Battery mode activated."), + PowerProfile::Performance => match daemon.set_active_profile("performance").await { + Ok(x) => tracing::info!("Performance mode activated."), Err(e) => tracing::error!("{e}"), }, } @@ -232,7 +232,7 @@ async fn get_power_profiles_proxy<'a>() -> Result Ok(d), Err(e) => { - tracing::error!("Power daemon proxy can't created. Is it installed? {e}"); + tracing::error!("Power daemon proxy can't be created. Is it installed? {e}"); Err(()) } } diff --git a/cosmic-settings/src/pages/power/mod.rs b/cosmic-settings/src/pages/power/mod.rs index 411cc6e..7720e46 100644 --- a/cosmic-settings/src/pages/power/mod.rs +++ b/cosmic-settings/src/pages/power/mod.rs @@ -1,5 +1,5 @@ use backend::PowerProfile; -use cosmic::iced::widget; +use cosmic::widget; use cosmic::{widget::settings, Apply}; use cosmic_settings_page::{self as page, section, Section}; use slotmap::SlotMap; @@ -49,7 +49,7 @@ impl Page { fn profiles() -> Section { Section::default() - .title(fl!("power-profiles")) + .title(fl!("power-mode")) .descriptions(vec![fl!("power", "desc").into()]) .view::(|_binder, page, section| { let mut section = settings::view_section(§ion.title); @@ -85,7 +85,7 @@ fn profiles() -> Section { section = section.add(item); } } else { - let item = widget::Text::new(fl!("power-profiles", "nobackend")); + let item = widget::text::body(fl!("power-mode", "nobackend")); section = section.add(item); } diff --git a/i18n/en/cosmic_settings.ftl b/i18n/en/cosmic_settings.ftl index 983650d..271f06c 100644 --- a/i18n/en/cosmic_settings.ftl +++ b/i18n/en/cosmic_settings.ftl @@ -445,11 +445,11 @@ open-workspaces-view = Open Workspaces Overview power = Power .desc = Manage power settings -power-profiles = Power Profiles - .performance = Performance Mode - .balanced = Balanced Mode - .battery = Power Save Mode - .performance-desc = Maximum performance but high power consumption. - .balanced-desc = Balanced performance and power consumption. - .battery-desc = Low performance but low power consumption. +power-mode = Power Mode + .performance = High performance + .balanced = Balanced + .battery = Extended battery life + .performance-desc = Peak performance and power usage. + .balanced-desc = Quiet performance and moderate power usage. + .battery-desc = Reduced power usage and silent performance. .nobackend = Backend not found. Install system76-power or power-profiles-daemon.