From 54dfbb8d37917bd30a16dd20aed699050ef09cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vuka=C5=A1in=20Vojinovi=C4=87?= <150025636+git-f0x@users.noreply.github.com> Date: Sun, 1 Sep 2024 15:27:20 +0200 Subject: [PATCH] fix(power): list item styling --- .../src/pages/power/backend/mod.rs | 2 +- cosmic-settings/src/pages/power/mod.rs | 41 ++++++++----------- i18n/de/cosmic_settings.ftl | 12 +++--- i18n/en/cosmic_settings.ftl | 2 +- i18n/es-419/cosmic-settings.ftl | 2 +- i18n/fr/cosmic_settings.ftl | 6 +-- i18n/hu/cosmic_settings.ftl | 2 +- i18n/ja/cosmic_settings.ftl | 8 ++-- i18n/pl/cosmic_settings.ftl | 2 +- i18n/pt-BR/cosmic_settings.ftl | 12 +++--- i18n/ru/cosmic_settings.ftl | 2 +- i18n/sk/cosmic_settings.ftl | 2 +- i18n/sr-Cyrl/cosmic_settings.ftl | 2 +- i18n/sr-Latn/cosmic_settings.ftl | 2 +- i18n/th/cosmic_settings.ftl | 4 +- i18n/uk/cosmic_settings.ftl | 2 +- 16 files changed, 49 insertions(+), 54 deletions(-) diff --git a/cosmic-settings/src/pages/power/backend/mod.rs b/cosmic-settings/src/pages/power/backend/mod.rs index 58cc5b1..dbbea6c 100644 --- a/cosmic-settings/src/pages/power/backend/mod.rs +++ b/cosmic-settings/src/pages/power/backend/mod.rs @@ -54,7 +54,7 @@ pub async fn get_backend() -> Option { } } -#[derive(Clone, Debug, PartialEq)] +#[derive(Clone, Copy, Debug, Eq, PartialEq)] pub enum PowerProfile { Battery, Balanced, diff --git a/cosmic-settings/src/pages/power/mod.rs b/cosmic-settings/src/pages/power/mod.rs index 195e01a..3fd9deb 100644 --- a/cosmic-settings/src/pages/power/mod.rs +++ b/cosmic-settings/src/pages/power/mod.rs @@ -5,8 +5,8 @@ use backend::{Battery, PowerProfile}; use chrono::TimeDelta; use cosmic::iced_widget::row; -use cosmic::widget::{self, column, text}; -use cosmic::{widget::settings, Apply}; +use cosmic::widget::{self, column, radio, settings, text}; +use cosmic::Apply; use cosmic_settings_page::{self as page, section, Section}; use slab::Slab; use slotmap::SlotMap; @@ -78,14 +78,13 @@ fn battery_info() -> Section { .show_while::(|page| page.battery.is_present) .view::(move |_binder, page, section| { let battery_icon = widget::icon::from_name(page.battery.icon_name.clone()); - let battery_percent = widget::text::body(format!("{}%", page.battery.percent)); + let battery_percent = text::body(format!("{}%", page.battery.percent)); - let battery_time = - widget::text::body(if page.battery.remaining_duration > TimeDelta::zero() { - &page.battery.remaining_time - } else { - "" - }); + let battery_time = text::body(if page.battery.remaining_duration > TimeDelta::zero() { + &page.battery.remaining_time + } else { + "" + }); column::with_capacity(2) .spacing(8) @@ -118,23 +117,19 @@ fn profiles() -> Section { section = profiles .into_iter() .map(|profile| { - let selected = if current_profile == profile { - Some(true) - } else { - None - }; - - let widget = widget::Radio::new("", true, selected, |_| { - Message::PowerProfileChange(profile.clone()) - }); - - settings::item::builder(profile.title()) - .description(profile.description()) - .control(widget) + settings::item_row(vec![radio( + column::with_capacity(2) + .push(text::body(profile.title())) + .push(text::caption(profile.description())), + profile.clone(), + Some(current_profile), + Message::PowerProfileChange, + ) + .into()]) }) .fold(section, settings::Section::add); } else { - let item = text::body(fl!("power-mode", "nobackend")); + let item = text::body(fl!("power-mode", "no-backend")); section = section.add(item); } diff --git a/i18n/de/cosmic_settings.ftl b/i18n/de/cosmic_settings.ftl index 55dbac9..98d506c 100644 --- a/i18n/de/cosmic_settings.ftl +++ b/i18n/de/cosmic_settings.ftl @@ -236,7 +236,7 @@ mirroring = Spiegelung .mirror = { $display } spiegeln .project = Auf { $display -> [all] alle Bildschirme - *[other] { $display } + *[other] { $display } } projizieren .project-count = Projektion auf { $count} { $count -> [1] anderen Bildschirm @@ -300,7 +300,7 @@ power-mode = Energiemodus .balanced-desc = Geräuscharme Leistung und moderater Stromverbrauch. .performance = Hohe Leistung .performance-desc = Spitzenleistung und höchster Stromverbrauch. - .nobackend = Backend nicht gefunden. Installiere system76-power oder power-profiles-daemon. + .no-backend = Backend nicht gefunden. Installiere system76-power oder power-profiles-daemon. ## Eingabe @@ -421,7 +421,7 @@ move-windows = Fenster verschieben *[down] unten [left] links [right] rechts - [up] oben + [up] oben } verschieben .display = Fenster um einen Monitor nach { $direction -> *[down] unten @@ -492,14 +492,14 @@ click-behavior = Klickverhalten .button-areas = Sekundärklick in der rechten unteren Ecke und Mittelklick in der unteren Mitte pinch-to-zoom = Zwei-Finger-Zoom - .desc = Mit zwei Fingern in den Inhalt zoomen, wenn die Anwendung den Zoom unterstützt. + .desc = Mit zwei Fingern in den Inhalt zoomen, wenn die Anwendung den Zoom unterstützt. tap-to-click = Tippen zum Klicken .desc = Ermöglicht das Tippen mit einem Finger für den ersten Klick, mit zwei Fingern für den zweiten Klick und mit drei Fingern für den mittleren Klick. touchpad = Touchpad - .acceleration = Touchpad-Beschleunigung aktivieren - .desc = Touchpad-Geschwindigkeit, Klickoptionen, Gesten. + .acceleration = Touchpad-Beschleunigung aktivieren + .desc = Touchpad-Geschwindigkeit, Klickoptionen, Gesten. .speed = Touchpad-Geschwindigkeit ## Eingabe: Gesten diff --git a/i18n/en/cosmic_settings.ftl b/i18n/en/cosmic_settings.ftl index e7bb412..d706683 100644 --- a/i18n/en/cosmic_settings.ftl +++ b/i18n/en/cosmic_settings.ftl @@ -303,7 +303,7 @@ power-mode = Power Mode .balanced-desc = Quiet performance and moderate power usage. .performance = High performance .performance-desc = Peak performance and power usage. - .nobackend = Backend not found. Install system76-power or power-profiles-daemon. + .no-backend = Backend not found. Install system76-power or power-profiles-daemon. ## Input diff --git a/i18n/es-419/cosmic-settings.ftl b/i18n/es-419/cosmic-settings.ftl index 1f07286..78b8f5d 100644 --- a/i18n/es-419/cosmic-settings.ftl +++ b/i18n/es-419/cosmic-settings.ftl @@ -576,4 +576,4 @@ power-mode = Modo de energía .performance-desc = Rendimiento y uso de energía alto. .balanced-desc = Rendimiento y uso de energía estándar. .battery-desc = Rendimiento y uso de energía reducido. - .nobackend = «Backend» no encontrado. Instalar system76-power o power-profiles-daemon. + .no-backend = «Backend» no encontrado. Instalar system76-power o power-profiles-daemon. diff --git a/i18n/fr/cosmic_settings.ftl b/i18n/fr/cosmic_settings.ftl index a3cfbd6..2f05977 100644 --- a/i18n/fr/cosmic_settings.ftl +++ b/i18n/fr/cosmic_settings.ftl @@ -288,10 +288,10 @@ sound-applications = Applications profile = Profile -## Power +## Power power = Énergie - .desc = Gérer les paramètres d'alimentation + .desc = Gérer les paramètres d'alimentation power-profiles = Modes d'énergie .battery = Économie d'énergie @@ -300,7 +300,7 @@ power-profiles = Modes d'énergie .balanced-desc = Performances et consommation d'énergie équilibré. .performance = Performance .performance-desc = Performances maximales mais force consommation d'énergie. - .nobackend = Backend non trouvé. Installez system76-power ou power-profiles-daemon. + .no-backend = Backend non trouvé. Installez system76-power ou power-profiles-daemon. ## Input diff --git a/i18n/hu/cosmic_settings.ftl b/i18n/hu/cosmic_settings.ftl index 9e7c25a..ed43abe 100644 --- a/i18n/hu/cosmic_settings.ftl +++ b/i18n/hu/cosmic_settings.ftl @@ -575,4 +575,4 @@ power-mode = Energiagazdálkodási mód .performance-desc = Csúcsteljesítmény és energiafelhasználás. .balanced-desc = Csendes teljesítmény és mérsékelt energiafogyasztás. .battery-desc = Csökkentett energiafogyasztás és csendes teljesítmény. - .nobackend = A háttérprogram nem található. Telepítse a system76-power vagy a power-profiles-daemont. + .no-backend = A háttérprogram nem található. Telepítse a system76-power vagy a power-profiles-daemont. diff --git a/i18n/ja/cosmic_settings.ftl b/i18n/ja/cosmic_settings.ftl index c1ed71e..c3a809d 100644 --- a/i18n/ja/cosmic_settings.ftl +++ b/i18n/ja/cosmic_settings.ftl @@ -262,7 +262,7 @@ time-date = 日付と時刻 time-zone = 時間帯 .auto = 自動的に時間帯を設定 .auto-info = 位置情報サービスとインターネット接続が必要です - + time-format = 日付と時刻 .twenty-four = 24時間制 .first = 週の初めの日 @@ -430,10 +430,10 @@ switch-to-prev-workspace = 前のワークスペースに切り替える open-application-library = アプリケーションライブラリを開く open-workspaces-view = ワークスペースのか概要を開く -## Power +## Power power = 電源 - .desc = 電源設定を管理 + .desc = 電源設定を管理 power-mode = 電源モード .performance = ハイパフォーマンス @@ -442,4 +442,4 @@ power-mode = 電源モード .performance-desc = 一番高い性能と電力消費量。 .balanced-desc = 静かな性能と程度な電力消費量。 .battery-desc = 低い電力消費量と静粛な性能。 - .nobackend = バックエンドは見つかれませんでした。 system76-powerまたはpower-profiles-daemonをインストールして下さい。 + .no-backend = バックエンドは見つかれませんでした。 system76-powerまたはpower-profiles-daemonをインストールして下さい。 diff --git a/i18n/pl/cosmic_settings.ftl b/i18n/pl/cosmic_settings.ftl index c96883a..966f558 100644 --- a/i18n/pl/cosmic_settings.ftl +++ b/i18n/pl/cosmic_settings.ftl @@ -317,7 +317,7 @@ power-mode = Profile Zasilania .performance-desc = Najwyższa wydajność i zwiększone zużycie energii. .balanced-desc = Standardowa wydajność i zużycie baterii. .battery-desc = Zmniejszone zużycie energii i zmniejszona wydajność. - .nobackend = Backend nie znaleziony. Zainstaluj system76-power lub power-profiles-daemon. + .no-backend = Backend nie znaleziony. Zainstaluj system76-power lub power-profiles-daemon. ## Input diff --git a/i18n/pt-BR/cosmic_settings.ftl b/i18n/pt-BR/cosmic_settings.ftl index 5fec81e..0de9936 100644 --- a/i18n/pt-BR/cosmic_settings.ftl +++ b/i18n/pt-BR/cosmic_settings.ftl @@ -77,7 +77,7 @@ auto-switch = Alternar automaticamente do modo Claro para o modo Escuro .next-sunset = Altera para o modo Escuro no próximo pôr do sol container-background = Fundo do contêiner - .desc-detail = A cor de fundo do contêiner é usada para a barra lateral de navegação, gaveta lateral, nas caixas de diálogos e em widgets similares. Por padrão, ela é automaticamente derivada do fundo da aplicação ou da janela. + .desc-detail = A cor de fundo do contêiner é usada para a barra lateral de navegação, gaveta lateral, nas caixas de diálogos e em widgets similares. Por padrão, ela é automaticamente derivada do fundo da aplicação ou da janela. .reset = Restaurar para automático .desc = A cor primária do contêiner é usada para a barra lateral de navegação, gaveta lateral, caixas de diálogos, e widgets similares. @@ -194,9 +194,9 @@ workspaces-behavior = Comportamento das Áreas de Trabalho .fixed = Número fixo de Áreas de Trabalho .fixed-desc = Adicione ou remova áreas de trabalho na visão geral. -workspaces-multi-behavior = Comportamento de vários monitores +workspaces-multi-behavior = Comportamento de vários monitores .span = Áreas de trabalho expandem monitores - .separate = Monitores têm áreas de trabalho separadas + .separate = Monitores têm áreas de trabalho separadas workspaces-overview-thumbnails = Miniaturas da Visão Geral das Áreas de Trabalho .show-number = Mostrar Número da Área de Trabalho @@ -287,10 +287,10 @@ sound-alerts = Alertas sound-applications = Aplicações .desc = Volumes e definições das aplicações -## Power +## Power power = Energia - .desc = Gerencie as configurações de energia + .desc = Gerencie as configurações de energia power-mode = Modo de Energia .performance = Alta performance @@ -299,7 +299,7 @@ power-mode = Modo de Energia .performance-desc = Alta performance e consumo de energia. .balanced-desc = Performance ajustada e consumo de energia moderado. .battery-desc = Baixo consumo de energia and performance limitada. - .nobackend = Processo não encontrado. Instale system76-power ou power-profiles-daemon. + .no-backend = Processo não encontrado. Instale system76-power ou power-profiles-daemon. ## Input diff --git a/i18n/ru/cosmic_settings.ftl b/i18n/ru/cosmic_settings.ftl index 13217b5..cd1365a 100644 --- a/i18n/ru/cosmic_settings.ftl +++ b/i18n/ru/cosmic_settings.ftl @@ -576,4 +576,4 @@ power-mode = Режим питания .performance-desc = Повышенная производительность и энергопотребление. .balanced-desc = Невысокая производительность и умеренное энергопотребление. .battery-desc = Сниженное энергопотребление и тихая работа. - .nobackend = Службы электропитания не найдены. Установите system76-power или power-profiles-daemon. + .no-backend = Службы электропитания не найдены. Установите system76-power или power-profiles-daemon. diff --git a/i18n/sk/cosmic_settings.ftl b/i18n/sk/cosmic_settings.ftl index 79820db..eb5d325 100644 --- a/i18n/sk/cosmic_settings.ftl +++ b/i18n/sk/cosmic_settings.ftl @@ -583,4 +583,4 @@ power-mode = Režim napájania .performance-desc = Maximálny výkon a vysoká spotreba energie. .balanced-desc = Tichá prevádzka a mierna spotreba energie. .battery-desc = Znížená spotreba energie a tichá prevádzka. - .nobackend = Backend sa nenašiel. Nainštalujte démona system76-power alebo power-profiles-daemon. + .no-backend = Backend sa nenašiel. Nainštalujte démona system76-power alebo power-profiles-daemon. diff --git a/i18n/sr-Cyrl/cosmic_settings.ftl b/i18n/sr-Cyrl/cosmic_settings.ftl index 7f3226a..8db0f36 100644 --- a/i18n/sr-Cyrl/cosmic_settings.ftl +++ b/i18n/sr-Cyrl/cosmic_settings.ftl @@ -300,7 +300,7 @@ power-mode = Режим напајања .balanced-desc = Тихе перформансе и умерена потрошња енергије. .performance = Високе перформансе .performance-desc = Највеће перформансе и потрошња енергије. - .nobackend = Подсистем није пронађен. Инсталирајте system76-power или power-profiles-daemon. + .no-backend = Подсистем није пронађен. Инсталирајте system76-power или power-profiles-daemon. ## Input diff --git a/i18n/sr-Latn/cosmic_settings.ftl b/i18n/sr-Latn/cosmic_settings.ftl index 90de92b..76948bd 100644 --- a/i18n/sr-Latn/cosmic_settings.ftl +++ b/i18n/sr-Latn/cosmic_settings.ftl @@ -300,7 +300,7 @@ power-mode = Režim napajanja .balanced-desc = Tihe performanse i umerena potrošnja energije. .performance = Visoke performanse .performance-desc = Najveće performanse i potrošnja energije. - .nobackend = Podsistem nije pronađen. Instalirajte system76-power ili power-profiles-daemon. + .no-backend = Podsistem nije pronađen. Instalirajte system76-power ili power-profiles-daemon. ## Input diff --git a/i18n/th/cosmic_settings.ftl b/i18n/th/cosmic_settings.ftl index fb83529..6fc32d3 100644 --- a/i18n/th/cosmic_settings.ftl +++ b/i18n/th/cosmic_settings.ftl @@ -294,7 +294,7 @@ power-mode = โหมดพลังงาน .balanced-desc = การใช้พลังงานปานกลางและประสิทธิภาพที่ลดเสียงรบกวนลง .performance = ประสิทธิภาพสูง .performance-desc = ประสิทธิภาพและการใช้พลังงานสูงสุด - .nobackend = ไม่พบแบ็คเอนด์ กรุณาติดตั้ง system76-power หรือ power-profiles-daemon + .no-backend = ไม่พบแบ็คเอนด์ กรุณาติดตั้ง system76-power หรือ power-profiles-daemon ## Input @@ -546,7 +546,7 @@ about = เกี่ยวกับ .desc = ชื่ออุปกรณ์ ข้อมูลฮาร์ดแวร์ และค่าเริ่มต้นระบบปฏิบัติการ about-device = ชื่ออุปกรณ์ - .desc = ชื่อนี้แสดงต่ออุปกรณ์ภายในเครือข่ายหรืออุปกรณ์บลูธูทอื่น ๆ + .desc = ชื่อนี้แสดงต่ออุปกรณ์ภายในเครือข่ายหรืออุปกรณ์บลูธูทอื่น ๆ about-hardware = ฮาร์ดแวร์ .model = รุ่นฮาร์ดแวร์ diff --git a/i18n/uk/cosmic_settings.ftl b/i18n/uk/cosmic_settings.ftl index 3e55037..5497f36 100644 --- a/i18n/uk/cosmic_settings.ftl +++ b/i18n/uk/cosmic_settings.ftl @@ -308,7 +308,7 @@ power-mode = Режим живлення .balanced-desc = Тиха робота та помірне споживання енергії. .performance = Висока продуктивність .performance-desc = Пік продуктивності та споживання енергії. - .nobackend = Бекенд не знайдено. Встановіть system76-power або power-profiles-daemon. + .no-backend = Бекенд не знайдено. Встановіть system76-power або power-profiles-daemon. ## Input