From 317de19eb3594b07bd34f6a6043ab914459aa645 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: Fri, 17 Apr 2026 13:03:32 +0200 Subject: [PATCH 01/24] fix(shortcuts): modified count for accessibility and tiling These weren't being set previously, so they never showed up. Also updates remaining things here to use ListButton. --- Cargo.lock | 36 ++++++++-------- .../pages/input/keyboard/shortcuts/common.rs | 31 +++++--------- .../src/pages/input/keyboard/shortcuts/mod.rs | 42 +++++++------------ cosmic-settings/src/pages/time/date.rs | 2 +- cosmic-settings/src/pages/time/region.rs | 2 +- cosmic-settings/src/widget/mod.rs | 6 ++- 6 files changed, 51 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e9205b2..582fce1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1199,7 +1199,7 @@ checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81" dependencies = [ "serde", "termcolor", - "unicode-width 0.1.14", + "unicode-width 0.2.2", ] [[package]] @@ -1391,7 +1391,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic#3f9e93067b31d9ba81a4e3a28653b3380c61c352" +source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1412,7 +1412,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic#3f9e93067b31d9ba81a4e3a28653b3380c61c352" +source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "quote", "syn 2.0.117", @@ -1827,7 +1827,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic#3f9e93067b31d9ba81a4e3a28653b3380c61c352" +source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "almost", "configparser", @@ -3250,7 +3250,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#3f9e93067b31d9ba81a4e3a28653b3380c61c352" +source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "dnd", "iced_accessibility", @@ -3271,7 +3271,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#3f9e93067b31d9ba81a4e3a28653b3380c61c352" +source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "accesskit", "accesskit_winit", @@ -3280,7 +3280,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#3f9e93067b31d9ba81a4e3a28653b3380c61c352" +source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "bitflags 2.11.1", "bytes", @@ -3305,7 +3305,7 @@ dependencies = [ [[package]] name = "iced_debug" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#3f9e93067b31d9ba81a4e3a28653b3380c61c352" +source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "iced_core", "iced_futures", @@ -3315,7 +3315,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#3f9e93067b31d9ba81a4e3a28653b3380c61c352" +source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "futures", "iced_core", @@ -3329,7 +3329,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#3f9e93067b31d9ba81a4e3a28653b3380c61c352" +source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "bitflags 2.11.1", "bytemuck", @@ -3350,7 +3350,7 @@ dependencies = [ [[package]] name = "iced_program" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#3f9e93067b31d9ba81a4e3a28653b3380c61c352" +source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "iced_graphics", "iced_runtime", @@ -3359,7 +3359,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#3f9e93067b31d9ba81a4e3a28653b3380c61c352" +source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3371,7 +3371,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#3f9e93067b31d9ba81a4e3a28653b3380c61c352" +source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3387,7 +3387,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#3f9e93067b31d9ba81a4e3a28653b3380c61c352" +source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "bytemuck", "cosmic-text", @@ -3404,7 +3404,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#3f9e93067b31d9ba81a4e3a28653b3380c61c352" +source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "as-raw-xcb-connection", "bitflags 2.11.1", @@ -3435,7 +3435,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.2" -source = "git+https://github.com/pop-os/libcosmic#3f9e93067b31d9ba81a4e3a28653b3380c61c352" +source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3455,7 +3455,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#3f9e93067b31d9ba81a4e3a28653b3380c61c352" +source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "cosmic-client-toolkit", "cursor-icon", @@ -4567,7 +4567,7 @@ checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" [[package]] name = "libcosmic" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic#3f9e93067b31d9ba81a4e3a28653b3380c61c352" +source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" dependencies = [ "apply", "ashpd 0.12.3", diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs index 70e1952..669c3e7 100644 --- a/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs +++ b/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs @@ -8,7 +8,7 @@ use cosmic::iced::keyboard::{Key, Location, Modifiers}; use cosmic::iced::platform_specific::shell::wayland::commands::keyboard_shortcuts_inhibit; use cosmic::iced::platform_specific::shell::wayland::keymap; use cosmic::iced::{self, Alignment, Length}; -use cosmic::widget::{self, button, icon, settings, text}; +use cosmic::widget::{self, button, icon, list, settings, text}; use cosmic::{Apply, Element, Task, theme}; use cosmic_config::{ConfigGet, ConfigSet}; use cosmic_settings_config::shortcuts::{self, Action, Binding, Shortcuts}; @@ -865,13 +865,11 @@ fn context_drawer<'a>( } /// Display a shortcut as a list item -fn shortcut_item(custom: bool, id: usize, data: &ShortcutModel) -> Element<'_, ShortcutMessage> { - #[derive(Copy, Clone, Debug)] - enum LocalMessage { - Remove, - Show, - } - +fn shortcut_item( + custom: bool, + id: usize, + data: &ShortcutModel, +) -> list::ListButton<'_, ShortcutMessage> { let bindings = data .bindings .iter() @@ -880,7 +878,7 @@ fn shortcut_item(custom: bool, id: usize, data: &ShortcutModel) -> Element<'_, S .map(|(_, shortcut)| text::body(shortcut.binding.to_string()).into()) .collect::>(); - let shortcuts: Element = if bindings.is_empty() { + let shortcuts: Element = if bindings.is_empty() { text::body(fl!("disabled")).into() } else { widget::column::with_children(bindings) @@ -900,7 +898,7 @@ fn shortcut_item(custom: bool, id: usize, data: &ShortcutModel) -> Element<'_, S .push(icon::from_name("go-next-symbolic").size(16)) .push_maybe(custom.then(|| { widget::button::icon(icon::from_name("edit-delete-symbolic")) - .on_press(LocalMessage::Remove) + .on_press(ShortcutMessage::DeleteShortcut(id)) })) .align_y(Alignment::Center) .spacing(8); @@ -909,14 +907,7 @@ fn shortcut_item(custom: bool, id: usize, data: &ShortcutModel) -> Element<'_, S .flex_control(control) .align_items(Alignment::Center) .spacing(16) - .apply(widget::container) - .class(theme::Container::List) - .apply(widget::button::custom) - .class(theme::Button::Transparent) - .on_press(LocalMessage::Show) - .apply(Element::from) - .map(move |message| match message { - LocalMessage::Show => ShortcutMessage::ShowShortcut(id, data.description.clone()), - LocalMessage::Remove => ShortcutMessage::DeleteShortcut(id), - }) + .width(Length::Shrink) + .apply(list::button) + .on_press(ShortcutMessage::ShowShortcut(id, data.description.clone())) } diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs index 5a5b1bb..ab60609 100644 --- a/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs +++ b/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs @@ -15,8 +15,8 @@ pub mod tiling; use cosmic::app::ContextDrawer; use cosmic::iced::Length; -use cosmic::widget::{self, icon, settings, text}; -use cosmic::{Apply, Element, Task, theme}; +use cosmic::widget::{self, list::ListButton, settings, text}; +use cosmic::{Apply, Element, Task}; use cosmic_config::ConfigGet; use cosmic_settings_config::Binding; use cosmic_settings_config::shortcuts::action::{ @@ -222,11 +222,13 @@ impl Page { self.search.localized = SecondaryMap::new(); self.search.input = String::new(); self.search_model.on_clear(); - self.modified.custom = 0; + self.modified.accessibility = 0; self.modified.manage_windows = 0; self.modified.move_windows = 0; self.modified.nav = 0; self.modified.system = 0; + self.modified.window_tiling = 0; + self.modified.custom = 0; } fn reload_search(&mut self) { @@ -497,32 +499,18 @@ fn shortcuts() -> Section { } /// Display a category as a list item -fn category_item(category: Category, name: &str, modified: u16) -> Element<'_, Message> { - let icon = icon::from_name("go-next-symbolic").size(16); - - let control = if modified == 0 { - Element::from(icon) - } else { - widget::row::with_capacity(2) - .push(text::body(fl!("modified", count = modified))) - .push(icon) - .into() - }; - - settings::item::builder(name) - .control(control) - .spacing(16) - .apply(widget::container) - .class(theme::Container::List) - .apply(widget::button::custom) - .class(theme::Button::Transparent) - .width(Length::Fill) - .on_press(Message::Category(category)) - .into() +fn category_item(category: Category, name: &str, modified: u16) -> ListButton<'_, Message> { + crate::widget::go_next_with_item( + name, + (modified > 0).then(|| text::body(fl!("modified", count = modified)).apply(Element::from)), + Message::Category(category), + ) } fn action_category(action: &Action) -> Option { - Some(if manage_windows::actions().contains(action) { + Some(if accessibility::actions().contains(action) { + Category::Accessibility + } else if manage_windows::actions().contains(action) { Category::ManageWindow } else if move_window::actions().contains(action) { Category::MoveWindow @@ -530,6 +518,8 @@ fn action_category(action: &Action) -> Option { Category::Nav } else if system::actions().contains(action) { Category::System + } else if tiling::actions().contains(action) { + Category::WindowTiling } else { return None; }) diff --git a/cosmic-settings/src/pages/time/date.rs b/cosmic-settings/src/pages/time/date.rs index 16cc382..2ff4e67 100644 --- a/cosmic-settings/src/pages/time/date.rs +++ b/cosmic-settings/src/pages/time/date.rs @@ -8,7 +8,7 @@ use cosmic::{ cosmic_config::{self, ConfigGet, ConfigSet}, iced::core::text::Wrapping, surface, - widget::{self, dropdown, list, settings}, + widget::{self, dropdown, settings}, }; use cosmic_settings_page::{self as page, Section, section}; use icu::{ diff --git a/cosmic-settings/src/pages/time/region.rs b/cosmic-settings/src/pages/time/region.rs index 36128f7..8a9be3f 100644 --- a/cosmic-settings/src/pages/time/region.rs +++ b/cosmic-settings/src/pages/time/region.rs @@ -7,7 +7,7 @@ use std::sync::Arc; use crate::widget::selection_context_item; use cosmic::app::{ContextDrawer, context_drawer}; use cosmic::iced::{Alignment, Length}; -use cosmic::widget::{self, button, list}; +use cosmic::widget::{self, button}; use cosmic::{Apply, Element}; use cosmic_config::{ConfigGet, ConfigSet}; use cosmic_settings_page::Section; diff --git a/cosmic-settings/src/widget/mod.rs b/cosmic-settings/src/widget/mod.rs index a5b8322..5646dc6 100644 --- a/cosmic-settings/src/widget/mod.rs +++ b/cosmic-settings/src/widget/mod.rs @@ -206,8 +206,10 @@ pub fn go_next_with_item<'a, Msg: 'static>( msg_opt: impl Into>, ) -> list::ListButton<'a, Msg> { settings::item_row(vec![ - text::body(description).wrapping(Wrapping::Word).into(), - horizontal().into(), + text::body(description) + .width(Length::Fill) + .wrapping(Wrapping::Word) + .into(), row::with_capacity(2) .push(item) .push(icon::from_name("go-next-symbolic").size(16).icon()) From 26f0fb0609a54393b3e279a24824ffa681ae778b 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: Fri, 17 Apr 2026 14:26:39 +0200 Subject: [PATCH 02/24] chore(default_apps): reduce code duplication Also fixes the flex items wrapping too early by setting the FlexRow width to Shrink. --- .../src/pages/applications/default_apps.rs | 328 ++++-------------- 1 file changed, 71 insertions(+), 257 deletions(-) diff --git a/cosmic-settings/src/pages/applications/default_apps.rs b/cosmic-settings/src/pages/applications/default_apps.rs index 89b28c0..ee759e3 100644 --- a/cosmic-settings/src/pages/applications/default_apps.rs +++ b/cosmic-settings/src/pages/applications/default_apps.rs @@ -11,7 +11,7 @@ use std::{ use cosmic::{ Apply, Element, Task, - iced::Alignment, + iced::{Alignment, Length}, surface, widget::{self, dropdown, icon, settings}, }; @@ -281,269 +281,83 @@ impl Page { } } +fn app_item(meta: &AppMeta, label: String, category: Category) -> widget::FlexRow<'_, Message> { + // Avoid creating popup_dropdown for empty app lists. + // Empty categories are rendered as non-interactive text to prevent Wayland crashes. + settings::flex_item( + label, + if meta.apps.is_empty() { + widget::text(fl!("default-apps", "not-installed")).apply(Element::from) + } else { + dropdown::popup_dropdown( + &meta.apps, + meta.selected, + move |id| Message::SetDefault(category, id), + cosmic::iced::window::Id::RESERVED, + Message::Surface, + |a| crate::app::Message::PageMessage(crate::pages::Message::DefaultApps(a)), + ) + .icons(Cow::Borrowed(&meta.icons)) + .apply(Element::from) + }, + ) + .align_items(Alignment::Center) + .width(Length::Shrink) +} + fn apps() -> Section { Section::default().view::(move |_binder, page, section| { let Some(mime_apps) = page.mime_apps.as_ref() else { return widget::space().into(); }; - // Avoid creating popup_dropdown for empty app lists. - // Empty categories are rendered as non-interactive text to prevent Wayland crashes. - settings::section() + settings::section::with_capacity(9) .title(§ion.title) - .add({ - let meta = &mime_apps.apps[DROPDOWN_WEB_BROWSER]; - if meta.apps.is_empty() { - settings::flex_item( - fl!("default-apps", "web-browser"), - widget::text(fl!("default-apps", "not-installed")), - ) - .align_items(Alignment::Center) - } else { - settings::flex_item( - fl!("default-apps", "web-browser"), - dropdown::popup_dropdown( - &meta.apps, - meta.selected, - |id| Message::SetDefault(Category::WebBrowser, id), - cosmic::iced::window::Id::RESERVED, - Message::Surface, - |a| { - crate::app::Message::PageMessage( - crate::pages::Message::DefaultApps(a), - ) - }, - ) - .icons(Cow::Borrowed(&meta.icons)), - ) - .align_items(Alignment::Center) - .min_item_width(300.0) - } - }) - .add({ - let meta = &mime_apps.apps[DROPDOWN_FILE_MANAGER]; - if meta.apps.is_empty() { - settings::flex_item( - fl!("default-apps", "file-manager"), - widget::text(fl!("default-apps", "not-installed")), - ) - .align_items(Alignment::Center) - } else { - settings::flex_item( - fl!("default-apps", "file-manager"), - dropdown::popup_dropdown( - &meta.apps, - meta.selected, - |id| Message::SetDefault(Category::FileManager, id), - cosmic::iced::window::Id::RESERVED, - Message::Surface, - |a| { - crate::app::Message::PageMessage( - crate::pages::Message::DefaultApps(a), - ) - }, - ) - .icons(Cow::Borrowed(&meta.icons)), - ) - .align_items(Alignment::Center) - } - }) - .add({ - let meta = &mime_apps.apps[DROPDOWN_MAIL]; - if meta.apps.is_empty() { - settings::flex_item( - fl!("default-apps", "mail-client"), - widget::text(fl!("default-apps", "not-installed")), - ) - .align_items(Alignment::Center) - } else { - settings::flex_item( - fl!("default-apps", "mail-client"), - dropdown::popup_dropdown( - &meta.apps, - meta.selected, - |id| Message::SetDefault(Category::Mail, id), - cosmic::iced::window::Id::RESERVED, - Message::Surface, - |a| { - crate::app::Message::PageMessage( - crate::pages::Message::DefaultApps(a), - ) - }, - ) - .icons(Cow::Borrowed(&meta.icons)), - ) - .align_items(Alignment::Center) - } - }) - .add({ - let meta = &mime_apps.apps[DROPDOWN_MUSIC]; - if meta.apps.is_empty() { - settings::flex_item( - fl!("default-apps", "music"), - widget::text(fl!("default-apps", "not-installed")), - ) - .align_items(Alignment::Center) - } else { - settings::flex_item( - fl!("default-apps", "music"), - dropdown::popup_dropdown( - &meta.apps, - meta.selected, - |id| Message::SetDefault(Category::Audio, id), - cosmic::iced::window::Id::RESERVED, - Message::Surface, - |a| { - crate::app::Message::PageMessage( - crate::pages::Message::DefaultApps(a), - ) - }, - ) - .icons(Cow::Borrowed(&meta.icons)), - ) - .align_items(Alignment::Center) - } - }) - .add({ - let meta = &mime_apps.apps[DROPDOWN_VIDEO]; - if meta.apps.is_empty() { - settings::flex_item( - fl!("default-apps", "video"), - widget::text(fl!("default-apps", "not-installed")), - ) - .align_items(Alignment::Center) - } else { - settings::flex_item( - fl!("default-apps", "video"), - dropdown::popup_dropdown( - &meta.apps, - meta.selected, - |id| Message::SetDefault(Category::Video, id), - cosmic::iced::window::Id::RESERVED, - Message::Surface, - |a| { - crate::app::Message::PageMessage( - crate::pages::Message::DefaultApps(a), - ) - }, - ) - .icons(Cow::Borrowed(&meta.icons)), - ) - .align_items(Alignment::Center) - } - }) - .add({ - let meta = &mime_apps.apps[DROPDOWN_PHOTO]; - if meta.apps.is_empty() { - settings::flex_item( - fl!("default-apps", "photos"), - widget::text(fl!("default-apps", "not-installed")), - ) - .align_items(Alignment::Center) - } else { - settings::flex_item( - fl!("default-apps", "photos"), - dropdown::popup_dropdown( - &meta.apps, - meta.selected, - |id| Message::SetDefault(Category::Image, id), - cosmic::iced::window::Id::RESERVED, - Message::Surface, - |a| { - crate::app::Message::PageMessage( - crate::pages::Message::DefaultApps(a), - ) - }, - ) - .icons(Cow::Borrowed(&meta.icons)), - ) - .align_items(Alignment::Center) - } - }) - .add({ - let meta = &mime_apps.apps[DROPDOWN_CALENDAR]; - if meta.apps.is_empty() { - settings::flex_item( - fl!("default-apps", "calendar"), - widget::text(fl!("default-apps", "not-installed")), - ) - .align_items(Alignment::Center) - } else { - settings::flex_item( - fl!("default-apps", "calendar"), - dropdown::popup_dropdown( - &meta.apps, - meta.selected, - |id| Message::SetDefault(Category::Calendar, id), - cosmic::iced::window::Id::RESERVED, - Message::Surface, - |a| { - crate::app::Message::PageMessage( - crate::pages::Message::DefaultApps(a), - ) - }, - ) - .icons(Cow::Borrowed(&meta.icons)), - ) - .align_items(Alignment::Center) - } - }) - .add({ - let meta = &mime_apps.apps[DROPDOWN_TERMINAL]; - if meta.apps.is_empty() { - settings::flex_item( - fl!("default-apps", "terminal"), - widget::text(fl!("default-apps", "not-installed")), - ) - .align_items(Alignment::Center) - } else { - settings::flex_item( - fl!("default-apps", "terminal"), - dropdown::popup_dropdown( - &meta.apps, - meta.selected, - |id| Message::SetDefault(Category::Terminal, id), - cosmic::iced::window::Id::RESERVED, - Message::Surface, - |a| { - crate::app::Message::PageMessage( - crate::pages::Message::DefaultApps(a), - ) - }, - ) - .icons(Cow::Borrowed(&meta.icons)), - ) - .align_items(Alignment::Center) - } - }) - .add({ - let meta = &mime_apps.apps[DROPDOWN_TEXT_EDITOR]; - if meta.apps.is_empty() { - settings::flex_item( - fl!("default-apps", "text-editor"), - widget::text(fl!("default-apps", "not-installed")), - ) - .align_items(Alignment::Center) - } else { - settings::flex_item( - fl!("default-apps", "text-editor"), - dropdown::popup_dropdown( - &meta.apps, - meta.selected, - |id| Message::SetDefault(Category::TextEditor, id), - cosmic::iced::window::Id::RESERVED, - Message::Surface, - |a| { - crate::app::Message::PageMessage( - crate::pages::Message::DefaultApps(a), - ) - }, - ) - .icons(Cow::Borrowed(&meta.icons)), - ) - .align_items(Alignment::Center) - } - }) + .add(app_item( + &mime_apps.apps[DROPDOWN_WEB_BROWSER], + fl!("default-apps", "web-browser"), + Category::WebBrowser, + )) + .add(app_item( + &mime_apps.apps[DROPDOWN_FILE_MANAGER], + fl!("default-apps", "file-manager"), + Category::FileManager, + )) + .add(app_item( + &mime_apps.apps[DROPDOWN_MAIL], + fl!("default-apps", "mail-client"), + Category::Mail, + )) + .add(app_item( + &mime_apps.apps[DROPDOWN_MUSIC], + fl!("default-apps", "music"), + Category::Audio, + )) + .add(app_item( + &mime_apps.apps[DROPDOWN_VIDEO], + fl!("default-apps", "video"), + Category::Video, + )) + .add(app_item( + &mime_apps.apps[DROPDOWN_PHOTO], + fl!("default-apps", "photos"), + Category::Image, + )) + .add(app_item( + &mime_apps.apps[DROPDOWN_CALENDAR], + fl!("default-apps", "calendar"), + Category::Calendar, + )) + .add(app_item( + &mime_apps.apps[DROPDOWN_TERMINAL], + fl!("default-apps", "terminal"), + Category::Terminal, + )) + .add(app_item( + &mime_apps.apps[DROPDOWN_TEXT_EDITOR], + fl!("default-apps", "text-editor"), + Category::TextEditor, + )) .apply(Element::from) .map(crate::pages::Message::DefaultApps) }) From c04e49e218023477069e29c37e28bb01ae709dbd Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Sat, 11 Apr 2026 13:40:27 +0200 Subject: [PATCH 03/24] fix(wallpapers): follow symlinks when scanning wallpaper directories On NixOS, /run/current-system/sw/share/backgrounds lists all wallpapers installed on the system. The folder entries are symbolic links to the actual PNG files (each in a dedicated nix store path). Previously WalkDir would skip over these, resulting in cosmic-settings displaying an empty wallpaper list. By following symbolic links, the list is now properly populated. --- pages/wallpapers/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/pages/wallpapers/src/lib.rs b/pages/wallpapers/src/lib.rs index 498b424..921117c 100644 --- a/pages/wallpapers/src/lib.rs +++ b/pages/wallpapers/src/lib.rs @@ -104,6 +104,7 @@ pub async fn load_each_from_path( ) -> Pin>> { let candidate_paths: Vec<_> = WalkDir::new(path) .max_depth(3) + .follow_links(true) .into_iter() .filter_map(Result::ok) .filter(|entry| entry.file_type().is_file()) From 78644a32e3741f8f80e9b8ce65c3550c85f9c1f8 Mon Sep 17 00:00:00 2001 From: Ashley Wulber <48420062+wash2@users.noreply.github.com> Date: Wed, 22 Apr 2026 16:33:37 -0400 Subject: [PATCH 04/24] =?UTF-8?q?Revert=20"Changes=20the=20PageInner.size?= =?UTF-8?q?=20field=20to=20have=20no=20explicit=20default.=E2=80=A6=20(#19?= =?UTF-8?q?77)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … It is only initialized (not None) when PageInner.panel_config is initialized. This implementation fails faster and more verbose, when program is in an unintended state." This reverts commit ba5fb65b44302d2aae5d969917d9f3d7b04c8d1e. - [x] I have disclosed use of any AI generated code in my commit messages. - If you are using an LLM, and do not fully understand the changes it is making to the code base, do not create a PR. - In our experience, AI generated code often results in overly complex code that lacks enough context for a proper fix or feature inclusion. This results in considerably longer code reviews. Due to this, AI authored or partially authored PRs may be closed without comment. - [x] I understand these changes in full and will be able to respond to review comments. - [x] My change is accurately described in the commit message. - [x] My contribution is tested and working as described. - [x] I have read the [Developer Certificate of Origin](https://developercertificate.org/) and certify my contribution under its conditions. Co-authored-by: Levi Portenier --- .../src/pages/desktop/panel/inner.rs | 22 ++++++------------- .../src/pages/desktop/panel/mod.rs | 2 -- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/cosmic-settings/src/pages/desktop/panel/inner.rs b/cosmic-settings/src/pages/desktop/panel/inner.rs index bcd7bb3..9974e54 100644 --- a/cosmic-settings/src/pages/desktop/panel/inner.rs +++ b/cosmic-settings/src/pages/desktop/panel/inner.rs @@ -22,9 +22,9 @@ use crate::pages::desktop::appearance::Roundness; pub struct PageInner { pub(crate) config_helper: Option, pub(crate) panel_config: Option, - pub size: Option, pub opacity: f32, pub opacity_changing: bool, + pub size: PanelSize, pub outputs: Vec, pub anchors: Vec, pub backgrounds: Vec, @@ -40,9 +40,9 @@ impl Default for PageInner { Self { config_helper: Option::default(), panel_config: Option::default(), - size: Option::default(), opacity: 0.0, opacity_changing: false, + size: PanelSize::M, outputs: vec![fl!("all-displays")], anchors: vec![ Anchor(PanelAnchor::Left).to_string(), @@ -209,9 +209,7 @@ pub(crate) fn style< text::body(fl!("small")).into(), slider( 0..=4, - match inner.size.as_ref().expect( - "PageInner.size is None even though PageInner.panel_config is Some", - ) { + match inner.size { PanelSize::XS => 0, PanelSize::S => 1, PanelSize::M => 2, @@ -506,7 +504,7 @@ impl PageInner { if let Err(err) = default.write_entry(config) { tracing::error!(?err, "Error resetting panel config."); } - self.size = Some(default.size.clone()); + self.size.clone_from(&default.size); self.system_default = Some(default.clone()); self.panel_config.clone_from(&self.system_default); } else { @@ -605,16 +603,10 @@ impl PageInner { _ = panel_config.set_border_radius(helper, new_radius).unwrap(); } Message::PanelSize(size) => { - self.size = Some(size); + self.size = size; } Message::PanelSizeCommit => { - _ = panel_config.set_size( - helper, - self.size - .as_ref() - .expect("PageInner.size is None even though it should be Some, since PageInner.panel_config is Some") - .clone() - ); + _ = panel_config.set_size(helper, self.size.clone()); // Reset any size overrides the user might have set _ = panel_config.set_size_center(helper, None); _ = panel_config.set_size_wings(helper, None); @@ -677,7 +669,7 @@ impl PageInner { } } Message::PanelConfig(c) => { - self.size = Some(c.size.clone()); + self.size = c.size.clone(); self.panel_config = Some(*c); return Task::none(); } diff --git a/cosmic-settings/src/pages/desktop/panel/mod.rs b/cosmic-settings/src/pages/desktop/panel/mod.rs index 7748618..4f98e64 100644 --- a/cosmic-settings/src/pages/desktop/panel/mod.rs +++ b/cosmic-settings/src/pages/desktop/panel/mod.rs @@ -79,7 +79,6 @@ impl Default for Page { // If the config is not present, it will be created with the default values and the name will not match (panel_config.name == "Panel").then_some(panel_config) }); - let size = panel_config.as_ref().map(|c| c.size.clone()); let system_default = cosmic::cosmic_config::Config::system( &format!("{}.Panel", cosmic_panel_config::NAME), CosmicPanelConfig::VERSION, @@ -99,7 +98,6 @@ impl Default for Page { inner: PageInner { config_helper, panel_config, - size, container_config, outputs_map: HashMap::new(), system_default, From fa085f9006f36e0df965819a1ead02749a18e3ba Mon Sep 17 00:00:00 2001 From: Anthony Lannutti Date: Fri, 24 Apr 2026 17:07:15 -0500 Subject: [PATCH 05/24] fix: set locale with DBus to fix OpenRC support This PR is intended to address #1955. At a high level, when using OpenRC with `openrc-settingsd`, the application would panic after trying to run the non-existent `localectl` command. This PR addresses that issue by setting the locale via D-Bus instead of through `localectl`. Additionally, there was a call to `localectl` to get the available locales for the system that was replaced with the more portable and POSIX compliant `locale` command. - [x] I have disclosed use of any AI generated code in my commit messages. - [x] I understand these changes in full and will be able to respond to review comments. - [x] My change is accurately described in the commit message. - [x] My contribution is tested and working as described. - [x] I have read the [Developer Certificate of Origin](https://developercertificate.org/) and certify my contribution under its conditions. --- AI Disclosure: This code was generated with the assistance of AI (Claude 3.7 Sonnet) under human direction and supervision. All code has been reviewed and tested. --- cosmic-settings/src/pages/time/region.rs | 277 ++++++++++++++++++++--- 1 file changed, 243 insertions(+), 34 deletions(-) diff --git a/cosmic-settings/src/pages/time/region.rs b/cosmic-settings/src/pages/time/region.rs index 8a9be3f..5ff3192 100644 --- a/cosmic-settings/src/pages/time/region.rs +++ b/cosmic-settings/src/pages/time/region.rs @@ -23,6 +23,7 @@ use icu::{ locale::Locale, }; use locales_rs as locale; +use regex::Regex; use slotmap::{DefaultKey, SlotMap}; static GNOME_LANGUAGE_SELECTOR: &str = "gnome-language-selector"; @@ -242,9 +243,7 @@ impl Page { let region = region.lang_code.clone(); return cosmic::task::future(async move { - if let Ok(exit_status) = set_locale(lang, region.clone()).await - && exit_status.success() - { + if set_locale(lang, region.clone()).await.is_ok() { update_time_settings_after_region_change(region); } @@ -710,20 +709,26 @@ pub async fn page_reload() -> eyre::Result { let mut available_languages_set = BTreeSet::new(); - let output = tokio::process::Command::new("localectl") - .arg("list-locales") + // Use 'locale -a' instead of 'localectl list-locales' for OpenRC compatibility + let output_result = tokio::process::Command::new("locale") + .arg("-a") .output() - .await - .expect("Failed to run localectl"); + .await; - let output = String::from_utf8(output.stdout).unwrap_or_default(); - for line in output.lines() { - if line == "C.UTF-8" { - continue; + let locale_list = match output_result { + Ok(output) => { + let output_str = String::from_utf8(output.stdout).unwrap_or_default(); + parse_locale_output(&output_str) } + Err(why) => { + tracing::error!(?why, "failed to list available locales using 'locale -a'"); + Vec::new() + } + }; - if let Some(locale) = registry.locale(line) { - available_languages_set.insert(localized_locale(&locale, line.to_owned())); + for line in locale_list { + if let Some(locale) = registry.locale(&line) { + available_languages_set.insert(localized_locale(&locale, line)); } } @@ -841,27 +846,28 @@ fn popover_menu_row( .apply(Element::from) } -pub async fn set_locale( - lang: String, - region: String, -) -> Result { - eprintln!("setting locale lang={lang}, region={region}"); - tokio::process::Command::new("localectl") - .arg("set-locale") - .args(&[ - ["LANG=", &lang].concat(), - ["LC_ADDRESS=", ®ion].concat(), - ["LC_IDENTIFICATION=", ®ion].concat(), - ["LC_MEASUREMENT=", ®ion].concat(), - ["LC_MONETARY=", ®ion].concat(), - ["LC_NAME=", ®ion].concat(), - ["LC_NUMERIC=", ®ion].concat(), - ["LC_PAPER=", ®ion].concat(), - ["LC_TELEPHONE=", ®ion].concat(), - ["LC_TIME=", ®ion].concat(), - ]) - .status() +/// Sets the system locale using D-Bus instead of localectl for OpenRC compatibility. +pub async fn set_locale(lang: String, region: String) -> eyre::Result<()> { + tracing::debug!("setting locale lang={lang}, region={region}"); + + let conn = zbus::Connection::system() .await + .wrap_err("failed to connect to system D-Bus")?; + + let proxy = locale1::locale1Proxy::new(&conn) + .await + .wrap_err("failed to create locale1 D-Bus proxy")?; + + let locale_settings = build_locale_settings(&lang, ®ion); + let locale_strs: Vec<&str> = locale_settings.iter().map(|s| s.as_str()).collect(); + + proxy + .set_locale(&locale_strs, true) + .await + .wrap_err("failed to set locale via D-Bus")?; + + tracing::debug!("successfully set locale via D-Bus"); + Ok(()) } /// Sets the user's preferred language list via AccountsService D-Bus. @@ -883,7 +889,7 @@ pub async fn set_user_language(language_list: String) -> eyre::Result<()> { .await .wrap_err("failed to set language via AccountsService")?; - eprintln!("set user language via AccountsService: {language_list}"); + tracing::debug!("set user language via AccountsService: {language_list}"); Ok(()) } @@ -1016,3 +1022,206 @@ fn strip_locale_suffix(locale: &str) -> String { .unwrap_or(without_codeset) .to_string() } + +/// Parses the output from `locale -a` command and returns a vector of locale strings. +/// Filters out pseudo-locales (C, POSIX) and accepts only allowed character encodings. +fn parse_locale_output(output: &str) -> Vec { + // Regex to match pseudo-locales: C or POSIX, optionally followed by .anything + let pseudo_locale_re = Regex::new(r"^(C|POSIX)(\.|$)").unwrap(); + + // Regex to match UTF-8 encoded locales (case-insensitive) + // Supports optional modifiers after encoding (e.g., @euro, @valencia) + let utf8_encoding_re = Regex::new(r"(?i)\.(utf-?8)(@.*)?$").unwrap(); + + output + .lines() + .map(|line| line.trim()) + .filter(|line| !pseudo_locale_re.is_match(line)) + .filter(|line| utf8_encoding_re.is_match(line)) + .map(|line| line.to_string()) + .collect() +} + +/// Builds the locale settings array for D-Bus SetLocale call. +/// Sets LANG to the language parameter and all LC_* variables to the region parameter. +fn build_locale_settings(lang: &str, region: &str) -> Vec { + vec![ + format!("LANG={}", lang), + format!("LC_ADDRESS={}", region), + format!("LC_IDENTIFICATION={}", region), + format!("LC_MEASUREMENT={}", region), + format!("LC_MONETARY={}", region), + format!("LC_NAME={}", region), + format!("LC_NUMERIC={}", region), + format!("LC_PAPER={}", region), + format!("LC_TELEPHONE={}", region), + format!("LC_TIME={}", region), + ] +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_parse_locale_output_handles_empty_input() { + let output = ""; + let result = parse_locale_output(output); + assert_eq!(result.len(), 0); + } + + #[test] + fn test_parse_locale_output_preserves_locale_strings() { + let output = "en_US.utf8\nde_DE.utf8\nfr_FR.utf8\n"; + let result = parse_locale_output(output); + assert_eq!(result.len(), 3); + assert!(result.contains(&"en_US.utf8".to_string())); + } + + #[test] + fn test_build_locale_settings_includes_all_lc_variables() { + let lang = "en_US.UTF-8"; + let region = "de_DE.UTF-8"; + let settings = build_locale_settings(lang, region); + + assert_eq!(settings.len(), 10); + assert!(settings.contains(&format!("LANG={}", lang))); + assert!(settings.contains(&format!("LC_ADDRESS={}", region))); + assert!(settings.contains(&format!("LC_IDENTIFICATION={}", region))); + assert!(settings.contains(&format!("LC_MEASUREMENT={}", region))); + assert!(settings.contains(&format!("LC_MONETARY={}", region))); + assert!(settings.contains(&format!("LC_NAME={}", region))); + assert!(settings.contains(&format!("LC_NUMERIC={}", region))); + assert!(settings.contains(&format!("LC_PAPER={}", region))); + assert!(settings.contains(&format!("LC_TELEPHONE={}", region))); + assert!(settings.contains(&format!("LC_TIME={}", region))); + } + + #[test] + fn test_build_locale_settings_uses_correct_values() { + let lang = "fr_FR.UTF-8"; + let region = "en_GB.UTF-8"; + let settings = build_locale_settings(lang, region); + + // LANG should use the lang parameter + assert!(settings.iter().any(|s| s == "LANG=fr_FR.UTF-8")); + // LC_* variables should use the region parameter + assert!(settings.iter().any(|s| s == "LC_TIME=en_GB.UTF-8")); + } + + #[test] + fn test_parse_locale_output_filters_pseudo_locales() { + let output = "C\nC.utf8\nC.UTF-8\nPOSIX\nen_US.utf8\nde_DE.UTF-8\n"; + let result = parse_locale_output(output); + + // Should filter out all C and POSIX variants + assert!(!result.contains(&"C".to_string())); + assert!(!result.contains(&"C.utf8".to_string())); + assert!(!result.contains(&"C.UTF-8".to_string())); + assert!(!result.contains(&"POSIX".to_string())); + + // Should keep actual locales + assert!(result.contains(&"en_US.utf8".to_string())); + assert!(result.contains(&"de_DE.UTF-8".to_string())); + assert_eq!(result.len(), 2); + } + + #[test] + fn test_parse_locale_output_accepts_only_utf8_locales() { + let output = + "en_US\nen_US.utf8\nen_US.UTF-8\nar_IN\nar_IN.utf8\nde_DE.iso88591\nfr_FR.UTF-8\n"; + let result = parse_locale_output(output); + + // Should accept UTF-8 variants + assert!(result.contains(&"en_US.utf8".to_string())); + assert!(result.contains(&"en_US.UTF-8".to_string())); + assert!(result.contains(&"ar_IN.utf8".to_string())); + assert!(result.contains(&"fr_FR.UTF-8".to_string())); + + // Should filter out non-UTF-8 encoded locales + assert!(!result.contains(&"en_US".to_string())); + assert!(!result.contains(&"ar_IN".to_string())); + assert!(!result.contains(&"de_DE.iso88591".to_string())); + + assert_eq!(result.len(), 4); + } + + #[test] + fn test_parse_locale_output_filters_any_c_posix_variant() { + let output = "C\nC.iso88591\nC.anything\nPOSIX\nPOSIX.utf8\nen_US.utf8\n"; + let result = parse_locale_output(output); + + // Should filter out any C or POSIX variant regardless of encoding + assert!(!result.contains(&"C".to_string())); + assert!(!result.contains(&"C.iso88591".to_string())); + assert!(!result.contains(&"C.anything".to_string())); + assert!(!result.contains(&"POSIX".to_string())); + assert!(!result.contains(&"POSIX.utf8".to_string())); + + // Should keep actual locales + assert!(result.contains(&"en_US.utf8".to_string())); + assert_eq!(result.len(), 1); + } + + #[test] + fn test_parse_locale_output_handles_whitespace() { + let output = " en_US.utf8 \n\t de_DE.UTF-8\t\n fr_FR.utf8 \n"; + let result = parse_locale_output(output); + + // Should handle leading/trailing whitespace + assert!(result.contains(&"en_US.utf8".to_string())); + assert!(result.contains(&"de_DE.UTF-8".to_string())); + assert!(result.contains(&"fr_FR.utf8".to_string())); + assert_eq!(result.len(), 3); + } + + #[test] + fn test_parse_locale_output_handles_empty_lines() { + let output = "en_US.utf8\n\n\nde_DE.UTF-8\n\n"; + let result = parse_locale_output(output); + + // Should skip empty lines + assert!(result.contains(&"en_US.utf8".to_string())); + assert!(result.contains(&"de_DE.UTF-8".to_string())); + assert_eq!(result.len(), 2); + } + + #[test] + fn test_parse_locale_output_catalan_not_filtered_as_pseudo() { + let output = "C\nca_ES.UTF-8\nca_ES.utf8\ncs_CZ.UTF-8\nen_US.utf8\n"; + let result = parse_locale_output(output); + + // Should filter out C but not Catalan (ca_*) or Czech (cs_*) + assert!(!result.contains(&"C".to_string())); + assert!(result.contains(&"ca_ES.UTF-8".to_string())); + assert!(result.contains(&"ca_ES.utf8".to_string())); + assert!(result.contains(&"cs_CZ.UTF-8".to_string())); + assert_eq!(result.len(), 4); + } + + #[test] + fn test_parse_locale_output_handles_locale_modifiers() { + let output = "en_US.UTF-8@euro\nca_ES.UTF-8@valencia\nde_DE.utf8\n"; + let result = parse_locale_output(output); + + // Locales with modifiers should be accepted + assert!(result.contains(&"en_US.UTF-8@euro".to_string())); + assert!(result.contains(&"ca_ES.UTF-8@valencia".to_string())); + assert!(result.contains(&"de_DE.utf8".to_string())); + assert_eq!(result.len(), 3); + } + + #[test] + fn test_parse_locale_output_case_variations() { + let output = "en_US.UTF-8\nen_US.utf-8\nen_US.utf8\nen_US.UTF8\nde_DE.Utf8\n"; + let result = parse_locale_output(output); + + // All case variations should be accepted (case-insensitive regex) + assert!(result.contains(&"en_US.UTF-8".to_string())); + assert!(result.contains(&"en_US.utf-8".to_string())); + assert!(result.contains(&"en_US.utf8".to_string())); + assert!(result.contains(&"en_US.UTF8".to_string())); + assert!(result.contains(&"de_DE.Utf8".to_string())); + assert_eq!(result.len(), 5); + } +} From e4c4c0d903b7e6a6ebde19c2daaa5331dd6658c9 Mon Sep 17 00:00:00 2001 From: Michael Aaron Murphy Date: Mon, 27 Apr 2026 15:08:13 +0200 Subject: [PATCH 06/24] build: set MSRV to Rust 1.93 --- Cargo.toml | 2 +- rust-toolchain.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c42187c..f4f5b43 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ default-members = ["cosmic-settings"] resolver = "3" [workspace.package] -rust-version = "1.90" +rust-version = "1.93" [workspace.dependencies] cosmic-randr = { git = "https://github.com/pop-os/cosmic-randr" } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index f35f369..fb5449a 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.90.0" +channel = "1.93.0" components = ["clippy", "rustfmt"] From c882df3d20acff8b15d87b19efee5cdbc29c942f Mon Sep 17 00:00:00 2001 From: Michael Aaron Murphy Date: Mon, 27 Apr 2026 15:10:53 +0200 Subject: [PATCH 07/24] chore: update libcosmic & iced - Contains fix for wgpu validation error on float16 shader with older GPUs. - Updates wgpu to 28 and cosmic-text to 0.19 - Misc. fixes and improvements for libcosmic widgets --- Cargo.lock | 197 +++++++--------------- cosmic-settings/src/pages/system/about.rs | 3 +- cosmic-settings/src/pages/system/info.rs | 8 +- 3 files changed, 68 insertions(+), 140 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 582fce1..ffa0c23 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -196,6 +196,12 @@ dependencies = [ "alloc-no-stdlib", ] +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + [[package]] name = "almost" version = "0.2.0" @@ -1199,7 +1205,7 @@ checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81" dependencies = [ "serde", "termcolor", - "unicode-width 0.2.2", + "unicode-width 0.1.14", ] [[package]] @@ -1391,7 +1397,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" +source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1412,7 +1418,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" +source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" dependencies = [ "quote", "syn 2.0.117", @@ -1803,8 +1809,9 @@ dependencies = [ [[package]] name = "cosmic-text" -version = "0.18.2" -source = "git+https://github.com/pop-os/cosmic-text.git#4d74f795cc771fdcc7ea0f9cacba63fcf036fad6" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be17b688510d934ce13f48a2beba700e11583e281e0fda99c22bb256a14eda73" dependencies = [ "bitflags 2.11.1", "fontdb", @@ -1827,7 +1834,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" +source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" dependencies = [ "almost", "configparser", @@ -1893,7 +1900,7 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "cryoglyph" version = "0.1.0" -source = "git+https://github.com/pop-os/glyphon.git?tag=cosmic-0.14#c49de15bce4d8254ac136d1be9911960cc85ce12" +source = "git+https://github.com/iced-rs/cryoglyph.git?rev=e429a025df36ab8145708acb309080ae3deec17a#e429a025df36ab8145708acb309080ae3deec17a" dependencies = [ "cosmic-text", "etagere", @@ -2956,35 +2963,18 @@ dependencies = [ "gl_generator", ] -[[package]] -name = "gpu-alloc" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" -dependencies = [ - "bitflags 2.11.1", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" -dependencies = [ - "bitflags 2.11.1", -] - [[package]] name = "gpu-allocator" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" +checksum = "51255ea7cfaadb6c5f1528d43e92a82acb2b96c43365989a28b2d44ee38f8795" dependencies = [ + "ash", + "hashbrown 0.16.1", "log", "presser", - "thiserror 1.0.69", - "windows 0.58.0", + "thiserror 2.0.18", + "windows 0.62.2", ] [[package]] @@ -3069,6 +3059,8 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ + "allocator-api2", + "equivalent", "foldhash 0.2.0", ] @@ -3250,7 +3242,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" +source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" dependencies = [ "dnd", "iced_accessibility", @@ -3271,7 +3263,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" +source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" dependencies = [ "accesskit", "accesskit_winit", @@ -3280,7 +3272,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" +source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" dependencies = [ "bitflags 2.11.1", "bytes", @@ -3305,7 +3297,7 @@ dependencies = [ [[package]] name = "iced_debug" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" +source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" dependencies = [ "iced_core", "iced_futures", @@ -3315,7 +3307,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" +source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" dependencies = [ "futures", "iced_core", @@ -3329,7 +3321,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" +source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" dependencies = [ "bitflags 2.11.1", "bytemuck", @@ -3350,7 +3342,7 @@ dependencies = [ [[package]] name = "iced_program" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" +source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" dependencies = [ "iced_graphics", "iced_runtime", @@ -3359,7 +3351,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" +source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3371,7 +3363,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" +source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3387,7 +3379,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" +source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" dependencies = [ "bytemuck", "cosmic-text", @@ -3404,7 +3396,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" +source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" dependencies = [ "as-raw-xcb-connection", "bitflags 2.11.1", @@ -3435,7 +3427,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.2" -source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" +source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3455,7 +3447,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" +source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" dependencies = [ "cosmic-client-toolkit", "cursor-icon", @@ -4567,7 +4559,7 @@ checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" [[package]] name = "libcosmic" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67" +source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" dependencies = [ "apply", "ashpd 0.12.3", @@ -4955,9 +4947,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605" +checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15" dependencies = [ "bitflags 2.11.1", "block", @@ -5038,9 +5030,9 @@ checksum = "13d2233c9842d08cfe13f9eac96e207ca6a2ea10b80259ebe8ad0268be27d2af" [[package]] name = "naga" -version = "27.0.3" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "066cf25f0e8b11ee0df221219010f213ad429855f57c494f995590c861a9a7d8" +checksum = "618f667225063219ddfc61251087db8a9aec3c3f0950c916b614e403486f1135" dependencies = [ "arrayvec", "bit-set", @@ -7006,7 +6998,7 @@ dependencies = [ [[package]] name = "softbuffer" version = "0.4.1" -source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#a3f77e251e7422803f693df6e3fc313c010c4dcb" +source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#c2b2c19ddb38ff17495643699f97cb1f2064a1be" dependencies = [ "as-raw-xcb-connection", "bytemuck", @@ -8180,12 +8172,13 @@ checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" [[package]] name = "wgpu" -version = "27.0.1" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe68bac7cde125de7a731c3400723cadaaf1703795ad3f4805f187459cd7a77" +checksum = "f9cb534d5ffd109c7d1135f34cdae29e60eab94855a625dcfe1705f8bc7ad79f" dependencies = [ "arrayvec", "bitflags 2.11.1", + "bytemuck", "cfg-if", "cfg_aliases 0.2.1", "document-features", @@ -8209,9 +8202,9 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "27.0.3" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27a75de515543b1897b26119f93731b385a19aea165a1ec5f0e3acecc229cae7" +checksum = "d23f4642f53f666adcfd2d3218ab174d1e6681101aef18696b90cbe64d1c10f9" dependencies = [ "arrayvec", "bit-set", @@ -8241,36 +8234,36 @@ dependencies = [ [[package]] name = "wgpu-core-deps-apple" -version = "27.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0772ae958e9be0c729561d5e3fd9a19679bcdfb945b8b1a1969d9bfe8056d233" +checksum = "87b7b696b918f337c486bf93142454080a32a37832ba8a31e4f48221890047da" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-emscripten" -version = "27.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06ac3444a95b0813ecfd81ddb2774b66220b264b3e2031152a4a29fda4da6b5" +checksum = "34b251c331f84feac147de3c4aa3aa45112622a95dd7ee1b74384fa0458dbd79" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-windows-linux-android" -version = "27.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71197027d61a71748e4120f05a9242b2ad142e3c01f8c1b47707945a879a03c3" +checksum = "68ca976e72b2c9964eb243e281f6ce7f14a514e409920920dcda12ae40febaae" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-hal" -version = "27.0.4" +version = "28.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b21cb61c57ee198bc4aff71aeadff4cbb80b927beb912506af9c780d64313ce" +checksum = "44d6cb474beb218824dcc9e1ce679d973f719262789bfb27407da560cac20eeb" dependencies = [ "android_system_properties", "arrayvec", @@ -8284,7 +8277,6 @@ dependencies = [ "core-graphics-types 0.2.0", "glow", "glutin_wgl_sys", - "gpu-alloc", "gpu-allocator", "gpu-descriptor", "hashbrown 0.16.1", @@ -8311,21 +8303,20 @@ dependencies = [ "wasm-bindgen", "web-sys", "wgpu-types", - "windows 0.58.0", - "windows-core 0.58.0", + "windows 0.62.2", + "windows-core 0.62.2", ] [[package]] name = "wgpu-types" -version = "27.0.1" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afdcf84c395990db737f2dd91628706cb31e86d72e53482320d368e52b5da5eb" +checksum = "e18308757e594ed2cd27dddbb16a139c42a683819d32a2e0b1b0167552f5840c" dependencies = [ "bitflags 2.11.1", "bytemuck", "js-sys", "log", - "thiserror 2.0.18", "web-sys", ] @@ -8384,16 +8375,6 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "windows" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" -dependencies = [ - "windows-core 0.58.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows" version = "0.61.3" @@ -8437,27 +8418,14 @@ dependencies = [ "windows-core 0.62.2", ] -[[package]] -name = "windows-core" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" -dependencies = [ - "windows-implement 0.58.0", - "windows-interface 0.58.0", - "windows-result 0.2.0", - "windows-strings 0.1.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows-core" version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ - "windows-implement 0.60.2", - "windows-interface 0.59.3", + "windows-implement", + "windows-interface", "windows-link 0.1.3", "windows-result 0.3.4", "windows-strings 0.4.2", @@ -8469,8 +8437,8 @@ version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ - "windows-implement 0.60.2", - "windows-interface 0.59.3", + "windows-implement", + "windows-interface", "windows-link 0.2.1", "windows-result 0.4.1", "windows-strings 0.5.1", @@ -8498,17 +8466,6 @@ dependencies = [ "windows-threading 0.2.1", ] -[[package]] -name = "windows-implement" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "windows-implement" version = "0.60.2" @@ -8520,17 +8477,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "windows-interface" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "windows-interface" version = "0.59.3" @@ -8574,15 +8520,6 @@ dependencies = [ "windows-link 0.2.1", ] -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - [[package]] name = "windows-result" version = "0.3.4" @@ -8601,16 +8538,6 @@ dependencies = [ "windows-link 0.2.1", ] -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result 0.2.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows-strings" version = "0.4.2" diff --git a/cosmic-settings/src/pages/system/about.rs b/cosmic-settings/src/pages/system/about.rs index 0ee99d0..d169ddb 100644 --- a/cosmic-settings/src/pages/system/about.rs +++ b/cosmic-settings/src/pages/system/about.rs @@ -66,7 +66,8 @@ impl page::Page for Page { fn on_enter(&mut self) -> Task { let (task, handle) = Task::future(async move { - crate::pages::Message::About(Message::Info(Box::new(Info::load()))) + let info = Info::load().await; + crate::pages::Message::About(Message::Info(Box::new(info))) }) .abortable(); diff --git a/cosmic-settings/src/pages/system/info.rs b/cosmic-settings/src/pages/system/info.rs index 2ea3ac5..be737fc 100644 --- a/cosmic-settings/src/pages/system/info.rs +++ b/cosmic-settings/src/pages/system/info.rs @@ -29,12 +29,12 @@ impl Info { } #[cfg(feature = "wgpu")] - fn wgpu_graphics() -> Vec { + async fn wgpu_graphics() -> Vec { let mut graphics = Vec::new(); // Use wgpu to enumerate GPUs. Works cross-platform and doesn't require external tools let instance = wgpu::Instance::default(); - let adapters = instance.enumerate_adapters(wgpu::Backends::all()); + let adapters = instance.enumerate_adapters(wgpu::Backends::all()).await; // Track seen GPUs by (vendor, device) and by name to handle different scenarios: // - Same GPU via different backends (Vulkan/OpenGL) -> deduplicate by device ID or name @@ -140,7 +140,7 @@ impl Info { graphics } - pub fn load() -> Info { + pub async fn load() -> Info { let mut info = Info { os_architecture: architecture(), kernel_version: kernel_version(), @@ -192,7 +192,7 @@ impl Info { #[cfg(feature = "wgpu")] { - info.graphics = Self::wgpu_graphics(); + info.graphics = Self::wgpu_graphics().await; } info From f4c7a2c14dd0072eb48eaea4d9bf45a07345ff31 Mon Sep 17 00:00:00 2001 From: Michael Aaron Murphy Date: Mon, 27 Apr 2026 15:25:12 +0200 Subject: [PATCH 08/24] chore: bump version to 1.0.12 --- Cargo.lock | 2 +- cosmic-settings/Cargo.toml | 2 +- debian/changelog | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ffa0c23..27a29a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1546,7 +1546,7 @@ dependencies = [ [[package]] name = "cosmic-settings" -version = "1.0.7" +version = "1.0.12" dependencies = [ "accounts-zbus", "anyhow", diff --git a/cosmic-settings/Cargo.toml b/cosmic-settings/Cargo.toml index 03c7a70..afee51c 100644 --- a/cosmic-settings/Cargo.toml +++ b/cosmic-settings/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmic-settings" -version = "1.0.7" +version = "1.0.12" edition = "2024" license = "GPL-3.0-only" publish = false diff --git a/debian/changelog b/debian/changelog index 1e3759c..02e319d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cosmic-settings (1.0.12) noble; urgency=medium + + * release: 1.0.12 + + -- Michael Murphy Mon, 27 Apr 2026 15:24:27 +0200 + cosmic-settings (1.0.7) noble; urgency=medium * release: 1.0.7 From d49a1d19903bf269548f78d264a0e810873d93a3 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Mon, 4 May 2026 13:15:57 -0400 Subject: [PATCH 09/24] chore: add defaults --- .../v1/list_button | 74 +++++++++++++++++++ .../v1/list_button | 74 +++++++++++++++++++ 2 files changed, 148 insertions(+) create mode 100644 resources/default_schema/com.system76.CosmicTheme.Dark/v1/list_button create mode 100644 resources/default_schema/com.system76.CosmicTheme.Light/v1/list_button diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v1/list_button b/resources/default_schema/com.system76.CosmicTheme.Dark/v1/list_button new file mode 100644 index 0000000..7ed0fdb --- /dev/null +++ b/resources/default_schema/com.system76.CosmicTheme.Dark/v1/list_button @@ -0,0 +1,74 @@ +( + base: ( + red: 0.0, + green: 0.0, + blue: 0.0, + alpha: 0.0, + ), + hover: ( + red: 0.0, + green: 0.0, + blue: 0.0, + alpha: 0.0, + ), + pressed: ( + red: 0.08610422, + green: 0.08610421, + blue: 0.08610421, + alpha: 0.5, + ), + selected: ( + red: 0.0, + green: 0.0, + blue: 0.0, + alpha: 0.0, + ), + selected_text: ( + red: 0.3882353, + green: 0.8156863, + blue: 0.8745098, + alpha: 1.0, + ), + focus: ( + red: 0.3882353, + green: 0.8156863, + blue: 0.8745098, + alpha: 1.0, + ), + divider: ( + red: 0.7532969, + green: 0.7532969, + blue: 0.75329685, + alpha: 0.2, + ), + on: ( + red: 0.7532969, + green: 0.7532969, + blue: 0.75329685, + alpha: 1.0, + ), + disabled: ( + red: 0.0, + green: 0.0, + blue: 0.0, + alpha: 0.0, + ), + on_disabled: ( + red: 0.7532969, + green: 0.7532969, + blue: 0.75329685, + alpha: 0.65, + ), + border: ( + red: 0.743206, + green: 0.74320585, + blue: 0.74320585, + alpha: 1.0, + ), + disabled_border: ( + red: 0.743206, + green: 0.74320585, + blue: 0.74320585, + alpha: 0.5, + ), +) \ No newline at end of file diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v1/list_button b/resources/default_schema/com.system76.CosmicTheme.Light/v1/list_button new file mode 100644 index 0000000..2a63b93 --- /dev/null +++ b/resources/default_schema/com.system76.CosmicTheme.Light/v1/list_button @@ -0,0 +1,74 @@ +( + base: ( + red: 0.0, + green: 0.0, + blue: 0.0, + alpha: 0.0, + ), + hover: ( + red: 0.0, + green: 0.0, + blue: 0.0, + alpha: 0.0, + ), + pressed: ( + red: 0.74320567, + green: 0.743206, + blue: 0.74320585, + alpha: 0.5, + ), + selected: ( + red: 0.0, + green: 0.0, + blue: 0.0, + alpha: 0.0, + ), + selected_text: ( + red: 0.0, + green: 0.32156864, + blue: 0.3529412, + alpha: 1.0, + ), + focus: ( + red: 0.0, + green: 0.32156864, + blue: 0.3529412, + alpha: 1.0, + ), + divider: ( + red: 0.15292808, + green: 0.15292814, + blue: 0.15292796, + alpha: 0.2, + ), + on: ( + red: 0.15292808, + green: 0.15292814, + blue: 0.15292796, + alpha: 1.0, + ), + disabled: ( + red: 0.0, + green: 0.0, + blue: 0.0, + alpha: 0.0, + ), + on_disabled: ( + red: 0.15292808, + green: 0.15292814, + blue: 0.15292796, + alpha: 0.65, + ), + border: ( + red: 0.08610404, + green: 0.08610427, + blue: 0.08610421, + alpha: 1.0, + ), + disabled_border: ( + red: 0.08610404, + green: 0.08610427, + blue: 0.08610421, + alpha: 0.5, + ), +) \ No newline at end of file From d632047ab3c5aa78f9255d35eac5c96f08437486 Mon Sep 17 00:00:00 2001 From: manascb1344 Date: Sat, 2 May 2026 16:27:27 +0530 Subject: [PATCH 10/24] fix(wifi): remove misleading search placeholder --- cosmic-settings/src/pages/networking/wifi.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cosmic-settings/src/pages/networking/wifi.rs b/cosmic-settings/src/pages/networking/wifi.rs index cc1f43b..bc194ef 100644 --- a/cosmic-settings/src/pages/networking/wifi.rs +++ b/cosmic-settings/src/pages/networking/wifi.rs @@ -1176,10 +1176,9 @@ fn devices_view() -> Section { // Search input (only shown when 15+ networks) if show_search { - let search_input = - widget::search_input(fl!("type-to-search"), &page.search_query) - .on_input(Message::SearchQuery) - .on_clear(Message::SearchQuery(String::new())); + let search_input = widget::search_input("", &page.search_query) + .on_input(Message::SearchQuery) + .on_clear(Message::SearchQuery(String::new())); visible_section = visible_section.push(search_input); } From 9b7a9538e6cfcf945076115c773894b25342fe80 Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Tue, 12 May 2026 13:11:36 +0200 Subject: [PATCH 11/24] i18n: translation updates from weblate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Baurzhan Muftakhidinov Co-authored-by: BoneNI Co-authored-by: Dan Co-authored-by: David Carvalho Co-authored-by: Ettore Atalan Co-authored-by: Fedorov Alexei Co-authored-by: Geeson Wan Co-authored-by: Hosted Weblate Co-authored-by: Hugo Carvalho Co-authored-by: Isaac Subirana Co-authored-by: Jim Spentzos Co-authored-by: Jiri Grönroos Co-authored-by: Julien Brouillard Co-authored-by: Jun Hwi Ku Co-authored-by: Nara Díaz Viñolas Co-authored-by: Tadas Misiūnas Co-authored-by: VandaL Co-authored-by: Walter William Beckerleg Bruckman Co-authored-by: Zahid Rizky Fakhri Co-authored-by: bittin1ddc447d824349b2 Co-authored-by: jonnysemon Co-authored-by: lorduskordus Co-authored-by: therealmate Co-authored-by: Димко Co-authored-by: Марко М. Костић Co-authored-by: 김유빈 Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/ar/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/ca/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/cs/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/de/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/el/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/fi/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/fr/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/hu/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/id/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/kk/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/ko/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/lt/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/pl/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/pt/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/pt_BR/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/ru/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/sr/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/sv/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/uk/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/zh_Hans/ Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-settings/zh_Hant/ Translation: Pop OS/COSMIC Settings --- i18n/ar/cosmic_settings.ftl | 2 + i18n/ca/cosmic_settings.ftl | 7 + i18n/cs/cosmic_settings.ftl | 16 +- i18n/de/cosmic_settings.ftl | 2 + i18n/el/cosmic_settings.ftl | 821 ++++++++++++++++++++++++++++++++ i18n/fi/cosmic_settings.ftl | 2 + i18n/fr/cosmic_settings.ftl | 2 + i18n/hu/cosmic_settings.ftl | 12 +- i18n/id/cosmic_settings.ftl | 2 + i18n/kk/cosmic_settings.ftl | 2 + i18n/ko/cosmic_settings.ftl | 17 + i18n/lo/cosmic_settings.ftl | 0 i18n/lt/cosmic_settings.ftl | 204 ++++---- i18n/pl/cosmic_settings.ftl | 2 + i18n/pt-BR/cosmic_settings.ftl | 10 +- i18n/pt/cosmic_settings.ftl | 2 +- i18n/ru/cosmic_settings.ftl | 2 + i18n/sr/cosmic_settings.ftl | 822 +++++++++++++++++++++++++++++++++ i18n/sv/cosmic_settings.ftl | 2 + i18n/uk/cosmic_settings.ftl | 38 +- i18n/zh-CN/cosmic_settings.ftl | 2 + i18n/zh-TW/cosmic_settings.ftl | 4 +- 22 files changed, 1835 insertions(+), 138 deletions(-) create mode 100644 i18n/lo/cosmic_settings.ftl diff --git a/i18n/ar/cosmic_settings.ftl b/i18n/ar/cosmic_settings.ftl index 88be08f..caa8ec2 100644 --- a/i18n/ar/cosmic_settings.ftl +++ b/i18n/ar/cosmic_settings.ftl @@ -911,3 +911,5 @@ xdg-entry-displays-keywords = COSMIC;عرض; xdg-entry-workspaces = مساحات العمل xdg-entry-wired-comment = الاتصالات السلكية وملفات تعريف الاتصال no-search-results = لا توجد شبكات تطابق بحثك. +workspaces-navigation = التنقل + .wraparound = تنقل بين مساحة العمل الأولى والأخيرة باستخدام اختصارات لوحة المفاتيح والإيماءات diff --git a/i18n/ca/cosmic_settings.ftl b/i18n/ca/cosmic_settings.ftl index e69de29..23264a3 100644 --- a/i18n/ca/cosmic_settings.ftl +++ b/i18n/ca/cosmic_settings.ftl @@ -0,0 +1,7 @@ +cancel = Cancel·lar +confirm = Confirmar +password = Contrasenya +identity = Identitat +password-confirm = Confirmeu la contrasenya +connected = Connectat +settings = Configuració diff --git a/i18n/cs/cosmic_settings.ftl b/i18n/cs/cosmic_settings.ftl index bc33e86..445a365 100644 --- a/i18n/cs/cosmic_settings.ftl +++ b/i18n/cs/cosmic_settings.ftl @@ -280,7 +280,7 @@ keyboard-sources = Vstupní zdroje keyboard-special-char = Zadávání speciálních znaků .alternate = Klávesa pro náhradní znaky .compose = Klávesa Compose - .compose-desc = Klávesa Compose umožňuje zadávat širokou škálu znaků. Pro její použití stiskněte Compose a poté zadejte sekvenci znaků. Například [Compose, C, O] vloží znak „©“, zatímco [Compose, A, ‘] znak „á“. + .compose-desc = Klávesa Compose umožňuje zadávat širokou škálu znaků. Pro její použití stiskněte Compose a poté zadejte sekvenci znaků. Například Compose, C, O vloží znak „©“, zatímco Compose, A, ‘ vloží znak „á“. .caps = Klávesa Caps Lock ## Input: Keyboard: Shortcuts @@ -627,13 +627,13 @@ power-saving = Možnosti úspory energie disable-while-typing = Zakázat při psaní input-devices = Vstupní zařízení modified = { $count } změněných -slow = Pomalá -fast = Rychlá -short = Krátké -long = Dlouhé +slow = Pomalu +fast = Rychle +short = Krátká +long = Dlouhá keyboard-typing-assist = Psaní - .repeat-rate = Frekvence opakování - .repeat-delay = Zpoždění opakování + .repeat-rate = Rychlost opakování + .repeat-delay = Prodleva před opakováním keyboard-numlock-boot = Num Lock .boot-state = Stav klávesy při spuštění systému .last-boot = Poslední spuštění systému @@ -893,3 +893,5 @@ xdg-entry-displays-keywords = COSMIC;Obrazovka;Obrazovky;Displeje;Monitory;Zobra xdg-entry-workspaces-keywords = COSMIC;Pracovní;Plocha;Plochy;Orientace;Přehled;Sledování; xdg-entry-x11-applications-keywords = COSMIC;X11;Aplikace;Hra;Hry;Kompatibilita; no-search-results = Žádné sítě neodpovídají vašemu vyhledávání. +workspaces-navigation = Navigace + .wraparound = Přecházet mezi první a poslední pracovní plochou pomocí klávesových zkratek a gest diff --git a/i18n/de/cosmic_settings.ftl b/i18n/de/cosmic_settings.ftl index 6c0dfdf..3fd972a 100644 --- a/i18n/de/cosmic_settings.ftl +++ b/i18n/de/cosmic_settings.ftl @@ -912,3 +912,5 @@ xdg-entry-desktop-keywords = COSMIC;Desktop; xdg-entry-desktop = Desktop xdg-entry-a11y-keywords = COSMIC;Barrierefreiheit;A11y;Bildschirm;Leser;Vergrößerungsglas;Kontrast;Farbe; xdg-entry-a11y-comment = Bildschirmleser, Vergrößerungsglas, hoher Kontrast und Farbfilter +workspaces-navigation = Navigation + .wraparound = Mit Tastenkombinationen und Gesten zwischen der ersten und letzten Arbeitsfläche wechseln diff --git a/i18n/el/cosmic_settings.ftl b/i18n/el/cosmic_settings.ftl index a167994..7453538 100644 --- a/i18n/el/cosmic_settings.ftl +++ b/i18n/el/cosmic_settings.ftl @@ -1 +1,822 @@ share = Κοινοποίηση δικτύου +connect = Σύνδεση +close = Κλείσιμο +save = Αποθήκευση +password = Κωδικός πρόσβασης +remove = Αφαίρεση +import = Εισαγωγή +username = Όνομα χρήστη +light = Ανοιχτόχρωμο +ok = OK +applets = Μικροεφαρμογές +dbus-connection-error = Αποτυχία σύνδεσης στο DBus +dark = Σκουρόχρωμο +cancel = Ακύρωση +settings = Ρυθμίσεις +replace = Αντικατάσταση +add = Προσθήκη +appearance = Εμφάνιση +panel-left = Αριστερά +panel-top = Πάνω +region = Περιοχή +forget-dialog = Διαγραφή αυτού του δικτύου Wi-Fi; + .description = Θα χρειαστεί να εισαγάγετε ξανά τον κωδικό πρόσβασης για να χρησιμοποιήσετε αυτό το δίκτυο Wi-Fi στο μέλλον. +default = Προεπιλογή +unknown = Άγνωστο +connecting = Σύνδεση… +export = Εξαγωγή +panel-right = Δεξιά +rgb = RGB +desktop = Επιφάνεια εργασίας +identity = Ταυτότητα +disconnect = Αποσύνδεση +app = Ρυθμίσεις COSMIC +debug = Εντοπισμός σφαλμάτων +number = { $number } +small = Μικρό +terminate = Τερματισμός +password-confirm = Επιβεβαίωση κωδικού πρόσβασης +applications = Εφαρμογές +connected = Συνδέθηκε +large = Μεγάλο +confirm = Επιβεβαίωση +enable = Ενεργοποίηση +never = Ποτέ +activate = Ενεργοποίηση +dialog-add = Προσθήκη +command = Εντολή +panel-bottom = Κάτω +navigate = Πλοήγηση +colors = Χρώματα +xdg-entry-touchpad = Επιφάνεια αφής +xdg-entry-bluetooth-comment = Διαχείριση συσκευών Bluetooth +xdg-entry-appearance-keywords = Έμφαση;Χρώμα;Εικονίδιο;Γραμματοσειρά;Θέμα;COSMIC;Accent;Color;Icon;Font;Theme +xdg-entry-mouse = Ποντίκι +firmware = Υλικολογισμικό +xdg-entry-a11y = Προσβασιμότητα +xdg-entry-desktop-keywords = Επιφάνεια;Εργασίας;COSMIC;Desktop; +xdg-entry-users = Χρήστες +xdg-entry-default-apps = Προεπιλεγμένες εφαρμογές +xdg-entry-applications-comment = Προεπιλεγμένες εφαρμογές, εφαρμογές εκκίνησης και ρυθμίσεις συμβατότητας εφαρμογών με το X11 +xdg-entry-about-keywords = Πληροφορίες;Σχετικά;Περί;COSMIC;About +xdg-entry-notifications = Ειδοποιήσεις +xdg-entry-a11y-keywords = Προσβασιμότητα;Προσιτότητα;Οθόνη;Ανάγνωση;Αναγνώστης;Μεγεθυντικός;Φακός;Αντίθεση;Χρώμα;COSMIC;Accessibility;A11y;Screen;Reader;Magnifier;Contrast;Color; +xdg-entry-desktop = Επιφάνεια εργασίας +xdg-entry-date-time-keywords = Ζώνη;Ώρα;COSMIC;Time;Zone; +xdg-entry-wallpaper = Ταπετσαρία +xdg-entry-keyboard = Πληκτρολόγιο +xdg-entry-a11y-comment = Ανάγνωση οθόνης, μεγεθυντικός φακός, υψηλή αντίθεση και χρωματικά φίλτρα +xdg-entry-displays = Οθόνες +sound = Ήχος +xdg-entry-date-time = Ημερομηνία και ώρα +notifications = Ειδοποιήσεις +xdg-entry-bluetooth-keywords = Σύνδεση;COSMIC;Bluetooth; +about = Πληροφορίες +workspaces = Χώροι εργασίας +xdg-entry-wireless = Wi-Fi +xdg-entry-about-comment = Όνομα συσκευής, πληροφορίες υλικού, προεπιλογές λειτουργικού συστήματος +xdg-entry-appearance-comment = Χρώματα έμφασης και θέματα +xdg-entry-comment = Εφαρμογή ρυθμίσεων για το περιβάλλον επιφάνειας εργασίας COSMIC +xdg-entry-applications = Εφαρμογές +xdg-entry-default-apps-keywords = Προεπιλογή;Προεπιλεγμένη;Εφαρμογή;COSMIC;Default;Application +xdg-entry-keywords = Προτιμήσεις;Ρυθμίσεις;COSMIC;Settings; +xdg-entry-about = Πληροφορίες +xdg-entry-input = Συσκευές εισόδου +keyboard = Πληκτρολόγιο +xdg-entry-appearance = Εμφάνιση +xdg-entry-sound = Ήχος +xdg-entry-displays-keywords = Οθόνη;COSMIC;Display; +xdg-entry-workspaces = Χώροι εργασίας +xdg-entry-date-time-comment = Ζώνη ώρας, αυτόματη ρύθμιση ρολογιού και μορφοποίηση ώρας +system-shortcut = Σύστημα + .app-library = Άνοιγμα βιβλιοθήκης εφαρμογών + .brightness-down = Μείωση φωτεινότητας οθόνης + .brightness-up = Αύξηση φωτεινότητας οθόνης + .display-toggle = Εναλλαγή εσωτερικής οθόνης + .home-folder = Άνοιγμα προσωπικού φακέλου + .keyboard-brightness-down = Μείωση φωτεινότητας πληκτρολογίου + .keyboard-brightness-up = Αύξηση φωτεινότητας πληκτρολογίου + .launcher = Άνοιγμα εκκινητή + .log-out = Αποσύνδεση + .lock-screen = Κλείδωμα οθόνης + .mute = Σίγαση εξόδου ήχου + .mute-mic = Σίγαση εισόδου μικροφώνου + .play-pause = Αναπαραγωγή/παύση + .play-next = Επόμενο κομμάτι + .play-prev = Προηγούμενο κομμάτι + .poweroff = Τερματισμός λειτουργίας + .screenshot = Λήψη στιγμιότυπου οθόνης + .suspend = Αναστολή λειτουργίας + .terminal = Άνοιγμα τερματικού + .touchpad-toggle = Εναλλαγή λειτουργίας επιφάνειας αφής + .volume-lower = Μείωση έντασης εξόδου ήχου + .volume-raise = Αύξηση έντασης εξόδου ήχου + .web-browser = Άνοιγμα προγράμματος περιήγησης ιστού + .window-switcher = Εναλλαγή μεταξύ των ανοικτών παραθύρων + .window-switcher-previous = Εναλλαγή μεταξύ των ανοικτών παραθύρων (αντίστροφα) + .workspace-overview = Άνοιγμα επισκόπησης χώρων εργασίας +super-key = Ενέργεια πλήκτρου Super + .launcher = Άνοιγμα μενού εκκίνησης + .workspaces = Άνοιγμα χώρων εργασίας + .applications = Άνοιγμα εφαρμογών + .disable = Απενεργοποίηση +x-minutes = + { $number } { $number -> + [one] λεπτό + *[other] λεπτά + } +vrr = Μεταβλητός ρυθμός ανανέωσης + .enabled = Ενεργός + .force = Πάντα + .auto = Αυτόματα + .disabled = Ανενεργός +window-hint-accent = Χρώμα ένδειξης ενεργού παραθύρου +fit-to-screen = Προσαρμογή στην οθόνη +control-tint = Απόχρωση στοιχείων ελέγχου + .desc = Χρησιμοποιείται για το φόντο των τυπικών κουμπιών, εισόδων αναζήτησης, εισόδων κειμένου και παρόμοιων στοιχείων +vpn-error = VPN Error + .config = Αποτυχία προσθήκης διαμόρφωσης VPN + .connect = Αποτυχία σύνδεσης στο VPN + .connection-editor = Αποτυχία επεξεργαστή συνδέσεων + .connection-settings = Αποτυχία λήψης ρυθμίσεων για ενεργές συνδέσεις + .updating-state = Αποτυχία ενημέρωσης κατάστασης διαχειριστή δικτύου + .wireguard-config-path = Μη έγκυρη διαδρομή αρχείων για τη διαμόρφωση του WireGuard + .wireguard-config-path-desc = Το επιλεγμένο αρχείο πρέπει να βρίσκεται στο τοπικό σύστημα αρχείων. + .wireguard-device = Αποτυχία δημιουργίας συσκευής WireGuard + .with-password = + Αποτυχία ορισμού { $field -> + *[username] ονόματος χρήστη + [password] κωδικού πρόσβασης + [password-flags] σημαιών κωδικού πρόσβασης + } VPN με το nmcli +toggle-stacking = Εναλλαγή στοίβαξης παραθύρων +no-applets-found = Δεν βρέθηκαν μικροεφαρμογές... +zoom-in = Μεγέθυνση +place-here = Τοποθετήστε τις μικροεφαρμογές εδώ +-requires-restart = Απαιτεί επανεκκίνηση +workspaces-orientation = Προσανατολισμός χώρων εργασίας + .vertical = Κάθετος + .horizontal = Οριζόντιος +acceleration-desc = Προσαρμόζει αυτόματα την ευαισθησία ιχνηλάτησης με βάση την ταχύτητα +all-displays = Όλες οι οθόνες +scheduling = Προγραμματισμός + .manual = Χειροκίνητο πρόγραμμα +frosted = Εφέ ημιδιαφανούς γυαλιού στο περιβάλλον συστήματος + .desc = Εφαρμόζει θόλωση του φόντου της γραμμής συστήματος, της μπάρας εφαρμογών, του μενού εκκίνησης και της βιβλιοθήκης εφαρμογών +about-hardware = Υλικό + .model = Μοντέλο υλικού + .memory = Μνήμη + .processor = Επεξεργαστής + .graphics = Γραφικά + .disk-capacity = Χωρητικότητα δίσκου +short = Σύντομη +vpn = VPN + .connections = Συνδέσεις VPN + .error = Αποτυχία προσθήκης διαμόρφωσης VPN + .remove = Αφαίρεση προφίλ σύνδεσης + .select-file = Επιλογή αρχείου διαμόρφωσης VPN +power-mode = Λειτουργία ενέργειας + .battery = Εκτεταμένη διάρκεια μπαταρίας + .battery-desc = Μειωμένη χρήση ενέργειας και χαμηλές επιδόσεις + .balanced = Ισορροπημένη + .balanced-desc = Μέτριες επιδόσεις και ήπια χρήση ενέργειας + .performance = Υψηλές επιδόσεις + .performance-desc = Κορυφαίες επιδόσεις και υψηλή χρήση ενέργειας + .no-backend = Δεν βρέθηκε υπηρεσία παρασκηνίου. Εγκαταστήστε το system76-power ή το power-profiles-daemon. +wired = Ενσύρματη δικτύωση + .adapter = Προσαρμογέας ενσύρματου δικτύου { $id } + .connections = Ενσύρματες συνδέσεις + .devices = Ενσύρματες συσκευές + .remove = Αφαίρεση προφίλ σύνδεσης +bluetooth-available = Κοντινές συσκευές +cable-unplugged = Αποσυνδεδεμένο καλώδιο +color-picker = Εργαλείο επιλογής χρωμάτων +interface-font = Γραμματοσειρά συστήματος +zoom-out = Σμίκρυνση +hot-corner = Γωνία συντόμευσης + .top-left-corner = Ενεργοποίηση της πάνω αριστερής γωνίας συντόμευσης για τους χώρους εργασίας +keyboard-typing-assist = Πληκτρολόγηση + .repeat-rate = Ρυθμός επανάληψης + .repeat-delay = Καθυστέρηση επανάληψης +edge-gravity = Έλξη αιωρούμενων παραθύρων στις κοντινές άκρες +amplification = Ενίσχυση ήχου + .desc = Επιτρέπει την αύξηση της έντασης στο 150% +recent-colors = Πρόσφατα χρώματα +about-os = Λειτουργικό σύστημα + .os = Λειτουργικό σύστημα + .os-architecture = Αρχιτεκτονική λειτουργικού συστήματος + .kernel = Έκδοση πυρήνα + .desktop-environment = Περιβάλλον επιφάνειας εργασίας + .windowing-system = Σύστημα διαχείρισης παραθύρων +panel-behavior-and-position = Συμπεριφορά και θέσεις + .autohide = Αυτόματη απόκρυψη γραμμής συστήματος + .dock-autohide = Αυτόματη απόκρυψη μπάρας εφαρμογών + .position = Θέση στην οθόνη + .display = Εμφάνιση στην οθόνη +add-language = Προσθήκη γλώσσας + .context = Προσθήκη γλώσσας +password-mismatch = Ο κωδικός πρόσβασης και το πεδίο επιβεβαίωσης θα πρέπει να είναι ίδια +accessibility = Προσβασιμότητα + .vision = Όραση + .on = Ενεργό + .off = Ανενεργό + .unavailable = Μη διαθέσιμο + .screen-reader = Ανάγνωση οθόνης + .high-contrast = Λειτουργία υψηλής αντίθεσης + .invert-colors = Αναστροφή χρωμάτων + .color-filters = Φίλτρα χρωμάτων +container-background = Φόντο πλαισίων + .desc-detail = Το χρώμα φόντου πλαισίων χρησιμοποιείται για την πλαϊνή στήλη πλοήγησης, το πλευρικό συρτάρι, τα παράθυρα διαλόγων και παρόμοια γραφικά στοιχεία. Από προεπιλογή, το χρώμα φόντου πλαισίων προκύπτει αυτόματα από το φόντο των παραθύρων. + .reset = Επαναφορά στο αυτόματο + .desc = Χρησιμοποιείται για την πλαϊνή στήλη πλοήγησης, το πλευρικό συρτάρι, τα παράθυρα διαλόγων και παρόμοια γραφικά στοιχεία +primary-button = Κύριο κουμπί + .desc = Ορίζει τη σειρά των φυσικών κουμπιών + .left = Αριστερό + .right = Δεξί +sound-alerts = Ειδοποιήσεις + .volume = Ένταση ήχου ειδοποιήσεων + .sound = Ήχος ειδοποιήσεων +icon-theme = Θέμα εικονιδίων + .desc = Εφαρμόζει ένα διαφορετικό σύνολο εικονιδίων για εφαρμογές +keyboard-shortcuts = Συντομεύσεις πληκτρολογίου + .desc = Προβολή και προσαρμογή συντομεύσεων +switch-between-windows = Εναλλαγή μεταξύ των παραθύρων +text-tint = Απόχρωση κειμένου περιβάλλοντος χρήστη + .desc = Χρησιμοποιείται για τον προσδιορισμό των χρωμάτων του κειμένου του περιβάλλοντος χρήστη ώστε να έχουν επαρκή αντίθεση σε διάφορες επιφάνειες +online-accounts = Διαδικτυακοί λογαριασμοί + .desc = Προσθήκη λογαριασμών, IMAP και SMTP, εταιρικών συνδέσεων +open-workspaces-view = Άνοιγμα επισκόπησης χώρων εργασίας +all = Όλα +remove-user = Αφαίρεση χρήστη +sound-input = Είσοδος ήχου + .volume = Ένταση εισόδου + .device = Συσκευή εισόδου + .level = Επίπεδο εισόδου +add-another-keybinding = Προσθήκη άλλου συνδυασμού πλήκτρων +copy-to-clipboard = Αντιγραφή στο πρόχειρο +monospace-font = Γραμματοσειρά σταθερού πλάτους +experimental-settings = Πειραματικές ρυθμίσεις +recent-folders = Πρόσφατοι φάκελοι +color-filter = Τύπος φίλτρου χρωμάτων + .unknown = Άγνωστο φίλτρο ενεργό + .greyscale = Κλίμακα του γκρι + .deuteranopia = Πράσινο/κόκκινο (αδυναμία στο πράσινο, Δευτερανοπία) + .protanopia = Κόκκινο/πράσινο (αδυναμία στο κόκκινο, Πρωτανοπία) + .tritanopia = Μπλε/κίτρινο (αδυναμία στο μπλε, Τριτανοπία) +migrate-workspace = + Μεταφορά χώρου εργασίας { $direction -> + *[down] στην κάτω έξοδο + [left] στην αριστερή έξοδο + [right] στη δεξιά έξοδο + [up] στην πάνω έξοδο + } +battery = Μπαταρία + .minute = + { $value } { $value -> + [one] λεπτό + *[other] λεπτά + } + .hour = + { $value } { $value -> + [one] ώρα + *[other] ώρες + } + .day = + { $value } { $value -> + [one] ημέρα + *[other] ημέρες + } + .less-than-minute = Λιγότερο από ένα λεπτό + .and = και + .remaining-time = + { $time } μέχρι την { $action -> + [full] πλήρη φόρτιση + *[other] αποφόρτιση + } +search-applets = Αναζήτηση μικροεφαρμογών... +pinch-to-zoom = Τσίμπημα για ζουμ + .desc = Χρησιμοποιήστε δύο δάχτυλα για να κάνετε ζουμ στο περιεχόμενο, σε εφαρμογές που το υποστηρίζουν +wifi = Wi-Fi + .adapter = Προσαρμογέας Wi-Fi { $id } + .forget = Διαγραφή αυτού του δικτύου +x-hours = + { $number } { $number -> + [one] ώρα + *[other] ώρες + } +added = Προστέθηκε +input-source-switch = Εναλλαγή πηγών εισόδου γλώσσας πληκτρολογίου +focus-navigation = Πλοήγηση εστίασης + .focus-follows-cursor = Η εστίαση ακολουθεί τον κέρσορα + .focus-follows-cursor-delay = Η εστίαση ακολουθεί την καθυστέρηση του κέρσορα σε ms + .cursor-follows-focus = Ο κέρσορας ακολουθεί την εστίαση +full-name = Ονοματεπώνυμο +app-background = Φόντο παραθύρων +keyboard-sources = Πηγές εισόδου + .desc = Μπορείτε να αλλάξετε τις πηγές εισόδου με τον συνδυασμό πλήκτρων Super+Space, τον οποίο μπορείτε να προσαρμόσετε στις ρυθμίσεις συντομεύσεων πληκτρολογίου. + .move-up = Μετακίνηση πάνω + .move-down = Μετακίνηση κάτω + .settings = Ρυθμίσεις + .view-layout = Προβολή διάταξης πληκτρολογίου + .remove = Αφαίρεση + .add = Προσθήκη πηγής εισόδου +nav-shortcuts = Πλοήγηση + .prev-output = Εστίαση στην προηγούμενη έξοδο + .next-output = Εστίαση στην επόμενη έξοδο + .last-workspace = Εστίαση στον τελευταίο χώρο εργασίας + .prev-workspace = Εστίαση στον προηγούμενο χώρο εργασίας + .next-workspace = Εστίαση στον επόμενο χώρο εργασίας + .focus = + Εστίαση κατά ένα παράθυρο { $direction -> + *[down] προς τα κάτω + [in] προς τα μέσα + [left] προς τα αριστερά + [out] προς τα έξω + [right] προς τα δεξιά + [up] προς τα πάνω + } + .output = + Εναλλαγή { $direction -> + *[down] στην κάτω έξοδο + [left] στην αριστερή έξοδο + [right] στη δεξιά έξοδο + [up] στην πάνω έξοδο + } + .workspace = Μετάβαση στον χώρο εργασίας { $num } +hearing = Ακοή + .mono = Αναπαραγωγή στερεοφωνικού ήχου ως μονοφωνικού +preferred-languages = Προτιμώμενες γλώσσες + .desc = Η σειρά των γλωσσών καθορίζει ποια γλώσσα θα χρησιμοποιείται για το περιβάλλον χρήστη. Οι αλλαγές θα εφαρμοστούν στην επόμενη σύνδεση. +panel-style = Στυλ + .anchor-gap = Κενό ανάμεσα στη γραμμή συστήματος και στις άκρες της οθόνης + .dock-anchor-gap = Κενό ανάμεσα στην μπάρα εφαρμογών και στις άκρες της οθόνης + .extend = Επέκταση της γραμμής συστήματος στις άκρες της οθόνης + .dock-extend = Επέκταση της μπάρας εφαρμογών στις άκρες της οθόνης + .appearance = Εμφάνιση + .size = Μέγεθος + .background-opacity = Αδιαφάνεια φόντου +panel-appearance = Εμφάνιση + .match = Συμφωνία με την επιφάνεια εργασίας + .light = Ανοιχτόχρωμη + .dark = Σκουρόχρωμη +workspaces-multi-behavior = Συμπεριφορά πολλαπλών οθονών + .span = Κοινοί χώροι εργασίας σε όλες τις οθόνες + .separate = Ξεχωριστοί χώροι εργασίας ανά οθόνη +replace-shortcut-dialog = Αντικατάσταση συντόμευσης; + .desc = Η συντόμευση { $shortcut } χρησιμοποιείται από το { $name }. Εάν την αντικαταστήσετε, το { $name } θα απενεργοποιηθεί. +about-device = Όνομα συσκευής + .desc = Αυτό το όνομα εμφανίζεται σε άλλα δίκτυα ή συσκευές Bluetooth +no-vpn = Δεν διατίθενται συνδέσεις VPN. +start-segment = Αρχικό τμήμα +reset-to-default = Επαναφορά προεπιλογών +enable-export = Εφαρμογή τρέχοντος θέματος σε εφαρμογές GNOME + .desc = Δεν υποστηρίζουν όλα τα σύνολα εργαλείων την αυτόματη εναλλαγή. Ενδέχεται να χρειαστεί επανεκκίνηση των μη-COSMIC εφαρμογών μετά από αλλαγή του θέματος. +shortcut-name = Όνομα συντόμευσης +style = Στυλ + .round = Στρογγυλό + .slightly-round = Ελαφρώς στρογγυλό + .square = Τετράγωνο +panel-applets = Διαμόρφωση + .dock-desc = Διαμόρφωση των μικροεφαρμογών της μπάρας εφαρμογών + .desc = Διαμόρφωση των μικροεφαρμογών της γραμμής συστήματος +qr-code-unavailable = Δεν διατίθεται κωδικός QR +window-tiling = Παράθεση παραθύρων + .horizontal = Ορισμός οριζόντιου προσανατολισμού + .vertical = Ορισμός κάθετου προσανατολισμού + .swap-window = Εναλλαγή παραθύρου + .toggle-tiling = Εναλλαγή παράθεσης παραθύρων + .toggle-stacking = Εναλλαγή στοίβαξης παραθύρων + .toggle-floating = Εναλλαγή αιώρησης παραθύρων + .toggle-orientation = Εναλλαγή προσανατολισμού +change-password = Αλλαγή κωδικού πρόσβασης +disable-while-typing = Απενεργοποίηση κατά την πληκτρολόγηση +long = Μεγάλη +copied-to-clipboard = Αντιγράφηκε στο πρόχειρο +bluetooth-confirm-pin = Επιβεβαίωση PIN για σύνδεση Bluetooth + .description = Επιβεβαιώστε ότι το ακόλουθο PIN είναι ίδιο με αυτό που εμφανίζεται στο { $device } +legacy-app-scaling = Κλιμάκωση εφαρμογών στο σύστημα παραθύρων X11 + .scaled-gaming = Βελτιστοποίηση για παιχνίδια και εφαρμογές πλήρους οθόνης + .gaming-description = Οι εφαρμογές σε X11 ενδέχεται να εμφανίζονται ελαφρώς μεγαλύτερες/μικρότερες σε σύγκριση με τις εφαρμογές σε Wayland + .scaled-applications = Βελτιστοποίηση για εφαρμογές + .applications-description = Τα παιχνίδια και οι εφαρμογές πλήρους οθόνης σε X11 ενδέχεται να μην αντιστοιχούν στην ανάλυση της οθόνης σας + .scaled-compatibility = Λειτουργία μέγιστης συμβατότητας + .compatibility-description = Οι εφαρμογές σε X11 ενδέχεται να εμφανίζονται θολές σε οθόνες HiDPI + .preferred-display = Προτιμώμενη οθόνη για παιχνίδια και εφαρμογές πλήρους οθόνης σε X11 + .no-display = Καμία +night-light = Νυχτερινός φωτισμός + .auto = Αυτόματα (από τη δύση έως την ανατολή) + .desc = Μείωση του μπλε φωτός με θερμότερα χρώματα +custom-shortcuts = Προσαρμοσμένες συντομεύσεις + .add = Προσθήκη συντόμευσης + .context = Προσθήκη προσαρμοσμένης συντόμευσης + .none = Δεν υπάρχουν προσαρμοσμένες συντομεύσεις +visible-networks = Ορατά δίκτυα +window-hint-accent-toggle = Χρήση του χρώματος έμφασης για την ένδειξη ενεργού παραθύρου +type-to-search = Πληκτρολογήστε για αναζήτηση... +workspaces-behavior = Συμπεριφορά χώρων εργασίας + .dynamic = Δυναμικοί χώροι εργασίας + .dynamic-desc = Αυτόματη κατάργηση των κενών χώρων εργασίας. + .fixed = Σταθερός αριθμός χώρων εργασίας + .fixed-desc = Προσθήκη ή κατάργηση χώρων εργασίας στην επισκόπηση. +wireguard-dialog = Προσθήκη συσκευής WireGuard + .description = Επιλέξτε ένα όνομα συσκευής για τη διαμόρφωση του WireGuard. +remove-connection-dialog = Αφαίρεση προφίλ σύνδεσης; + .vpn-description = Θα χρειαστεί να εισαγάγετε ξανά τον κωδικό πρόσβασης για να χρησιμοποιήσετε αυτό το δίκτυο στο μέλλον. + .wired-description = Θα χρειαστεί να δημιουργήσετε εκ νέου αυτό το προφίλ για να το χρησιμοποιήσετε στο μέλλον. +click-behavior = Συμπεριφορά κλικ + .click-finger = Δευτερεύον κλικ με δύο δάχτυλα και μεσαίο κλικ με τρία δάχτυλα + .button-areas = Δευτερεύον κλικ στην κάτω δεξιά γωνία και μεσαίο κλικ στο κάτω κεντρικό μέρος +move-windows = Μετακίνηση παραθύρων + .direction = + Μετακίνηση παραθύρου { $direction -> + *[down] προς τα κάτω + [left] προς τα αριστερά + [right] προς τα δεξιά + [up] προς τα πάνω + } + .display = + Μετακίνηση παραθύρου κατά μία οθόνη { $direction -> + *[down] προς τα κάτω + [left] προς τα αριστερά + [right] προς τα δεξιά + [up] προς τα πάνω + } + .workspace = + Μετακίνηση παραθύρου κατά έναν χώρο εργασίας { $direction -> + *[below] προς τα κάτω + [left] προς τα αριστερά + [right] προς τα δεξιά + [above] προς τα πάνω + } + .workspace-num = Μετακίνηση παραθύρου στον χώρο εργασίας { $num } + .prev-workspace = Μετακίνηση παραθύρου στον προηγούμενο χώρο εργασίας + .next-workspace = Μετακίνηση παραθύρου στον επόμενο χώρο εργασίας + .last-workspace = Μετακίνηση παραθύρου στον τελευταίο χώρο εργασίας + .next-display = Μετακίνηση παραθύρου στην επόμενη οθόνη + .prev-display = Μετακίνηση παραθύρου στην προηγούμενη οθόνη + .send-to-prev-workspace = Μετακίνηση παραθύρου στον προηγούμενο χώρο εργασίας + .send-to-next-workspace = Μετακίνηση παραθύρου στον επόμενο χώρο εργασίας +switch-workspaces = Εναλλαγή χώρων εργασίας + .horizontal = Ολίσθηση με τέσσερα δάχτυλα προς τα αριστερά/δεξιά + .vertical = Ολίσθηση με τέσσερα δάχτυλα προς τα πάνω/κάτω +system-controls = Έλεγχος συστήματος +auto-switch = Αυτόματη εναλλαγή μεταξύ ανοιχτόχρωμης και σκουρόχρωμης λειτουργίας + .sunrise = Εναλλαγή στην ανοιχτόχρωμη λειτουργία την ανατολή + .sunset = Εναλλαγή στη σκουρόχρωμη λειτουργία τη δύση + .next-sunrise = Εναλλαγή στην ανοιχτόχρωμη λειτουργία στην επόμενη ανατολή + .next-sunset = Εναλλαγή στην ανοιχτόχρωμη λειτουργία στην επόμενη δύση +add-vpn = Προσθήκη VPN +keyboard-numlock-boot = Πλήκτρο Numlock + .boot-state = Κατάσταση κατά την εκκίνηση + .last-boot = Τελευταία εκκίνηση + .on = Ενεργό + .off = Ανενεργό + .set = Ορισμός κατάστασης Numlock κατά την εκκίνηση +about-related = Σχετικές ρυθμίσεις + .support = Λήψη υποστήριξης +tap-to-click = Πάτημα για κλικ + .desc = Ενεργοποιεί το πάτημα με ένα δάχτυλο για κύριο κλικ, με δύο δάχτυλα για δευτερεύον κλικ και με τρία δάχτυλα για μεσαίο κλικ +interface-density = Πυκνότητα περιβάλλοντος χρήστη + .comfortable = Άνετο + .compact = Πυκνό + .spacious = Ευρύχωρο +open-application-library = Άνοιγμα βιβλιοθήκης εφαρμογών +slow = Αργός +network-name = Όνομα δικτύου +scrolling = Κύλιση + .two-finger = Κύλιση με δύο δάχτυλα + .edge = Κύλιση κατά μήκος της άκρης με ένα δάχτυλο + .speed = Ταχύτητα κύλισης + .natural = Φυσική κατεύθυνση κύλισης + .natural-desc = Κύλιση του περιεχομένου, αντί της προβολής +auth-dialog = Απαιτείται πιστοποίηση + .vpn-description = Εισαγάγετε το όνομα χρήστη και τον κωδικό πρόσβασης που απαιτούνται από την υπηρεσία VPN. + .wifi-description = Εισαγάγετε τον κωδικό πρόσβασης ή το κλειδί κρυπτογράφησης. Μπορείτε επίσης να συνδεθείτε πατώντας το κουμπί «WPS» του δρομολογητή. +add-user = Προσθήκη χρήστη +add-image = Προσθήκη εικόνας +migrate-workspace-next = Μεταφορά χώρου εργασίας στην επόμενη έξοδο +airplane-on = Η λειτουργία πτήσης είναι ενεργή. +formatting = Μορφοποίηση + .dates = Ημερομηνίες + .time = Ώρα + .date-and-time = Ημερομηνία και ώρα + .numbers = Αριθμοί + .measurement = Μονάδα μέτρησης + .paper = Χαρτί +disabled = Ανενεργό +add-applet = Προσθήκη μικροεφαρμογής +show-extended-input-sources = Εμφάνιση εκτεταμένων πηγών εισόδου +mode-and-colors = Λειτουργία και χρώματα +forget = Διαγραφή +center-segment = Κεντρικό τμήμα +panel-missing = Απουσία διαμόρφωσης γραμμής συστήματος + .desc = Το αρχείο διαμόρφωσης της γραμμής συστήματος απουσιάζει λόγω της χρήσης μιας προσαρμοσμένης διαμόρφωσης ή είναι κατεστραμμένο. + .fix = Επαναφορά προεπιλογής +invalid-username = Μη έγκυρο όνομα χρήστη +mirroring = Κατοπτρισμός + .id = Κατοπτρισμός { $id } + .dont = Να μην γίνει κατοπτρισμός + .mirror = Κατοπτρισμός { $display } + .project = + Προβολή σε { $display -> + [all] όλες τις οθόνες + *[other] { $display } + } + .project-count = + Προβολή σε { $count } { $count -> + [1] άλλη οθόνη + *[other] άλλες οθόνες + } +orientation = Προσανατολισμός + .standard = Τυπικός + .rotate-90 = Περιστροφή 90° + .rotate-180 = Περιστροφή 180° + .rotate-270 = Περιστροφή 270° +auto = Αυτόματο +end-segment = Τελικό τμήμα +bluetooth-adapters = Προσαρμογείς Bluetooth +time-format = Μορφή ημερομηνίας και ώρας + .twenty-four = 24ωρη μορφή + .show-seconds = Εμφάνιση δευτερολέπτων + .first = Πρώτη ημέρα εβδομάδας + .show-date = Εμφάνιση ημερομηνίας στη μικροεφαρμογή ώρας + .friday = Παρασκευή + .saturday = Σάββατο + .sunday = Κυριακή + .monday = Δευτέρα +accent-color = Χρώμα έμφασης +type-key-combination = Εισαγάγετε τον συνδυασμό πλήκτρων +manage-windows = Διαχείριση παραθύρων + .close = Κλείσιμο παραθύρου + .maximize = Μεγιστοποίηση παραθύρου + .fullscreen = Παράθυρο σε πλήρη οθόνη + .minimize = Ελαχιστοποίηση παραθύρου + .resize-inwards = Αλλαγή μεγέθους παραθύρου προς τα μέσα + .resize-outwards = Αλλαγή μεγέθους παραθύρου προς τα έξω + .toggle-sticky = Εναλλαγή καρφιτσωμένου παραθύρου +install-additional-languages = Εγκατάσταση πρόσθετων γλωσσών +sound-output = Έξοδος ήχου + .volume = Ένταση εξόδου + .device = Συσκευή εξόδου + .level = Επίπεδο εξόδου + .config = Διαμόρφωση + .balance = Ισορροπία + .left = Αριστερό + .right = Δεξί +window-controls = Στοιχεία ελέγχου παραθύρων + .maximize = Εμφάνιση κουμπιού μεγιστοποίησης + .minimize = Εμφάνιση κουμπιού ελαχιστοποίησης + .active-window-hint = Εμφάνιση ένδειξης ενεργού παραθύρου +window-management-appearance = Διαχείριση παραθύρων + .active-hint = Μέγεθος ένδειξης ενεργού παραθύρου + .gaps = Κενά γύρω από τα παράθυρα σε παράθεση +migrate-workspace-prev = Μεταφορά χώρου εργασίας στην προηγούμενη έξοδο +legacy-app-global-shortcuts = Καθολικές συντομεύσεις σε εφαρμογές X11 + .desc = Οι καθολικές συντομεύσεις επιτρέπουν σε πατήματα πλήκτρων και συμβάντα κουμπιών ποντικιού που εκτελούνται στις εφαρμογές να αναγνωρίζονται από άλλες εφαρμογές για λειτουργίες, όπως πάτημα για ομιλία ή πάτημα για σίγαση. Από προεπιλογή, οι καθολικές συντομεύσεις είναι απενεργοποιημένες στις εφαρμογές X11 για να διασφαλιστεί ότι οι άλλες εφαρμογές δεν μπορούν να παρακολουθούν τα συμβάντα πληκτρολογίου και ποντικιού που περιέχουν ευαίσθητες πληροφορίες. + .none = Κανένα πλήκτρο + .modifiers = Πλήκτρα τροποποίησης (Super, Shift, Control, Alt) + .combination = Όλα τα πλήκτρα, ενώ είναι πατημένα τα Super, Control ή Alt + .all = Όλα τα πλήκτρα + .mouse = Συμβάντα κουμπιών ποντικιού σε εφαρμογές X11 +power-saving = Επιλογές εξοικονόμησης ενέργειας + .turn-off-screen-after = Απενεργοποίηση οθόνης μετά από + .auto-suspend = Αυτόματη αναστολή + .auto-suspend-ac = Αυτόματη αναστολή με τροφοδοσία ρεύματος + .auto-suspend-battery = Αυτόματη αναστολή με τροφοδοσία μπαταρίας +connected-devices = Συνδεδεμένες συσκευές + .unknown = Άγνωστη συσκευή +icons-and-toolkit = Εικονίδια και θέματα συνόλου εργαλείων +sound-applications = Εφαρμογές + .desc = Ένταση και ρυθμίσεις ήχου εφαρμογών +time-zone = Ζώνη ώρας + .auto = Αυτόματη ζώνη ώρας + .auto-info = Απαιτεί τη χρήση υπηρεσιών τοποθεσίας και πρόσβαση στο διαδίκτυο +fast = Γρήγορος +add-color = Προσθήκη χρώματος +add-network = Προσθήκη δικτύου + .profile = Προσθήκη προφίλ +network-device-state = + .activated = Συνδεδεμένο + .config = Σύνδεση + .deactivating = Αποσύνδεση + .disconnected = Αποσυνδεδεμένο + .failed = Αποτυχία σύνδεσης + .ip-check = Έλεγχος σύνδεσης + .ip-config = Αίτημα για διεύθυνση IP και πληροφορίες δρομολόγησης + .need-auth = Απαιτεί πιστοποίηση + .prepare = Προετοιμασία για σύνδεση + .secondaries = Αναμονή για δευτερεύουσα σύνδεση + .unavailable = Μη διαθέσιμο + .unknown = Άγνωστη κατάσταση + .unmanaged = Χωρίς διαχείριση + .unplugged = Αποσυνδεδεμένο καλώδιο +gestures = Χειρονομίες + .four-finger-down = Ολίσθηση με τέσσερα δάχτυλα προς τα κάτω + .four-finger-left = Ολίσθηση με τέσσερα δάχτυλα προς τα αριστερά + .four-finger-right = Ολίσθηση με τέσσερα δάχτυλα προς τα δεξιά + .four-finger-up = Ολίσθηση με τέσσερα δάχτυλα προς τα πάνω + .three-finger-any = Ολίσθηση με τρία δάχτυλα προς κάθε κατεύθυνση +system = Σύστημα και λογαριασμοί +no-networks = Δεν βρέθηκαν δίκτυα. +open-new-folder = Άνοιγμα νέου φακέλου +fill = Συμπλήρωση +custom = Προσαρμοσμένες +bluetooth-paired = Παλαιότερες συνδεδεμένες συσκευές + .connect = Σύνδεση + .battery = { $percentage }% μπαταρία +dialog = Παράθυρο διαλόγου + .title = Διατήρηση αυτών των ρυθμίσεων οθόνης; + .keep-changes = Διατήρηση αλλαγών + .change-prompt = Οι αλλαγές των ρυθμίσεων θα αναιρεθούν αυτόματα σε { $time } δευτερόλεπτα. + .revert-settings = Επαναφορά ρυθμίσεων +workspaces-overview-thumbnails = Μικρογραφίες επισκόπησης χώρων εργασίας + .show-number = Εμφάνιση αριθμού χώρων εργασίας + .show-name = Εμφάνιση ονόματος χώρων εργασίας +color = Χρώμα + .depth = Βάθος χρωμάτων + .profile = Προφίλ χρωμάτων + .sidebar = Προφίλ χρωμάτων + .temperature = Θερμοκρασία χρωμάτων +hex = Δεκαεξαδικό +magnifier = Μεγεθυντικός φακός + .controls = + Ή χρησιμοποιήστε αυτές τις συντομεύσεις: { $zoom_in -> + [zero] { "" } + *[other] + { "" } + { $zoom_in } για μεγέθυνση, + }{ $zoom_out -> + [zero] { "" } + *[other] + { "" } + { $zoom_out } για σμίκρυνση, + } + Super + κύλιση με το ποντίκι + .scroll_controls = Ενεργοποίηση ζουμ ποντικιού ή επιφάνειας αφής με Super + κύλιση + .show_overlay = Εμφάνιση της επικάλυψης μεγεθυντικού φακού + .increment = Αύξηση ζουμ + .signin = Έναρξη μεγεθυντικού φακού κατά τη σύνδεση + .applet = Εναλλαγή μεγεθυντικού φακού στη γραμμή συστήματος + .movement = Η ζουμαρισμένη προβολή μετακινείται + .continuous = Συνέχεια με τον κέρσορα + .onedge = Όταν ο κέρσορας φτάνει στην άκρη + .centered = Για να διατηρεί τον κέρσορα στο κέντρο +administrator = Διαχειριστής + .desc = Οι διαχειριστές μπορούν να αλλάζουν ρυθμίσεις για όλους τους χρήστες, να προσθέτουν και να καταργούν άλλους χρήστες +scan-to-connect-description = Σαρώστε τον κωδικό QR για να συνδεθείτε σε αυτό το δίκτυο. +modified = { $count } τροποποιήσεις +sound-usb-audio = Ήχος USB +sound-device-profiles = Προφίλ συσκευών +sound-hd-audio = Ήχος HD +shadow-and-corners = Σκίαση και γωνίες παραθύρων +shadows-tiling = Παράθεση παραθύρων + .clip = Συμφωνία με τις γωνίες συστήματος + .shadow = Εφαρμογή σκιών +shadows-floating = Αιωρούμενα παράθυρα + .clip = Συμφωνία με τις γωνίες συστήματος και εφαρμογή σκιών +sound-device-port-unplugged = Αποσυνδεδεμένο +workspaces-overview = Επισκόπηση χώρων εργασίας + .action-on-typing = Ενέργεια κατά την πληκτρολόγηση + .none = Καμία + .launcher = Άνοιγμα μενού εκκίνησης + .applications = Άνοιγμα εφαρμογών +time-region = Περιοχή και γλώσσα +power = Ενέργεια και μπαταρία +xdg-entry-wired = Ενσύρματη δικτύωση +xdg-entry-startup-apps-comment = Διαμόρφωση των εφαρμογών που εκτελούνται κατά τη σύνδεση +xdg-entry-region-language = Περιοχή και γλώσσα +time-date = Ημερομηνία και ώρα + .auto = Αυτόματη ρύθμιση + .auto-ntp = Η ημερομηνία και η ώρα θα ενημερώνονται αυτόματα όταν οριστεί ζώνη ώρας +xdg-entry-mouse-keywords = Ποντίκι;Επιτάχυνση;Κύλιση;COSMIC;Mouse;Acceleration;Scrolling; +xdg-entry-notifications-keywords = Ειδοποίηση;Κλείδωμα;COSMIC;Notification;Lock; +xdg-entry-startup-apps-keywords = Εφαρμογή;Εκκίνηση;COSMIC;Startup;Application; +xdg-entry-default-apps-comment = Προεπιλεγμένο πρόγραμμα περιήγησης ιστού, πρόγραμμα ηλεκτρονικού ταχυδρομείου, εφαρμογή περιήγησης αρχείων και άλλες εφαρμογές +xdg-entry-keyboard-comment = Πηγές εισόδου, εναλλαγή, εισαγωγή ειδικών χαρακτήρων, συντομεύσεις +xdg-entry-wired-keywords = Σύνδεση;Δίκτυο;Ενσύρματο;COSMIC;Wired;LAN;Network;Connection; +xdg-entry-power = Ενέργεια και μπαταρία +xdg-entry-dock-keywords = Μικροεφαρμογή;Μπάρα;Εφαρμογών;Γραμμή;Συστήματος;COSMIC;Dock;Panel;Applet +bluetooth = Bluetooth + .status = Αυτό το σύστημα είναι ορατό ως { $aliases } όσο είναι ανοικτές οι ρυθμίσεις του Bluetooth. + .connected = Συνδεδεμένο + .connecting = Σύνδεση + .disconnecting = Αποσύνδεση + .connect = Σύνδεση + .disconnect = Αποσύνδεση + .forget = Διαγραφή + .dbus-error = Προέκυψε σφάλμα κατά την αλληλεπίδραση με το DBus: { $why } + .disabled = Η υπηρεσία Bluetooth είναι απενεργοποιημένη + .inactive = Η υπηρεσία Bluetooth δεν είναι ενεργή + .unknown = Δεν ήταν δυνατή η ενεργοποίηση της υπηρεσίας Bluetooth. Είναι εγκατεστημένο το BlueZ; +xdg-entry-mouse-comment = Ταχύτητα ποντικιού, επιτάχυνση και φυσική κατεύθυνση κύλισης +xdg-entry-system = Σύστημα και λογαριασμοί +xdg-entry-panel-keywords = Μικροεφαρμογή;Γραμμή;Συστήματος;COSMIC;Panel;Applet +xdg-entry-window-management = Διαχείριση παραθύρων +xdg-entry-time-language-comment = Διαχείριση ημερομηνίας, ώρας, περιοχής και γλώσσας συστήματος +default-apps = Προεπιλεγμένες εφαρμογές + .web-browser = Περιήγηση ιστού + .file-manager = Διαχείριση αρχείων + .mail-client = Ηλεκτρονικό ταχυδρομείο + .music = Μουσική + .video = Βίντεο + .photos = Φωτογραφίες + .calendar = Ημερολόγιο + .terminal = Τερματικό + .other-associations = Άλλες συσχετίσεις + .text-editor = Επεξεργασία κειμένου + .not-installed = Δεν έχει εγκατασταθεί +xdg-entry-x11-applications-keywords = Εφαρμογή;Παιχνίδι;Συμβατότητα;COSMIC;X11;Application;Game;Compatibility; +xdg-entry-displays-comment = Διαχείριση ρυθμίσεων διαμόρφωσης οθονών +xdg-entry-touchpad-keywords = Επιφάνεια;Αφή;Χειρονομία;COSMIC;Touchpad;Gesture; +xdg-entry-time-language = Ώρα και γλώσσα +window-management = Διαχείριση παραθύρων +xdg-entry-system-keywords = Σύστημα;Πληροφορίες;Λογαριασμοί;Υλικολογισμικό;COSMIC;System;Info;Accounts;Firmware; +xdg-entry-wireless-keywords = Σύνδεση;Δίκτυο;COSMIC;WiFi;Wi-Fi;Network;Connection; +mouse = Ποντίκι + .speed = Ταχύτητα ποντικιού + .acceleration = Ενεργοποίηση επιτάχυνσης ποντικιού +dock = Μπάρα εφαρμογών +xdg-entry-panel = Γραμμή συστήματος +display = Οθόνες + .arrangement = Διάταξη οθονών + .arrangement-desc = Σύρετε τις οθόνες για να τις αναδιατάξετε + .enable = Ενεργοποίηση οθόνης + .external = Εξωτερική οθόνη { $size } { $output } + .laptop = Οθόνη φορητού υπολογιστή { $size } + .options = Επιλογές οθόνης + .refresh-rate = Ρυθμός ανανέωσης + .resolution = Ανάλυση + .scale = Κλίμακα + .additional-scale-options = Πρόσθετες επιλογές κλίμακας +xdg-entry-wireless-comment = Συνδέσεις Wi-Fi και προφίλ σύνδεσης +xdg-entry-desktop-comment = Ρυθμίσεις ταπετσαρίας, εμφάνισης, γραμμής συστήματος, μπάρας εφαρμογών, διαχείρισης παραθύρων και χώρων εργασίας +xdg-entry-network = Δίκτυα και ασύρματη σύνδεση +xdg-entry-users-comment = Πιστοποίηση και λογαριασμοί χρηστών +startup-apps = Εφαρμογές εκκίνησης + .add = Προσθήκη εφαρμογής + .user = Εφαρμογές που εκκινούνται όταν κάνετε σύνδεση + .none = Δεν έχουν προστεθεί εφαρμογές εκκίνησης + .remove-dialog-title = Αφαίρεση του «{ $name }»; + .remove-dialog-description = Αφαίρεση αυτής της εφαρμογής εκκίνησης; + .add-startup-app = Προσθήκη εφαρμογής εκκίνησης +xdg-entry-input-comment = Ρυθμίσεις πληκτρολογίου και ποντικιού +input-devices = Συσκευές εισόδου +xdg-entry-dock-comment = Μια προαιρετική μπάρα για εφαρμογές και μικροεφαρμογές +xdg-entry-network-keywords = Δίκτυο;Δικτύωση;Ασύρματο;COSMIC;Network;Wireless;WiFi;VPN; +xdg-entry-wallpaper-comment = Εικόνες ταπετσαρίας, χρώματα και επιλογές παρουσίασης διαφανειών +xdg-entry-dock = Μπάρα εφαρμογών +xdg-entry-startup-apps = Εφαρμογές εκκίνησης +xdg-entry-workspaces-keywords = Χώρος;Εργασίας;Προσανατολισμός;Επισκόπηση;Οθόνη;COSMIC;Workspace;Orientation;Overview;Monitor; +xdg-entry-system-comment = Πληροφορίες συστήματος, λογαριασμοί και ενημερώσεις υλικολογισμικού +xdg-entry-x11-applications-comment = Κλιμάκωση εφαρμογών συστήματος παραθύρων X11, κύρια οθόνη και καθολικές συντομεύσεις +xdg-entry-region-language-comment = Μορφοποίηση ημερομηνιών, ώρας και αριθμών με βάση την περιοχή σας +panel = Γραμμή συστήματος +xdg-entry-wallpaper-keywords = Ταπετσαρία;Φόντο;Παρουσίαση;Διαφανειών;COSMIC;Wallpaper;Background;Slideshow; +xdg-entry-users-keywords = Λογαριασμός;Χρήστης;COSMIC;User;Account; +xdg-entry-vpn-keywords = Δίκτυο;Σύνδεση;COSMIC;VPN;Network;Connection;OpenVPN;OpenConnect; +users = Χρήστες + .admin = Διαχειριστής + .standard = Τυπικός + .profile-add = Επιλογή εικόνας προφίλ +xdg-entry-time-language-keywords = Σύστημα;Ώρα;Ημερομηνία;Περιοχή;Γλώσσα;COSMIC;System;Time;Date;Region;Language; +xdg-entry-input-keywords = Εισαγωγή;Είσοδος;Πληκτρολόγιο;Ποντίκι;Ποντίκια;COSMIC;Input;Keyboard;Mouse;Mice; +xdg-entry-notifications-comment = Λειτουργία «Μην ενοχλείτε», ειδοποιήσεις οθόνης κλειδώματος και ρυθμίσεις ανά εφαρμογή +xdg-entry-sound-keywords = Ήχος;Ειδοποίηση;COSMIC;Sound;Audio;Alert;Pipewire; +xdg-entry-power-keywords = Μπαταρία;Ισχύς;Ενέργεια;COSMIC;Power;Battery +legacy-applications = Συμβατότητα εφαρμογών X11 +xdg-entry-region-language-keywords = Περιοχή;Γλώσσα;Ημερομηνία;Μορφή;Ώρα;Τοπικές;Τοπικοποίηση;COSMIC;Region;Language;Date;Format;Time;Locale;Localization; +xdg-entry-applications-keywords = Προεπιλογή;Προεπιλεγμένες;Εφαρμογές;Εφαρμογή;Εκκίνηση;Συμβατότητα;COSMIC;Default;Application;Startup;X11;Compatibility +xdg-entry-sound-comment = Ρυθμίσεις ήχου για συσκευές, ειδοποιήσεις και εφαρμογές +wallpaper = Ταπετσαρία + .change = Αλλαγή εικόνας κάθε + .fit = Προσαρμογή ταπετσαρίας + .folder-dialog = Επιλογή φακέλου ταπετσαριών + .image-dialog = Επιλογή εικόνας ταπετσαρίας + .plural = Ταπετσαρίες + .same = Κοινή ταπετσαρία για όλες τις οθόνες + .slide = Παρουσίαση διαφανειών +xdg-entry-touchpad-comment = Ταχύτητα επιφάνειας αφής, επιλογές κλικ και χειρονομίες +xdg-entry-keyboard-keywords = Πληκτρολόγιο;Είσοδος;Πηγή;Συντομεύσεις;COSMIC;Keyboard;Input;Source;Shortcuts; +xdg-entry-vpn-comment = Συνδέσεις VPN και προφίλ σύνδεσης +xdg-entry-window-management-keywords = Παράθυρο;Διαχείριση;Παράθεση;Πλήκτρο;COSMIC;Window;Management;Tiling;Super;Key; +xdg-entry-workspaces-comment = Προσανατολισμός χώρων εργασίας, επισκόπηση και συμπεριφορά πολλαπλών οθονών +xdg-entry-network-comment = Διαχείριση συνδέσεων δικτύου +xdg-entry-panel-comment = Η κύρια γραμμή του συστήματος για μενού και μικροεφαρμογές +touchpad = Επιφάνεια αφής + .acceleration = Ενεργοποίηση επιτάχυνσης επιφάνειας αφής + .speed = Ταχύτητα επιφάνειας αφής +xdg-entry-power-comment = Λειτουργίες ενέργειας και επιλογές εξοικονόμησης ενέργειας +time = Ώρα και γλώσσα +xdg-entry-x11-applications = Συμβατότητα εφαρμογών X11 +xdg-entry-window-management-comment = Ενέργεια πλήκτρου Super, επιλογές ελέγχου παραθύρων και πρόσθετες επιλογές παράθεσης παραθύρων +xdg-entry-wired-comment = Ενσύρματες συνδέσεις και προφίλ σύνδεσης +known-networks = Γνωστά δίκτυα +network-and-wireless = Δίκτυα και ασύρματη δικτύωση +keyboard-special-char = Εισαγωγή ειδικών χαρακτήρων + .alternate = Πλήκτρο εναλλακτικών χαρακτήρων + .compose = Πλήκτρο σύνθεσης + .compose-desc = Το πλήκτρο σύνθεσης επιτρέπει την εισαγωγή μιας ευρείας ποικιλίας χαρακτήρων. Για να το χρησιμοποιήσετε, πατήστε το πλήκτρο σύνθεσης και έπειτα, μια ακολουθία χαρακτήρων. Για παράδειγμα, μπορείτε να εισαγάγετε τον χαρακτήρα «©» πατώντας το πλήκτρο σύνθεσης, ακολουθούμενο από τα «C» και «o», ή τον χαρακτήρα «á» πατώντας το πλήκτρο σύνθεσης, ακολουθούμενο από τα «a» και «‘» . + .caps = Πλήκτρο Caps Lock +no-search-results = Δεν αντιστοιχεί κανένα δίκτυο στην αναζήτησή σας. +workspaces-navigation = Πλοήγηση + .wraparound = Μετακίνηση μεταξύ του πρώτου και του τελευταίου χώρου εργασίας με συντομεύσεις πληκτρολογίου και χειρονομίες diff --git a/i18n/fi/cosmic_settings.ftl b/i18n/fi/cosmic_settings.ftl index 58b2efb..3dd3588 100644 --- a/i18n/fi/cosmic_settings.ftl +++ b/i18n/fi/cosmic_settings.ftl @@ -818,3 +818,5 @@ shadows-tiling = Asetellut ikkunat .clip = Sovita järjestelmän kulmiin .shadow = Käytä varjoja no-search-results = Hakuasi vastaavia verkkoja ei löytynyt. +workspaces-navigation = Liikkuminen + .wraparound = Siirry ensimmäisen ja viimeisen työtilan välillä käyttäen pikanäppäimiä ja eleitä diff --git a/i18n/fr/cosmic_settings.ftl b/i18n/fr/cosmic_settings.ftl index 419dc72..95b488e 100644 --- a/i18n/fr/cosmic_settings.ftl +++ b/i18n/fr/cosmic_settings.ftl @@ -902,3 +902,5 @@ xdg-entry-keyboard-keywords = COSMIC;Clavier;Saisie;Source;Raccourcis; xdg-entry-window-management-keywords = COSMIC;Fenêtre;Gestion;Agencement;Super;Touche; xdg-entry-displays-keywords = COSMIC;Écran; no-search-results = Aucun réseau ne correspond à votre recherche. +workspaces-navigation = Navigation + .wraparound = Passez du premier au dernier espace de travail à l'aide des raccourcis clavier et des gestes diff --git a/i18n/hu/cosmic_settings.ftl b/i18n/hu/cosmic_settings.ftl index a3d2e76..847d223 100644 --- a/i18n/hu/cosmic_settings.ftl +++ b/i18n/hu/cosmic_settings.ftl @@ -101,7 +101,7 @@ network-device-state = .need-auth = Hitelesítés szükséges .prepare = Felkészülés a kapcsolódáshoz .secondaries = Várakozás másodlagos kapcsolatra - .unavailable = Nem elérhető + .unavailable = Nem érhető el .unknown = Ismeretlen állapot .unmanaged = Kezeletlen .unplugged = Kábel kihúzva @@ -150,7 +150,7 @@ activate = Aktiválás confirm = Megerősítés enable = Engedélyezés bluetooth = Bluetooth - .status = Ez a rendszer { $aliases } néven látható, amíg a Bluetooth beállítások vannak megnyitva. + .status = Ez a rendszer { $aliases } néven látható, amíg a Bluetooth beállítások meg vannak nyitva. .connected = Csatlakoztatva .connecting = Csatlakozás… .disconnecting = Bontás… @@ -175,7 +175,7 @@ accessibility = Akadálymentesség .vision = Látás .on = Bekapcsolva .off = Kikapcsolva - .unavailable = Nem elérhető + .unavailable = Nem érhető el .screen-reader = Képernyőolvasó .high-contrast = Magas kontraszt mód .invert-colors = Színek invertálása @@ -290,8 +290,8 @@ text-tint = Felületi szöveg árnyalata .desc = A felület szövegszíneinek meghatározására szolgál, hogy azok megfelelő kontrasztot biztosítsanak különböző felületeken style = Stílus .round = Lekerekített - .slightly-round = Némileg lekerekített - .square = Négyzetes + .slightly-round = Enyhén lekerekített + .square = Szögletes interface-density = Felületsűrűség .comfortable = Kényelmes .compact = Kompakt @@ -914,3 +914,5 @@ xdg-entry-vpn-keywords = COSMIC;VPN;Hálózat;Kapcsolat;OpenVPN;OpenConnect; xdg-entry-comment = Beállításalkalmazás a COSMIC asztalhoz xdg-entry-window-management-keywords = COSMIC;Ablak;Kezelés;Csempézés;Super;BIllentyű; no-search-results = Nem található a keresésnek megfelelő hálózat. +workspaces-navigation = Navigáció + .wraparound = Váltás az első és az utolsó munkaterület között gyorsbillentyűkkel és gesztusokkal diff --git a/i18n/id/cosmic_settings.ftl b/i18n/id/cosmic_settings.ftl index 8ae3b70..f8271c2 100644 --- a/i18n/id/cosmic_settings.ftl +++ b/i18n/id/cosmic_settings.ftl @@ -818,3 +818,5 @@ xdg-entry-x11-applications = Kompatibilitas Aplikasi X11 xdg-entry-window-management-comment = Tindakan tombol Super, opsi kontrol jendela, dan pengubinan jendela tambahan xdg-entry-wired-comment = Sambungan berkabel dan profil sambungan no-search-results = Tidak ada jaringan yang sesuai pencarian anda. +workspaces-navigation = Navigasi + .wraparound = Pindahkan antara ruang kerja pertama dan terakhir menggunakan pintasan papan ketik dan gerakan diff --git a/i18n/kk/cosmic_settings.ftl b/i18n/kk/cosmic_settings.ftl index 2b58689..37aa0ec 100644 --- a/i18n/kk/cosmic_settings.ftl +++ b/i18n/kk/cosmic_settings.ftl @@ -818,3 +818,5 @@ xdg-entry-x11-applications = X11 қолданбаларының үйлесімд xdg-entry-window-management-comment = Super пернесінің әрекеті, терезелерді басқару опциялары және терезелерді қатар қоюдың қосымша опциялары xdg-entry-wired-comment = Сымды қосылымдар және қосылымдар профильдері no-search-results = Сіздің іздеуіңізге ешбір желі сәйкес келмейді. +workspaces-navigation = Навигация + .wraparound = Бірінші және соңғы жұмыс орындары арасында пернетақта жарлықтары мен ым қимылдар арқылы ауысу diff --git a/i18n/ko/cosmic_settings.ftl b/i18n/ko/cosmic_settings.ftl index 77d04a2..476cb4a 100644 --- a/i18n/ko/cosmic_settings.ftl +++ b/i18n/ko/cosmic_settings.ftl @@ -764,3 +764,20 @@ xdg-entry-workspaces = 작업 공간 xdg-entry-date-time-comment = 시간대와 자동 시계 설정 및 시간 형식 xdg-entry-x11-applications = X11 앱 호환성 xdg-entry-wired-comment = 유선 연결 및 연결 프로필 +xdg-entry-touchpad = 터치패드 +xdg-entry-startup-apps-comment = 로그인 시 실행할 앱 설정 +xdg-entry-region-language = 지역 & 언어 +xdg-entry-startup-apps-keywords = COSMIC;시작;앱; +xdg-entry-system = 시스템 & 계정 +xdg-entry-time-language-comment = 시스템 날짜와 시간, 지역 및 언어 관리 +xdg-entry-touchpad-keywords = COSMIC;터치패드;제스처; +xdg-entry-time-language = 시간 & 언어 +xdg-entry-users = 사용자 +xdg-entry-system-keywords = COSMIC;시스템;정보;계정;펌웨어; +xdg-entry-users-comment = 인증 및 사용자 계정 +xdg-entry-startup-apps = 시작 앱 +xdg-entry-system-comment = 시스템 정보와 계정 및 펌웨어 업데이트 +xdg-entry-region-language-comment = 지역에 기반한 날짜와 시간 및 숫자 형식 +xdg-entry-time-language-keywords = COSMIC;시스템;시간;날짜;지역;언어; +xdg-entry-sound-keywords = COSMIC;소리;오디오;알림;Pipewire; +xdg-entry-sound = 소리 diff --git a/i18n/lo/cosmic_settings.ftl b/i18n/lo/cosmic_settings.ftl new file mode 100644 index 0000000..e69de29 diff --git a/i18n/lt/cosmic_settings.ftl b/i18n/lt/cosmic_settings.ftl index 880dc9f..3d3e1bd 100644 --- a/i18n/lt/cosmic_settings.ftl +++ b/i18n/lt/cosmic_settings.ftl @@ -1,9 +1,9 @@ time-region = Regionas ir kalba panel-left = Kairė super-key = Super klavišo veiksmas - .launcher = Atidaryti aplikacijų paleidėją + .launcher = Atverti programų leistuką .workspaces = Atidaryti darbo sritis - .applications = Atidaryti aplikaciją + .applications = Atidaryti programą .disable = Neaktyvus x-minutes = { $number } { $number -> @@ -28,8 +28,8 @@ save = Išsaugoti vpn-error = VPN klaida .config = Nepavyko pridėti VPN konfigūracijos .connect = Nepavyko prisijungti prie VPN - .connection-editor = Prisijungimo redaguoklės problema - .connection-settings = Nepavyko gauti aktyvaus prisijungimo nustatymų + .connection-editor = Ryšio rengyklės triktis + .connection-settings = Nepavyko gauti veikiančių ryšių nuostatų .updating-state = Nepavyko atnaujinti tinklo valdytojo būsenos .wireguard-config-path = Klaidingas WireGuard nustatymų failo kelio vardas .wireguard-config-path-desc = Pasirinktas failas turi būti lokalioje failų sistemoje. @@ -46,7 +46,7 @@ no-applets-found = Apletų nerasta... region = Regionas zoom-in = Priartinti place-here = Padėti apletą čia --requires-restart = Reikalingas paleidimas iš naujo +-requires-restart = Reikia paleisti iš naujo workspaces-orientation = Darbo sričių orientacija .vertical = Vertikali .horizontal = Horizontali @@ -55,7 +55,7 @@ all-displays = Visi ekranai scheduling = Planavimas .manual = Rankininis planavimas frosted = Apšalusio stiklo efektas sistemos komponentuose - .desc = Taikomas fono suliejimas panelėje, aplikacijos doke, apletuose, programų paleidyklėje ir aplikacijų bibliotekoje + .desc = Taikomas fono suliejimas skydelyje, doke, apletuose, programų paleidyklėje ir programų bibliotekoje password = Slaptažodis about-hardware = Aparatinė įranga .model = Modelis @@ -66,9 +66,9 @@ about-hardware = Aparatinė įranga short = Trumpas vpn = VPN .connections = VPN prisijungimai - .error = Nepavyko pridėti VPN nustatymų + .error = Nepavyko pridėti VPN nuostatų .remove = Pašalinti prisijungimo profilį - .select-file = Pasirinkti VPN konfigūracinė failą + .select-file = Pasirinkti VPN konfigūracijos failą power-mode = Maitinimo režimas .battery = Ilgesnis baterijos veikimo laikas .battery-desc = Mažesnis energijos suvartojimas ir tylus veikimas @@ -83,7 +83,7 @@ wired = Laidinis .devices = Laidiniai įrenginiai .remove = Pašalinti ryšio profilį bluetooth-available = Įrenginiai netoliese -cable-unplugged = Kabelis neprijungtas +cable-unplugged = Kabelis atjungtas color-picker = Spalvų pipetė interface-font = Sistemos šriftas forget-dialog = Pamirštį šį Wi-Fi tinklą? @@ -96,19 +96,19 @@ hot-corner = Aktyvusis Kampas (Hot Corner) keyboard-typing-assist = Rašymas .repeat-rate = Pakartojimo dažnis .repeat-delay = Pakartojimo uždelsimas -edge-gravity = Slankių langų trauka prie artimiausių kraštų +edge-gravity = Slankūs langai traukiami prie artimiausių kraštų bluetooth = Bluetooth - .status = Jūsų įrenginys matomas kaip { $aliases }, kol Bluetooth nustatymai bus įjungti. + .status = Jūsų įrenginys matomas kaip { $aliases }, kol Bluetooth nuostatos bus įjungtos. .connected = Prisijungta .connecting = Jungiamasi .disconnecting = Atsijungiama .connect = Prisijungti .disconnect = Atsijungti .forget = Pamiršti - .dbus-error = Įvyko klaida procese su DBus: { $why } - .disabled = Bluetooth funkcionalumas išjungtas - .inactive = Bluetooth functionalumas neaktyvus - .unknown = Bluetooth functionalumas negali būti aktyvuotas. Ar jūsų įrenginys įdiegtas BlueZ paketas? + .dbus-error = Klaida veikiant su DBus: { $why } + .disabled = Bluetooth tarnyba išjungta + .inactive = Bluetooth tarnyba neaktyvi + .unknown = Nepavyksta altyvuoti Bluetooth tarnybos. Ar jūsų įrenginyje įdiegtas BlueZ paketas? amplification = Stiprinimas .desc = Leidžia padidinti garsumą iki 150% recent-colors = Pastarosios spalvos @@ -119,7 +119,7 @@ about-os = Operacinė sistema .desktop-environment = Darbalaukio aplinka .windowing-system = Langų valdymo sistema panel-behavior-and-position = Elgsena ir pozicija - .autohide = Automatiškai slėpti panelę + .autohide = Automatiškai slėpti skydelį .dock-autohide = Automatiškai slėpti doką .position = Pozicija ekrane .display = Rodyti ekrane @@ -137,9 +137,9 @@ accessibility = Prieinamumas .color-filters = Spalvų filtrai firmware = Programinė aparatinė įranga container-background = Įrankių fono spalva - .desc-detail = Įrankių fono spalva naudojama navigavimo šonjuostėse, šoniniame stalčiuje, iššokančiuose languose ir panašiuose komponentuose. Pagal numatytus nustatymus, ši fono spalva automatiškai parenkama pagal lango fono spalvą. + .desc-detail = Įrankių fono spalva naudojama naršymo šonjuostėse, šoniniame meniu, iššokančiuose languose ir panašiuose komponentuose. Pagal numatytus nustatymus, ši fono spalva automatiškai parenkama pagal lango fono spalvą. .reset = Atstatyti į automatinį - .desc = Naudojama navigavimo šonjuostėse, šoniniame stalčiuje, iššokančiuose languose ir panašiuose komponentuose + .desc = Naudojama naršymo šonjuostėse, šoniniame meniu, iššokančiuose languose ir panašiuose komponentuose primary-button = Pagrindiniai mygtukai .desc = Nustato fizinių mygtukų tvarką .left = Kairė @@ -148,7 +148,7 @@ sound-alerts = Įspėjimai .volume = Įspėjimo garsumas .sound = Įspėjimo garsas icon-theme = Piktogramų tema - .desc = Skirtingų piktogramų rinkinių taikymas aplikacijoms + .desc = Skirtingų piktogramų rinkinių taikymas programoms import = Importuoti keyboard-shortcuts = Klaviatūros spartieji klavišai .desc = Peržiūrėti ir modifikuoti sparčiuosius klavišus @@ -180,7 +180,7 @@ sound-input = Įvestis add-another-keybinding = Pridėti kitą klavišų kombinacija copy-to-clipboard = Kopijuoti į iškarpinę monospace-font = Lygiaplotis šriftas -experimental-settings = Eksperimentiniai nustatymai +experimental-settings = Eksperimentinės nuostatos recent-folders = Pastarieji aplankai color-filter = Spalvų filtrų tipai .unknown = Aktyvus nežinomas filtras @@ -234,10 +234,10 @@ x-hours = } added = Pridėta input-source-switch = Perjungti klaviatūros kalbos įvesties šaltinį -focus-navigation = Navigacija pagal fokusą - .focus-follows-cursor = Fokusas seka žymeklį - .focus-follows-cursor-delay = Fokusas seka žymeklį su atidėjimu (mikrosekundės) - .cursor-follows-focus = Žymeklis seka fokusą +focus-navigation = Aktyvaus lango vairavimas + .focus-follows-cursor = Aktyvuoti langą po žymekliu + .focus-follows-cursor-delay = Delsa ms kol langas po žymekliu bus aktyvuotas + .cursor-follows-focus = Perkelti žymeklį į aktyvų langą full-name = Vardas ir Pavardė app-background = Lango fonas panel-right = Dešinė @@ -283,19 +283,19 @@ preferred-languages = Pageidaujamos kalbos .desc = Kalbų tvarka nulemia, kuri kalba bus naudojama naudotojo sąsajoje. Pakeitimai įsigalios po kito prisijungimo. display = Monitoriai .arrangement = Monitorių išdėstyimas - .arrangement-desc = Pertvarkite monitorius velkant juos + .arrangement-desc = Perdėstykite monitorius juos vilkdami .enable = Įjungti monitorių .external = { $size } { $output } išorinis monitorius .laptop = { $size } nešiojamo kompiuterio monitorius .options = Monitoriaus parinktys .refresh-rate = Atnaujinimo dažnis - .resolution = Rezoliucija + .resolution = Raiška .scale = Mastelis .additional-scale-options = Papildomos mastelio parinktys panel-style = Stilius - .anchor-gap = Tarpas tarp panelės ir ekrano krašto + .anchor-gap = Tarpas tarp skydelio ir ekrano krašto .dock-anchor-gap = Tarpas tarp doko ir ekrano krašto - .extend = Ištęsti panelę iki ekrano kraštų + .extend = Ištęsti skydelį iki ekrano kraštų .dock-extend = Ištęsti doką iki ekrano kraštų .appearance = Išvaizda .size = Dydis @@ -305,35 +305,35 @@ panel-appearance = Išvaizda .match = Pagal darbalaukį .light = Šviesi .dark = Tamsi -workspaces-multi-behavior = Elgsena su keletais monitoriais +workspaces-multi-behavior = Darbas su keliais monitoriais .span = Darbo sritis tęsiasi per visus monitorius - .separate = Kiekvienas monitorius turi savo atskirą darbo sritį + .separate = Kiekvieno monitoriaus darbo sritis atskira replace-shortcut-dialog = Pakeisti spartųjį klavišą? .desc = { $shortcut } naudoja { $name }. Jeigu norite pakeisti, { $name } bus išjungtas. rgb = RŽM about-device = Įrenginio vardas .desc = Šis pavadinimas rodomas kitiems tinklo arba „Bluetooth“ įrenginiams -no-vpn = VPN ryšys nėra prieinamas. +no-vpn = Nėra prieinamų VPN ryšių start-segment = Pradžios segmentas desktop = Darbalaukis identity = Tapatybė reset-to-default = Atstatyti į numatytas reikšmes disconnect = Atjungti ok = Gerai -app = COSMIC Settings +app = COSMIC Nuostatos debug = Derinti sound = Garsas enable-export = Taikyti dabartinę temą GNOME aplikacijose - .desc = Ne visi programiniai rinkiniai palaiko automatinį perjungimą. Po temos pakeitimo , ne COSMIC tipo aplikacijoms gali prireikti paleidimo iš naujo. + .desc = Ne visi programiniai rinkiniai palaiko automatinį perjungimą. Pakeitus temą , gali reikėti iš naujo paleisti ne COSMIC tipo programas.. number = { $number } shortcut-name = Sparčių klavišų derinio pavadinimas style = Stilius .round = Apvalus - .slightly-round = Lengvai apvalus + .slightly-round = Truputį suapvalintas .square = Kampuotas panel-applets = Konfigūracija .dock-desc = Konfigūruoti doko apletus - .desc = Konfigūruoti panelės apletus + .desc = Konfigūruoti skydelio apletus qr-code-unavailable = QR kodas negalimas small = Mažas notifications = Pranešimai @@ -368,8 +368,8 @@ legacy-app-scaling = X11 langų sistemos programų mastelis .preferred-display = Pageidaujamas žaidimų ir viso ekrano X11 programų ekranas .no-display = Joks night-light = Nakties šviesa - .auto = Automatinė (nuo saulėlydžio iki saulėtekio) - .desc = Sumažinta mėlyna šviesa ir padidinamas spalvų šiltumas + .auto = Automatiškai (nuo saulėlydžio iki saulėtekio) + .desc = Mažiau mėlynos šviesos ir šiltesnės spalvos about = Apie input-devices = Įvesties įrenginiai custom-shortcuts = Pasirinktiniai sparčiųjų klavišų deriniai @@ -383,11 +383,11 @@ window-hint-accent-toggle = Naudoti temos akcento spalvą, kaip aktyvaus lango type-to-search = Norint ieškoti, pradėkite rašyti… workspaces-behavior = Darbo sričių elgsena .dynamic = Dinamiškos darbo sritys - .dynamic-desc = Automatiškai pašalinamos tuščios darbo sritys + .dynamic-desc = Tuščios darbo sritys pašalinamos automatiškai .fixed = Pastovus darbo sričių skaičius - .fixed-desc = Darbo sričių pridėjimas arba pašalinamas darbo sričių apžvalgos režime. + .fixed-desc = Peržiūrioje pridėkite arba pašalinkite darbo sritis. wireguard-dialog = Pridėti WireGuard įrenginį - .description = Pasirinkite įrenginio vardą WireGuard nustatymams. + .description = Pasirinkite įrenginio pavadinimą WireGuard nuostatoms. remove-connection-dialog = Pašalinti prisijungimo profilį .vpn-description = Jums reikės įvesti slaptažodį iš naujo, kad galėtumėte naudotis šiuo tinklu ateityje. .wired-description = Jums reikės atkurti šį profilį, kad galėtumėte naudotis šiuo prisijungimu. @@ -433,10 +433,10 @@ applications = Aplikacijos dbus-connection-error = Nepavyko prisijungti prie DBus system-controls = Sistemos valdymas auto-switch = Automatinis šviesaus ir tamsaus režimo valdymas - .sunrise = Įjungiamas šviesus režimas tekant saulei - .sunset = Įjungiamas tamsus režimas saulei leidžiantis - .next-sunrise = Įjungiamas šviesus režimas kitą kartą saulei tekant - .next-sunset = Įjungiamas tamsus režimas kitą kartą saulei leidžiantis + .sunrise = Šviesus režimas įjungiamas tekant saulei + .sunset = Tamsus režimas įjungiamas saulei leidžiantis + .next-sunrise = Šviesus režimas įjungiamas kitą kartą saulei tekant + .next-sunset = Tamsus režimas įjungiamas kitą kartą saulei leidžiantis add-vpn = Pridėti VPN cancel = Atšaukti keyboard-numlock-boot = Numlock @@ -456,9 +456,9 @@ interface-density = Sąsajos tankumas open-application-library = Atidaryti Aplikacijų Sąrašą connected = Prisijungta slow = Lėtas -network-name = Tinklo Pavadinimas +network-name = Tinklo pavadinimas large = Didelis -panel = Panelė +panel = Skydelis scrolling = Slinkimas .two-finger = Slinkimas dviem pirštais .edge = Vieno piršto slinkimas palei kraštą @@ -492,8 +492,8 @@ users = Naudotojai forget = Pamiršti center-segment = Centrinis segmentas panel-missing = Panelė nesukonfigūruota - .desc = Panelės konfigūraciniai failai nerasti dėl netinkamo jų modifikavimo arba tas failas buvo sugadintas. - .fix = Nustatyti į numatytus nustatymus + .desc = Skydelio konfigūracijos failas nerastas nes buvo netinkamai sukonfigūruotas arba sugadintas. + .fix = Grąžinti numatytas nuostatas invalid-username = Netinkamas naudotojo vardas mirroring = Veidrodinis atvaizdavimas .id = Atvaizduojamas { $id } @@ -539,7 +539,7 @@ manage-windows = Valdyti langus .toggle-sticky = Įjungti/išjungti lipnų langą never = Niekada install-additional-languages = Pridėti papildomas kalbas -settings = Nustatymai +settings = Nuostatos sound-output = Išvestis .volume = Išvesties garsumas .device = Išvesties įrenginys @@ -551,7 +551,7 @@ sound-output = Išvestis wallpaper = Darbalaukio fonas .change = Keisti paveiksliuką kas .fit = Darbalaukio fono talpinimas ekrane - .folder-dialog = Pasirinkite darbalaukio fono aplankalą + .folder-dialog = Pasirinkite darbalaukio fonų aplanką .image-dialog = Pasirinkite darbalaukio foną .plural = Darbalaukio fonai .same = Kiekvienam ekrane toks pat fonas @@ -573,15 +573,15 @@ legacy-app-global-shortcuts = Sparčiųjų klavišų kombinacijos X11 programose .all = Visi klavišai .mouse = Peles mygtuko veiksmai X11 programose activate = Aktyvuoti -replace = Pakeisti +replace = Keisti power-saving = Energijos taupymo parinktys - .turn-off-screen-after = Išjunkti ekraną po + .turn-off-screen-after = Išjungti ekraną po .auto-suspend = Automatinis miego režimas .auto-suspend-ac = Automatinis miego režimas, kai prijungtas maitinimas .auto-suspend-battery = Automatinis miego režimas, kai naudojama baterija connected-devices = Prijungti įrenginiai .unknown = Nežinomas įrenginys -icons-and-toolkit = Ikonų ir įrankių rinkinio temos +icons-and-toolkit = Piktogramų ir įrankių stiliai sound-applications = Aplikacijos .desc = Aplikacijų garsumas ir nustatymai time-zone = Laiko juosta @@ -599,10 +599,10 @@ network-device-state = .disconnected = Atsijungta .failed = Nepavyko prisijungti .ip-check = Tikrinamas ryšys - .ip-config = Vykdoma IP adreso and maršrutizavimo informacijos užklausa - .need-auth = Reikalinga autentifikacija + .ip-config = Užklausiama IP adreso ir maršrutizavimo informacijos + .need-auth = Reikja patvirtinti tapatumą .prepare = Ruošiamasi prisijungti - .secondaries = Laukiama antrinio ryšio + .secondaries = Laukiama prisijungiant antrąkart .unavailable = Nepasiekiama .unknown = Nežinoma būsena .unmanaged = Nevaldomas @@ -618,10 +618,10 @@ gestures = Gestai .four-finger-up = Keturių pirštų braukimas aukštyn .three-finger-any = Trijų pirštų braukimas system = Sistema ir paskyros -no-networks = Nebuvo rasta tinklų. -open-new-folder = Atidaryti naują aplanką +no-networks = Tinklų nerasta +open-new-folder = Atverti naują aplanką panel-bottom = Apačia -share = Pasidalinti tinklu +share = Dalintis tinklu add = Pridėti time = Laikas ir kalba fill = Užpildyti @@ -635,7 +635,7 @@ dialog = Dialogas .change-prompt = Nustatymai bus automatiškai atkurti po { $time } sekundžių. .revert-settings = Atkurti nustatymus navigate = Naviguoti -workspaces-overview-thumbnails = Darbo sričių apžvalgos režimo miniatiūros +workspaces-overview-thumbnails = Darbo sričių peržiūros miniatiūros .show-number = Rodyti darbo srities numerį .show-name = Rodyti darbo srities vardą color = Spalvos @@ -646,33 +646,33 @@ color = Spalvos hex = Šešioliktainis magnifier = Didinamasis stiklas .controls = - Arba pasinaudokite sparčiaisiais klavišais: { $zoom_in -> + Arba naudokite sparčiaisius klavišus: { $zoom_in -> [zero] { "" } *[other] { "" } - { $zoom_in } priartinimui, + { $zoom_in } priartinti, }{ $zoom_out -> [zero] { "" } *[other] { "" } - { $zoom_out } atitolinimui, + { $zoom_out } tolinti, } Super + slinkimas su pele .scroll_controls = Įgalinkite pelės ar jutiklinio pulto vaizdo mastelio keitimą su Super + slinkimas .show_overlay = Rodyti didinamojo stiklo perdangą .increment = Artinimo dydis .signin = Įjungti didinamąjį stiklą prisijungimo ekrane - .applet = Didinamojo stiklo jungiklio apletas panelėje - .movement = Priartinto vaizdo judėjimas - .continuous = Nuolatos su pelės žymekliu + .applet = Didinamojo stiklo jungiklio apletas skydelyje + .movement = Priartinto vaizdo judinimas + .continuous = Nuolat su pelės žymekliu .onedge = Kai žymeklis pasiekia ekrano ribą .centered = Laikyti žymeklį centre colors = Spalvos administrator = Administratorius .desc = Administratorius gali keisti nustatymus visiems naudotojams, pridėti ir pašalinti kitus naudotojus -scan-to-connect-description = Norinti prisijungti prie šio tinklo, skenuokite QR kodą. +scan-to-connect-description = Norėdami prisijungti prie šio tinklo, skenuokite QR kodą. modified = Pakeista: { $count } -known-networks = Žinomi tinklai +known-networks = Įsiminti tinklai network-and-wireless = Tinklas ir belaidis ryšys sound-device-port-unplugged = Neprijungta sound-hd-audio = HD garsas @@ -719,98 +719,98 @@ shadows-floating = Slankieji langai workspaces-overview = Darbo sričių apžvalga .action-on-typing = Veiksmas rašant .none = Jokia - .launcher = Atidaryti Aplikacijų leidyklę - .applications = Atidaryti Aplikacijas + .launcher = Atverti Leistuką + .applications = Atidaryti Programas connect = Prisijungti light = Šviesi dark = Tamsus xdg-entry-touchpad = Jutiklinis kilimėlis xdg-entry-wired = Laidinis -xdg-entry-startup-apps-comment = Konfigūruoti aplikacijas paleidžiamas prisijungus +xdg-entry-startup-apps-comment = Konfigūruoti programas paleidžiamas prisijungus xdg-entry-region-language = Regionas ir Kalba xdg-entry-mouse-keywords = COSMIC;Pelė;Pagreitis;Slinkimas; xdg-entry-bluetooth-comment = Valdyti Bluetooth įrenginius -xdg-entry-notifications-keywords = COSMIC;Pranešimai;Užrakinimas; -xdg-entry-startup-apps-keywords = COSMIC;Paleistis;Aplikacija; -xdg-entry-default-apps-comment = Numatytoji naršyklė, pašto programa, failų naršyklė ir kitos aplikacijos -xdg-entry-keyboard-comment = Įvesties šaltiniai, perjungimas, specialių ženklų įvestis, spartieji klavišai -xdg-entry-wired-keywords = COSMIC;Laidinis;LAN;Tinkas;Ryšys; +xdg-entry-notifications-keywords = COSMIC;Pranešimai;Užraktas; +xdg-entry-startup-apps-keywords = COSMIC;Paleistis;Programa; +xdg-entry-default-apps-comment = Numatytoji naršyklė, pašto programa, failų naršyklė ir kitos programos +xdg-entry-keyboard-comment = Įvesties įtaisai, perjungimas, specialių ženklų įvestis, spartieji klavišai +xdg-entry-wired-keywords = COSMIC;Laidinis;LAN;Tinklas;Ryšys; xdg-entry-power = Energija ir Baterija xdg-entry-mouse = Pelė -xdg-entry-dock-keywords = COSMIC;Dokas;Panelė;Apletas +xdg-entry-dock-keywords = COSMIC;Dokas;Skydelis;Apletas xdg-entry-mouse-comment = Pelės greitis, pagreitis ir natūralus slinkimas xdg-entry-system = Sistema ir Paskyros -xdg-entry-panel-keywords = COSMIC;Panelė;Apletas +xdg-entry-panel-keywords = COSMIC;Skydelis;Apletas xdg-entry-window-management = Langų Valdymas xdg-entry-a11y = Prieinamumas -xdg-entry-time-language-comment = Valdyti sistemos datą, laiką, regioną ir kalbą +xdg-entry-time-language-comment = Tvarkyti sistemos datą, laiką, regioną ir kalbą xdg-entry-desktop-keywords = COSMIC;Darbalaukis; -xdg-entry-x11-applications-keywords = COSMIC;X11;Aplikacijos;Žaidimas;Suderinamumas; -xdg-entry-displays-comment = Valdyti ekrano konfigūracijos nustatymus +xdg-entry-x11-applications-keywords = COSMIC;X11;Programa;Žaidimas;Suderinamumas; +xdg-entry-displays-comment = Tvarkyti ekrano nuostatas xdg-entry-touchpad-keywords = COSMIC;Jutiklinis kilimėlis; Gestai; xdg-entry-time-language = Laikas ir Kalba xdg-entry-users = Naudotojai xdg-entry-system-keywords = COSMIC;Sistema;Informacija;Paskyros;Programinė aparatinė įranga; -xdg-entry-default-apps = Numatytosios Aplikacijos +xdg-entry-default-apps = Numatytosios programos xdg-entry-wireless-keywords = COSMIC;WiFi-Wi-Fi;Tinklas;Ryšys; -xdg-entry-applications-comment = Numatytosios aplikacijos, pradžios aplikacijos ir X11 aplikacijų suderinamumo nustatymai +xdg-entry-applications-comment = Numatytosios programos, pradžios programos ir X11 programų suderinamumo nuostatos xdg-entry-about-keywords = COSMIC;Apie -xdg-entry-panel = Panelė +xdg-entry-panel = Skydelis xdg-entry-notifications = Pranešimai xdg-entry-a11y-keywords = COSMIC;Prieinamumas;A11y;Ekranas;Skaitytuvas;Didinamasis stiklas;Kontrastas;Spalva; xdg-entry-wireless-comment = Wi-Fi ryšiai ir ryšių profiliai xdg-entry-desktop = Darbalaukis xdg-entry-date-time-keywords = COSMIC;Laikas;Zona; -xdg-entry-desktop-comment = Darbalaukio fonas, išvaizda, panelė, dokas, langų valdymo ir darbo sričių nustatymai +xdg-entry-desktop-comment = Darbalaukio fonas, išvaizda, skydelis, dokas, langų valdymo ir darbo sričių nuostatos xdg-entry-wallpaper = Darbalaukio fonas xdg-entry-keyboard = Klaviatūra xdg-entry-a11y-comment = Ekrano Skaitytuvas, didinamasis stiklas, didelis kontrastas ir spalvų filtrai xdg-entry-displays = Ekranai xdg-entry-network = Tinklas ir Belaidis ryšys xdg-entry-date-time = Data ir Laikas -xdg-entry-users-comment = Autentifikacija ir naudotojų paskyros -xdg-entry-input-comment = Klaviatūros ir pelės nustatymai +xdg-entry-users-comment = Naudotojų tapatumo patvirtinimas ir paskyros +xdg-entry-input-comment = Klaviatūros ir pelės nuostatos xdg-entry-bluetooth-keywords = COSMIC;Bluetooth; -xdg-entry-dock-comment = Pasirinktina juosta aplikacijomis ir apletams +xdg-entry-dock-comment = Pasirinktinė juosta programoms ir apletams xdg-entry-network-keywords = COSMIC;Tinklas;Bevielis ryšys;WiFi;VPN; xdg-entry-wallpaper-comment = Darbalaukio paveikslėlis, spalvos ir skaidrių parinktys xdg-entry-dock = Dokas -xdg-entry-startup-apps = Pradžios Aplikacijos +xdg-entry-startup-apps = Paleisties programos xdg-entry-wireless = Wi-Fi xdg-entry-workspaces-keywords = COSMIC;Darbo sritis;Orientacija;Apžvalga;Monitorius; -xdg-entry-system-comment = Sistemos informacija, paskyros ir programinės aparatinės įrangos atnaujinimai -xdg-entry-x11-applications-comment = X11 langų sistemos aplikacijų mastelis, pagrindinis ekranas ir sistemos greitieji klavišai -xdg-entry-region-language-comment = Datų, laiko ir skaičių formatas pagal nustatytą regioną +xdg-entry-system-comment = Sistemos informacija, paskyros ir programinės aparatinės įrangos naujiniai +xdg-entry-x11-applications-comment = X11 langų sistemos programų mastelis, pagrindinis ekranas ir sistemos greitieji klavišai +xdg-entry-region-language-comment = Datų, laiko ir skaičių formatas pagal pasirinktą regioną xdg-entry-wallpaper-keywords = COSMIC;Darbalaukio fonas;Fonas;Skaidrės; xdg-entry-users-keywords = COSMIC;Naudotojas;Paskyra; -xdg-entry-about-comment = Įrenginio pavadinimas, techninė informacija, operacinės sistemos numatytieji nustatymai +xdg-entry-about-comment = Įrenginio pavadinimas, techninė informacija, operacinės sistemos numatytosios nuostatos xdg-entry-vpn-keywords = COSMIC;VPN;Ryšys;Prisijungimai;OpenVPN;OpenConnect; xdg-entry-time-language-keywords = COSMIC;Sistema;Laikas;Data;Regionas;Kalba; xdg-entry-input-keywords = COSMIC;Įvestis;Klaviatūra;Pelė;Pelytė; xdg-entry-comment = COSMIC desktop aplikacijų nustatymai -xdg-entry-notifications-comment = Netrukdyti režimas, užrakinto ekrano pranešimai ir programų nustatymai -xdg-entry-applications = Aplikacijos +xdg-entry-notifications-comment = Režimas „Netrukdyti“, užrakinto ekrano pranešimai ir programų nuostatos +xdg-entry-applications = Programos xdg-entry-sound-keywords = COSMIC;Garsas;Audio;Pranešimai;Pipewire; xdg-entry-power-keywords = COSMIC;Energija;Baterija -xdg-entry-default-apps-keywords = COSMIC;Numatyta;Aplikacija +xdg-entry-default-apps-keywords = COSMIC;Numatyta;Programa xdg-entry-keywords = COSMIC;Nustatymai; xdg-entry-region-language-keywords = COSMIC;Regionas;Kalba;Data;Formatas;Laikas;Vietovė;Lokalizavimas; xdg-entry-about = Apie xdg-entry-input = Įvesties Įrenginiai xdg-entry-applications-keywords = COSMIC;Numatytas;Aplikacija;Paleidimas;X11;Suderinamumas -xdg-entry-sound-comment = Audio nustatymai įrenginiams, pranešimams ir aplikacijoms +xdg-entry-sound-comment = Įrenginių, pranešimų ir programų garso nuostatos xdg-entry-touchpad-comment = Jutiklinis kilimėlio greitis, valdymo parinktys, gestai xdg-entry-keyboard-keywords = COSMIC;Klaviatūra;Įvestis;Šaltinis;Spartieji klavišai; xdg-entry-vpn-comment = VPN ryšiai ir prisijungimų profiliai xdg-entry-appearance = Išvaizda -xdg-entry-workspaces-comment = Darbo sričių orientacija, apžvalga ir keletos monitorių funkcionavimas -xdg-entry-network-comment = Valdyti tinklo ryšius -xdg-entry-panel-comment = Pagrindinė sistemos juosta apletams ir meniu +xdg-entry-workspaces-comment = Darbo sričių orientacija, peržiūra ir veikimas keliuose monitoriuose +xdg-entry-network-comment = Tvarkyti tinklo ryšius +xdg-entry-panel-comment = Pagrindinė sistemos meniu ir apletų juosta xdg-entry-sound = Garsas xdg-entry-power-comment = Energijos režimai ir energijos taupymo parinktys xdg-entry-displays-keywords = COSMIC;Ekranas; xdg-entry-workspaces = Darbo sritys -xdg-entry-date-time-comment = Laiko juosta, automatiniai laikrodžio nustatymai ir laiko formatavimas -xdg-entry-x11-applications = X11 Aplikacijų Suderinamumas +xdg-entry-date-time-comment = Laiko juosta, automatinės laikrodžio nuostatos ir laiko formatai +xdg-entry-x11-applications = Suderinamumas su X11 programomis xdg-entry-wired-comment = Laidiniai ryšiai ir ryšių profiliai no-search-results = Joks tinklas neatitinka jūsų paieškos. diff --git a/i18n/pl/cosmic_settings.ftl b/i18n/pl/cosmic_settings.ftl index 73ca92c..185fdc3 100644 --- a/i18n/pl/cosmic_settings.ftl +++ b/i18n/pl/cosmic_settings.ftl @@ -928,3 +928,5 @@ xdg-entry-window-management-keywords = COSMIC;Okna;Zarządzanie;Kafelkowanie;Sup xdg-entry-panel-comment = Podstawowy panel z menu i apletami xdg-entry-displays-keywords = COSMIC;Wyświetlacz;Ekran; no-search-results = Żadna sieć nie odpowiada twojemu wyszukiwaniu. +workspaces-navigation = Navigation + .wraparound = Przemieszczaj się między pierwszym a ostatnim obszarem roboczym używając skrótów klawiszowych i gestów diff --git a/i18n/pt-BR/cosmic_settings.ftl b/i18n/pt-BR/cosmic_settings.ftl index cfc2d69..510c95d 100644 --- a/i18n/pt-BR/cosmic_settings.ftl +++ b/i18n/pt-BR/cosmic_settings.ftl @@ -674,10 +674,10 @@ open-workspaces-view = Abrir a visão geral dos espaços de trabalho ## Time & Language time = Hora e Idioma -time-date = Data e Hora +time-date = Data e hora .auto = Definir automaticamente .auto-ntp = A data e a hora serão atualizadas automaticamente quando o fuso horário for definido -time-zone = Fuso Horário +time-zone = Fuso horário .auto = Fuso horário automático .auto-info = Requer um serviço de localização e acesso à Internet time-format = Formato de data e hora @@ -833,7 +833,7 @@ xdg-entry-appearance-keywords = COSMIC;Destaque;Accent;Cor;Ícone;Fonte;Tema xdg-entry-mouse = Mouse xdg-entry-dock-keywords = COSMIC;Dock;Painel;Applet;Miniaplicativo xdg-entry-mouse-comment = Velocidade do mouse, aceleração e rolagem natural -xdg-entry-system = Sistema e Contas +xdg-entry-system = Sistema e contas xdg-entry-panel-keywords = COSMIC;Painel;Applet;Miniaplicativo xdg-entry-window-management = Gerenciamento de janelas xdg-entry-a11y = Acessibilidade @@ -842,7 +842,7 @@ xdg-entry-desktop-keywords = COSMIC;Desktop;Área;Trabalho; xdg-entry-x11-applications-keywords = COSMIC;X11;Aplicativo;Jogos;Compatibilidade; xdg-entry-displays-comment = Gerenciar configurações de tela xdg-entry-touchpad-keywords = COSMIC;Touchpad;Gestos; -xdg-entry-time-language = Hora e Idioma +xdg-entry-time-language = Hora e idioma xdg-entry-users = Usuários xdg-entry-system-keywords = COSMIC;Sistema;Info;Contas;Firmware; xdg-entry-default-apps = Aplicativos padrão @@ -911,3 +911,5 @@ xdg-entry-x11-applications = Compatibilidade com aplicativos X11 xdg-entry-window-management-comment = Ação da tecla Super, opções de controle de janela e opções de janelas lado a lado (tiling) xdg-entry-wired-comment = Conexões de rede com fio e perfis de conexão no-search-results = Nenhuma rede corresponde à sua pesquisa. +workspaces-navigation = Navegação + .wraparound = Navegar entre o primeiro e o último espaço de trabalho usando atalhos de teclado e gestos diff --git a/i18n/pt/cosmic_settings.ftl b/i18n/pt/cosmic_settings.ftl index c5e60f3..53e7796 100644 --- a/i18n/pt/cosmic_settings.ftl +++ b/i18n/pt/cosmic_settings.ftl @@ -494,7 +494,7 @@ system-shortcut = Sistema .keyboard-brightness-down = Diminuir o brilho do teclado .keyboard-brightness-up = Aumentar o brilho do teclado .launcher = Abrir o lançador - .log-out = Sair + .log-out = Terminar sessão .lock-screen = Bloquear o ecrã .mute = Silenciar saída de áudio .mute-mic = Silenciar entrada do microfone diff --git a/i18n/ru/cosmic_settings.ftl b/i18n/ru/cosmic_settings.ftl index 6240086..d1d59f1 100644 --- a/i18n/ru/cosmic_settings.ftl +++ b/i18n/ru/cosmic_settings.ftl @@ -888,3 +888,5 @@ xdg-entry-x11-applications = Совместимость с приложения xdg-entry-window-management-comment = Действие кнопки Super, параметры размещения и управления окнами xdg-entry-wired-comment = Проводные соединения и профили no-search-results = По запросу не найдено ни одной сети. +workspaces-navigation = Навигация + .wraparound = Переход между крайними рабочими столами при помощи сочетаний клавиш и жестов diff --git a/i18n/sr/cosmic_settings.ftl b/i18n/sr/cosmic_settings.ftl index e69de29..da3828d 100644 --- a/i18n/sr/cosmic_settings.ftl +++ b/i18n/sr/cosmic_settings.ftl @@ -0,0 +1,822 @@ +cancel = Откажи +connected = Повезано +confirm = Потврди +panel-left = Лево +connect = Повежи +super-key = Радња Супер тастера + .launcher = Отвори покретача + .workspaces = Отвори радне просторе + .applications = Отвори програме + .disable = Онемогући +x-minutes = + { $number } { $number -> + [one] минут + *[other] минута + } +vrr = Променљива стопа освежавања + .enabled = Омогућено + .force = Увек + .auto = Самостално + .disabled = Онемогућено +window-hint-accent = Боја наговештаја за активни прозор +fit-to-screen = Уклопи у екран +control-tint = Боја компоненте за управљање + .desc = Користи се за позадине уобичајених дугмади, поља за претрагу, поља за унос текста и сличних компоненти +close = Затвори +save = Сачувај +vpn-error = Грешка ВПН-а + .config = Неуспешно додавање поставки ВПН-а + .connect = Неуспешно повезивање на ВПН + .connection-editor = Уређивач везе није успео + .connection-settings = Неуспешно преузимање подешавања за активне везе + .updating-state = Неуспешно ажурирање стања руководиоца мреже + .wireguard-config-path = Неисправна путања до датотеке подешавања за Вајергард + .wireguard-config-path-desc = Изабрана датотека мора бити у локалном систему датотека. + .wireguard-device = Неуспешно стварање уређаја за Вајергард + .with-password = + Неуспешно постављање ВПН { $field -> + *[username] username + [password] password + [password-flags] password-flags + } помоћу nmcli +toggle-stacking = Окини слагање прозора +panel-top = Горе +no-applets-found = Није пронађен ниједан програмчић... +region = Област +zoom-in = Увећај +place-here = Поставите програмчиће овде +-requires-restart = Захтева поновно покретање +workspaces-orientation = Смер радних простора + .vertical = Усправно + .horizontal = Водоравно +acceleration-desc = Самостално прилагођава осетљивост праћења на основу брзине +all-displays = Сви екрани +scheduling = Заказивање + .manual = Ручно заказивање +frosted = Ефекат матираног стакла на системском прочељу + .desc = Примењује замућење позадине на окно, док, програмчиће, покретач и библиотеку програма +password = Лозинка +about-hardware = Хардвер + .model = Модел хардвера + .memory = Меморија + .processor = Процесор + .graphics = Графика + .disk-capacity = Капацитет диска +short = Кратко +vpn = ВПН + .connections = ВПН везе + .remove = Уклони профил везе + .select-file = Изабери датотеку са поставкама ВПН-а + .error = Неуспешно додавање ВПН подешавања +power-mode = Режим напајања + .battery = Продужено трајање батерије + .battery-desc = Смањена употреба напајања и утишан рад + .balanced = Уравнотежено + .balanced-desc = Тихи учинак и умерена потрошња енергије + .performance = Висок учинак + .performance-desc = Највећи учинак и потрошња енергије + .no-backend = Позадинац није пронађен. Инсталирај system76-power или power-profiles-daemon. +wired = Жичана + .adapter = Жичани адаптер { $id } + .connections = Жичане везе + .devices = Жичани уређаји + .remove = Уклони профил везе +bluetooth-available = Уређаји у близини +cable-unplugged = Кабел није прикључен +color-picker = Бирач боје +interface-font = Системски фонт +forget-dialog = Заборавити ову бежичну мрежу? + .description = Поново ћете морати да унесете лозинку да бисте у будућности користили ову бежичну мрежу. +remove = Уклони +default = Подразумевано +zoom-out = Умањи +hot-corner = Врући угао + .top-left-corner = Омогући горњи леви врући угао за радне просторе +keyboard-typing-assist = Куцање + .repeat-rate = Брзина понављања + .repeat-delay = Интервал понављања +edge-gravity = Лебдећи прозори теже ка најближим ивицама +amplification = Појачање + .desc = Омогућава повећање јачине звука на 150% +recent-colors = Недавне боје +about-os = Оперативни систем + .os = Оперативни систем + .os-architecture = Архитектура оперативног система + .kernel = Издање језгра + .desktop-environment = Радно окружење + .windowing-system = Прозорски систем +panel-behavior-and-position = Понашање и положаји + .autohide = Самостално сакриј траку + .dock-autohide = Самостално сакриј док + .position = Положај на екрану + .display = Прикажи на екрану +add-language = Додај језик + .context = Додај језик +password-mismatch = Лозинка и потврда се морају поклапати +accessibility = Приступачност + .vision = Вид + .on = Укључено + .off = Искључено + .unavailable = Недоступно + .screen-reader = Читач екрана + .high-contrast = Режим високог контраста + .invert-colors = Изврни боје + .color-filters = Филтери боје +container-background = Позадина контејнера + .desc-detail = Боја позадине контејнера се користи за бочни панел за навигацију, бочну фиоку, прозорчиће и сличне елементе. Подразумевано, боја позадине контејнера се самостално изводи из позадине прозора. + .reset = Врати на самостално + .desc = Користи се за бочни панел за навигацију, бочну фиоку, прозорчиће и сличне елементе +primary-button = Главно дугме + .desc = Подешава поредак физичких дугмади + .left = Лево + .right = Десно +sound-alerts = Упозорења + .volume = Јачина звука упозорења + .sound = Звук упозорења +icon-theme = Тема иконица + .desc = Примењује различит скуп иконица на програме +import = Увези +keyboard-shortcuts = Пречице тастатуре + .desc = Прикажи и прилагоди пречице +switch-between-windows = Пребацујте се између прозора +text-tint = Боја текста прочеља + .desc = Користи се за одређивање боја текста прочеља које имају довољан контраст на различитим површинама +online-accounts = Налози на мрежи + .desc = Додај налоге, ИМАП и СМТП, пословну пријаву +open-workspaces-view = Отвори преглед радних простора +all = Све +remove-user = Уклони корисника +unknown = Непознато +sound-input = Улаз + .volume = Јачина звука на улазу + .device = Улазни уређај + .level = Ниво улаза +add-another-keybinding = Додај још једну комбинацију тастера +copy-to-clipboard = Копирај у оставу +monospace-font = Фонт утврђене ширине +experimental-settings = Експериментална подешавања +recent-folders = Недавне фасцикле +color-filter = Врста филтера боје + .unknown = Непознат филтер је активан + .greyscale = Сива скала + .deuteranopia = Зелена/црвена (слабост зелене боје, деутеранопија) + .protanopia = Црвена/зелена (слабост црвене боје, протанопија) + .tritanopia = Плава/жута (слабост плаве боје, тританопија) +migrate-workspace = + Пресели радни простор на излаз { $direction -> + *[down] доле + [left] лево + [right] десно + [up] горе + } +connecting = Повезивање… +battery = Батерија + .minute = + { $value } { $value -> + [one] минут + *[other] минута + } + .hour = + { $value } { $value -> + [one] сат + *[other] сати + } + .day = + { $value } { $value -> + [one] дан + *[other] дана + } + .less-than-minute = Мање од једног минута + .and = и + .remaining-time = + { $time } до { $action -> + [full] пуног + *[other] празног + } +search-applets = Претрага програмчића... +export = Извези +pinch-to-zoom = Штипај за увећање + .desc = Користите два прста за увећање садржаја, за програме који подржавају увећање +wifi = Бежична + .adapter = Бежични адаптер { $id } + .forget = Заборави ову мрежу +x-hours = + { $number } { $number -> + [one] сат + *[other] сати + } +added = Додато +input-source-switch = Промени извор уноса језика тастатуре +focus-navigation = Навигација фокусом + .focus-follows-cursor = Фокус прати показивач + .focus-follows-cursor-delay = Интервал праћења фокуса показивачем у мс + .cursor-follows-focus = Показивач прати фокус +full-name = Име и презиме +app-background = Позадина прозора +panel-right = Десно +keyboard-sources = Извори уноса + .desc = Извори уноса се могу пребацити помоћу комбинације тастера Super+Space. Ово се може прилагодити у подешавањима пречица тастатуре. + .move-up = Помери горе + .move-down = Помери доле + .settings = Подешавања + .view-layout = Прикажи распоред тастатуре + .remove = Уклони + .add = Додај извор уноса +nav-shortcuts = Навигација + .prev-output = Усредсреди претходни излаз + .next-output = Усредсреди следећи излаз + .last-workspace = Усредсреди последњи радни простор + .prev-workspace = Усредсреди претходни радни простор + .next-workspace = Усредсреди следећи радни простор + .focus = + Усредсреди прозор { $direction -> + *[down] доле + [in] унутра + [left] лево + [out] напоље + [right] десно + [up] горе + } + .output = + Пребаци на излаз { $direction -> + *[down] доле + [left] лево + [right] десно + [up] горе + } + .workspace = Пребаци на радни простор { $num } +hearing = Слух + .mono = Пусти стерео звук као моно +preferred-languages = Жељени језици + .desc = Редослед језика одређује који се језик користи за корисничко прочеље. Измене ступају на снагу при следећој пријави. +panel-style = Стил + .anchor-gap = Размак између траке и ивица екрана + .dock-anchor-gap = Размак између дока и ивица екрана + .extend = Прошири траку до ивица екрана + .dock-extend = Прошири док до ивица екрана + .appearance = Изглед + .size = Величина + .background-opacity = Непровидност позадине +username = Корисничко име +light = Светла +panel-appearance = Изглед + .match = Поклопи радну површину + .light = Светла + .dark = Тамна +workspaces-multi-behavior = Понашање са више екрана + .span = Радни простори се протежу преко екрана + .separate = Екрани имају раздвојене радне просторе +replace-shortcut-dialog = Заменити пречицу? + .desc = { $name } користи { $shortcut }. Ако је замените, { $name } ће бити онемогућено. +rgb = РГБ +about-device = Назив уређаја + .desc = Овај назив се појављује другим мрежним или Блутут уређајима +no-vpn = Нема доступних ВПН веза. +start-segment = Почетак сегмента +desktop = Радна површ +identity = Идентитет +reset-to-default = Врати на подразумевано +disconnect = Прекини везу +ok = У реду +app = Космик подешавања +debug = Уклањање грешака +enable-export = Примени тренутну тему на Гномове програме + .desc = Не подржавају сви скупови алата самостално пребацивање. Програме који нису Космик може бити потребно поново покренути након промене теме. +number = { $number } +shortcut-name = Назив пречице +style = Стил + .round = Заобљено + .slightly-round = Благо заобљено + .square = Квадратно +panel-applets = Подешавање + .dock-desc = Подеси програмчиће дока + .desc = Подеси програмчиће траке +qr-code-unavailable = КР код није доступан +small = Мало +window-tiling = Поплочавање прозора + .horizontal = Подеси водоравни смер + .vertical = Подеси усправни смер + .swap-window = Замени прозор + .toggle-tiling = Промени стање поплочавања прозора + .toggle-stacking = Промени стање слагања прозора + .toggle-floating = Промени стање плутања прозора + .toggle-orientation = Промени смер +change-password = Промени лозинку +disable-while-typing = Онемогући током куцања +long = Дуго +copied-to-clipboard = Копирано у оставу +bluetooth-confirm-pin = Потврдите ПИН блутута + .description = Потврдите да се следећи ПИН подудара са оним који је приказан на { $device } +legacy-app-scaling = Скалирање програма у Икс-11 систему прозора + .scaled-gaming = Оптимизуј за игре и програме у пуном екрану + .gaming-description = Икс-11 програми се могу појавити благо већи/мањи у поређењу са Вејленд програмима + .scaled-applications = Оптимизуј за програме + .applications-description = Игре и Икс-11 програми у пуном екрану могу се не поклопити са резолуцијом вашег екрана + .scaled-compatibility = Режим максималне усаглашености + .compatibility-description = Икс-11 програми се могу појавити замућеним на HiDPI екранима + .preferred-display = Жељени екран за игре и Икс-11 програме у пуном екрану + .no-display = Ништа +night-light = Ноћно светло + .auto = Самостално (од заласка до изласка сунца) + .desc = Умањи плаво светло топлијим бојама +custom-shortcuts = Произвољне пречице + .add = Додај пречицу + .context = Додај произвољну пречицу + .none = Нема произвољних пречица +visible-networks = Видљиве мреже +applets = Програмчићи +terminate = Окончај +window-hint-accent-toggle = Употреби акцентну боју теме као наговештај за активни прозор +type-to-search = Куцајте за претрагу... +workspaces-behavior = Понашање радног простора + .dynamic = Динамички радни простори + .dynamic-desc = Самостално уклања празне радне просторе. + .fixed = Неизмењив број радних простора + .fixed-desc = Додај или уклони радне просторе у прегледу. +wireguard-dialog = Додај Вајергард уређај + .description = Изаберите назив уређаја за подешавање Вајергарда. +remove-connection-dialog = Уклонити профил везе? + .vpn-description = Биће потребно да поново унесете лозинку како бисте у будућности користили ову мрежу. + .wired-description = Мораћете поново да креирате овај профил да бисте га у будућности користили. +password-confirm = Потврди лозинку +click-behavior = Понашање клика + .click-finger = Секундарни клик са два прста и средњи клик са три прста + .button-areas = Секундарни клик у доњем десном углу и средњи клик у доњем центру +move-windows = Помери прозоре + .direction = + Помери прозор { $direction -> + *[down] доле + [left] лево + [right] десно + [up] горе + } + .display = + Помери прозор за један екран { $direction -> + *[down] доле + [left] лево + [right] десно + [up] горе + } + .workspace = + Помери прозор за један радни простор { $direction -> + *[below] испод + [left] лево + [right] десно + [above] изнад + } + .workspace-num = Помери прозор у радни простор { $num } + .prev-workspace = Помери прозор у претходни радни простор + .next-workspace = Помери прозор у следећи радни простор + .last-workspace = Премешта прозор на последњи радни простор + .next-display = Премешта прозор на следећи екран + .prev-display = Премешта прозор на претходни екран + .send-to-prev-workspace = Премешта прозор у претходни радни простор + .send-to-next-workspace = Премешта прозор у следећи радни простор +switch-workspaces = Пребаци радне просторе + .horizontal = Превлачење са четири прста лево/десно + .vertical = Превлачење са четири прста горе/доле +applications = Програми +dbus-connection-error = Није успело повезивање са Д-сабирницом +system-controls = Системске контроле +auto-switch = Самостално пребацивање између светлог и тамног режима + .sunrise = Пребацује на светли режим при изласку сунца + .sunset = Пребацује на тамни режим при заласку сунца + .next-sunrise = Пребацује на светли режим при следећем изласку сунца + .next-sunset = Пребацује на тамни режим при следећем заласку сунца +dark = Тамна +add-vpn = Додај ВПН +keyboard-numlock-boot = Num Lock + .boot-state = Стање при покретању + .last-boot = Последње покретање + .on = Укључено + .off = Искључено + .set = Постави стање Num Lock-а при подизању +about-related = Повезана подешавања + .support = Потражите подршку +tap-to-click = Тапни за клик + .desc = Омогућава тап једним прстом за примарни клик, тап два прста за секундарни клик и тап три прста за средњи клик +interface-density = Густина прочеља + .comfortable = Удобно + .compact = Збијено + .spacious = Пространо +open-application-library = Отвори библиотеку програма +slow = Споро +network-name = Назив мреже +large = Велико +scrolling = Помицање + .two-finger = Помицање са два прста + .edge = Помицање дуж ивице једним прстом + .speed = Брзина помицања + .natural = Природно помицање + .natural-desc = Помакни садржај, уместо приказа +auth-dialog = Потребно је потврђивање идентитета + .vpn-description = Унесите корисничко име и лозинку које захтева ВПН услуга. + .wifi-description = Унесите лозинку или кључ за шифровање. Такође се можете повезати притискањем дугмета „WPS“ на рутеру. +add-user = Додај корисника +enable = Омогући +add-image = Додај слику +migrate-workspace-next = Пресели радни простор на следећи излаз +airplane-on = Режим авиона је укључен. +formatting = Форматирање + .dates = Датуми + .time = Време + .date-and-time = Датум и време + .numbers = Бројеви + .measurement = Мерење + .paper = Папир +disabled = Онемогућено +add-applet = Додај програмчић +show-extended-input-sources = Прикажи проширене изворе улаза +mode-and-colors = Режим и боје +forget = Заборави +center-segment = Средишњи сегмент +panel-missing = Подешавање траке недостаје + .desc = Датотека са подешавањима траке недостаје због употребе прилагођеног подешавања или је оштећена. + .fix = Врати на подразумевано +invalid-username = Неисправно корисничко име +mirroring = Пресликавање + .id = Пресликавање { $id } + .dont = Немој пресликати + .mirror = Пресликај { $display } + .project = + Пројектуј на { $display -> + [all] све екране + *[other] { $display } + } + .project-count = + Пројектује на { $count } { $count -> + [1] други екран + *[other] других екрана + } +orientation = Смер + .standard = Обично + .rotate-90 = Заокрени за 90° + .rotate-180 = Заокрени за 180° + .rotate-270 = Заокрени за 270° +auto = Самостално +end-segment = Крајњи сегмент +bluetooth-adapters = Блутут адаптери +time-format = Формат датума и времена + .twenty-four = 24-часовни формат + .show-seconds = Прикажи секунде + .first = Први дан у недељи + .show-date = Прикажи датум у програмчићу за време + .friday = Петак + .saturday = Субота + .sunday = Недеља + .monday = Понедељак +accent-color = Боја за наглашавање +type-key-combination = Укуцај комбинацију тастера +manage-windows = Управљај прозорима + .close = Затвори прозор + .maximize = Увећај прозор + .fullscreen = Прозор преко целог екрана + .minimize = Умањи прозор + .resize-inwards = Промени величину прозора ка унутра + .resize-outwards = Промени величину прозора ка споља + .toggle-sticky = Окини лепљиви прозор +never = Никада +install-additional-languages = Инсталирај додатне језике +settings = Подешавања +sound-output = Излаз + .volume = Јачина излаза + .device = Излазни уређај + .level = Ниво излаза + .config = Поставка + .balance = Равнотежа + .left = Лево + .right = Десно +window-controls = Контроле прозора + .maximize = Прикажи дугме за увећање + .minimize = Прикажи дугме за умањење + .active-window-hint = Прикажи ознаку за активни прозор +window-management-appearance = Управљање прозорима + .active-hint = Величина ознаке за активни прозор + .gaps = Размаци око поређаних прозора +migrate-workspace-prev = Пресели радни простор на претходни излаз +legacy-app-global-shortcuts = Опште пречице у програмима Икс-11 + .desc = Опште пречице омогућавају да притисаци тастатура и догађаји дугмића миша у програмима буду препознати од стране других програма за функције као што су „притисни-за-говор“ или „притисни-за-утишавање“. Подразумевано, опште пречице су онемогућене у програмима Икс-11 како би се осигурало да други програми не могу пратити догађаје тастатуре и миша који садрже осетљиве податке. + .none = Нема кључева + .modifiers = Заменски тастери (Super, Shift, Control, Alt) + .combination = Сви тастери док су заменски тастери Super, Control или Alt притиснути + .all = Сви тастери + .mouse = Догађаји дугмади миша у Икс-11 програмима +activate = Покрени +replace = Замени +power-saving = Могућности штедње енергије + .turn-off-screen-after = Искључи екран након + .auto-suspend = Самостално обустављање + .auto-suspend-ac = Самостално обустављање када је прикључен + .auto-suspend-battery = Самостално обустављање при напајању батеријом +connected-devices = Повезани уређаји + .unknown = Непознат уређај +icons-and-toolkit = Иконице и теме скупа алата +sound-applications = Програми + .desc = Јачина звука и подешавања програма +time-zone = Временска зона + .auto = Самостална временска зона + .auto-info = Захтева услуге локације и приступ интернету +dialog-add = Додај +fast = Брзо +add-color = Додај боју +add-network = Додај мрежу + .profile = Додај профил +network-device-state = + .activated = Повезано + .config = Повезује се + .deactivating = Веза се прекида + .disconnected = Веза прекинута + .failed = Неуспешно повезивање + .ip-check = Провера везе + .ip-config = Захтевање ИП и информација о рутирању + .need-auth = Потребно је потврђивање идентитета + .prepare = Припрема за повезивање + .secondaries = Чекање секундарне везе + .unavailable = Недоступно + .unknown = Непознато стање + .unmanaged = Неуправљиво + .unplugged = Кабел није прикључен +command = Наредба +gestures = Гестови + .four-finger-down = Превлачење са четири прста на доле + .four-finger-left = Превлачење са четири прста на лево + .four-finger-right = Превлачење са четири прста на десно + .four-finger-up = Превлачење са четири прста на горе + .three-finger-any = Превлачење са три прста у било ком смеру +system = Систем и налози +no-networks = Ниједна мрежа није пронађена. +open-new-folder = Отвори нову фасциклу +panel-bottom = Доле +share = Дељење мреже +add = Додај +fill = Попуна +custom = Прилагођено +bluetooth-paired = Претходно повезани уређаји + .connect = Повежи + .battery = { $percentage }% батерија +dialog = Прозорче + .title = Задржати подешавања екрана? + .keep-changes = Задржи измене + .change-prompt = Измене подешавања ће се самостално вратити за { $time } секунди. + .revert-settings = Врати подешавања +navigate = Навигирај +workspaces-overview-thumbnails = Сличице прегледа радних простора + .show-number = Прикажи број радног простора + .show-name = Прикажи назив радног простора +color = Боја + .depth = Дубина боје + .profile = Профил боје + .sidebar = Профили боја + .temperature = Температура боје +hex = Хекс +magnifier = Лупа + .controls = + Или употребите ове пречице: { $zoom_in -> + [zero] { "" } + *[other] + { "" } + { $zoom_in } за увећање, + }{ $zoom_out -> + [zero] { "" } + *[other] + { "" } + { $zoom_out } за умањење, + } + Супер + помакните точком миша + .scroll_controls = Омогући увећање мишем или додирном таблом помоћу Супер + помицање + .show_overlay = Прикажи прекривање лупе + .increment = Корак увећања + .signin = Покрени лупу при пријави + .applet = Окини лупу у програмчићу на траци + .movement = Померање увећаног прегледа + .continuous = Континуирано показивачем + .onedge = Када показивач досегне ивицу + .centered = За задржавање показивача на средини +colors = Боје +administrator = Администратор + .desc = Администратори могу да промене подешавања за све кориснике, као и да додају и уклоне друге кориснике +scan-to-connect-description = Скенирај КР код да би се повезао на ову мрежу. +modified = { $count } измењено +sound-usb-audio = УСБ аудио +sound-device-profiles = Профили уређаја +sound-hd-audio = ХД аудио +shadow-and-corners = Сенка и углови прозора +shadows-tiling = Поплочани прозори + .clip = Поклопи системске углове + .shadow = Примени сенке +shadows-floating = Лебдећи прозори + .clip = Поклопи системске углове и примени сенке +sound-device-port-unplugged = Ископчано +workspaces-overview = Преглед радних простора + .action-on-typing = Радња при куцању + .none = Ништа + .launcher = Отвори покретач + .applications = Отварање програма +xdg-entry-touchpad = Додирна табла +time-region = Регион и језик +power = Напајање и батерија +xdg-entry-wired = Жичана +xdg-entry-startup-apps-comment = Подеси програме који се покрећу при пријави +xdg-entry-region-language = Регион и језик +time-date = Датум и време + .auto = Постави самостално + .auto-ntp = Датум и време ће се самостално ажурирати када се постави временска зона +xdg-entry-mouse-keywords = COSMIC;Mouse;Acceleration;Scrolling;Космик;миш;убрзање;помицање;Kosmik;miš;ubrzanje;pomicanje; +xdg-entry-bluetooth-comment = Управљај Блутут уређајима +xdg-entry-notifications-keywords = COSMIC;Notification;Lock;Космик;обавештење;закључавање;Kosmik;obaveštenje;zaključavanje; +xdg-entry-startup-apps-keywords = COSMIC;Startup;Application;Космик;Покретање;Програм;kosmik;pokretanje;program; +xdg-entry-default-apps-comment = Подразумевани веб-прегледач, програм за е-пошту, прегледач датотека и остали програми +xdg-entry-keyboard-comment = Извори уноса, пребацивање, унос посебних знакова, пречице +xdg-entry-wired-keywords = COSMIC;Wired;LAN;Network;Connection;Космик;Жичана;ЛАН;Мрежа;Веза;kosmik;žičana;lan;mreža;veza; +xdg-entry-power = Напајање и батерија +xdg-entry-appearance-keywords = COSMIC;Accent;Color;Icon;Font;Theme;Космик;Нагласак;Боја;Иконица;Фонт;Тема;kosmik;naglasak;boja;ikonica;font;tema +xdg-entry-mouse = Миш +xdg-entry-dock-keywords = COSMIC;Dock;Panel;Applet;Космик;Док;Окно;Програмчић;kosmik;dok;okno;programčić +bluetooth = Блутут + .status = Овај систем је видљив као { $aliases } док су подешавања за Блутут отворена. + .connected = Повезано + .connecting = Повезује се + .disconnecting = Веза се прекида + .connect = Повежи + .disconnect = Прекини везу + .forget = Заборави + .dbus-error = Дошло је до грешке при интеракцији са Д-сабирницом: { $why } + .disabled = Услуга блутута је онемогућена + .inactive = Услуга блутута није покренута + .unknown = Није могуће покренути услугу блутута. Да ли је BlueZ инсталиран? +xdg-entry-mouse-comment = Брзина миша, убрзање и природно помицање +xdg-entry-system = Систем и налози +firmware = Фирмвер +xdg-entry-panel-keywords = COSMIC;Panel;Applet;Космик;површ;програмчић;Kosmik;površ;programčić +xdg-entry-window-management = Управљање прозорима +xdg-entry-a11y = Приступачност +xdg-entry-time-language-comment = Управљај системским датумом, временом, облашћу и језиком +xdg-entry-desktop-keywords = COSMIC;Desktop;Космик;Радна површина;kosmik;radna površina; +default-apps = Подразумевани програми + .web-browser = Веб прегледач + .file-manager = Управник датотека + .mail-client = Програм за е-пошту + .music = Музика + .video = Видео + .photos = Фотографије + .calendar = Календар + .terminal = Терминал + .other-associations = Остала повезивања + .text-editor = Уређивач текста + .not-installed = Није инсталирано +xdg-entry-x11-applications-keywords = COSMIC;X11;Application;Game;Compatibility;Космик;Икс-11;Програм;Игрица;Усаглашеност;kosmik;iks-11;program;igrica;usaglašenost; +xdg-entry-displays-comment = Управљај подешавањима поставки екрана +xdg-entry-touchpad-keywords = COSMIC;Touchpad;Gesture;Космик;додирна табла;гест;Kosmik;dodirna tabla;gest; +xdg-entry-time-language = Време и језик +xdg-entry-users = Корисници +window-management = Управљање прозорима +xdg-entry-system-keywords = COSMIC;System;Info;Accounts;Firmware;Космик;Систем;Подаци;Налози;Фирмвер;kosmik;sistem;podaci;nalozi;firmver; +xdg-entry-default-apps = Подразумевани програми +xdg-entry-wireless-keywords = Космик;Бежична;Вај-фај;Мрежа;Веза; +xdg-entry-applications-comment = Подразумевани програми, почетни програми и подешавања усаглашености програма за Икс-11 +appearance = Изглед +mouse = Миш + .speed = Брзина миша + .acceleration = Омогући убрзање миша +dock = Док +xdg-entry-about-keywords = COSMIC;About;Космик;О програму;Kosmik;O programu +xdg-entry-panel = Површ +xdg-entry-notifications = Обавештења +display = Екрани + .arrangement = Распоред екрана + .arrangement-desc = Превуците екране да бисте их преуредили + .enable = Омогући екран + .external = { $size } { $output } спољни екран + .laptop = { $size } екран преносиног рачунара + .options = Подешавања приказа + .refresh-rate = Учесталост освежавања + .resolution = Резолуција + .scale = Размера + .additional-scale-options = Додатне могућности размере +xdg-entry-a11y-keywords = COSMIC;Accessibility;A11y;Screen;Reader;Magnifier;Contrast;Color;Космик;Приступачност;Екран;Читач;Лупа;Контраст;Боја;kosmik;pristupačnost;ekran;čitač;lupa;kontrast;boja; +xdg-entry-wireless-comment = Бежичне везе и профили везе +xdg-entry-desktop = Радна површина +xdg-entry-date-time-keywords = COSMIC;Time;Zone;Космик;Време;Зона;kosmik;vreme;zona; +xdg-entry-desktop-comment = Позадина, изглед, окно, док, управљање прозорима и подешавања радног простора +xdg-entry-wallpaper = Позадина +xdg-entry-keyboard = Тастатура +xdg-entry-a11y-comment = Читач екрана, лупа, велики контраст и филтери боја +xdg-entry-displays = Екрани +xdg-entry-network = Мрежа и бежична веза +sound = Звук +xdg-entry-date-time = Датум и време +notifications = Обавештења +xdg-entry-users-comment = Потврђивање идентитета и кориснички налози +startup-apps = Почетни програми + .add = Додај програм + .user = Програми који се покрећу када се пријавите + .none = Није додат ниједан програм за покретање + .remove-dialog-title = Уклонити { $name }? + .remove-dialog-description = Уклонити овај програм за покретање? + .add-startup-app = Додај програм за покретање +xdg-entry-input-comment = Подешавања тастатуре и миша +xdg-entry-bluetooth-keywords = COSMIC;Bluetooth;Космик;Блутут;kosmik;blutut; +about = О систему +input-devices = Улазни уређаји +xdg-entry-dock-comment = Необавезна трака за апликације и програмчиће +xdg-entry-network-keywords = COSMIC;Network;Wireless;WiFi;VPN;Космик;мрежа;бежична веза;бежична;ВПН;Kosmik;mreža;bežična veza;bežična;vpn; +xdg-entry-wallpaper-comment = Слике позадине, боје и могућности покретног приказа +xdg-entry-dock = Док +xdg-entry-startup-apps = Почетни програми +workspaces = Радни простори +xdg-entry-wireless = Бежична +xdg-entry-workspaces-keywords = COSMIC;WiFi;Wi-Fi;Network;Connection;Космик;Радни простор;Смер;Преглед;Монитор;kosmik;radni prostor;smer;pregled;monitor; +xdg-entry-system-comment = Подаци о систему, налози и ажурирања фирмвера +xdg-entry-x11-applications-comment = Размера програма прозорног система Икс-11, главни екран и опште пречице +xdg-entry-region-language-comment = Форматирајте датуме, време и бројеве на основу вашег региона +panel = Трака +xdg-entry-wallpaper-keywords = COSMIC;Wallpaper;Background;Slideshow;Космик;позадина;позадина;покретни приказ;Kosmik;pozadina;pozadina;pokretni prikaz; +xdg-entry-users-keywords = COSMIC;User;Account;Космик;корисник;налог;Kosmik;korisnik;nalog; +xdg-entry-about-comment = Назив уређаја, подаци о хардверу, подразумевана подешавања оперативног система +xdg-entry-vpn-keywords = COSMIC;VPN;Network;Connection;OpenVPN;OpenConnect;Космик;ВПН;мрежа;веза;ОпенВПН;ОпенКонект;kosmik;vpn;mreža;veza;openvpn;openkonekt; +users = Корисници + .admin = Админ + .standard = Обичан + .profile-add = Изаберите слику профила +xdg-entry-appearance-comment = Боје нагласка и теме +xdg-entry-time-language-keywords = COSMIC;System;Time;Date;Region;Language;Космик;систем;време;датум;област;језик;Kosmik;sistem;vreme;datum;oblast;jezik; +xdg-entry-input-keywords = COSMIC;Input;Keyboard;Mouse;Mice;Космик;Унос;Тастатура;Миш;Мишеви;kosmik;unos;tastatura;miš;miševi; +xdg-entry-comment = Програм Подешавања за Космик радну површину +xdg-entry-notifications-comment = Не узнемиравај, обавештења на закључаном екрану и подешавања по програмима +xdg-entry-applications = Програми +xdg-entry-sound-keywords = COSMIC;Sound;Audio;Alert;Pipewire;Космик;Звук;Аудио;Упозорење;Пајпвајер;kosmik;zvuk;audio;upozorenje;pajpvajer; +xdg-entry-power-keywords = COSMIC;Power;Battery;Космик;Напајање;Батерија;kosmik;napajanje;baterija +legacy-applications = Усаглашеност програма Икс-11 +xdg-entry-default-apps-keywords = COSMIC;Default;Application;Космик;Подразумевано;Програм;kosmik;podrazumevano;program +xdg-entry-keywords = COSMIC;Settings;Космик;Подешавања;kosmik;podešavanja; +xdg-entry-region-language-keywords = COSMIC;Region;Language;Date;Format;Time;Locale;Localization;Космик;Регион;Језик;Датум;Формат;Време;Локалитет;Локализација;kosmik;region;jezik;datum;format;vreme;lokalitet;lokalizacija; +xdg-entry-about = О програму +xdg-entry-input = Улазни уређаји +xdg-entry-applications-keywords = COSMIC;Default;Application;Startup;X11;Compatibility;Космик;Подразумевано;Програм;Покретање;Икс-11;Усаглашеност;kosmik;podrazumevano;program;pokretanje;iks-11;usaglašenost +xdg-entry-sound-comment = Подешавања звука за уређаје, упозорења и програме +wallpaper = Позадина + .change = Промени слику сваких + .fit = Уклапање позадине + .folder-dialog = Изаберите фасциклу позадине + .image-dialog = Изаберите слику позадине + .plural = Позадине + .same = Иста позадина на свим екранима + .slide = Покретни приказ +xdg-entry-touchpad-comment = Брзина додирне табле, могућности клика и гестова +xdg-entry-keyboard-keywords = COSMIC;Keyboard;Input;Source;Shortcuts;Космик;тастатура;унос;извор;пречице;Kosmik;tastatura;unos;izvor;prečice; +xdg-entry-vpn-comment = ВПН везе и профили везе +keyboard = Тастатура +xdg-entry-appearance = Изглед +xdg-entry-window-management-keywords = COSMIC;Window;Management;Tiling;Super;Key;Космик;Прозор;Управљање;Поплочавање;Супер;Тастер;kosmik;prozor;upravljanje;popločavanje;super;taster; +xdg-entry-workspaces-comment = Смер радних простора, преглед и понашање са више екрана +xdg-entry-network-comment = Управљај мрежним везама +xdg-entry-panel-comment = Примарна системска трака за изборнике и програмчиће +touchpad = Додирна табла + .acceleration = Омогући убрзање додирне табле + .speed = Брзина додирне табле +xdg-entry-sound = Звук +xdg-entry-power-comment = Режими напајања и могућности уштеде енергије +xdg-entry-displays-keywords = COSMIC;Display;Космик;Екран;kosmik;ekran; +time = Време и језик +xdg-entry-workspaces = Радни простори +xdg-entry-date-time-comment = Временска зона, самостална подешавања сата и форматирање времена +xdg-entry-x11-applications = Усаглашеност програма Икс-11 +xdg-entry-window-management-comment = Радња Супер тастера, могућности управљања прозором и додатне могућности поплочавања прозора +xdg-entry-wired-comment = Жичане везе и профили везе +known-networks = Познате мреже +network-and-wireless = Мрежа и бежична веза +keyboard-special-char = Унос посебних знакова + .alternate = Тастер заменских знакова + .compose = Саставни тастер + .compose-desc = Саставни тастер омогућава унос великого броја различитих знакова. Да бисте га користили, притисните саставни тастер, а затим низ знакова. На пример, саставни тастер праћено словима C и o унеће ©, док саставни тастер праћено словима a и ‘ унеће á. + .caps = Тастер Caps Lock +system-shortcut = Систем + .app-library = Отвори библиотеку програма + .brightness-down = Смањи осветљење екрана + .brightness-up = Повећај осветљење екрана + .display-toggle = Промени стање унутрашњег екрана + .home-folder = Отвори личну фасциклу + .keyboard-brightness-down = Смањи осветљење тастатуре + .keyboard-brightness-up = Повећај осветљење тастатуре + .launcher = Отвори покретач + .log-out = Одјави се + .lock-screen = Закључај екран + .mute = Утишај аудио излаз + .mute-mic = Утишај микрофонски улаз + .play-pause = Пусти/паузирај + .play-next = Следећа нумера + .play-prev = Претходна нумера + .poweroff = Искључи + .screenshot = Направи снимак екрана + .suspend = Обустави + .terminal = Отвори терминал + .touchpad-toggle = Промени стање додирне табле + .volume-lower = Смањи јачину звука на излазу + .volume-raise = Повећај јачину звука на излазу + .web-browser = Отвори веб прегледач + .window-switcher = Пребаци између отворених прозора + .window-switcher-previous = Пребаци између отворених прозора у обратном смеру + .workspace-overview = Отвори преглед радног простора +workspaces-navigation = Навигација + .wraparound = Померите се између првог и последњег радног простора помоћу пречица на тастатури и гестова +no-search-results = Ниједна мрежа се не поклопи са вашом претрагом. diff --git a/i18n/sv/cosmic_settings.ftl b/i18n/sv/cosmic_settings.ftl index 5f216c2..5f893ac 100644 --- a/i18n/sv/cosmic_settings.ftl +++ b/i18n/sv/cosmic_settings.ftl @@ -926,3 +926,5 @@ xdg-entry-region-language-keywords = COSMIC;Region;Språk;Datum;Format;Tid;Lokal xdg-entry-keyboard-keywords = COSMIC;Tangentbord;Inmatning;Källa;Genvägar; xdg-entry-window-management-keywords = COSMIC;Fönster;Hantering;Kaklande;Super;Tangent; no-search-results = Inga nätverk matchar din sökning. +workspaces-navigation = Navigering + .wraparound = Flytta mellan första och sista arbetsytan med hjälp av tangentbordsgenvägar och gester diff --git a/i18n/uk/cosmic_settings.ftl b/i18n/uk/cosmic_settings.ftl index 82c9769..36e25ef 100644 --- a/i18n/uk/cosmic_settings.ftl +++ b/i18n/uk/cosmic_settings.ftl @@ -524,7 +524,7 @@ users = Користувачі .standard = Звичайний .profile-add = Вибрати зображення профілю remove = Вилучити -connect = З'єднати +connect = З’єднати password = Пароль username = Ім'я користувача settings = Налаштування @@ -544,10 +544,10 @@ no-networks = Мереж не знайдено. no-vpn = Немає доступних VPN-з'єднань. password-confirm = Підтвердити пароль visible-networks = Видимі мережі -auth-dialog = Авторизація обов'язкова +auth-dialog = Авторизація обов’язкова .vpn-description = Введіть ім’я користувача та пароль, необхідні для служби VPN. - .wifi-description = Введіть пароль або ключ шифрування. Також можна підключитися через кнопку «WPS» на маршрутизаторі. -forget-dialog = Забути цю Wi-Fi мережу? + .wifi-description = Введіть пароль або ключ шифрування. Також можна під’єднатися через кнопку «WPS» на маршрутизаторі. +forget-dialog = Забути цю Wi‑Fi-мережу? .description = Вам потрібно буде знову ввести пароль, щоб використовувати цю мережу в майбутньому. network-device-state = .activated = З'єднано @@ -564,9 +564,9 @@ network-device-state = .unknown = Невідомий стан .unmanaged = Некерований .unplugged = Дріт від'єднано -remove-connection-dialog = Вилучити профіль з'єднання? +remove-connection-dialog = Вилучити профіль з’єднання? .vpn-description = Щоб скористатися цією мережею знову, вам потрібно буде повторно ввести пароль. - .wired-description = Щоб скористатися цим підключенням знову, вам потрібно буде створити цей профіль повторно. + .wired-description = Щоб скористатися цим з’єднанням знову, вам потрібно буде створити цей профіль повторно. vpn = VPN .connections = VPN з'єднання .error = Не вдалося додати налаштування VPN @@ -591,7 +591,7 @@ wifi = Wi-Fi .adapter = Бездротовий адаптер { $id } .forget = Забути цю мережу wireguard-dialog = Додати пристрій WireGuard - .description = Оберіть ім'я пристрою для профілю WireGuard. + .description = Оберіть назву пристрою для профілю WireGuard. activate = Активувати confirm = Підтвердити enable = Увімкнути @@ -607,11 +607,11 @@ bluetooth = Bluetooth .disabled = Служба Bluetooth вимкнена .inactive = Служба Bluetooth неактивна .unknown = Неможливо активувати службу Bluetooth. Можливо, у вас не встановлено пакет BlueZ? -bluetooth-paired = З'єднані у минулому пристрої - .connect = З'єднати +bluetooth-paired = З’єднані у минулому пристрої + .connect = З’єднати .battery = { $percentage }% заряду bluetooth-confirm-pin = Перевірка PIN-коду між Bluetooth-пристроями - .description = Будь ласка, підтвердіть, що цей PIN-код збігається із тим, який відображається на іншому пристрої: { $device } + .description = Підтвердіть, що цей PIN-код збігається із тим, який показується на іншому пристрої: { $device } bluetooth-available = Пристрої поблизу bluetooth-adapters = Адаптери Bluetooth accessibility = Доступність @@ -630,7 +630,7 @@ dbus-connection-error = Не вдалося з'єднатися з DBus identity = Ідентичність magnifier = Лупа .controls = - Або скористайтеся такими скороченнями: { $zoom_in -> + Або скористайтеся такими сполученнями: { $zoom_in -> [zero] { "" } *[other] { "" } @@ -762,7 +762,7 @@ startup-apps = Автозапуск .add-startup-app = Додати застосунок до автозапуску legacy-applications = Сумісність із застосунками X11 legacy-app-global-shortcuts = Глобальні сполучення клавіш у застосунках X11 - .desc = Глобальні сполучення дозволяють іншим застосункам реагувати на натискання клавіш і кнопок миші, навіть якщо вони виконані в іншому застосунку, наприклад для функцій активації або вимкнення голосу кнопкою. За замовчуванням ця функція вимкнена у застосунках X11, щоб уникнути перехоплення чутливої інформації. + .desc = Глобальні сполучення дозволяють іншим застосункам реагувати на натискання клавіш і кнопок миші, навіть якщо вони виконані в іншому застосунку, наприклад, для функцій активації або вимкнення голосу кнопкою. Типово ця функція вимкнена у застосунках X11, щоб уникнути перехоплення чутливої інформації. .none = Ніякі клавіші .modifiers = Модифікатори (Super, Shift, Control, Alt) .combination = Усі клавіши у комбінації з клавішами Super, Control або Alt @@ -787,8 +787,8 @@ invalid-username = Неприпустиме ім'я користувача password-mismatch = Обидва паролі мусять збігатися save = Зберегти qr-code-unavailable = QR-код недоступний -network-name = Ім'я мережі -share = Ширити мережу +network-name = Назва мережі +share = Поширити мережу scan-to-connect-description = Відскануйте QR-код, щоб з'єднатися з цією мережею. sound-hd-audio = HD Аудіо sound-usb-audio = USB Аудіо @@ -799,7 +799,7 @@ shadows-tiling = Укладені вікна .clip = Вирівняти до системних кутів .shadow = Застосувати тіні shadow-and-corners = Тіні й кути вікон -sound-device-port-unplugged = Відключено +sound-device-port-unplugged = Від’єднано place-here = Розмістити тут віджети workspaces-overview = Режим огляду робочих просторів .action-on-typing = Дія при введенні тексту @@ -827,7 +827,7 @@ xdg-entry-default-apps = Типові застосунки xdg-entry-applications-comment = Типові застосунки, автозапуск і сумісність X11 xdg-entry-panel = Панель xdg-entry-notifications = Сповіщення -xdg-entry-wireless-comment = Wi-Fi з'єднання і профілі підключення +xdg-entry-wireless-comment = Wi-Fi з’єднання і профілі з’єднання xdg-entry-desktop = Стільниця xdg-entry-wallpaper = Тло xdg-entry-keyboard = Клавіатура @@ -853,7 +853,7 @@ xdg-entry-about = Про систему xdg-entry-input = Пристрої введення xdg-entry-sound-comment = Налаштування звуку для пристроїв, сповіщень та застосунків xdg-entry-touchpad-comment = Швидкість сенсорної панелі, варіанти натискання, жести -xdg-entry-vpn-comment = VPN з'єднання та профілі підключення +xdg-entry-vpn-comment = VPN з’єднання та профілі з’єднання xdg-entry-appearance = Вигляд xdg-entry-workspaces-comment = Орієнтація та поведінка робочих просторів xdg-entry-network-comment = Керуйте мережевими з’єднаннями @@ -864,7 +864,7 @@ xdg-entry-workspaces = Робочі простори xdg-entry-date-time-comment = Часовий пояс, автоматичне налаштування годинника та формат часу xdg-entry-x11-applications = Сумісність із застосунками X11 xdg-entry-window-management-comment = Дія клавіші Super, параметри керування вікнами та додаткові налаштування укладання вікон -xdg-entry-wired-comment = Дротове з'єднання і профілі підключень +xdg-entry-wired-comment = Дротове з’єднання і профілі з’єднань xdg-entry-desktop-comment = Тло, вигляд, панель, область завдань, керування вікнами та налаштування робочого простору xdg-entry-mouse-keywords = COSMIC;Миша;Прискорення;Прокручування;Гортання;КОСМІК;КОСМОС;КОСМІЧНЕ; xdg-entry-notifications-keywords = COSMIC;Сповіщення;Блокування;КОСМІК;КОСМОС;КОСМІЧНЕ; @@ -900,3 +900,5 @@ xdg-entry-displays-keywords = COSMIC;Дисплей;Екран;КОСМІК;КО xdg-entry-bluetooth-keywords = COSMIC;Bluetooth;Блютуз;Бездротове;З’єднання;КОСМІК;КОСМОС;КОСМІЧНЕ; xdg-entry-a11y-comment = Екранний читач, лупа, високий контраст і фільтри кольорів no-search-results = Пошук не дав результатів. +workspaces-navigation = Навігація + .wraparound = Перехід між першим і останнім робочим простором сполученнями клавіш і жестами diff --git a/i18n/zh-CN/cosmic_settings.ftl b/i18n/zh-CN/cosmic_settings.ftl index a8fab47..64a0b8e 100644 --- a/i18n/zh-CN/cosmic_settings.ftl +++ b/i18n/zh-CN/cosmic_settings.ftl @@ -914,3 +914,5 @@ xdg-entry-keyboard-keywords = COSMIC;键盘;输入;输入源;快捷键; xdg-entry-window-management-keywords = COSMIC;窗口;管理;平铺;Super;键; xdg-entry-displays-keywords = COSMIC;显示器;屏幕; no-search-results = 无网络符合您的搜索。 +workspaces-navigation = 导航 + .wraparound = 使用快捷键和手势在第一个和最后个工作区间切换 diff --git a/i18n/zh-TW/cosmic_settings.ftl b/i18n/zh-TW/cosmic_settings.ftl index 413d3a4..4087a00 100644 --- a/i18n/zh-TW/cosmic_settings.ftl +++ b/i18n/zh-TW/cosmic_settings.ftl @@ -219,7 +219,7 @@ auto-switch = 在淺色與深色模式間自動切換 container-background = 容器背景 .desc-detail = 容器背景與導航列、側邊欄、對話方塊等元件相關，預設從應用程式或視窗背景進行衍生。 .reset = 重設至自動 - .desc = 容器背景色與導航列、側邊欄、對話方塊等元件相關 + .desc = 容器背景色與導覽列、側邊欄、對話方塊等元件相關 control-tint = 控制元件色調 .desc = 使用於標準按鈕、搜尋輸入、文字輸入和類似元件的背景 frosted = 系統介面呈現磨砂玻璃的透明效果 @@ -911,3 +911,5 @@ shadows-tiling = 平鋪視窗 shadows-floating = 浮動視窗 .clip = 符合系統角型和套用陰影 no-search-results = 沒有網路符合您所要搜尋的。 +workspaces-navigation = 導覽 + .wraparound = 使用快捷鍵和手勢在第一個和最後個工作區間切換 From 703a934b096b8681b1b8d16d8625118c8073151a Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Tue, 12 May 2026 11:06:08 -0400 Subject: [PATCH 12/24] fix: retry connection to settings daemon and allow requests for brightness values --- subscriptions/settings-daemon/src/lib.rs | 56 ++++++++++++++++++++---- 1 file changed, 47 insertions(+), 9 deletions(-) diff --git a/subscriptions/settings-daemon/src/lib.rs b/subscriptions/settings-daemon/src/lib.rs index 313bfb6..ef745db 100644 --- a/subscriptions/settings-daemon/src/lib.rs +++ b/subscriptions/settings-daemon/src/lib.rs @@ -3,7 +3,7 @@ // XXX error handling? -use std::hash::Hash; +use std::{hash::Hash, time::Duration}; use futures::{FutureExt, StreamExt}; use iced_futures::Subscription; @@ -33,22 +33,50 @@ pub fn subscription(connection: zbus::Connection) -> iced_futures::Subscription< }| { let connection = connection.clone(); async move { - let settings_daemon = match CosmicSettingsDaemonProxy::new(&connection).await { - Ok(value) => value, - Err(err) => { - log::error!("Error connecting to settings daemon: {}", err); - futures::future::pending().await + let count = 5; + let mut settings_daemon = None; + for _ in 0..5 { + if count == 4 { + return futures::future::pending().await; } - }; + match CosmicSettingsDaemonProxy::new(&connection).await { + Ok(value) => { + // interface methods can be called + // FIXME why does this fail sometimes?? + if let Err(err) = value.display_brightness().await { + log::error!("Error connecting to settings daemon: {}", err); + tokio::time::sleep(Duration::from_secs(1)).await; + continue; + } + if let Err(err) = value.max_display_brightness().await { + log::error!("Error connecting to settings daemon: {}", err); + tokio::time::sleep(Duration::from_secs(1)).await; + + continue; + } + settings_daemon = Some(value); + + break; + } + Err(err) => { + log::error!("Error connecting to settings daemon: {}", err); + + tokio::time::sleep(Duration::from_secs(1)).await; + } + }; + } + let settings_daemon = settings_daemon.unwrap(); let (tx, rx) = unbounded_channel(); let max_brightness_stream = settings_daemon .receive_max_display_brightness_changed() .await; - let brightness_stream = settings_daemon.receive_display_brightness_changed().await; - let initial = futures::stream::iter([Event::Sender(tx)]); + let brightness_stream = settings_daemon.receive_display_brightness_changed().await; + let mut init = vec![Event::Sender(tx)]; + + let initial = futures::stream::iter(init); initial.chain(futures::stream_select!( Box::pin(UnboundedReceiverStream::new(rx).filter_map(move |request| { @@ -59,6 +87,14 @@ pub fn subscription(connection: zbus::Connection) -> iced_futures::Subscription< let _ = settings_daemon.set_display_brightness(brightness).await; } + Request::GetDisplayBrightness => { + let b = settings_daemon.display_brightness().await; + return Some(Event::DisplayBrightness(b.ok()?)); + } + Request::GetMaxDisplayBrightness => { + let m = settings_daemon.max_display_brightness().await; + return Some(Event::MaxDisplayBrightness(m.ok()?)); + } } None:: } @@ -102,4 +138,6 @@ trait CosmicSettingsDaemon { #[derive(Debug, Clone)] pub enum Request { SetDisplayBrightness(i32), + GetDisplayBrightness, + GetMaxDisplayBrightness, } From f2c374ff6b046168db18a6818fb1eb44d316a0fd Mon Sep 17 00:00:00 2001 From: manascb1344 Date: Sat, 2 May 2026 15:37:00 +0530 Subject: [PATCH 13/24] Sort VPN connections alphabetically Adds case-insensitive alphabetical sorting to the VPN connections list. The connections are now sorted by name when received and before display, making it easier to find specific VPN profiles. Fixes #1947 --- .../src/pages/networking/vpn/mod.rs | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/cosmic-settings/src/pages/networking/vpn/mod.rs b/cosmic-settings/src/pages/networking/vpn/mod.rs index 651022e..d9cf113 100644 --- a/cosmic-settings/src/pages/networking/vpn/mod.rs +++ b/cosmic-settings/src/pages/networking/vpn/mod.rs @@ -428,7 +428,19 @@ impl Page { } } Message::KnownConnections(connections) => { - self.known_connections = connections; + let mut connections: Vec<_> = connections.into_iter().collect(); + connections.sort_by(|a, b| { + let name_a = match &a.1 { + ConnectionSettings::Vpn(s) => s.id.as_str(), + ConnectionSettings::Wireguard { id } => id.as_str(), + }; + let name_b = match &b.1 { + ConnectionSettings::Vpn(s) => s.id.as_str(), + ConnectionSettings::Wireguard { id } => id.as_str(), + }; + name_a.to_lowercase().cmp(&name_b.to_lowercase()) + }); + self.known_connections = connections.into_iter().collect(); } Message::UpdateDevices(devices) => { self.update_devices(devices); @@ -1005,7 +1017,20 @@ fn devices_view() -> Section { widget::text::body(fl!("no-vpn")).into(), ]))); } else { - let known_networks = page.known_connections.iter().fold( + let mut known_connections: Vec<_> = page.known_connections.iter().collect(); + known_connections.sort_by(|a, b| { + let name_a = match a.1 { + ConnectionSettings::Vpn(s) => s.id.as_str(), + ConnectionSettings::Wireguard { id } => id.as_str(), + }; + let name_b = match b.1 { + ConnectionSettings::Vpn(s) => s.id.as_str(), + ConnectionSettings::Wireguard { id } => id.as_str(), + }; + name_a.to_lowercase().cmp(&name_b.to_lowercase()) + }); + + let known_networks = known_connections.into_iter().fold( vpn_connections, |networks, (uuid, connection)| { let id = match connection { From cb4a0d3a3aa4ebe5289a8d95d93d55f24ab1b661 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: Mon, 4 May 2026 18:00:33 +0200 Subject: [PATCH 14/24] chore: update libcosmic --- Cargo.lock | 81 +++++++++---------- .../src/pages/desktop/appearance/mod.rs | 52 +----------- .../src/pages/desktop/panel/inner.rs | 4 +- 3 files changed, 38 insertions(+), 99 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 27a29a2..a82f88f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1205,7 +1205,7 @@ checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81" dependencies = [ "serde", "termcolor", - "unicode-width 0.1.14", + "unicode-width 0.2.2", ] [[package]] @@ -1397,7 +1397,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" +source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1418,7 +1418,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" +source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "quote", "syn 2.0.117", @@ -1834,7 +1834,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" +source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "almost", "configparser", @@ -3242,7 +3242,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" +source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "dnd", "iced_accessibility", @@ -3263,7 +3263,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" +source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "accesskit", "accesskit_winit", @@ -3272,7 +3272,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" +source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "bitflags 2.11.1", "bytes", @@ -3297,7 +3297,7 @@ dependencies = [ [[package]] name = "iced_debug" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" +source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "iced_core", "iced_futures", @@ -3307,7 +3307,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" +source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "futures", "iced_core", @@ -3321,7 +3321,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" +source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "bitflags 2.11.1", "bytemuck", @@ -3342,7 +3342,7 @@ dependencies = [ [[package]] name = "iced_program" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" +source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "iced_graphics", "iced_runtime", @@ -3351,7 +3351,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" +source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3363,7 +3363,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" +source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3379,7 +3379,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" +source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "bytemuck", "cosmic-text", @@ -3396,7 +3396,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" +source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "as-raw-xcb-connection", "bitflags 2.11.1", @@ -3427,7 +3427,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.2" -source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" +source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3447,7 +3447,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" +source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "cosmic-client-toolkit", "cursor-icon", @@ -4552,14 +4552,14 @@ checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8" [[package]] name = "libc" -version = "0.2.185" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "libcosmic" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8" +source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "apply", "ashpd 0.12.3", @@ -9029,15 +9029,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winnow" -version = "0.7.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" -dependencies = [ - "memchr", -] - [[package]] name = "winnow" version = "1.0.1" @@ -9351,9 +9342,9 @@ dependencies = [ [[package]] name = "zbus" -version = "5.14.0" +version = "5.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca82f95dbd3943a40a53cfded6c2d0a2ca26192011846a1810c4256ef92c60bc" +checksum = "c3bcbf15c8708d7fc1be0c993622e0a5cbd5e8b52bfa40afa4c3e0cd8d724ac1" dependencies = [ "async-broadcast", "async-executor", @@ -9379,7 +9370,7 @@ dependencies = [ "uds_windows", "uuid", "windows-sys 0.61.2", - "winnow 0.7.15", + "winnow 1.0.1", "zbus_macros", "zbus_names", "zvariant", @@ -9411,9 +9402,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "5.14.0" +version = "5.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897e79616e84aac4b2c46e9132a4f63b93105d54fe8c0e8f6bffc21fa8d49222" +checksum = "51fa5406ad9175a8c825a931f8cf347116b531b3634fcb0b627c290f1f2516ff" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9426,12 +9417,12 @@ dependencies = [ [[package]] name = "zbus_names" -version = "4.3.1" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffd8af6d5b78619bab301ff3c560a5bd22426150253db278f164d6cf3b72c50f" +checksum = "7074f3e50b894eac91750142016d30d0a89be8e67dbfd9704fb875825760e52d" dependencies = [ "serde", - "winnow 0.7.15", + "winnow 1.0.1", "zvariant", ] @@ -9595,24 +9586,24 @@ dependencies = [ [[package]] name = "zvariant" -version = "5.10.0" +version = "5.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5708299b21903bbe348e94729f22c49c55d04720a004aa350f1f9c122fd2540b" +checksum = "1c1567a6ec68df868cbbfde844cfc6d81649fe5109a62b116b19fabd53e618ee" dependencies = [ "endi", "enumflags2", "serde", "url", - "winnow 0.7.15", + "winnow 1.0.1", "zvariant_derive", "zvariant_utils", ] [[package]] name = "zvariant_derive" -version = "5.10.0" +version = "5.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b59b012ebe9c46656f9cc08d8da8b4c726510aef12559da3e5f1bf72780752c" +checksum = "c7d5b780599bbde114e39d9a0799577fad1ced5105d38515745f7b3099d8ceda" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9623,13 +9614,13 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "3.3.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f75c23a64ef8f40f13a6989991e643554d9bef1d682a281160cf0c1bc389c5e9" +checksum = "6d464f5733ffa07a3164d656f18533caace9d0638596721355d73256a410d691" dependencies = [ "proc-macro2", "quote", "serde", "syn 2.0.117", - "winnow 0.7.15", + "winnow 1.0.1", ] diff --git a/cosmic-settings/src/pages/desktop/appearance/mod.rs b/cosmic-settings/src/pages/desktop/appearance/mod.rs index aa28ea8..c1934b6 100644 --- a/cosmic-settings/src/pages/desktop/appearance/mod.rs +++ b/cosmic-settings/src/pages/desktop/appearance/mod.rs @@ -16,7 +16,7 @@ use cosmic::app::ContextDrawer; use cosmic::config::CosmicTk; use cosmic::cosmic_config::{Config, ConfigSet, CosmicConfigEntry}; use cosmic::cosmic_theme::palette::{FromColor, Hsv, Srgb}; -use cosmic::cosmic_theme::{CornerRadii, Density, ThemeBuilder, ThemeMode}; +use cosmic::cosmic_theme::{CornerRadii, Density, Roundness, ThemeBuilder, ThemeMode}; #[cfg(feature = "xdg-portal")] use cosmic::dialog::file_chooser::{self, FileFilter}; use cosmic::iced::Subscription; @@ -171,56 +171,6 @@ impl From for crate::pages::Message { } } -#[derive(Debug, Clone, Copy)] -pub enum Roundness { - Round, - SlightlyRound, - Square, -} - -impl From for CornerRadii { - fn from(value: Roundness) -> Self { - match value { - Roundness::Round => CornerRadii { - radius_0: [0.0; 4], - radius_xs: [4.0; 4], - radius_s: [8.0; 4], - radius_m: [16.0; 4], - radius_l: [32.0; 4], - radius_xl: [160.0; 4], - }, - Roundness::SlightlyRound => CornerRadii { - radius_0: [0.0; 4], - radius_xs: [2.0; 4], - radius_s: [8.0; 4], - radius_m: [8.0; 4], - radius_l: [8.0; 4], - radius_xl: [8.0; 4], - }, - Roundness::Square => CornerRadii { - radius_0: [0.0; 4], - radius_xs: [2.0; 4], - radius_s: [2.0; 4], - radius_m: [2.0; 4], - radius_l: [2.0; 4], - radius_xl: [2.0; 4], - }, - } - } -} - -impl From for Roundness { - fn from(value: CornerRadii) -> Self { - if (value.radius_m[0] - 16.0).abs() < 0.01 { - Self::Round - } else if (value.radius_m[0] - 8.0).abs() < 0.01 { - Self::SlightlyRound - } else { - Self::Square - } - } -} - impl Page { #[allow(clippy::too_many_lines)] pub fn update(&mut self, message: Message) -> Task { diff --git a/cosmic-settings/src/pages/desktop/panel/inner.rs b/cosmic-settings/src/pages/desktop/panel/inner.rs index 9974e54..3627398 100644 --- a/cosmic-settings/src/pages/desktop/panel/inner.rs +++ b/cosmic-settings/src/pages/desktop/panel/inner.rs @@ -2,7 +2,7 @@ use cosmic::{ Element, Task, cctk::sctk::reexports::client::{Proxy, backend::ObjectId, protocol::wl_output::WlOutput}, cosmic_config::{self, CosmicConfigEntry}, - cosmic_theme::Density, + cosmic_theme::{Density, Roundness}, iced::{Alignment, Length}, surface, widget::{button, container, dropdown, row, settings, slider, space, text}, @@ -17,8 +17,6 @@ use cosmic_panel_config::{ use cosmic_settings_page::{self as page, Section}; use std::{collections::HashMap, time::Duration}; -use crate::pages::desktop::appearance::Roundness; - pub struct PageInner { pub(crate) config_helper: Option, pub(crate) panel_config: Option, From 4b1f388a4fb2cc14cfa00379f3d7c41dbaebf1f2 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: Mon, 4 May 2026 18:02:46 +0200 Subject: [PATCH 15/24] chore: add rustfmt config --- .zed/settings.json | 15 ++++++ cosmic-settings/build.rs | 3 +- cosmic-settings/src/app.rs | 29 +++++------ cosmic-settings/src/config.rs | 6 +-- cosmic-settings/src/localize.rs | 6 +-- cosmic-settings/src/main.rs | 3 +- .../src/pages/accessibility/magnifier.rs | 17 +++---- .../src/pages/accessibility/mod.rs | 21 +++----- .../src/pages/applications/default_apps.rs | 19 +++---- .../pages/applications/legacy_applications.rs | 24 +++------ cosmic-settings/src/pages/bluetooth/mod.rs | 3 +- .../src/pages/desktop/appearance/drawer.rs | 15 ++---- .../pages/desktop/appearance/font_config.rs | 7 +-- .../pages/desktop/appearance/icon_themes.rs | 11 ++-- .../src/pages/desktop/appearance/mod.rs | 9 ++-- .../src/pages/desktop/appearance/style.rs | 3 +- .../src/pages/desktop/dock/applets.rs | 22 +++----- cosmic-settings/src/pages/desktop/dock/mod.rs | 9 ++-- .../src/pages/desktop/panel/applets_inner.rs | 26 +++++----- .../src/pages/desktop/panel/inner.rs | 20 ++++---- .../src/pages/desktop/panel/mod.rs | 3 +- .../src/pages/desktop/wallpaper/mod.rs | 40 +++++---------- .../src/pages/desktop/wallpaper/widgets.rs | 4 +- .../src/pages/desktop/window_management.rs | 12 ++--- .../src/pages/desktop/workspaces.rs | 12 ++--- .../src/pages/display/arrangement.rs | 6 +-- cosmic-settings/src/pages/display/mod.rs | 3 +- .../src/pages/input/keyboard/mod.rs | 13 ++--- .../pages/input/keyboard/shortcuts/common.rs | 6 ++- .../pages/input/keyboard/shortcuts/custom.rs | 9 ++-- .../keyboard/shortcuts/manage_windows.rs | 3 +- .../src/pages/input/keyboard/shortcuts/mod.rs | 6 +-- .../input/keyboard/shortcuts/move_window.rs | 3 +- .../pages/input/keyboard/shortcuts/system.rs | 3 +- .../pages/input/keyboard/shortcuts/tiling.rs | 3 +- cosmic-settings/src/pages/input/mod.rs | 6 +-- cosmic-settings/src/pages/input/mouse.rs | 3 +- cosmic-settings/src/pages/input/touchpad.rs | 3 +- cosmic-settings/src/pages/networking/mod.rs | 10 ++-- .../src/pages/networking/vpn/mod.rs | 16 +++--- cosmic-settings/src/pages/networking/wifi.rs | 29 +++++------ cosmic-settings/src/pages/networking/wired.rs | 19 ++++--- .../src/pages/power/backend/mod.rs | 6 ++- cosmic-settings/src/pages/power/mod.rs | 3 +- cosmic-settings/src/pages/sound/mod.rs | 10 ++-- cosmic-settings/src/pages/system/info.rs | 4 +- cosmic-settings/src/pages/system/users/mod.rs | 25 ++++----- cosmic-settings/src/pages/time/date.rs | 29 +++++------ cosmic-settings/src/pages/time/region.rs | 26 ++++------ cosmic-settings/src/subscription/daytime.rs | 8 ++- .../src/subscription/desktop_files.rs | 7 +-- .../src/subscription/wallpapers.rs | 8 ++- cosmic-settings/src/theme.rs | 3 +- cosmic-settings/src/utils.rs | 3 +- cosmic-settings/src/widget/mod.rs | 5 +- crates/cosmic-pipewire/src/lib.rs | 27 +++++----- crates/cosmic-pipewire/src/node.rs | 6 ++- crates/cosmic-pipewire/src/profile.rs | 3 +- crates/cosmic-pipewire/src/route.rs | 9 ++-- page/src/binder.rs | 9 ++-- page/src/lib.rs | 4 +- pages/wallpapers/src/lib.rs | 15 +++--- rustfmt.toml | 1 + subscriptions/a11y-manager/src/lib.rs | 18 +++---- subscriptions/airplane-mode/src/lib.rs | 3 +- subscriptions/bluetooth/src/adapter.rs | 12 ++--- subscriptions/bluetooth/src/device.rs | 8 ++- subscriptions/bluetooth/src/subscription.rs | 6 ++- .../network-manager/src/active_conns.rs | 3 +- .../network-manager/src/available_wifi.rs | 9 ++-- .../network-manager/src/current_networks.rs | 7 ++- subscriptions/network-manager/src/devices.rs | 7 ++- subscriptions/network-manager/src/lib.rs | 33 ++++++------ .../network-manager/src/nm_secret_agent.rs | 14 ++--- .../network-manager/src/wireless_enabled.rs | 3 +- subscriptions/pulse/src/lib.rs | 51 ++++++++----------- subscriptions/sound/src/lib.rs | 8 ++- subscriptions/upower/src/lib.rs | 6 ++- 78 files changed, 394 insertions(+), 485 deletions(-) create mode 100644 .zed/settings.json create mode 100644 rustfmt.toml diff --git a/.zed/settings.json b/.zed/settings.json new file mode 100644 index 0000000..2cc7b98 --- /dev/null +++ b/.zed/settings.json @@ -0,0 +1,15 @@ +{ + "format_on_save": "on", + "lsp": { + "rust-analyzer": { + "initialization_options": { + "check": { + "command": "clippy", + }, + "rustfmt": { + "extraArgs": ["+nightly"], + }, + }, + }, + }, +} diff --git a/cosmic-settings/build.rs b/cosmic-settings/build.rs index 4f0dd04..5be3e7c 100644 --- a/cosmic-settings/build.rs +++ b/cosmic-settings/build.rs @@ -1,4 +1,5 @@ -use std::{env, fs, path::PathBuf}; +use std::path::PathBuf; +use std::{env, fs}; use xdgen::{App, Context, FluentString}; fn main() { diff --git a/cosmic-settings/src/app.rs b/cosmic-settings/src/app.rs index dfac360..bbeec4a 100644 --- a/cosmic-settings/src/app.rs +++ b/cosmic-settings/src/app.rs @@ -5,7 +5,6 @@ use crate::PageCommands; use crate::config::Config; #[cfg(feature = "page-accessibility")] use crate::pages::accessibility; -use crate::pages::applications; #[cfg(feature = "page-bluetooth")] use crate::pages::bluetooth; use crate::pages::desktop::{self, appearance}; @@ -19,26 +18,21 @@ use crate::pages::networking; use crate::pages::power; #[cfg(feature = "page-sound")] use crate::pages::sound; -use crate::pages::{self, system, time}; +use crate::pages::{self, applications, system, time}; use crate::subscription::desktop_files; use crate::widget::{page_title, search_header}; +use cosmic::app::context_drawer::ContextDrawer; +use cosmic::app::{Core, Task}; #[cfg(feature = "wayland")] use cosmic::cctk::{sctk::output::OutputInfo, wayland_client::protocol::wl_output::WlOutput}; -use cosmic::{ - Element, - app::{Core, Task, context_drawer::ContextDrawer}, - iced::{ - self, Length, Subscription, - event::{self, PlatformSpecific}, - keyboard, window, - }, - prelude::*, - surface, - widget::{ - button, column, container, icon, id_container, nav_bar, row, scrollable, segmented_button, - settings, text_input, - }, +use cosmic::iced::event::{self, PlatformSpecific}; +use cosmic::iced::{self, Length, Subscription, keyboard, window}; +use cosmic::prelude::*; +use cosmic::widget::{ + button, column, container, icon, id_container, nav_bar, row, scrollable, segmented_button, + settings, text_input, }; +use cosmic::{Element, surface}; #[cfg(feature = "cosmic-comp-config")] use cosmic_comp_config::CosmicCompConfig; #[cfg(feature = "wayland")] @@ -52,8 +46,9 @@ use desktop::{ #[cfg(feature = "wayland")] use event::wayland; use page::Entity; +use std::borrow::Cow; use std::collections::BTreeSet; -use std::{borrow::Cow, str::FromStr}; +use std::str::FromStr; #[allow(clippy::struct_excessive_bools)] #[allow(clippy::module_name_repetitions)] diff --git a/cosmic-settings/src/config.rs b/cosmic-settings/src/config.rs index 88de69e..9856f63 100644 --- a/cosmic-settings/src/config.rs +++ b/cosmic-settings/src/config.rs @@ -1,10 +1,8 @@ // Copyright 2023 System76 // SPDX-License-Identifier: GPL-3.0-only -use cosmic::{ - cosmic_config::{self, ConfigGet, ConfigSet}, - cosmic_theme::palette::Srgba, -}; +use cosmic::cosmic_config::{self, ConfigGet, ConfigSet}; +use cosmic::cosmic_theme::palette::Srgba; const NAME: &str = "com.system76.CosmicSettings"; diff --git a/cosmic-settings/src/localize.rs b/cosmic-settings/src/localize.rs index 25aee1d..3e4d237 100644 --- a/cosmic-settings/src/localize.rs +++ b/cosmic-settings/src/localize.rs @@ -1,10 +1,8 @@ // Copyright 2023 System76 // SPDX-License-Identifier: GPL-3.0-only -use i18n_embed::{ - DefaultLocalizer, LanguageLoader, Localizer, - fluent::{FluentLanguageLoader, fluent_language_loader}, -}; +use i18n_embed::fluent::{FluentLanguageLoader, fluent_language_loader}; +use i18n_embed::{DefaultLocalizer, LanguageLoader, Localizer}; use rust_embed::RustEmbed; use std::sync::LazyLock; diff --git a/cosmic-settings/src/main.rs b/cosmic-settings/src/main.rs index cb68840..3c18d77 100644 --- a/cosmic-settings/src/main.rs +++ b/cosmic-settings/src/main.rs @@ -24,7 +24,8 @@ pub mod widget; use std::path::PathBuf; use clap::{Parser, Subcommand}; -use cosmic::{app::CosmicFlags, iced::Limits}; +use cosmic::app::CosmicFlags; +use cosmic::iced::Limits; use i18n_embed::DesktopLanguageRequester; use ron::error::SpannedError; use serde::{Deserialize, Serialize}; diff --git a/cosmic-settings/src/pages/accessibility/magnifier.rs b/cosmic-settings/src/pages/accessibility/magnifier.rs index d476b71..7dae60d 100644 --- a/cosmic-settings/src/pages/accessibility/magnifier.rs +++ b/cosmic-settings/src/pages/accessibility/magnifier.rs @@ -1,20 +1,15 @@ use std::collections::HashSet; use std::fmt::Write; -use cosmic::{ - Apply, - iced::core::text::Wrapping, - iced::{Element, Length, stream}, - surface, - widget::{self, icon, settings, svg, text}, -}; +use cosmic::iced::core::text::Wrapping; +use cosmic::iced::{Element, Length, stream}; +use cosmic::widget::{self, icon, settings, svg, text}; +use cosmic::{Apply, surface}; use cosmic_comp_config::{ZoomConfig, ZoomMovement}; use cosmic_config::{ConfigGet, ConfigSet}; use cosmic_settings_config::{Action, Binding, shortcuts}; -use cosmic_settings_page::{ - self as page, Entity, - section::{self, Section}, -}; +use cosmic_settings_page::section::{self, Section}; +use cosmic_settings_page::{self as page, Entity}; use futures::SinkExt; use slotmap::SlotMap; use tracing::error; diff --git a/cosmic-settings/src/pages/accessibility/mod.rs b/cosmic-settings/src/pages/accessibility/mod.rs index f8b75f2..919b5e5 100644 --- a/cosmic-settings/src/pages/accessibility/mod.rs +++ b/cosmic-settings/src/pages/accessibility/mod.rs @@ -1,21 +1,16 @@ -use cosmic::{ - Apply, Element, Task, - cosmic_theme::{CosmicPalette, ThemeBuilder}, - iced::core::text::Wrapping, - iced::stream, - surface, - theme::CosmicTheme, - widget::{dropdown, settings, text}, -}; +use cosmic::cosmic_theme::{CosmicPalette, ThemeBuilder}; +use cosmic::iced::core::text::Wrapping; +use cosmic::iced::stream; +use cosmic::theme::CosmicTheme; +use cosmic::widget::{dropdown, settings, text}; +use cosmic::{Apply, Element, Task, surface}; pub use cosmic_comp_config::ZoomMovement; use cosmic_config::CosmicConfigEntry; use cosmic_settings_a11y_manager_subscription as cosmic_a11y_manager; use cosmic_settings_accessibility_subscription as a11y_bus; use cosmic_settings_daemon_config::CosmicSettingsDaemonConfig; -use cosmic_settings_page::{ - self as page, Insert, - section::{self, Section}, -}; +use cosmic_settings_page::section::{self, Section}; +use cosmic_settings_page::{self as page, Insert}; use futures::SinkExt; use num_traits::FromPrimitive; use slotmap::SlotMap; diff --git a/cosmic-settings/src/pages/applications/default_apps.rs b/cosmic-settings/src/pages/applications/default_apps.rs index ee759e3..8512ab9 100644 --- a/cosmic-settings/src/pages/applications/default_apps.rs +++ b/cosmic-settings/src/pages/applications/default_apps.rs @@ -2,19 +2,14 @@ // Copyright 2024 bbb651 // SPDX-License-Identifier: GPL-3.0-only -use std::{ - borrow::Cow, - collections::{BTreeMap, BTreeSet}, - path::{Path, PathBuf}, - sync::Arc, -}; +use std::borrow::Cow; +use std::collections::{BTreeMap, BTreeSet}; +use std::path::{Path, PathBuf}; +use std::sync::Arc; -use cosmic::{ - Apply, Element, Task, - iced::{Alignment, Length}, - surface, - widget::{self, dropdown, icon, settings}, -}; +use cosmic::iced::{Alignment, Length}; +use cosmic::widget::{self, dropdown, icon, settings}; +use cosmic::{Apply, Element, Task, surface}; use cosmic_config::{ConfigGet, ConfigSet}; use cosmic_settings_config::shortcuts::SystemActions; use cosmic_settings_config::shortcuts::action::System; diff --git a/cosmic-settings/src/pages/applications/legacy_applications.rs b/cosmic-settings/src/pages/applications/legacy_applications.rs index a21d605..f2a1b20 100644 --- a/cosmic-settings/src/pages/applications/legacy_applications.rs +++ b/cosmic-settings/src/pages/applications/legacy_applications.rs @@ -1,25 +1,17 @@ // Copyright 2023 System76 // SPDX-License-Identifier: GPL-3.0-only -use std::{ - process::ExitStatus, - sync::{ - Arc, - atomic::{AtomicBool, Ordering}, - }, -}; +use std::process::ExitStatus; +use std::sync::Arc; +use std::sync::atomic::{AtomicBool, Ordering}; -use cosmic::{ - Apply, Element, Task, - cosmic_config::{self, ConfigGet, ConfigSet}, - iced::stream, - surface, - widget::{self, dropdown, settings, text}, -}; +use cosmic::cosmic_config::{self, ConfigGet, ConfigSet}; +use cosmic::iced::stream; +use cosmic::widget::{self, dropdown, settings, text}; +use cosmic::{Apply, Element, Task, surface}; use cosmic_comp_config::{EavesdroppingKeyboardMode, XwaylandDescaling, XwaylandEavesdropping}; use cosmic_randr_shell::List; -use cosmic_settings_page::Section; -use cosmic_settings_page::{self as page, section}; +use cosmic_settings_page::{self as page, Section, section}; use futures::SinkExt; use slotmap::SlotMap; use tokio::sync::oneshot; diff --git a/cosmic-settings/src/pages/bluetooth/mod.rs b/cosmic-settings/src/pages/bluetooth/mod.rs index f8d1338..7ffec0a 100644 --- a/cosmic-settings/src/pages/bluetooth/mod.rs +++ b/cosmic-settings/src/pages/bluetooth/mod.rs @@ -3,7 +3,8 @@ use cosmic::iced::core::text::Wrapping; use cosmic::iced::{Alignment, Length, color}; -use cosmic::widget::{self, settings, space::horizontal as horizontal_space, text}; +use cosmic::widget::space::horizontal as horizontal_space; +use cosmic::widget::{self, settings, text}; use cosmic::{Apply, Element, Task, theme}; use cosmic_settings_bluetooth_subscription::*; use cosmic_settings_page::{self as page, Section, section}; diff --git a/cosmic-settings/src/pages/desktop/appearance/drawer.rs b/cosmic-settings/src/pages/desktop/appearance/drawer.rs index 7b7caa0..5e33fd6 100644 --- a/cosmic-settings/src/pages/desktop/appearance/drawer.rs +++ b/cosmic-settings/src/pages/desktop/appearance/drawer.rs @@ -3,11 +3,9 @@ use cosmic::config::CosmicTk; use cosmic::cosmic_config::{Config, ConfigSet}; use cosmic::cosmic_theme::Spacing; use cosmic::iced::core::{Color, Length}; -use cosmic::widget::{ - ColorPickerModel, color_picker::ColorPickerUpdate, container, flex_row, settings, text, -}; -use cosmic::{Apply, Task}; -use cosmic::{Element, widget}; +use cosmic::widget::color_picker::ColorPickerUpdate; +use cosmic::widget::{ColorPickerModel, container, flex_row, settings, text}; +use cosmic::{Apply, Element, Task, widget}; use cosmic_config::ConfigGet; use std::sync::Arc; use tracing::error; @@ -15,11 +13,8 @@ use tracing::error; use crate::app; use crate::widget::color_picker_context_view; -use super::{ - ContextView, Message, font_config, icon_themes, - icon_themes::{IconHandles, IconThemes}, - theme_manager, -}; +use super::icon_themes::{IconHandles, IconThemes}; +use super::{ContextView, Message, font_config, icon_themes, theme_manager}; pub struct Content { context_view: Option, diff --git a/cosmic-settings/src/pages/desktop/appearance/font_config.rs b/cosmic-settings/src/pages/desktop/appearance/font_config.rs index d2b2558..92905dd 100644 --- a/cosmic-settings/src/pages/desktop/appearance/font_config.rs +++ b/cosmic-settings/src/pages/desktop/appearance/font_config.rs @@ -3,11 +3,8 @@ use std::sync::Arc; -use cosmic::{ - Apply, Element, Task, - config::{CosmicTk, FontConfig}, - widget, -}; +use cosmic::config::{CosmicTk, FontConfig}; +use cosmic::{Apply, Element, Task, widget}; use cosmic_config::ConfigSet; use crate::app; diff --git a/cosmic-settings/src/pages/desktop/appearance/icon_themes.rs b/cosmic-settings/src/pages/desktop/appearance/icon_themes.rs index 5dc4620..112568c 100644 --- a/cosmic-settings/src/pages/desktop/appearance/icon_themes.rs +++ b/cosmic-settings/src/pages/desktop/appearance/icon_themes.rs @@ -1,14 +1,13 @@ // Copyright 2024 System76 // SPDX-License-Identifier: GPL-3.0-only -use std::{collections::BTreeMap, path::PathBuf}; +use std::collections::BTreeMap; +use std::path::PathBuf; use super::Message; -use cosmic::{ - Element, - iced::{Background, Length}, - widget::{button, icon, text}, -}; +use cosmic::Element; +use cosmic::iced::{Background, Length}; +use cosmic::widget::{button, icon, text}; use tokio::io::AsyncBufReadExt; const ICON_PREV_N: usize = 6; diff --git a/cosmic-settings/src/pages/desktop/appearance/mod.rs b/cosmic-settings/src/pages/desktop/appearance/mod.rs index c1934b6..e07fbe7 100644 --- a/cosmic-settings/src/pages/desktop/appearance/mod.rs +++ b/cosmic-settings/src/pages/desktop/appearance/mod.rs @@ -21,14 +21,13 @@ use cosmic::cosmic_theme::{CornerRadii, Density, Roundness, ThemeBuilder, ThemeM use cosmic::dialog::file_chooser::{self, FileFilter}; use cosmic::iced::Subscription; use cosmic::iced::core::{Alignment, Length}; -use cosmic::widget::{ - button, color_picker::ColorPickerUpdate, container, row, settings, space::horizontal, text, -}; +use cosmic::widget::color_picker::ColorPickerUpdate; +use cosmic::widget::space::horizontal; +use cosmic::widget::{button, container, row, settings, text}; use cosmic::{Apply, Element, Task, widget}; #[cfg(feature = "wayland")] use cosmic_panel_config::CosmicPanelConfig; -use cosmic_settings_page::Section; -use cosmic_settings_page::{self as page, section}; +use cosmic_settings_page::{self as page, Section, section}; use ron::ser::PrettyConfig; use slotmap::{Key, SlotMap}; diff --git a/cosmic-settings/src/pages/desktop/appearance/style.rs b/cosmic-settings/src/pages/desktop/appearance/style.rs index 6db3477..160b794 100644 --- a/cosmic-settings/src/pages/desktop/appearance/style.rs +++ b/cosmic-settings/src/pages/desktop/appearance/style.rs @@ -1,4 +1,5 @@ -use cosmic::iced::core::{Alignment, Length, text::Wrapping}; +use cosmic::iced::core::text::Wrapping; +use cosmic::iced::core::{Alignment, Length}; use cosmic::widget::icon::{from_name, icon}; use cosmic::widget::{button, container, settings, text}; use cosmic::{Apply, Element}; diff --git a/cosmic-settings/src/pages/desktop/dock/applets.rs b/cosmic-settings/src/pages/desktop/dock/applets.rs index 5dc1923..a8a9dc4 100644 --- a/cosmic-settings/src/pages/desktop/dock/applets.rs +++ b/cosmic-settings/src/pages/desktop/dock/applets.rs @@ -1,22 +1,16 @@ -use cosmic::{ - Apply, Element, Task, - app::ContextDrawer, - cosmic_config::CosmicConfigEntry, - iced::{Alignment, Length}, - widget::{button, container, row}, -}; +use cosmic::app::ContextDrawer; +use cosmic::cosmic_config::CosmicConfigEntry; +use cosmic::iced::{Alignment, Length}; +use cosmic::widget::{button, container, row}; +use cosmic::{Apply, Element, Task}; use cosmic_panel_config::CosmicPanelConfig; use cosmic_settings_page::{self as page, Section, section}; use slotmap::{Key, SlotMap}; use std::borrow::Cow; -use crate::{ - app, - pages::{ - self, - desktop::panel::applets_inner::{self, AppletsPage, ContextDrawerVariant, lists}, - }, -}; +use crate::app; +use crate::pages::desktop::panel::applets_inner::{self, AppletsPage, ContextDrawerVariant, lists}; +use crate::pages::{self}; pub(crate) struct Page { inner: applets_inner::Page, diff --git a/cosmic-settings/src/pages/desktop/dock/mod.rs b/cosmic-settings/src/pages/desktop/dock/mod.rs index 40738aa..a118e91 100644 --- a/cosmic-settings/src/pages/desktop/dock/mod.rs +++ b/cosmic-settings/src/pages/desktop/dock/mod.rs @@ -1,11 +1,8 @@ use std::collections::HashMap; -use cosmic::Apply; -use cosmic::{ - Element, Task, - cosmic_config::{ConfigSet, CosmicConfigEntry}, - widget::{settings, text}, -}; +use cosmic::cosmic_config::{ConfigSet, CosmicConfigEntry}; +use cosmic::widget::{settings, text}; +use cosmic::{Apply, Element, Task}; use cosmic_panel_config::{CosmicPanelConfig, CosmicPanelContainerConfig}; use cosmic_settings_page::{self as page, Section, section}; use slotmap::SlotMap; diff --git a/cosmic-settings/src/pages/desktop/panel/applets_inner.rs b/cosmic-settings/src/pages/desktop/panel/applets_inner.rs index bd0ed6c..8f75940 100644 --- a/cosmic-settings/src/pages/desktop/panel/applets_inner.rs +++ b/cosmic-settings/src/pages/desktop/panel/applets_inner.rs @@ -10,23 +10,21 @@ use cosmic::iced; use cosmic::iced::core::clipboard::IconSurface; use cosmic::widget::{Column, button, column, container, icon, list_column, row, text, text_input}; -use cosmic::{ - Apply, Element, - cosmic_config::{Config, CosmicConfigEntry}, - iced::core::{ - Clipboard, Shell, Widget, layout, renderer, - widget::{Operation, Tree, tree}, - }, - iced::runtime::{Task, core::id::Id}, - iced::{ - Alignment, Border, Color, Length, Point, Rectangle, Size, Vector, core::window, event, - mouse, overlay, touch, - }, - theme, +use cosmic::cosmic_config::{Config, CosmicConfigEntry}; +use cosmic::iced::core::widget::{Operation, Tree, tree}; +use cosmic::iced::core::{Clipboard, Shell, Widget, layout, renderer, window}; +use cosmic::iced::runtime::Task; +use cosmic::iced::runtime::core::id::Id; +use cosmic::iced::{ + Alignment, Border, Color, Length, Point, Rectangle, Size, Vector, event, mouse, overlay, touch, }; +use cosmic::{Apply, Element, theme}; +use std::borrow::Cow; +use std::fmt::Debug; +use std::mem; use std::path::{Path, PathBuf}; -use std::{borrow::Cow, fmt::Debug, mem, sync::LazyLock}; +use std::sync::LazyLock; use crate::{app, pages}; use cosmic_panel_config::CosmicPanelConfig; diff --git a/cosmic-settings/src/pages/desktop/panel/inner.rs b/cosmic-settings/src/pages/desktop/panel/inner.rs index 3627398..7d5dd85 100644 --- a/cosmic-settings/src/pages/desktop/panel/inner.rs +++ b/cosmic-settings/src/pages/desktop/panel/inner.rs @@ -1,12 +1,11 @@ -use cosmic::{ - Element, Task, - cctk::sctk::reexports::client::{Proxy, backend::ObjectId, protocol::wl_output::WlOutput}, - cosmic_config::{self, CosmicConfigEntry}, - cosmic_theme::{Density, Roundness}, - iced::{Alignment, Length}, - surface, - widget::{button, container, dropdown, row, settings, slider, space, text}, -}; +use cosmic::cctk::sctk::reexports::client::Proxy; +use cosmic::cctk::sctk::reexports::client::backend::ObjectId; +use cosmic::cctk::sctk::reexports::client::protocol::wl_output::WlOutput; +use cosmic::cosmic_config::{self, CosmicConfigEntry}; +use cosmic::cosmic_theme::{Density, Roundness}; +use cosmic::iced::{Alignment, Length}; +use cosmic::widget::{button, container, dropdown, row, settings, slider, space, text}; +use cosmic::{Element, Task, surface}; use cosmic::Apply; use cosmic_config::ConfigSet; @@ -15,7 +14,8 @@ use cosmic_panel_config::{ CosmicPanelOuput, PanelAnchor, PanelSize, }; use cosmic_settings_page::{self as page, Section}; -use std::{collections::HashMap, time::Duration}; +use std::collections::HashMap; +use std::time::Duration; pub struct PageInner { pub(crate) config_helper: Option, diff --git a/cosmic-settings/src/pages/desktop/panel/mod.rs b/cosmic-settings/src/pages/desktop/panel/mod.rs index 4f98e64..72aa66b 100644 --- a/cosmic-settings/src/pages/desktop/panel/mod.rs +++ b/cosmic-settings/src/pages/desktop/panel/mod.rs @@ -1,6 +1,7 @@ use std::collections::HashMap; -use cosmic::{Task, cosmic_config::CosmicConfigEntry}; +use cosmic::Task; +use cosmic::cosmic_config::CosmicConfigEntry; use cosmic_panel_config::{CosmicPanelConfig, CosmicPanelContainerConfig}; use cosmic_settings_page::{self as page, Section, section}; use slotmap::SlotMap; diff --git a/cosmic-settings/src/pages/desktop/wallpaper/mod.rs b/cosmic-settings/src/pages/desktop/wallpaper/mod.rs index 7f99b25..b3acb5a 100644 --- a/cosmic-settings/src/pages/desktop/wallpaper/mod.rs +++ b/cosmic-settings/src/pages/desktop/wallpaper/mod.rs @@ -7,37 +7,25 @@ pub mod widgets; pub use config::Config; use url::Url; -use std::{ - collections::HashMap, - path::{Path, PathBuf}, - sync::Arc, -}; +use std::collections::HashMap; +use std::path::{Path, PathBuf}; +use std::sync::Arc; +use cosmic::app::ContextDrawer; #[cfg(feature = "xdg-portal")] use cosmic::dialog::file_chooser; -use cosmic::{ - Apply, Element, Task, - iced::core::text::{Ellipsize, EllipsizeHeightLimit}, - widget::{ColorPickerModel, color_picker::ColorPickerUpdate, icon}, -}; -use cosmic::{app::ContextDrawer, iced::runtime::core::image::Handle as ImageHandle}; -use cosmic::{ - iced::Subscription, - widget::{ - button, dropdown, list_column, row, - segmented_button::{self, SingleSelectModel}, - settings, - space::horizontal as horizontal_space, - tab_bar, text, - }, -}; -use cosmic::{ - iced::{Alignment, Color, Length, window}, - surface, +use cosmic::iced::core::text::{Ellipsize, EllipsizeHeightLimit}; +use cosmic::iced::runtime::core::image::Handle as ImageHandle; +use cosmic::iced::{Alignment, Color, Length, Subscription, window}; +use cosmic::widget::color_picker::ColorPickerUpdate; +use cosmic::widget::segmented_button::{self, SingleSelectModel}; +use cosmic::widget::space::horizontal as horizontal_space; +use cosmic::widget::{ + ColorPickerModel, button, dropdown, icon, list_column, row, settings, tab_bar, text, }; +use cosmic::{Apply, Element, Task, surface}; use cosmic_bg_config::Source; -use cosmic_settings_page::Section; -use cosmic_settings_page::{self as page, section}; +use cosmic_settings_page::{self as page, Section, section}; use cosmic_settings_wallpaper::{self as wallpaper, Entry, ScalingMode}; use image::imageops::FilterType::Lanczos3; use image::{ImageBuffer, Rgba}; diff --git a/cosmic-settings/src/pages/desktop/wallpaper/widgets.rs b/cosmic-settings/src/pages/desktop/wallpaper/widgets.rs index f9d2bcb..e71efde 100644 --- a/cosmic-settings/src/pages/desktop/wallpaper/widgets.rs +++ b/cosmic-settings/src/pages/desktop/wallpaper/widgets.rs @@ -3,8 +3,8 @@ use super::Message; use cosmic::iced::Radius; -use cosmic::iced::core::Border; -use cosmic::iced::core::{Background, Color, Degrees, Length, gradient::Linear}; +use cosmic::iced::core::gradient::Linear; +use cosmic::iced::core::{Background, Border, Color, Degrees, Length}; use cosmic::iced::runtime::core::image::Handle as ImageHandle; use cosmic::prelude::*; use cosmic::widget::{Space, button, container}; diff --git a/cosmic-settings/src/pages/desktop/window_management.rs b/cosmic-settings/src/pages/desktop/window_management.rs index b93e0f8..b3b130f 100644 --- a/cosmic-settings/src/pages/desktop/window_management.rs +++ b/cosmic-settings/src/pages/desktop/window_management.rs @@ -1,18 +1,14 @@ // Copyright 2023 System76 // SPDX-License-Identifier: GPL-3.0-only -use cosmic::{ - Apply, Element, - iced::Length, - surface, - widget::{self, settings}, -}; +use cosmic::iced::Length; +use cosmic::widget::{self, settings}; +use cosmic::{Apply, Element, surface}; use cosmic_comp_config::CosmicCompConfig; use cosmic_config::{ConfigGet, ConfigSet}; use cosmic_settings_config::{Action, Binding, Shortcuts, shortcuts}; -use cosmic_settings_page::Section; -use cosmic_settings_page::{self as page, section}; +use cosmic_settings_page::{self as page, Section, section}; use slotmap::SlotMap; use tracing::error; diff --git a/cosmic-settings/src/pages/desktop/workspaces.rs b/cosmic-settings/src/pages/desktop/workspaces.rs index 6f5e1f2..ecb93a3 100644 --- a/cosmic-settings/src/pages/desktop/workspaces.rs +++ b/cosmic-settings/src/pages/desktop/workspaces.rs @@ -3,15 +3,11 @@ // TODO make settings work -use cosmic::{ - Apply, Element, - cosmic_config::{self, ConfigGet, ConfigSet}, - surface, - widget::{self, settings}, -}; +use cosmic::cosmic_config::{self, ConfigGet, ConfigSet}; +use cosmic::widget::{self, settings}; +use cosmic::{Apply, Element, surface}; use cosmic_comp_config::workspace::{Action, WorkspaceConfig, WorkspaceLayout, WorkspaceMode}; -use cosmic_settings_page::Section; -use cosmic_settings_page::{self as page, section}; +use cosmic_settings_page::{self as page, Section, section}; use slotmap::SlotMap; use tracing::error; diff --git a/cosmic-settings/src/pages/display/arrangement.rs b/cosmic-settings/src/pages/display/arrangement.rs index 61d99e4..0eced7f 100644 --- a/cosmic-settings/src/pages/display/arrangement.rs +++ b/cosmic-settings/src/pages/display/arrangement.rs @@ -5,11 +5,9 @@ use cosmic::Renderer; use cosmic::iced::core::renderer::Quad; use cosmic::iced::core::widget::{Tree, tree}; use cosmic::iced::core::{ - self as core, Border, Clipboard, Element, Layout, Length, Rectangle, Renderer as IcedRenderer, - Shell, Size, Widget, + self as core, Border, Clipboard, Element, Layout, Length, Point, Rectangle, + Renderer as IcedRenderer, Shell, Size, Widget, alignment, layout, mouse, renderer, text, touch, }; -use cosmic::iced::core::{Point, layout, mouse, renderer, touch}; -use cosmic::iced::core::{alignment, text}; use cosmic::widget::segmented_button::{self, SingleSelectModel}; use cosmic_randr_shell::{self as randr, OutputKey}; use randr::Transform; diff --git a/cosmic-settings/src/pages/display/mod.rs b/cosmic-settings/src/pages/display/mod.rs index 1b73211..eba2ee7 100644 --- a/cosmic-settings/src/pages/display/mod.rs +++ b/cosmic-settings/src/pages/display/mod.rs @@ -20,9 +20,10 @@ use cosmic_settings_page::{self as page, Section, section}; use futures::SinkExt; use indexmap::Equivalent; use slotmap::{Key, SecondaryMap, SlotMap}; +use std::collections::BTreeMap; +use std::process::ExitStatus; use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::{Arc, LazyLock}; -use std::{collections::BTreeMap, process::ExitStatus}; use tokio::sync::oneshot; static DPI_SCALES: &[u32] = &[50, 75, 100, 125, 150, 175, 200, 225, 250, 275, 300]; diff --git a/cosmic-settings/src/pages/input/keyboard/mod.rs b/cosmic-settings/src/pages/input/keyboard/mod.rs index 468ecbb..2372c90 100644 --- a/cosmic-settings/src/pages/input/keyboard/mod.rs +++ b/cosmic-settings/src/pages/input/keyboard/mod.rs @@ -5,14 +5,11 @@ pub mod shortcuts; use std::cmp; -use cosmic::{ - Apply, Element, Task, - app::{ContextDrawer, context_drawer}, - cosmic_config::{self, ConfigSet}, - iced::{Alignment, Length}, - theme, - widget::{self, ListColumn, button, container, icon, list, row, settings}, -}; +use cosmic::app::{ContextDrawer, context_drawer}; +use cosmic::cosmic_config::{self, ConfigSet}; +use cosmic::iced::{Alignment, Length}; +use cosmic::widget::{self, ListColumn, button, container, icon, list, row, settings}; +use cosmic::{Apply, Element, Task, theme}; use cosmic_comp_config::{KeyboardConfig, NumlockState, XkbConfig}; use cosmic_settings_page::{self as page, Section, section}; use itertools::Itertools; diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs index 669c3e7..5e6a558 100644 --- a/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs +++ b/cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs @@ -652,7 +652,8 @@ impl Model { modifiers, .. }) => { - use cosmic::iced::keyboard::{Key, key::Named}; + use cosmic::iced::keyboard::Key; + use cosmic::iced::keyboard::key::Named; if matches!( key, @@ -669,7 +670,8 @@ impl Model { location, .. }) => { - use cosmic::iced::keyboard::{Key, key::Named}; + use cosmic::iced::keyboard::Key; + use cosmic::iced::keyboard::key::Named; if matches!( key, diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/custom.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/custom.rs index 7b04dea..d15f4dc 100644 --- a/cosmic-settings/src/pages/input/keyboard/shortcuts/custom.rs +++ b/cosmic-settings/src/pages/input/keyboard/shortcuts/custom.rs @@ -590,7 +590,8 @@ impl page::Page for Page { &self, core: &cosmic::Core, ) -> cosmic::iced::Subscription { - use cosmic::iced::{self, event::listen_with}; + use cosmic::iced::event::listen_with; + use cosmic::iced::{self}; cosmic::iced::Subscription::batch(vec![ if self.add_shortcut.active @@ -605,7 +606,8 @@ impl page::Page for Page { modifiers, .. }) => { - use cosmic::iced::keyboard::{Key, key::Named}; + use cosmic::iced::keyboard::Key; + use cosmic::iced::keyboard::key::Named; if matches!( key, Key::Named(Named::Super | Named::Alt | Named::Control | Named::Shift) @@ -624,7 +626,8 @@ impl page::Page for Page { location, .. }) => { - use cosmic::iced::keyboard::{Key, key::Named}; + use cosmic::iced::keyboard::Key; + use cosmic::iced::keyboard::key::Named; if matches!( key, Key::Named(Named::Super | Named::Alt | Named::Control | Named::Shift) diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/manage_windows.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/manage_windows.rs index 3d14669..394f5fe 100644 --- a/cosmic-settings/src/pages/input/keyboard/shortcuts/manage_windows.rs +++ b/cosmic-settings/src/pages/input/keyboard/shortcuts/manage_windows.rs @@ -2,8 +2,9 @@ // SPDX-License-Identifier: GPL-3.0-only use super::{ShortcutMessage, ShortcutModel}; +use cosmic::app::ContextDrawer; use cosmic::iced::platform_specific::shell::wayland::commands::keyboard_shortcuts_inhibit; -use cosmic::{Element, Task, app::ContextDrawer}; +use cosmic::{Element, Task}; use cosmic_settings_config::shortcuts::Action; use cosmic_settings_config::shortcuts::action::ResizeDirection; use cosmic_settings_page::{self as page, Section, section}; diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs index ab60609..0635893 100644 --- a/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs +++ b/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs @@ -15,7 +15,8 @@ pub mod tiling; use cosmic::app::ContextDrawer; use cosmic::iced::Length; -use cosmic::widget::{self, list::ListButton, settings, text}; +use cosmic::widget::list::ListButton; +use cosmic::widget::{self, settings, text}; use cosmic::{Apply, Element, Task}; use cosmic_config::ConfigGet; use cosmic_settings_config::Binding; @@ -23,8 +24,7 @@ use cosmic_settings_config::shortcuts::action::{ Direction, FocusDirection, Orientation, ResizeDirection, }; use cosmic_settings_config::shortcuts::{self, Action, Shortcuts}; -use cosmic_settings_page::Section; -use cosmic_settings_page::{self as page, section}; +use cosmic_settings_page::{self as page, Section, section}; use itertools::Itertools; use shortcuts::action::System as SystemAction; use slab::Slab; diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/move_window.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/move_window.rs index f0ca09c..15389ed 100644 --- a/cosmic-settings/src/pages/input/keyboard/shortcuts/move_window.rs +++ b/cosmic-settings/src/pages/input/keyboard/shortcuts/move_window.rs @@ -2,8 +2,9 @@ // SPDX-License-Identifier: GPL-3.0-only // use super::{ShortcutMessage, ShortcutModel}; +use cosmic::app::ContextDrawer; use cosmic::iced::platform_specific::shell::wayland::commands::keyboard_shortcuts_inhibit; -use cosmic::{Element, Task, app::ContextDrawer}; +use cosmic::{Element, Task}; use cosmic_settings_config::shortcuts::Action; use cosmic_settings_config::shortcuts::action::Direction; use cosmic_settings_page::{self as page, Section, section}; diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/system.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/system.rs index 02c2277..788f147 100644 --- a/cosmic-settings/src/pages/input/keyboard/shortcuts/system.rs +++ b/cosmic-settings/src/pages/input/keyboard/shortcuts/system.rs @@ -2,8 +2,9 @@ // SPDX-License-Identifier: GPL-3.0-only use super::{ShortcutMessage, ShortcutModel}; +use cosmic::app::ContextDrawer; use cosmic::iced::platform_specific::shell::wayland::commands::keyboard_shortcuts_inhibit; -use cosmic::{Element, Task, app::ContextDrawer}; +use cosmic::{Element, Task}; use cosmic_settings_config::shortcuts::Action; use cosmic_settings_config::shortcuts::action::System as SystemAction; use cosmic_settings_page::{self as page, Section, section}; diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/tiling.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/tiling.rs index aa0717d..1b40522 100644 --- a/cosmic-settings/src/pages/input/keyboard/shortcuts/tiling.rs +++ b/cosmic-settings/src/pages/input/keyboard/shortcuts/tiling.rs @@ -2,8 +2,9 @@ // SPDX-License-Identifier: GPL-3.0-only use super::{ShortcutMessage, ShortcutModel}; +use cosmic::app::ContextDrawer; use cosmic::iced::platform_specific::shell::wayland::commands::keyboard_shortcuts_inhibit; -use cosmic::{Element, Task, app::ContextDrawer}; +use cosmic::{Element, Task}; use cosmic_settings_config::shortcuts::Action; use cosmic_settings_config::shortcuts::action::Orientation; use cosmic_settings_page::{self as page, Section, section}; diff --git a/cosmic-settings/src/pages/input/mod.rs b/cosmic-settings/src/pages/input/mod.rs index 560f740..10613dc 100644 --- a/cosmic-settings/src/pages/input/mod.rs +++ b/cosmic-settings/src/pages/input/mod.rs @@ -2,10 +2,8 @@ // SPDX-License-Identifier: GPL-3.0-only use crate::app; -use cosmic::{ - Task, - cosmic_config::{self, ConfigGet, ConfigSet}, -}; +use cosmic::Task; +use cosmic::cosmic_config::{self, ConfigGet, ConfigSet}; use cosmic_comp_config::input::{ AccelConfig, AccelProfile, ClickMethod, InputConfig, ScrollConfig, ScrollMethod, TapButtonMap, TapConfig, diff --git a/cosmic-settings/src/pages/input/mouse.rs b/cosmic-settings/src/pages/input/mouse.rs index a32eb57..849820f 100644 --- a/cosmic-settings/src/pages/input/mouse.rs +++ b/cosmic-settings/src/pages/input/mouse.rs @@ -5,8 +5,7 @@ use cosmic::iced::{Alignment, Length}; use cosmic::widget::{self, row, settings, text}; use cosmic::{Apply, Element}; use cosmic_comp_config::input::AccelProfile; -use cosmic_settings_page::Section; -use cosmic_settings_page::{self as page, section}; +use cosmic_settings_page::{self as page, Section, section}; use slotmap::SlotMap; use super::Message; diff --git a/cosmic-settings/src/pages/input/touchpad.rs b/cosmic-settings/src/pages/input/touchpad.rs index ba667ef..29d167c 100644 --- a/cosmic-settings/src/pages/input/touchpad.rs +++ b/cosmic-settings/src/pages/input/touchpad.rs @@ -8,8 +8,7 @@ use cosmic::{Apply, Element}; use cosmic_comp_config::CosmicCompConfig; use cosmic_comp_config::input::{AccelProfile, ClickMethod, ScrollMethod}; use cosmic_comp_config::workspace::{WorkspaceConfig, WorkspaceLayout}; -use cosmic_settings_page::Section; -use cosmic_settings_page::{self as page, section}; +use cosmic_settings_page::{self as page, Section, section}; use slotmap::SlotMap; use tracing::error; diff --git a/cosmic-settings/src/pages/networking/mod.rs b/cosmic-settings/src/pages/networking/mod.rs index 8382e38..f9b4a4c 100644 --- a/cosmic-settings/src/pages/networking/mod.rs +++ b/cosmic-settings/src/pages/networking/mod.rs @@ -5,14 +5,14 @@ pub mod vpn; pub mod wifi; pub mod wired; -use std::{ffi::OsStr, process::Stdio, sync::Arc}; +use std::ffi::OsStr; +use std::process::Stdio; +use std::sync::Arc; use anyhow::Context; use cosmic::{Apply, Element, Task, widget}; -use cosmic_dbus_networkmanager::{ - interface::enums::{DeviceState, DeviceType}, - nm::NetworkManager, -}; +use cosmic_dbus_networkmanager::interface::enums::{DeviceState, DeviceType}; +use cosmic_dbus_networkmanager::nm::NetworkManager; use cosmic_settings_network_manager_subscription as network_manager; use cosmic_settings_page::{self as page, Section, section}; use futures::{SinkExt, StreamExt}; diff --git a/cosmic-settings/src/pages/networking/vpn/mod.rs b/cosmic-settings/src/pages/networking/vpn/mod.rs index d9cf113..4e8c150 100644 --- a/cosmic-settings/src/pages/networking/vpn/mod.rs +++ b/cosmic-settings/src/pages/networking/vpn/mod.rs @@ -8,16 +8,16 @@ use std::sync::{Arc, LazyLock}; use anyhow::Context; use cosmic::dialog::file_chooser::FileFilter; -use cosmic::task; -use cosmic::{ - Apply, Element, Task, - iced::core::text::Wrapping, - iced::{Alignment, Length}, - widget::{self, icon, space::horizontal as horizontal_space, text_input::focus}, -}; +use cosmic::iced::core::text::Wrapping; +use cosmic::iced::{Alignment, Length}; +use cosmic::widget::space::horizontal as horizontal_space; +use cosmic::widget::text_input::focus; +use cosmic::widget::{self, icon}; +use cosmic::{Apply, Element, Task, task}; +use cosmic_settings_network_manager_subscription::current_networks::ActiveConnectionInfo; use cosmic_settings_network_manager_subscription::nm_secret_agent::{self, PasswordFlag}; use cosmic_settings_network_manager_subscription::{ - self as network_manager, NetworkManagerState, UUID, current_networks::ActiveConnectionInfo, + self as network_manager, NetworkManagerState, UUID, }; use cosmic_settings_page::{self as page, Section, section}; use futures::{FutureExt, SinkExt, StreamExt}; diff --git a/cosmic-settings/src/pages/networking/wifi.rs b/cosmic-settings/src/pages/networking/wifi.rs index bc194ef..53c0a37 100644 --- a/cosmic-settings/src/pages/networking/wifi.rs +++ b/cosmic-settings/src/pages/networking/wifi.rs @@ -1,25 +1,22 @@ // Copyright 2024 System76 // SPDX-License-Identifier: GPL-3.0-only -use std::{ - collections::{BTreeMap, BTreeSet}, - sync::{Arc, LazyLock}, -}; +use std::collections::{BTreeMap, BTreeSet}; +use std::sync::{Arc, LazyLock}; use anyhow::Context; -use cosmic::{ - Apply, Element, Task, - app::ContextDrawer, - iced::core::text::Wrapping, - iced::{Alignment, Length, widget::operation::focus_next}, - task, - widget::{self, column, icon, space::horizontal, text_input::focus}, -}; +use cosmic::app::ContextDrawer; +use cosmic::iced::core::text::Wrapping; +use cosmic::iced::widget::operation::focus_next; +use cosmic::iced::{Alignment, Length}; +use cosmic::widget::space::horizontal; +use cosmic::widget::text_input::focus; +use cosmic::widget::{self, column, icon}; +use cosmic::{Apply, Element, Task, task}; +use cosmic_settings_network_manager_subscription::available_wifi::{AccessPoint, NetworkType}; +use cosmic_settings_network_manager_subscription::current_networks::ActiveConnectionInfo; use cosmic_settings_network_manager_subscription::{ - self as network_manager, NetworkManagerState, - available_wifi::{AccessPoint, NetworkType}, - current_networks::ActiveConnectionInfo, - nm_secret_agent, + self as network_manager, NetworkManagerState, nm_secret_agent, }; use cosmic_settings_page::{self as page, Section, section}; use futures::{SinkExt, StreamExt}; diff --git a/cosmic-settings/src/pages/networking/wired.rs b/cosmic-settings/src/pages/networking/wired.rs index 18bb8af..104d4a0 100644 --- a/cosmic-settings/src/pages/networking/wired.rs +++ b/cosmic-settings/src/pages/networking/wired.rs @@ -1,19 +1,18 @@ // Copyright 2024 System76 // SPDX-License-Identifier: GPL-3.0-only -use std::{collections::BTreeSet, sync::Arc}; +use std::collections::BTreeSet; +use std::sync::Arc; use anyhow::Context; -use cosmic::{ - Apply, Element, Task, - iced::core::text::Wrapping, - iced::{Alignment, Length}, - widget::{self, icon, space::horizontal as horizontal_space}, -}; +use cosmic::iced::core::text::Wrapping; +use cosmic::iced::{Alignment, Length}; +use cosmic::widget::space::horizontal as horizontal_space; +use cosmic::widget::{self, icon}; +use cosmic::{Apply, Element, Task}; use cosmic_dbus_networkmanager::interface::enums::DeviceState; -use cosmic_settings_network_manager_subscription::{ - self as network_manager, NetworkManagerState, current_networks::ActiveConnectionInfo, -}; +use cosmic_settings_network_manager_subscription::current_networks::ActiveConnectionInfo; +use cosmic_settings_network_manager_subscription::{self as network_manager, NetworkManagerState}; use cosmic_settings_page::{self as page, Section, section}; use futures::{SinkExt, StreamExt}; diff --git a/cosmic-settings/src/pages/power/backend/mod.rs b/cosmic-settings/src/pages/power/backend/mod.rs index fd9ca73..afff003 100644 --- a/cosmic-settings/src/pages/power/backend/mod.rs +++ b/cosmic-settings/src/pages/power/backend/mod.rs @@ -1,7 +1,9 @@ -use futures::{FutureExt, Stream, StreamExt, future::join_all}; +use futures::future::join_all; +use futures::{FutureExt, Stream, StreamExt}; use jiff::{Span, SpanRelativeTo, SpanRound, ToSpan, Unit}; use upower_dbus::{BatteryState, BatteryType, DeviceProxy}; -use zbus::{Connection, zvariant::ObjectPath}; +use zbus::Connection; +use zbus::zvariant::ObjectPath; mod ppdaemon; mod s76powerdaemon; diff --git a/cosmic-settings/src/pages/power/mod.rs b/cosmic-settings/src/pages/power/mod.rs index b68b135..33e75d6 100644 --- a/cosmic-settings/src/pages/power/mod.rs +++ b/cosmic-settings/src/pages/power/mod.rs @@ -3,12 +3,11 @@ mod backend; use self::backend::{GetCurrentPowerProfile, SetPowerProfile}; use backend::{Battery, ConnectedDevice, PowerProfile}; -use cosmic::Task; use cosmic::iced::core::text::{Ellipsize, EllipsizeHeightLimit}; use cosmic::iced::widget::{column, row}; use cosmic::iced::{self, Alignment, Length, stream}; use cosmic::widget::{self, settings, space, text}; -use cosmic::{Apply, surface}; +use cosmic::{Apply, Task, surface}; use cosmic_config::{Config, CosmicConfigEntry}; use cosmic_idle_config::CosmicIdleConfig; use cosmic_settings_page::{self as page, Section, section}; diff --git a/cosmic-settings/src/pages/sound/mod.rs b/cosmic-settings/src/pages/sound/mod.rs index a2a7699..fa27e9a 100644 --- a/cosmic-settings/src/pages/sound/mod.rs +++ b/cosmic-settings/src/pages/sound/mod.rs @@ -3,12 +3,10 @@ pub mod device_profiles; -use cosmic::{ - Apply, Element, Task, - iced::{Alignment, Length, window}, - surface, - widget::{self, settings, space::horizontal as horizontal_space}, -}; +use cosmic::iced::{Alignment, Length, window}; +use cosmic::widget::space::horizontal as horizontal_space; +use cosmic::widget::{self, settings}; +use cosmic::{Apply, Element, Task, surface}; use cosmic_config::{Config, ConfigGet, ConfigSet}; use cosmic_settings_page::{self as page, Section, section}; use cosmic_settings_sound_subscription as subscription; diff --git a/cosmic-settings/src/pages/system/info.rs b/cosmic-settings/src/pages/system/info.rs index be737fc..69b3540 100644 --- a/cosmic-settings/src/pages/system/info.rs +++ b/cosmic-settings/src/pages/system/info.rs @@ -3,7 +3,9 @@ #[cfg(feature = "wgpu")] use cosmic::iced::wgpu; -use std::{collections::HashMap, collections::HashSet, ffi::OsStr, process::Command}; +use std::collections::{HashMap, HashSet}; +use std::ffi::OsStr; +use std::process::Command; #[must_use] #[derive(Clone, Debug, Default)] diff --git a/cosmic-settings/src/pages/system/users/mod.rs b/cosmic-settings/src/pages/system/users/mod.rs index 5d23597..2e48195 100644 --- a/cosmic-settings/src/pages/system/users/mod.rs +++ b/cosmic-settings/src/pages/system/users/mod.rs @@ -4,25 +4,22 @@ mod getent; use crate::pages; -use cosmic::{ - Apply, Element, - dialog::file_chooser, - iced::{Alignment, Length}, - widget::{self, column, icon, list, row, settings, space::horizontal, text}, -}; +use cosmic::dialog::file_chooser; +use cosmic::iced::{Alignment, Length}; +use cosmic::widget::space::horizontal; +use cosmic::widget::{self, column, icon, list, row, settings, text}; +use cosmic::{Apply, Element}; use cosmic_settings_page::{self as page, Section, section}; use image::GenericImageView; use pwhash::{bcrypt, md5_crypt, sha256_crypt, sha512_crypt}; use regex::Regex; use slotmap::SlotMap; -use std::{ - collections::HashMap, - fs::File, - future::Future, - io::{BufRead, BufReader}, - path::{Path, PathBuf}, - sync::Arc, -}; +use std::collections::HashMap; +use std::fs::File; +use std::future::Future; +use std::io::{BufRead, BufReader}; +use std::path::{Path, PathBuf}; +use std::sync::Arc; use url::Url; use zbus_polkit::policykit1::CheckAuthorizationFlags; diff --git a/cosmic-settings/src/pages/time/date.rs b/cosmic-settings/src/pages/time/date.rs index 2ff4e67..8127127 100644 --- a/cosmic-settings/src/pages/time/date.rs +++ b/cosmic-settings/src/pages/time/date.rs @@ -2,24 +2,19 @@ // SPDX-License-Identifier: GPL-3.0-only use crate::widget::selection_context_item; -use cosmic::{ - Apply, Element, Task, - app::ContextDrawer, - cosmic_config::{self, ConfigGet, ConfigSet}, - iced::core::text::Wrapping, - surface, - widget::{self, dropdown, settings}, -}; +use cosmic::app::ContextDrawer; +use cosmic::cosmic_config::{self, ConfigGet, ConfigSet}; +use cosmic::iced::core::text::Wrapping; +use cosmic::widget::{self, dropdown, settings}; +use cosmic::{Apply, Element, Task, surface}; use cosmic_settings_page::{self as page, Section, section}; -use icu::{ - calendar::{Gregorian, types::Weekday, week}, - datetime::{ - DateTimeFormatter, DateTimeFormatterPreferences, fieldsets, - input::{Date, DateTime, Time}, - options::TimePrecision, - }, - locale::{Locale, preferences::extensions::unicode::keywords::HourCycle}, -}; +use icu::calendar::types::Weekday; +use icu::calendar::{Gregorian, week}; +use icu::datetime::input::{Date, DateTime, Time}; +use icu::datetime::options::TimePrecision; +use icu::datetime::{DateTimeFormatter, DateTimeFormatterPreferences, fieldsets}; +use icu::locale::Locale; +use icu::locale::preferences::extensions::unicode::keywords::HourCycle; use slotmap::{Key, SlotMap}; pub use timedate_zbus::TimeDateProxy; use tracing::error; diff --git a/cosmic-settings/src/pages/time/region.rs b/cosmic-settings/src/pages/time/region.rs index 5ff3192..7da958a 100644 --- a/cosmic-settings/src/pages/time/region.rs +++ b/cosmic-settings/src/pages/time/region.rs @@ -10,18 +10,15 @@ use cosmic::iced::{Alignment, Length}; use cosmic::widget::{self, button}; use cosmic::{Apply, Element}; use cosmic_config::{ConfigGet, ConfigSet}; -use cosmic_settings_page::Section; -use cosmic_settings_page::{self as page, section}; +use cosmic_settings_page::{self as page, Section, section}; use eyre::Context; -use icu::{ - calendar::{types::Weekday, week}, - datetime::{ - DateTimeFormatter, DateTimeFormatterPreferences, fieldsets, - input::{Date, DateTime, Time}, - }, - decimal::{DecimalFormatter, input::Decimal}, - locale::Locale, -}; +use icu::calendar::types::Weekday; +use icu::calendar::week; +use icu::datetime::input::{Date, DateTime, Time}; +use icu::datetime::{DateTimeFormatter, DateTimeFormatterPreferences, fieldsets}; +use icu::decimal::DecimalFormatter; +use icu::decimal::input::Decimal; +use icu::locale::Locale; use locales_rs as locale; use regex::Regex; use slotmap::{DefaultKey, SlotMap}; @@ -497,11 +494,8 @@ mod preferred_languages { use crate::pages::time::region::localized_iso_codes; use super::Message; - use cosmic::{ - Apply, - iced::{Alignment, Length}, - widget, - }; + use cosmic::iced::{Alignment, Length}; + use cosmic::{Apply, widget}; use cosmic_settings_page::Section; pub fn section() -> Section { diff --git a/cosmic-settings/src/subscription/daytime.rs b/cosmic-settings/src/subscription/daytime.rs index 00b8159..06915d3 100644 --- a/cosmic-settings/src/subscription/daytime.rs +++ b/cosmic-settings/src/subscription/daytime.rs @@ -2,11 +2,9 @@ use std::any::TypeId; use ashpd::desktop::location::{Location, LocationProxy}; use chrono::NaiveDate; -use cosmic::iced::{ - Subscription, - futures::{SinkExt, StreamExt, channel::mpsc::Sender, future}, - stream, -}; +use cosmic::iced::futures::channel::mpsc::Sender; +use cosmic::iced::futures::{SinkExt, StreamExt, future}; +use cosmic::iced::{Subscription, stream}; use sunrise::{Coordinates, SolarDay, SolarEvent}; use tokio::select; diff --git a/cosmic-settings/src/subscription/desktop_files.rs b/cosmic-settings/src/subscription/desktop_files.rs index 61b439d..2f04488 100644 --- a/cosmic-settings/src/subscription/desktop_files.rs +++ b/cosmic-settings/src/subscription/desktop_files.rs @@ -1,8 +1,5 @@ -use cosmic::iced::{ - Subscription, - futures::{self, SinkExt}, - stream, -}; +use cosmic::iced::futures::{self, SinkExt}; +use cosmic::iced::{Subscription, stream}; use notify::{Config, EventKind, RecommendedWatcher, RecursiveMode, Watcher}; use std::fmt::Debug; use std::hash::Hash; diff --git a/cosmic-settings/src/subscription/wallpapers.rs b/cosmic-settings/src/subscription/wallpapers.rs index 5e062b1..b424219 100644 --- a/cosmic-settings/src/subscription/wallpapers.rs +++ b/cosmic-settings/src/subscription/wallpapers.rs @@ -1,10 +1,8 @@ use std::path::PathBuf; -use cosmic::iced::{ - Subscription, - futures::{SinkExt, StreamExt, channel::mpsc::Sender, future}, - stream, -}; +use cosmic::iced::futures::channel::mpsc::Sender; +use cosmic::iced::futures::{SinkExt, StreamExt, future}; +use cosmic::iced::{Subscription, stream}; use image::{ImageBuffer, Rgba}; #[derive(Clone, Debug)] diff --git a/cosmic-settings/src/theme.rs b/cosmic-settings/src/theme.rs index df074d1..ab21f41 100644 --- a/cosmic-settings/src/theme.rs +++ b/cosmic-settings/src/theme.rs @@ -1,7 +1,8 @@ // Copyright 2023 System76 // SPDX-License-Identifier: GPL-3.0-only -use cosmic::{iced::Border, theme}; +use cosmic::iced::Border; +use cosmic::theme; #[must_use] pub fn display_container_frame() -> cosmic::theme::Container<'static> { diff --git a/cosmic-settings/src/utils.rs b/cosmic-settings/src/utils.rs index 6286b8b..ac1e413 100644 --- a/cosmic-settings/src/utils.rs +++ b/cosmic-settings/src/utils.rs @@ -1,4 +1,5 @@ -use std::{future::Future, io, process}; +use std::future::Future; +use std::{io, process}; use futures::future::select; diff --git a/cosmic-settings/src/widget/mod.rs b/cosmic-settings/src/widget/mod.rs index 5646dc6..e53b151 100644 --- a/cosmic-settings/src/widget/mod.rs +++ b/cosmic-settings/src/widget/mod.rs @@ -8,10 +8,9 @@ use cosmic::cosmic_theme::Spacing; use cosmic::iced::core::text::Wrapping; use cosmic::iced::{Alignment, Length}; use cosmic::widget::color_picker::ColorPickerUpdate; +use cosmic::widget::space::{horizontal, vertical}; use cosmic::widget::{ - self, ColorPickerModel, button, column, container, divider, icon, list, row, settings, - space::{horizontal, vertical}, - text, + self, ColorPickerModel, button, column, container, divider, icon, list, row, settings, text, }; use cosmic::{Apply, Element, theme}; use cosmic_settings_page as page; diff --git a/crates/cosmic-pipewire/src/lib.rs b/crates/cosmic-pipewire/src/lib.rs index 3aefd1e..9cf2538 100644 --- a/crates/cosmic-pipewire/src/lib.rs +++ b/crates/cosmic-pipewire/src/lib.rs @@ -21,20 +21,19 @@ pub use route::{Route, RouteProps}; mod spa_utils; pub use spa_utils::Channel; -use libspa::{ - param::{ParamType, format::FormatProperties}, - pod::{self, Pod, serialize::PodSerializer}, - utils::SpaTypes, -}; -use pipewire::{ - device::{DeviceChangeMask, DeviceListener}, - main_loop::MainLoopWeak, - metadata::MetadataListener, - node::NodeListener, - proxy::{ProxyListener, ProxyT}, - types::ObjectType, -}; -use std::{cell::RefCell, rc::Rc}; +use libspa::param::ParamType; +use libspa::param::format::FormatProperties; +use libspa::pod::serialize::PodSerializer; +use libspa::pod::{self, Pod}; +use libspa::utils::SpaTypes; +use pipewire::device::{DeviceChangeMask, DeviceListener}; +use pipewire::main_loop::MainLoopWeak; +use pipewire::metadata::MetadataListener; +use pipewire::node::NodeListener; +use pipewire::proxy::{ProxyListener, ProxyT}; +use pipewire::types::ObjectType; +use std::cell::RefCell; +use std::rc::Rc; pub type NodeId = u32; pub type RouteId = u32; diff --git a/crates/cosmic-pipewire/src/node.rs b/crates/cosmic-pipewire/src/node.rs index 5536f30..5bf7ff0 100644 --- a/crates/cosmic-pipewire/src/node.rs +++ b/crates/cosmic-pipewire/src/node.rs @@ -1,8 +1,10 @@ // Copyright 2025 System76 // SPDX-License-Identifier: MPL-2.0 -use crate::{Channel, spa_utils::array_from_pod}; -use libspa::{pod::Pod, utils::Id}; +use crate::Channel; +use crate::spa_utils::array_from_pod; +use libspa::pod::Pod; +use libspa::utils::Id; use pipewire::node::{NodeInfoRef, NodeState}; use std::ffi::c_float; diff --git a/crates/cosmic-pipewire/src/profile.rs b/crates/cosmic-pipewire/src/profile.rs index aabad61..c6bf75d 100644 --- a/crates/cosmic-pipewire/src/profile.rs +++ b/crates/cosmic-pipewire/src/profile.rs @@ -1,7 +1,8 @@ // Copyright 2025 System76 // SPDX-License-Identifier: MPL-2.0 -use crate::{Availability, spa_utils::string_from_pod}; +use crate::Availability; +use crate::spa_utils::string_from_pod; use libspa::pod::Pod; #[derive(Clone, Debug, Default)] diff --git a/crates/cosmic-pipewire/src/route.rs b/crates/cosmic-pipewire/src/route.rs index 961a7eb..cf370c6 100644 --- a/crates/cosmic-pipewire/src/route.rs +++ b/crates/cosmic-pipewire/src/route.rs @@ -3,11 +3,10 @@ use std::ffi::{c_float, c_int}; -use crate::{ - Availability, Channel, Direction, - spa_utils::{array_from_pod, string_from_pod}, -}; -use libspa::{pod::Pod, utils::Id}; +use crate::spa_utils::{array_from_pod, string_from_pod}; +use crate::{Availability, Channel, Direction}; +use libspa::pod::Pod; +use libspa::utils::Id; #[derive(Clone, Debug, Default)] pub struct Route { diff --git a/page/src/binder.rs b/page/src/binder.rs index b9aee2b..fe7f43e 100644 --- a/page/src/binder.rs +++ b/page/src/binder.rs @@ -3,15 +3,12 @@ use crate::section::{self, Section}; use crate::{Content, Info, Page}; -use cosmic::Element; -use cosmic::Task; use cosmic::app::ContextDrawer; +use cosmic::{Element, Task}; use regex::Regex; use slotmap::{SecondaryMap, SlotMap, SparseSecondaryMap}; -use std::{ - any::{Any, TypeId}, - collections::HashMap, -}; +use std::any::{Any, TypeId}; +use std::collections::HashMap; /// All settings pages are registered and managed by the [`Binder`]. pub struct Binder { diff --git a/page/src/lib.rs b/page/src/lib.rs index 23f894d..26335d5 100644 --- a/page/src/lib.rs +++ b/page/src/lib.rs @@ -5,7 +5,9 @@ mod binder; pub use binder::{AutoBind, Binder}; mod insert; -use cosmic::{Element, Task, app::ContextDrawer, iced::Subscription}; +use cosmic::app::ContextDrawer; +use cosmic::iced::Subscription; +use cosmic::{Element, Task}; use downcast_rs::{Downcast, impl_downcast}; pub use insert::Insert; diff --git a/pages/wallpapers/src/lib.rs b/pages/wallpapers/src/lib.rs index 921117c..a0b309b 100644 --- a/pages/wallpapers/src/lib.rs +++ b/pages/wallpapers/src/lib.rs @@ -6,16 +6,15 @@ use futures_util::StreamExt; use image::imageops::FilterType; use image::{DynamicImage, ImageBuffer, Rgba, RgbaImage}; use jxl_oxide::integration::JxlDecoder; +use std::borrow::Cow; +use std::collections::HashMap; +use std::collections::hash_map::DefaultHasher; use std::fs::File; +use std::hash::{Hash, Hasher}; +use std::io::Read; use std::os::unix::ffi::OsStrExt; -use std::{ - borrow::Cow, - collections::{HashMap, hash_map::DefaultHasher}, - hash::{Hash, Hasher}, - io::Read, - path::{Path, PathBuf}, - pin::Pin, -}; +use std::path::{Path, PathBuf}; +use std::pin::Pin; use walkdir::WalkDir; pub const DEFAULT_COLORS: &[Color] = &[ diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 0000000..c1578aa --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1 @@ +imports_granularity = "Module" diff --git a/subscriptions/a11y-manager/src/lib.rs b/subscriptions/a11y-manager/src/lib.rs index 0bcd849..ba9b8e4 100644 --- a/subscriptions/a11y-manager/src/lib.rs +++ b/subscriptions/a11y-manager/src/lib.rs @@ -1,17 +1,11 @@ use cosmic_protocols::a11y::v1::client::cosmic_a11y_manager_v1::{self, ActiveState}; use num_derive::{FromPrimitive, ToPrimitive}; -use sctk::{ - reexports::{ - calloop::{self, LoopSignal, channel}, - calloop_wayland_source::WaylandSource, - client::{ - ConnectError, Connection, Dispatch, Proxy, WEnum, - globals::{GlobalListContents, registry_queue_init}, - protocol::wl_registry, - }, - }, - registry::RegistryState, -}; +use sctk::reexports::calloop::{self, LoopSignal, channel}; +use sctk::reexports::calloop_wayland_source::WaylandSource; +use sctk::reexports::client::globals::{GlobalListContents, registry_queue_init}; +use sctk::reexports::client::protocol::wl_registry; +use sctk::reexports::client::{ConnectError, Connection, Dispatch, Proxy, WEnum}; +use sctk::registry::RegistryState; use tokio::sync::mpsc; #[derive(Debug, Clone, Copy)] diff --git a/subscriptions/airplane-mode/src/lib.rs b/subscriptions/airplane-mode/src/lib.rs index 1e326e7..48f4c8e 100644 --- a/subscriptions/airplane-mode/src/lib.rs +++ b/subscriptions/airplane-mode/src/lib.rs @@ -42,8 +42,9 @@ fn is_airplane_mode(rfkill_state: &HashMap) -> bool { mod rfkill { use futures::stream::Stream; + use std::collections::HashMap; use std::os::unix::fs::OpenOptionsExt; - use std::{collections::HashMap, fs, io, mem, slice}; + use std::{fs, io, mem, slice}; use tokio::io::unix::AsyncFd; // /usr/include/linux/rfkill.h diff --git a/subscriptions/bluetooth/src/adapter.rs b/subscriptions/bluetooth/src/adapter.rs index eb5de34..756f893 100644 --- a/subscriptions/bluetooth/src/adapter.rs +++ b/subscriptions/bluetooth/src/adapter.rs @@ -2,13 +2,11 @@ // SPDX-License-Identifier: MPL-2.0 use crate::{Active, Event}; -use std::{ - collections::HashMap, - convert::Infallible, - hash::{Hash, Hasher}, - path::PathBuf, - time::Duration, -}; +use std::collections::HashMap; +use std::convert::Infallible; +use std::hash::{Hash, Hasher}; +use std::path::PathBuf; +use std::time::Duration; use zbus::zvariant::OwnedObjectPath; #[derive(Default, Debug, Clone)] diff --git a/subscriptions/bluetooth/src/device.rs b/subscriptions/bluetooth/src/device.rs index aec4a72..2ba1854 100644 --- a/subscriptions/bluetooth/src/device.rs +++ b/subscriptions/bluetooth/src/device.rs @@ -3,11 +3,9 @@ use crate::{Active, Event}; use futures::join; -use std::{ - collections::HashMap, - hash::{Hash, Hasher}, - time::Duration, -}; +use std::collections::HashMap; +use std::hash::{Hash, Hasher}; +use std::time::Duration; use zbus::zvariant::OwnedObjectPath; const DEFAILT_DEVICE_ICON: &str = "bluetooth-symbolic"; diff --git a/subscriptions/bluetooth/src/subscription.rs b/subscriptions/bluetooth/src/subscription.rs index c88b98f..b92b262 100644 --- a/subscriptions/bluetooth/src/subscription.rs +++ b/subscriptions/bluetooth/src/subscription.rs @@ -5,9 +5,11 @@ use crate::{AdapterUpdate, Device, DeviceUpdate, Event}; use std::pin::Pin; use bluez_zbus::BluetoothDevice; -use futures::{channel::mpsc, stream::FusedStream}; +use futures::channel::mpsc; +use futures::stream::FusedStream; use iced_futures::futures::{SinkExt, StreamExt}; -use zbus::{fdo, zvariant::OwnedObjectPath}; +use zbus::fdo; +use zbus::zvariant::OwnedObjectPath; enum DevicePropertyWatcherTask { Add(OwnedObjectPath), diff --git a/subscriptions/network-manager/src/active_conns.rs b/subscriptions/network-manager/src/active_conns.rs index e902b2a..63af460 100644 --- a/subscriptions/network-manager/src/active_conns.rs +++ b/subscriptions/network-manager/src/active_conns.rs @@ -7,7 +7,8 @@ use super::Event; use cosmic_dbus_networkmanager::nm::NetworkManager; use futures::{SinkExt, StreamExt}; use iced_futures::{Subscription, stream}; -use std::{fmt::Debug, hash::Hash}; +use std::fmt::Debug; +use std::hash::Hash; use zbus::Connection; #[derive(Debug, Clone)] diff --git a/subscriptions/network-manager/src/available_wifi.rs b/subscriptions/network-manager/src/available_wifi.rs index f467092..0653ae1 100644 --- a/subscriptions/network-manager/src/available_wifi.rs +++ b/subscriptions/network-manager/src/available_wifi.rs @@ -1,14 +1,13 @@ // Copyright 2024 System76 // SPDX-License-Identifier: MPL-2.0 -use cosmic_dbus_networkmanager::{ - device::wireless::WirelessDevice, - interface::enums::{ApFlags, ApSecurityFlags, DeviceState}, -}; +use cosmic_dbus_networkmanager::device::wireless::WirelessDevice; +use cosmic_dbus_networkmanager::interface::enums::{ApFlags, ApSecurityFlags, DeviceState}; use futures::StreamExt; use itertools::Itertools; -use std::{collections::HashMap, sync::Arc}; +use std::collections::HashMap; +use std::sync::Arc; use zbus::zvariant::ObjectPath; use super::hw_address::HwAddress; diff --git a/subscriptions/network-manager/src/current_networks.rs b/subscriptions/network-manager/src/current_networks.rs index 2fc6b9b..45ac95d 100644 --- a/subscriptions/network-manager/src/current_networks.rs +++ b/subscriptions/network-manager/src/current_networks.rs @@ -1,10 +1,9 @@ // Copyright 2024 System76 // SPDX-License-Identifier: MPL-2.0 -use cosmic_dbus_networkmanager::{ - active_connection::ActiveConnection, device::SpecificDevice, - interface::enums::ActiveConnectionState, -}; +use cosmic_dbus_networkmanager::active_connection::ActiveConnection; +use cosmic_dbus_networkmanager::device::SpecificDevice; +use cosmic_dbus_networkmanager::interface::enums::ActiveConnectionState; use std::net::Ipv4Addr; pub async fn active_connections( diff --git a/subscriptions/network-manager/src/devices.rs b/subscriptions/network-manager/src/devices.rs index 235b0b5..4dbcdb6 100644 --- a/subscriptions/network-manager/src/devices.rs +++ b/subscriptions/network-manager/src/devices.rs @@ -10,8 +10,11 @@ use core::hash; use cosmic_dbus_networkmanager::nm::NetworkManager; use futures::{SinkExt, StreamExt}; use iced_futures::{self, Subscription, stream}; -use std::{fmt::Debug, hash::Hash, sync::Arc}; -use zbus::{Connection, zvariant::ObjectPath}; +use std::fmt::Debug; +use std::hash::Hash; +use std::sync::Arc; +use zbus::Connection; +use zbus::zvariant::ObjectPath; #[derive(Debug, Clone, Eq, PartialEq)] pub struct DeviceInfo { diff --git a/subscriptions/network-manager/src/lib.rs b/subscriptions/network-manager/src/lib.rs index 631eda9..675b7bf 100644 --- a/subscriptions/network-manager/src/lib.rs +++ b/subscriptions/network-manager/src/lib.rs @@ -9,34 +9,33 @@ pub mod hw_address; pub mod nm_secret_agent; pub mod wireless_enabled; -use std::{collections::HashMap, fmt::Debug, hash::Hash, sync::Arc, time::Duration}; +use std::collections::HashMap; +use std::fmt::Debug; +use std::hash::Hash; +use std::sync::Arc; +use std::time::Duration; use available_wifi::NetworkType; pub use cosmic_dbus_networkmanager as dbus; pub use dbus::settings::connection::Settings; -use cosmic_dbus_networkmanager::{ - device::SpecificDevice, - interface::{ - enums::{self, ActiveConnectionState, DeviceType, NmConnectivityState}, - settings::connection::ConnectionSettingsProxy, - }, - nm::NetworkManager, - settings::{NetworkManagerSettings, connection::Connection}, -}; -use futures::{ - FutureExt, SinkExt, StreamExt, - channel::mpsc::{UnboundedReceiver, UnboundedSender, unbounded}, +use cosmic_dbus_networkmanager::device::SpecificDevice; +use cosmic_dbus_networkmanager::interface::enums::{ + self, ActiveConnectionState, DeviceType, NmConnectivityState, }; +use cosmic_dbus_networkmanager::interface::settings::connection::ConnectionSettingsProxy; +use cosmic_dbus_networkmanager::nm::NetworkManager; +use cosmic_dbus_networkmanager::settings::NetworkManagerSettings; +use cosmic_dbus_networkmanager::settings::connection::Connection; +use futures::channel::mpsc::{UnboundedReceiver, UnboundedSender, unbounded}; +use futures::{FutureExt, SinkExt, StreamExt}; use iced_futures::{Subscription, stream}; use secure_string::SecureString; use tokio::process::Command; use zbus::zvariant::{self, ObjectPath, Value}; -use self::{ - available_wifi::{AccessPoint, handle_wireless_device}, - current_networks::{ActiveConnectionInfo, active_connections}, -}; +use self::available_wifi::{AccessPoint, handle_wireless_device}; +use self::current_networks::{ActiveConnectionInfo, active_connections}; pub type SSID = Arc; pub type UUID = Arc; diff --git a/subscriptions/network-manager/src/nm_secret_agent.rs b/subscriptions/network-manager/src/nm_secret_agent.rs index fa697c9..330c594 100644 --- a/subscriptions/network-manager/src/nm_secret_agent.rs +++ b/subscriptions/network-manager/src/nm_secret_agent.rs @@ -1,18 +1,14 @@ -use std::{ - collections::{HashMap, HashSet}, - fmt::Debug, - sync::Arc, -}; +use std::collections::{HashMap, HashSet}; +use std::fmt::Debug; +use std::sync::Arc; use bitflags::bitflags; use cosmic_dbus_networkmanager::interface::settings::connection::ConnectionSettingsProxy; use futures::{SinkExt, Stream}; use secure_string::SecureString; use tokio::sync::oneshot; -use zbus::{ - ObjectServer, fdo, - zvariant::{OwnedValue, Str}, -}; +use zbus::zvariant::{OwnedValue, Str}; +use zbus::{ObjectServer, fdo}; pub type SecretSender = Arc>>>; diff --git a/subscriptions/network-manager/src/wireless_enabled.rs b/subscriptions/network-manager/src/wireless_enabled.rs index 5ad940d..039bbf3 100644 --- a/subscriptions/network-manager/src/wireless_enabled.rs +++ b/subscriptions/network-manager/src/wireless_enabled.rs @@ -7,7 +7,8 @@ use super::Event; use cosmic_dbus_networkmanager::nm::NetworkManager; use futures::{SinkExt, StreamExt}; use iced_futures::{Subscription, stream}; -use std::{fmt::Debug, hash::Hash}; +use std::fmt::Debug; +use std::hash::Hash; use zbus::Connection; #[derive(Debug, Clone)] diff --git a/subscriptions/pulse/src/lib.rs b/subscriptions/pulse/src/lib.rs index 4220765..b2a7779 100644 --- a/subscriptions/pulse/src/lib.rs +++ b/subscriptions/pulse/src/lib.rs @@ -4,37 +4,30 @@ // Make sure not to fail if pulse not found, and reconnect? // change to device shouldn't send osd? -use futures::{SinkExt, executor::block_on}; +use futures::SinkExt; +use futures::executor::block_on; use iced_futures::{Subscription, stream}; -use libpulse_binding::{ - callbacks::ListResult, - channelmap::Map, - context::{ - Context, FlagSet, State, - introspect::{CardInfo, CardProfileInfo, Introspector, ServerInfo, SinkInfo, SourceInfo}, - subscribe::{Facility, InterestMaskSet, Operation}, - }, - def::{PortAvailable, Retval}, - mainloop::{ - api::MainloopApi, - events::io::IoEventInternal, - standard::{IterateResult, Mainloop}, - }, - volume::{ChannelVolumes, Volume}, -}; -use std::{ - borrow::Cow, - cell::{Cell, RefCell}, - convert::Infallible, - io::{Read, Write}, - os::{ - fd::{FromRawFd, IntoRawFd, RawFd}, - raw::c_void, - }, - rc::Rc, - str::FromStr, - sync::mpsc, +use libpulse_binding::callbacks::ListResult; +use libpulse_binding::channelmap::Map; +use libpulse_binding::context::introspect::{ + CardInfo, CardProfileInfo, Introspector, ServerInfo, SinkInfo, SourceInfo, }; +use libpulse_binding::context::subscribe::{Facility, InterestMaskSet, Operation}; +use libpulse_binding::context::{Context, FlagSet, State}; +use libpulse_binding::def::{PortAvailable, Retval}; +use libpulse_binding::mainloop::api::MainloopApi; +use libpulse_binding::mainloop::events::io::IoEventInternal; +use libpulse_binding::mainloop::standard::{IterateResult, Mainloop}; +use libpulse_binding::volume::{ChannelVolumes, Volume}; +use std::borrow::Cow; +use std::cell::{Cell, RefCell}; +use std::convert::Infallible; +use std::io::{Read, Write}; +use std::os::fd::{FromRawFd, IntoRawFd, RawFd}; +use std::os::raw::c_void; +use std::rc::Rc; +use std::str::FromStr; +use std::sync::mpsc; pub fn subscription() -> iced_futures::Subscription { Subscription::run_with("pulse", |_| { diff --git a/subscriptions/sound/src/lib.rs b/subscriptions/sound/src/lib.rs index adac229..f6a66d0 100644 --- a/subscriptions/sound/src/lib.rs +++ b/subscriptions/sound/src/lib.rs @@ -7,11 +7,9 @@ use cosmic_pipewire as pipewire; use futures::{SinkExt, Stream}; use intmap::IntMap; use pipewire::Availability; -use std::{ - process::Stdio, - sync::{Arc, Mutex}, - time::Duration, -}; +use std::process::Stdio; +use std::sync::{Arc, Mutex}; +use std::time::Duration; pub type DeviceId = u32; pub type NodeId = u32; diff --git a/subscriptions/upower/src/lib.rs b/subscriptions/upower/src/lib.rs index e594774..968bbe2 100644 --- a/subscriptions/upower/src/lib.rs +++ b/subscriptions/upower/src/lib.rs @@ -4,7 +4,8 @@ pub mod device { use futures::{FutureExt, Stream, StreamExt}; use iced_futures::Subscription; - use std::{fmt::Debug, hash::Hash}; + use std::fmt::Debug; + use std::hash::Hash; use upower_dbus::{BatteryType, DeviceProxy, UPowerProxy}; pub fn device_subscription( @@ -97,7 +98,8 @@ pub mod kbdbacklight { use futures::{FutureExt, Stream, StreamExt}; use iced_futures::Subscription; - use std::{fmt::Debug, hash::Hash}; + use std::fmt::Debug; + use std::hash::Hash; use tokio::sync::mpsc::{UnboundedSender, unbounded_channel}; use tokio_stream::wrappers::UnboundedReceiverStream; use upower_dbus::{BrightnessChanged, KbdBacklightProxy}; From 6db1e6a17bf3a23e0ae74545bf9ec7705df5f4bf 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: Tue, 12 May 2026 21:44:06 +0200 Subject: [PATCH 16/24] fix(sound): use `go_next_item` for device profiles button --- cosmic-settings/src/pages/sound/mod.rs | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/cosmic-settings/src/pages/sound/mod.rs b/cosmic-settings/src/pages/sound/mod.rs index fa27e9a..0e7816d 100644 --- a/cosmic-settings/src/pages/sound/mod.rs +++ b/cosmic-settings/src/pages/sound/mod.rs @@ -451,24 +451,13 @@ fn device_profiles() -> Section { .descriptions(descriptions) .view::(move |_binder, page, section| { let descriptions = §ion.descriptions; - let button = widget::row::with_children(vec![ - horizontal_space().into(), - widget::icon::from_name("go-next-symbolic").size(16).into(), - ]); - let device_profiles = settings::item::builder(&*descriptions[button_txt]) - .control(button) - .spacing(16) - .apply(widget::container) - .width(Length::Fill) - .class(cosmic::theme::Container::List) - .apply(widget::button::custom) - .width(Length::Fill) - .class(cosmic::theme::Button::Transparent) - .on_press(crate::pages::Message::Page(page.device_profiles)) - .width(Length::Fill); - - settings::section().add(device_profiles).into() + settings::section() + .add(crate::widget::go_next_item( + &descriptions[button_txt], + crate::pages::Message::Page(page.device_profiles), + )) + .into() }) } From d6bf77bf3a9444c8b3e9d4289776c7dba2e59322 Mon Sep 17 00:00:00 2001 From: manascb1344 Date: Fri, 8 May 2026 15:39:31 +0530 Subject: [PATCH 17/24] sort startup applications and all apps by name for improved organization --- .../src/pages/applications/startup_apps.rs | 38 ++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/cosmic-settings/src/pages/applications/startup_apps.rs b/cosmic-settings/src/pages/applications/startup_apps.rs index bbe4488..3f03e75 100644 --- a/cosmic-settings/src/pages/applications/startup_apps.rs +++ b/cosmic-settings/src/pages/applications/startup_apps.rs @@ -142,8 +142,21 @@ impl page::Page for Page { let user_entries = freedesktop_desktop_entry::Iter::new(user_dirs.into_iter()).entries(Some(&locales)); + let mut user_entries_vec = user_entries.collect_vec(); + user_entries_vec.sort_by(|a, b| { + let name_a = a + .name(&locales) + .map(|n| n.to_lowercase()) + .unwrap_or_else(|| a.appid.to_lowercase()); + let name_b = b + .name(&locales) + .map(|n| n.to_lowercase()) + .unwrap_or_else(|| b.appid.to_lowercase()); + name_a.cmp(&name_b) + }); + let mut apps_hash = HashMap::with_capacity(1); - apps_hash.insert(DirectoryType::User, user_entries.collect_vec()); + apps_hash.insert(DirectoryType::User, user_entries_vec); Message::UpdateStartupApplications(CachedApps { apps: apps_hash, @@ -246,6 +259,17 @@ impl Page { if let Some(target_apps) = target_apps { let mut new_apps = target_apps.clone(); new_apps.push(app.clone()); + new_apps.sort_by(|a, b| { + let name_a = a + .name(&cached_startup_apps.locales) + .map(|n| n.to_lowercase()) + .unwrap_or_else(|| a.appid.to_lowercase()); + let name_b = b + .name(&cached_startup_apps.locales) + .map(|n| n.to_lowercase()) + .unwrap_or_else(|| b.appid.to_lowercase()); + name_a.cmp(&name_b) + }); cached_startup_apps .apps @@ -473,5 +497,17 @@ fn get_all_apps(locales: Vec) -> Vec { dedupe.insert(app_id.to_owned()); } + result.sort_by(|a, b| { + let name_a = a + .name(&locales) + .map(|n| n.to_lowercase()) + .unwrap_or_else(|| a.appid.to_lowercase()); + let name_b = b + .name(&locales) + .map(|n| n.to_lowercase()) + .unwrap_or_else(|| b.appid.to_lowercase()); + name_a.cmp(&name_b) + }); + result } From 1f225d19ce582423fe8713fc6669c51d162f256f Mon Sep 17 00:00:00 2001 From: manascb1344 Date: Fri, 8 May 2026 15:52:34 +0530 Subject: [PATCH 18/24] refactor: extract sorting logic for startup applications and all apps - Introduced a new function `sort_entries_by_name` to encapsulate the sorting logic for desktop entries by name, improving code readability and maintainability. - Updated existing sorting implementations to use the new function, ensuring consistent behavior across the application. --- .../src/pages/applications/startup_apps.rs | 47 ++++++------------- 1 file changed, 14 insertions(+), 33 deletions(-) diff --git a/cosmic-settings/src/pages/applications/startup_apps.rs b/cosmic-settings/src/pages/applications/startup_apps.rs index 3f03e75..d5cd855 100644 --- a/cosmic-settings/src/pages/applications/startup_apps.rs +++ b/cosmic-settings/src/pages/applications/startup_apps.rs @@ -143,17 +143,7 @@ impl page::Page for Page { freedesktop_desktop_entry::Iter::new(user_dirs.into_iter()).entries(Some(&locales)); let mut user_entries_vec = user_entries.collect_vec(); - user_entries_vec.sort_by(|a, b| { - let name_a = a - .name(&locales) - .map(|n| n.to_lowercase()) - .unwrap_or_else(|| a.appid.to_lowercase()); - let name_b = b - .name(&locales) - .map(|n| n.to_lowercase()) - .unwrap_or_else(|| b.appid.to_lowercase()); - name_a.cmp(&name_b) - }); + sort_entries_by_name(&mut user_entries_vec, &locales); let mut apps_hash = HashMap::with_capacity(1); apps_hash.insert(DirectoryType::User, user_entries_vec); @@ -259,17 +249,10 @@ impl Page { if let Some(target_apps) = target_apps { let mut new_apps = target_apps.clone(); new_apps.push(app.clone()); - new_apps.sort_by(|a, b| { - let name_a = a - .name(&cached_startup_apps.locales) - .map(|n| n.to_lowercase()) - .unwrap_or_else(|| a.appid.to_lowercase()); - let name_b = b - .name(&cached_startup_apps.locales) - .map(|n| n.to_lowercase()) - .unwrap_or_else(|| b.appid.to_lowercase()); - name_a.cmp(&name_b) - }); + sort_entries_by_name( + &mut new_apps, + &cached_startup_apps.locales, + ); cached_startup_apps .apps @@ -457,6 +440,14 @@ fn apps() -> Section { }) } +fn sort_entries_by_name(entries: &mut [DesktopEntry], locales: &[String]) { + entries.sort_by_cached_key(|e| { + e.name(locales) + .map(|n| n.to_lowercase()) + .unwrap_or_else(|| e.appid.to_lowercase()) + }); +} + fn get_all_apps(locales: Vec) -> Vec { let mut dedupe = HashSet::new(); @@ -497,17 +488,7 @@ fn get_all_apps(locales: Vec) -> Vec { dedupe.insert(app_id.to_owned()); } - result.sort_by(|a, b| { - let name_a = a - .name(&locales) - .map(|n| n.to_lowercase()) - .unwrap_or_else(|| a.appid.to_lowercase()); - let name_b = b - .name(&locales) - .map(|n| n.to_lowercase()) - .unwrap_or_else(|| b.appid.to_lowercase()); - name_a.cmp(&name_b) - }); + sort_entries_by_name(&mut result, &locales); result } From f19da761296a28ea97d6dadc2971de0bf2c0ad85 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, 10 May 2026 16:07:30 +0200 Subject: [PATCH 19/24] improv(panel): corner radius handling This ensures that the padding of a panel is taken into account when calculating corner_radius (except when Square), and also prevents various visual issues, like slightly round without gaps having a corner radius of 0. Also extracts panel config fetching into a helper function. --- .../src/pages/desktop/appearance/mod.rs | 121 ++++++------------ .../src/pages/desktop/panel/inner.rs | 34 ++--- 2 files changed, 51 insertions(+), 104 deletions(-) diff --git a/cosmic-settings/src/pages/desktop/appearance/mod.rs b/cosmic-settings/src/pages/desktop/appearance/mod.rs index e07fbe7..ff3b3ea 100644 --- a/cosmic-settings/src/pages/desktop/appearance/mod.rs +++ b/cosmic-settings/src/pages/desktop/appearance/mod.rs @@ -238,8 +238,8 @@ impl Page { #[cfg(feature = "wayland")] tokio::task::spawn(async move { - Self::update_panel_radii(r); Self::update_dock_padding(r); + Self::update_panel_radii(r); }); } @@ -519,113 +519,66 @@ impl Page { } // TODO: cache panel and dock configs so that they needn't be re-read + #[cfg(feature = "wayland")] + fn load_panel_config(name: &str) -> Option<(Config, CosmicPanelConfig)> { + let helper = CosmicPanelConfig::cosmic_config(name).ok()?; + let config = CosmicPanelConfig::get_entry(&helper).ok()?; + (config.name == name).then_some((helper, config)) + } + #[cfg(feature = "wayland")] pub fn update_panel_radii(roundness: Roundness) { - let panel_config_helper = CosmicPanelConfig::cosmic_config("Panel").ok(); - let dock_config_helper = CosmicPanelConfig::cosmic_config("Dock").ok(); + let corner_radii: CornerRadii = roundness.into(); + let radius = corner_radii.radius_xl[0] as u32; - let mut panel_config = panel_config_helper.as_ref().and_then(|config_helper| { - let panel_config = CosmicPanelConfig::get_entry(config_helper).ok()?; - (panel_config.name == "Panel").then_some(panel_config) - }); + for name in ["Panel", "Dock"] { + let Some((helper, mut config)) = Self::load_panel_config(name) else { + continue; + }; - let mut dock_config = dock_config_helper.as_ref().and_then(|config_helper| { - let panel_config = CosmicPanelConfig::get_entry(config_helper).ok()?; - (panel_config.name == "Dock").then_some(panel_config) - }); - - if let Some(panel_config_helper) = panel_config_helper.as_ref() - && let Some(panel_config) = panel_config.as_mut() - { - let radii = if panel_config.anchor_gap { - let cornder_radii: CornerRadii = roundness.into(); - cornder_radii.radius_xl[0] as u32 - } else if matches!(roundness, Roundness::Round) && !panel_config.expand_to_edges { - 12 + let new_radius = if config.anchor_gap { + radius + } else if !config.expand_to_edges { + radius.min(12) } else { 0 }; - if let Err(why) = panel_config.set_border_radius(panel_config_helper, radii) { - tracing::error!(?why, "Error updating panel corner radii"); - } - } - - if let Some(dock_config_helper) = dock_config_helper.as_ref() - && let Some(dock_config) = dock_config.as_mut() - { - let radii = if dock_config.anchor_gap { - let cornder_radii: CornerRadii = roundness.into(); - cornder_radii.radius_xl[0] as u32 - } else if matches!(roundness, Roundness::Round) && !dock_config.expand_to_edges { - 12 - } else { - 0 - }; - - if let Err(why) = dock_config.set_border_radius(dock_config_helper, radii) { - tracing::error!(?why, "Error updating dock corner radii"); + if let Err(why) = config.set_border_radius(&helper, new_radius) { + tracing::error!(?why, "Error updating {name} corner radii"); } } } #[cfg(feature = "wayland")] pub fn update_dock_padding(roundness: Roundness) { - let dock_config_helper = CosmicPanelConfig::cosmic_config("Dock").ok(); + let Some((helper, mut config)) = Self::load_panel_config("Dock") else { + return; + }; - let mut dock_config = dock_config_helper.as_ref().and_then(|config_helper| { - let panel_config = CosmicPanelConfig::get_entry(config_helper).ok()?; - (panel_config.name == "Dock").then_some(panel_config) - }); + let padding = match roundness { + Roundness::Round | Roundness::SlightlyRound => 4, + Roundness::Square => 0, + }; - if let Some(dock_config_helper) = dock_config_helper.as_ref() - && let Some(dock_config) = dock_config.as_mut() - { - let padding = match roundness { - Roundness::Round => 4, - Roundness::SlightlyRound => 4, - Roundness::Square => 0, - }; - - if let Err(why) = dock_config.set_padding(dock_config_helper, padding) { - tracing::error!(?why, "Error updating dock padding"); - } + if let Err(why) = config.set_padding(&helper, padding) { + tracing::error!(?why, "Error updating dock padding"); } } - // TODO: cache panel and dock configs so that they needn't be re-read #[cfg(feature = "wayland")] pub fn update_panel_spacing(density: Density) { let spacing: cosmic::cosmic_theme::Spacing = density.into(); - let space_none = spacing.space_none; - let panel_config_helper = CosmicPanelConfig::cosmic_config("Panel").ok(); - let dock_config_helper = CosmicPanelConfig::cosmic_config("Dock").ok(); - let mut panel_config = panel_config_helper.as_ref().and_then(|config_helper| { - let panel_config = CosmicPanelConfig::get_entry(config_helper).ok()?; - (panel_config.name == "Panel").then_some(panel_config) - }); - let mut dock_config = dock_config_helper.as_ref().and_then(|config_helper| { - let panel_config = CosmicPanelConfig::get_entry(config_helper).ok()?; - (panel_config.name == "Dock").then_some(panel_config) - }); + let space_none = spacing.space_none as u32; - if let Some(panel_config_helper) = panel_config_helper.as_ref() - && let Some(panel_config) = panel_config.as_mut() - { - let update = panel_config.set_spacing(panel_config_helper, space_none as u32); - if let Err(err) = update { - tracing::error!(?err, "Error updating panel spacing"); + for name in ["Panel", "Dock"] { + let Some((helper, mut config)) = Self::load_panel_config(name) else { + continue; + }; + if let Err(err) = config.set_spacing(&helper, space_none) { + tracing::error!(?err, "Error updating {name} spacing"); } - }; - - if let Some(dock_config_helper) = dock_config_helper.as_ref() - && let Some(dock_config) = dock_config.as_mut() - { - let update = dock_config.set_spacing(dock_config_helper, space_none as u32); - if let Err(err) = update { - tracing::error!(?err, "Error updating dock spacing"); - } - }; + } } fn can_reset(&self) -> bool { diff --git a/cosmic-settings/src/pages/desktop/panel/inner.rs b/cosmic-settings/src/pages/desktop/panel/inner.rs index 7d5dd85..bce638f 100644 --- a/cosmic-settings/src/pages/desktop/panel/inner.rs +++ b/cosmic-settings/src/pages/desktop/panel/inner.rs @@ -587,17 +587,14 @@ impl PageInner { } let theme = cosmic::theme::system_preference(); let theme = theme.cosmic(); - let radius = theme.corner_radii; - let roundness: Roundness = radius.into(); - let new_radius; - if enabled { - let radii = theme.corner_radii.radius_xl[0] as u32; - new_radius = radii; - } else if matches!(roundness, Roundness::Round) && !panel_config.expand_to_edges { - new_radius = 12; + let radius = theme.corner_radii.radius_xl[0] as u32; + let new_radius = if enabled { + radius + } else if !panel_config.expand_to_edges { + radius.min(12) } else { - new_radius = 0; - } + 0 + }; _ = panel_config.set_border_radius(helper, new_radius).unwrap(); } Message::PanelSize(size) => { @@ -622,17 +619,14 @@ impl PageInner { let theme = cosmic::theme::system_preference(); let theme = theme.cosmic(); - let radius = theme.corner_radii; - let roundness: Roundness = radius.into(); - let new_radius; - if panel_config.anchor_gap { - let radii = theme.corner_radii.radius_xl[0] as u32; - new_radius = radii; - } else if matches!(roundness, Roundness::Round) && !enabled { - new_radius = 12; + let radius = theme.corner_radii.radius_xl[0] as u32; + let new_radius = if panel_config.anchor_gap { + radius + } else if !enabled { + radius.min(12) } else { - new_radius = 0; - } + 0 + }; _ = panel_config.set_border_radius(helper, new_radius).unwrap(); } Message::OpacityRequest(opacity) => { From 553c05e2f0556aa88fc61b351b94527c6aad0393 Mon Sep 17 00:00:00 2001 From: leyoda Date: Thu, 23 Apr 2026 17:33:22 +0200 Subject: [PATCH 20/24] yoda: rebase onto libcosmic-yoda via path deps + macOS controls toggle MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fresh rewiring from upstream master (78644a3) — the previous attempt on 051f4f9 was 137 commits behind and hit API drift (cosmic::iced_futures, Subscription::run_with_id). Upstream master uses the newer API (cosmic::iced::stream + Subscription::run_with) which our libcosmic-yoda already supports. Yoda wiring: - [workspace.dependencies.libcosmic] (git pop-os) -> libcosmic-yoda { path, wayland } - cosmic-config + iced_winit workspace deps -> path to libcosmic-yoda submodule - [patch.pop-os/libcosmic] redirects transitive cosmic-config + cosmic-theme + iced_futures + iced_winit to our local paths so the graph resolves to a single copy (cosmic-bg/comp/idle/panel configs unify cleanly against master) - subscriptions/sound + page + cosmic-settings inner Cargo.toml: libcosmic -> libcosmic-yoda (workspace + direct variants) - winit feature dropped from libcosmic-yoda deps (our fork is Wayland-only) Cherry-picked from leyoda/local/window-controls-position @ 52ce463: - cosmic-settings/src/pages/desktop/window_management.rs — macOS toggle UI - i18n/en + fr/cosmic_settings.ftl — translations Installed at /usr/bin/cosmic-settings (yoda build, 78 MB). Pre-yoda pacman version kept at /usr/bin/cosmic-settings.pre-yoda-fork. --- Cargo.lock | 653 ++++++++---------- Cargo.toml | 58 +- cosmic-settings/Cargo.toml | 14 +- .../src/pages/desktop/window_management.rs | 22 + i18n/en/cosmic_settings.ftl | 1 + i18n/fr/cosmic_settings.ftl | 1 + page/Cargo.toml | 2 +- subscriptions/sound/Cargo.toml | 2 +- 8 files changed, 337 insertions(+), 416 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a82f88f..a1caacb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -196,12 +196,6 @@ dependencies = [ "alloc-no-stdlib", ] -[[package]] -name = "allocator-api2" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" - [[package]] name = "almost" version = "0.2.0" @@ -361,12 +355,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" -[[package]] -name = "as-raw-xcb-connection" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" - [[package]] name = "as-slice" version = "0.2.1" @@ -618,9 +606,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "av-scenechange" @@ -658,9 +646,9 @@ dependencies = [ [[package]] name = "avif-serialize" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375082f007bd67184fb9c0374614b29f9aaa604ec301635f72338bb65386a53d" +checksum = "e7178fe5f7d460b13895ebb9dcb28a3a6216d2df2574a0806cb51b555d297f38" dependencies = [ "arrayvec", ] @@ -865,6 +853,15 @@ dependencies = [ "alloc-stdlib", ] +[[package]] +name = "bs58" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" +dependencies = [ + "tinyvec", +] + [[package]] name = "bstr" version = "1.12.1" @@ -887,15 +884,15 @@ dependencies = [ [[package]] name = "built" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ad8f11f288f48ca24471bbd51ac257aaeaaa07adae295591266b792902ae64" +checksum = "5c0e531d93d39c34eef561e929e8a7f86d77a5af08aac4f6d6e39976c51858e9" [[package]] name = "bumpalo" -version = "3.20.2" +version = "3.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" +checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" [[package]] name = "by_address" @@ -987,9 +984,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.60" +version = "1.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20" +checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98" dependencies = [ "find-msvc-tools", "jobserver", @@ -1141,7 +1138,6 @@ dependencies = [ [[package]] name = "clipboard_macos" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c" dependencies = [ "objc", "objc-foundation", @@ -1151,22 +1147,12 @@ dependencies = [ [[package]] name = "clipboard_wayland" version = "0.2.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c" dependencies = [ "dnd", "mime 0.1.0", "smithay-clipboard", ] -[[package]] -name = "clipboard_x11" -version = "0.4.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c" -dependencies = [ - "thiserror 1.0.69", - "x11rb", -] - [[package]] name = "cocoa" version = "0.25.0" @@ -1360,7 +1346,6 @@ dependencies = [ [[package]] name = "cosmic-bg-config" version = "1.0.3" -source = "git+https://github.com/pop-os/cosmic-bg#06970d5945b45a634b9ed314f5ca3a86a8502fd8" dependencies = [ "cosmic-config", "derive_setters", @@ -1371,8 +1356,7 @@ dependencies = [ [[package]] name = "cosmic-client-toolkit" -version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols//?rev=d0e95be#d0e95be25e423cfe523b11111a3666ed7aaf0dc4" +version = "0.2.0" dependencies = [ "bitflags 2.11.1", "cosmic-protocols", @@ -1385,7 +1369,6 @@ dependencies = [ [[package]] name = "cosmic-comp-config" version = "1.0.0" -source = "git+https://github.com/pop-os/cosmic-comp#4df95190db07f7410666cec4d3bf648de90f81dd" dependencies = [ "cosmic-config", "input", @@ -1397,7 +1380,6 @@ dependencies = [ [[package]] name = "cosmic-config" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1418,7 +1400,6 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "quote", "syn 2.0.117", @@ -1448,7 +1429,6 @@ dependencies = [ [[package]] name = "cosmic-freedesktop-icons" version = "0.4.0" -source = "git+https://github.com/pop-os/freedesktop-icons#9c562fe3ecf03241a46a60c0078cd6ea10bd75ce" dependencies = [ "bstr", "btoi", @@ -1462,7 +1442,6 @@ dependencies = [ [[package]] name = "cosmic-idle-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-idle#c95d066b5b640509a6369634b669ca60dc50e168" dependencies = [ "cosmic-config", "serde", @@ -1482,7 +1461,6 @@ dependencies = [ [[package]] name = "cosmic-panel-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-panel#d518c7d25ef96f1a9696aa8cce008656bf66ece4" dependencies = [ "anyhow", "cosmic-config", @@ -1508,8 +1486,7 @@ dependencies = [ [[package]] name = "cosmic-protocols" -version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols//?rev=d0e95be#d0e95be25e423cfe523b11111a3666ed7aaf0dc4" +version = "0.2.0" dependencies = [ "bitflags 2.11.1", "wayland-backend", @@ -1523,7 +1500,6 @@ dependencies = [ [[package]] name = "cosmic-randr" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-randr#6e8e795970fa06d434af22775e415b517f7552d3" dependencies = [ "cosmic-protocols", "indexmap 2.14.0", @@ -1537,7 +1513,6 @@ dependencies = [ [[package]] name = "cosmic-randr-shell" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-randr#6e8e795970fa06d434af22775e415b517f7552d3" dependencies = [ "kdl", "slotmap", @@ -1569,7 +1544,7 @@ dependencies = [ "cosmic-settings-accessibility-subscription", "cosmic-settings-airplane-mode-subscription", "cosmic-settings-bluetooth-subscription", - "cosmic-settings-config", + "cosmic-settings-config 0.1.0 (git+https://github.com/pop-os/cosmic-settings-daemon)", "cosmic-settings-daemon-config", "cosmic-settings-network-manager-subscription", "cosmic-settings-page", @@ -1594,7 +1569,7 @@ dependencies = [ "itertools 0.14.0", "itoa", "jiff", - "libcosmic", + "libcosmic-yoda", "locale1", "locales-rs", "mime 0.3.17", @@ -1680,7 +1655,19 @@ dependencies = [ [[package]] name = "cosmic-settings-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-settings-daemon#716da6d6af0b252e2f78aba2ad72ee19ae0241e0" +dependencies = [ + "cosmic-config", + "ron 0.11.0", + "serde", + "serde_with", + "tracing", + "xkbcommon 0.9.0", +] + +[[package]] +name = "cosmic-settings-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-settings-daemon#fa82bdf9fe7b5f5bd6008f32f393efd5e7a71c47" dependencies = [ "cosmic-config", "ron 0.11.0", @@ -1692,8 +1679,7 @@ dependencies = [ [[package]] name = "cosmic-settings-daemon" -version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75" +version = "0.1.1-yoda.1" dependencies = [ "zbus", ] @@ -1701,7 +1687,7 @@ dependencies = [ [[package]] name = "cosmic-settings-daemon-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-settings-daemon#716da6d6af0b252e2f78aba2ad72ee19ae0241e0" +source = "git+https://github.com/pop-os/cosmic-settings-daemon#fa82bdf9fe7b5f5bd6008f32f393efd5e7a71c47" dependencies = [ "cosmic-config", "serde", @@ -1743,7 +1729,7 @@ version = "1.0.7" dependencies = [ "derive_setters", "downcast-rs 2.0.2", - "libcosmic", + "libcosmic-yoda", "regex", "slab", "slotmap", @@ -1768,7 +1754,7 @@ dependencies = [ "cosmic-pipewire", "futures", "intmap", - "libcosmic", + "libcosmic-yoda", "numtoa", "rustix 1.1.4", "tokio", @@ -1810,8 +1796,6 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be17b688510d934ce13f48a2beba700e11583e281e0fda99c22bb256a14eda73" dependencies = [ "bitflags 2.11.1", "fontdb", @@ -1829,12 +1813,12 @@ dependencies = [ "unicode-linebreak", "unicode-script", "unicode-segmentation", + "unicode-width 0.2.2", ] [[package]] name = "cosmic-theme" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "almost", "configparser", @@ -1900,7 +1884,6 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "cryoglyph" version = "0.1.0" -source = "git+https://github.com/iced-rs/cryoglyph.git?rev=e429a025df36ab8145708acb309080ae3deec17a#e429a025df36ab8145708acb309080ae3deec17a" dependencies = [ "cosmic-text", "etagere", @@ -1947,12 +1930,6 @@ dependencies = [ "uncased", ] -[[package]] -name = "ctor-lite" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e162d0c2e2068eb736b71e5597eff0b9944e6b973cd9f37b6a288ab9bf20e300" - [[package]] name = "cursor-icon" version = "1.2.0" @@ -2209,7 +2186,6 @@ dependencies = [ [[package]] name = "dnd" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c" dependencies = [ "bitflags 2.11.1", "mime 0.1.0", @@ -2242,46 +2218,6 @@ checksum = "117240f60069e65410b3ae1bb213295bd828f707b5bec6596a1afc8793ce0cbc" [[package]] name = "dpi" version = "0.1.2" -source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366" - -[[package]] -name = "drm" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" -dependencies = [ - "bitflags 2.11.1", - "bytemuck", - "drm-ffi", - "drm-fourcc", - "rustix 0.38.44", -] - -[[package]] -name = "drm-ffi" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" -dependencies = [ - "drm-sys", - "rustix 0.38.44", -] - -[[package]] -name = "drm-fourcc" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" - -[[package]] -name = "drm-sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" -dependencies = [ - "libc", - "linux-raw-sys 0.6.5", -] [[package]] name = "dyn-clone" @@ -2291,9 +2227,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "either" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" [[package]] name = "endi" @@ -2457,23 +2393,9 @@ checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" [[package]] name = "fax" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f05de7d48f37cd6730705cbca900770cab77a89f413d23e100ad7fad7795a0ab" -dependencies = [ - "fax_derive", -] - -[[package]] -name = "fax_derive" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] +checksum = "caf1079563223d5d59d83c85886a56e586cfd5c1a26292e971a0fa266531ac5a" [[package]] name = "fdeflate" @@ -2827,16 +2749,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "gethostname" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8" -dependencies = [ - "rustix 1.1.4", - "windows-link 0.2.1", -] - [[package]] name = "getrandom" version = "0.2.17" @@ -2964,17 +2876,34 @@ dependencies = [ ] [[package]] -name = "gpu-allocator" -version = "0.28.0" +name = "gpu-alloc" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51255ea7cfaadb6c5f1528d43e92a82acb2b96c43365989a28b2d44ee38f8795" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.11.1", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.11.1", +] + +[[package]] +name = "gpu-allocator" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" dependencies = [ - "ash", - "hashbrown 0.16.1", "log", "presser", - "thiserror 2.0.18", - "windows 0.62.2", + "thiserror 1.0.69", + "windows 0.58.0", ] [[package]] @@ -2999,9 +2928,9 @@ dependencies = [ [[package]] name = "grid" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9e2d4c0a8296178d8802098410ca05d86b17a10bb5ab559b3fb404c1f948220" +checksum = "b40ca9252762c466af32d0b1002e91e4e1bc5398f77455e55474deb466355ff5" [[package]] name = "guillotiere" @@ -3059,16 +2988,14 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ - "allocator-api2", - "equivalent", "foldhash 0.2.0", ] [[package]] name = "hashbrown" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" [[package]] name = "heck" @@ -3242,7 +3169,6 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "dnd", "iced_accessibility", @@ -3263,7 +3189,6 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "accesskit", "accesskit_winit", @@ -3272,7 +3197,6 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "bitflags 2.11.1", "bytes", @@ -3297,7 +3221,6 @@ dependencies = [ [[package]] name = "iced_debug" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "iced_core", "iced_futures", @@ -3307,7 +3230,6 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "futures", "iced_core", @@ -3321,7 +3243,6 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "bitflags 2.11.1", "bytemuck", @@ -3342,7 +3263,6 @@ dependencies = [ [[package]] name = "iced_program" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "iced_graphics", "iced_runtime", @@ -3351,7 +3271,6 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3363,7 +3282,6 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3379,7 +3297,6 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "bytemuck", "cosmic-text", @@ -3396,9 +3313,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ - "as-raw-xcb-connection", "bitflags 2.11.1", "bytemuck", "cosmic-client-toolkit", @@ -3415,19 +3330,16 @@ dependencies = [ "rustc-hash 2.1.2", "rustix 0.38.44", "thiserror 2.0.18", - "tiny-xlib", "wayland-backend", "wayland-client", "wayland-protocols", "wayland-sys", "wgpu", - "x11rb", ] [[package]] name = "iced_widget" version = "0.14.2" -source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3447,7 +3359,6 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" dependencies = [ "cosmic-client-toolkit", "cursor-icon", @@ -3901,9 +3812,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714" dependencies = [ "icu_normalizer", "icu_properties", @@ -3935,9 +3846,9 @@ dependencies = [ [[package]] name = "image-extras" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d29ba92ef6970a2685cc758b455d190842b8b9e96c865ffd31cdb9954b7548" +checksum = "60d02eb2c9ccbbab470538fce34c7bc3be7b4e59268e65a3171367b296cdb842" dependencies = [ "image", ] @@ -3960,9 +3871,9 @@ checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" [[package]] name = "imgref" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c5cedc30da3a610cac6b4ba17597bdf7152cf974e8aab3afb3d54455e371c8" +checksum = "40fac9d56ed6437b198fddba683305e8e2d651aa42647f00f5ae542e7f5c94a2" [[package]] name = "indenter" @@ -3988,7 +3899,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown 0.17.0", + "hashbrown 0.17.1", "serde", "serde_core", ] @@ -4034,9 +3945,9 @@ dependencies = [ [[package]] name = "input" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdc09524a91f9cacd26f16734ff63d7dc650daffadd2b6f84d17a285bd875a9" +checksum = "f9793345a65d71317763a33066b5d8351f8760dde8d4930fe9e39b5f14a7959d" dependencies = [ "bitflags 2.11.1", "input-sys", @@ -4136,9 +4047,9 @@ checksum = "2ceaf4c6c48465bead8cb6a0b7c4ee0c86ecbb31239032b9c66ab9a08d2f3ee1" [[package]] name = "jiff" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a3546dc96b6d42c5f24902af9e2538e82e39ad350b0c766eb3fbf2d8f3d8359" +checksum = "6835eea34fb6321b9b3aa7b685c2b433948c09447e389dc017fdf687d5d11e65" dependencies = [ "jiff-static", "jiff-tzdb-platform", @@ -4151,9 +4062,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4" +checksum = "3c22e04db9c58f5136eb1757f3d5c49a7b187f49e52185228cbd2f5acdfcc08c" dependencies = [ "proc-macro2", "quote", @@ -4245,9 +4156,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.95" +version = "0.3.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca" +checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11" dependencies = [ "cfg-if", "futures-util", @@ -4503,11 +4414,11 @@ dependencies = [ [[package]] name = "kqueue-sys" -version = "1.0.4" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +checksum = "07293a4e297ac234359b510362495713f75ea345d5307140414f20c69ffeb087" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.11.1", "libc", ] @@ -4557,9 +4468,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] -name = "libcosmic" -version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5" +name = "libcosmic-yoda" +version = "0.1.0-yoda.2" dependencies = [ "apply", "ashpd 0.12.3", @@ -4567,7 +4477,7 @@ dependencies = [ "cosmic-client-toolkit", "cosmic-config", "cosmic-freedesktop-icons", - "cosmic-settings-config", + "cosmic-settings-config 0.1.0", "cosmic-settings-daemon", "cosmic-theme", "css-color", @@ -4673,7 +4583,7 @@ dependencies = [ "bitflags 2.11.1", "libc", "plain", - "redox_syscall 0.7.4", + "redox_syscall 0.7.5", ] [[package]] @@ -4735,12 +4645,6 @@ version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" -[[package]] -name = "linux-raw-sys" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7" - [[package]] name = "linux-raw-sys" version = "0.12.1" @@ -4802,9 +4706,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.29" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +checksum = "616ec5685824bcc94416c6d4a7a446eea774a31efd7062c8480ba6fd06d7a6e5" [[package]] name = "loop9" @@ -4833,9 +4737,9 @@ dependencies = [ [[package]] name = "lyon_algorithms" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9815fac08e6fd96733a11dce4f9d15a3f338e96a2e2311ee21e1b738efc2bc0f" +checksum = "8575c0d003ae459399623c4def180c63b77f343b1a7fee64f249b349e7699a31" dependencies = [ "lyon_path", "num-traits", @@ -4947,9 +4851,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.33.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15" +checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605" dependencies = [ "bitflags 2.11.1", "block", @@ -4973,7 +4877,6 @@ dependencies = [ [[package]] name = "mime" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c" dependencies = [ "smithay-clipboard", ] @@ -5030,9 +4933,9 @@ checksum = "13d2233c9842d08cfe13f9eac96e207ca6a2ea10b80259ebe8ad0268be27d2af" [[package]] name = "naga" -version = "28.0.0" +version = "27.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "618f667225063219ddfc61251087db8a9aec3c3f0950c916b614e403486f1135" +checksum = "066cf25f0e8b11ee0df221219010f213ad429855f57c494f995590c861a9a7d8" dependencies = [ "arrayvec", "bit-set", @@ -5112,9 +5015,9 @@ dependencies = [ [[package]] name = "no_std_io2" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b51ed7824b6e07d354605f4abb3d9d300350701299da96642ee084f5ce631550" +checksum = "418abd1b6d34fbf6cae440dc874771b0525a604428704c76e48b29a5e67b8003" dependencies = [ "memchr", ] @@ -5224,9 +5127,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967" +checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" [[package]] name = "num-derive" @@ -5561,9 +5464,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orbclient" -version = "0.3.51" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59aed3b33578edcfa1bc96a321d590d31832b6ad55a26f0313362ce687e9abd6" +checksum = "5df339f526ea9a60e371768d50efc2f2508c7203290731565d1f7a6f71d21747" dependencies = [ "libc", "libredox", @@ -5727,7 +5630,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" dependencies = [ "phf_shared 0.11.3", - "rand 0.8.5", + "rand 0.8.6", ] [[package]] @@ -5794,18 +5697,18 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" -version = "1.1.11" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517" +checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.11" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6" +checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b" dependencies = [ "proc-macro2", "quote", @@ -6054,18 +5957,18 @@ dependencies = [ [[package]] name = "profiling" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773" +checksum = "3d595e54a326bc53c1c197b32d295e14b169e3cfeaa8dc82b529f947fba6bcf5" dependencies = [ "profiling-procmacros", ] [[package]] name = "profiling-procmacros" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b" +checksum = "4488a4a36b9a4ba6b9334a32a39971f77c1436ec82c38707bce707699cc3bbcb" dependencies = [ "quote", "syn 2.0.117", @@ -6081,16 +5984,16 @@ dependencies = [ "byteorder", "hmac 0.10.1", "md-5", - "rand 0.8.5", + "rand 0.8.6", "sha-1", "sha2 0.9.9", ] [[package]] name = "pxfm" -version = "0.1.28" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a041e753da8b807c9255f28de81879c78c876392ff2469cde94799b2896b9d" +checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f" [[package]] name = "qoi" @@ -6120,16 +6023,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c" dependencies = [ "memchr", - "serde", ] [[package]] name = "quick-xml" -version = "0.39.2" +version = "0.39.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d" +checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e" dependencies = [ "memchr", + "serde", ] [[package]] @@ -6155,9 +6058,9 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "rand" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" dependencies = [ "libc", "rand_chacha 0.3.1", @@ -6322,9 +6225,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f450ad9c3b1da563fb6948a8e0fb0fb9269711c9c73d9ea1de5058c79c8d643a" +checksum = "4666a1a60d8412eab19d94f6d13dcc9cea0a5ef4fdf6a5db306537413c661b1b" dependencies = [ "bitflags 2.11.1", ] @@ -6732,9 +6635,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.149" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" +checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" dependencies = [ "indexmap 2.14.0", "itoa", @@ -6766,11 +6669,12 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.18.0" +version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd5414fad8e6907dbdd5bc441a50ae8d6e26151a03b1de04d89a5576de61d01f" +checksum = "e72c1c2cb7b223fafb600a619537a871c2818583d619401b785e7c0b746ccde2" dependencies = [ "base64", + "bs58", "chrono", "hex", "indexmap 1.9.3", @@ -6785,9 +6689,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.18.0" +version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3db8978e608f1fe7357e211969fd9abdcae80bac1ba7a3369bb7eb6b404eb65" +checksum = "b90c488738ecb4fb0262f41f43bc40efc5868d9fb744319ddf5f5317f417bfac" dependencies = [ "darling 0.23.0", "proc-macro2", @@ -6899,9 +6803,9 @@ dependencies = [ [[package]] name = "siphasher" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" +checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649" [[package]] name = "skrifa" @@ -6967,7 +6871,6 @@ dependencies = [ [[package]] name = "smithay-clipboard" version = "0.8.0" -source = "git+https://github.com/pop-os/smithay-clipboard?tag=sctk-0.20#859b02c88f45c554049a67c6ddeec1692ce0e20b" dependencies = [ "libc", "raw-window-handle", @@ -6998,14 +6901,11 @@ dependencies = [ [[package]] name = "softbuffer" version = "0.4.1" -source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#c2b2c19ddb38ff17495643699f97cb1f2064a1be" dependencies = [ - "as-raw-xcb-connection", "bytemuck", "cfg_aliases 0.2.1", "cocoa", "core-graphics", - "drm", "fastrand", "foreign-types", "js-sys", @@ -7015,14 +6915,12 @@ dependencies = [ "raw-window-handle", "redox_syscall 0.5.18", "rustix 0.38.44", - "tiny-xlib", "wasm-bindgen", "wayland-backend", "wayland-client", "wayland-sys", "web-sys", "windows-sys 0.52.0", - "x11rb", ] [[package]] @@ -7374,19 +7272,6 @@ dependencies = [ "strict-num", ] -[[package]] -name = "tiny-xlib" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0324504befd01cab6e0c994f34b2ffa257849ee019d3fb3b64fb2c858887d89e" -dependencies = [ - "as-raw-xcb-connection", - "ctor-lite", - "libloading", - "pkg-config", - "tracing", -] - [[package]] name = "tinystr" version = "0.8.3" @@ -7415,9 +7300,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.52.0" +version = "1.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91135f59b1cbf38c91e73cf3386fca9bb77915c45ce2771460c9d92f0f3d776" +checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" dependencies = [ "bytes", "libc", @@ -7473,7 +7358,7 @@ dependencies = [ "toml_datetime", "toml_parser", "toml_writer", - "winnow 1.0.1", + "winnow 1.0.3", ] [[package]] @@ -7494,7 +7379,7 @@ dependencies = [ "indexmap 2.14.0", "toml_datetime", "toml_parser", - "winnow 1.0.1", + "winnow 1.0.3", ] [[package]] @@ -7503,7 +7388,7 @@ version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" dependencies = [ - "winnow 1.0.1", + "winnow 1.0.3", ] [[package]] @@ -7610,9 +7495,9 @@ checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" [[package]] name = "typenum" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" +checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" [[package]] name = "udev" @@ -7875,11 +7760,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.2+wasi-0.2.9" +version = "1.0.3+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" dependencies = [ - "wit-bindgen", + "wit-bindgen 0.57.1", ] [[package]] @@ -7888,14 +7773,14 @@ version = "0.4.0+wasi-0.3.0-rc-2026-01-06" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" dependencies = [ - "wit-bindgen", + "wit-bindgen 0.51.0", ] [[package]] name = "wasm-bindgen" -version = "0.2.118" +version = "0.2.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89" +checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409" dependencies = [ "cfg-if", "once_cell", @@ -7906,9 +7791,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.68" +version = "0.4.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f371d383f2fb139252e0bfac3b81b265689bf45b6874af544ffa4c975ac1ebf8" +checksum = "9473dbd2991ae90b6291c3c32c30c6187ac49aa32f9905d1cce280ec1e110b0f" dependencies = [ "js-sys", "wasm-bindgen", @@ -7916,9 +7801,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.118" +version = "0.2.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed" +checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7926,9 +7811,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.118" +version = "0.2.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904" +checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e" dependencies = [ "bumpalo", "proc-macro2", @@ -7939,9 +7824,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.118" +version = "0.2.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129" +checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437" dependencies = [ "unicode-ident", ] @@ -8115,7 +8000,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c324a910fd86ebdc364a3e61ec1f11737d3b1d6c273c0239ee8ff4bc0d24b4a" dependencies = [ "proc-macro2", - "quick-xml 0.39.2", + "quick-xml 0.39.4", "quote", ] @@ -8146,9 +8031,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.95" +version = "0.3.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2dfbb17949fa2088e5d39408c48368947b86f7834484e87b73de55bc14d97d" +checksum = "6d621441cfc37b84979402712047321980c178f299193a3589d05b99e8763436" dependencies = [ "js-sys", "wasm-bindgen", @@ -8172,13 +8057,12 @@ checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" [[package]] name = "wgpu" -version = "28.0.0" +version = "27.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cb534d5ffd109c7d1135f34cdae29e60eab94855a625dcfe1705f8bc7ad79f" +checksum = "bfe68bac7cde125de7a731c3400723cadaaf1703795ad3f4805f187459cd7a77" dependencies = [ "arrayvec", "bitflags 2.11.1", - "bytemuck", "cfg-if", "cfg_aliases 0.2.1", "document-features", @@ -8202,9 +8086,9 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "28.0.1" +version = "27.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23f4642f53f666adcfd2d3218ab174d1e6681101aef18696b90cbe64d1c10f9" +checksum = "27a75de515543b1897b26119f93731b385a19aea165a1ec5f0e3acecc229cae7" dependencies = [ "arrayvec", "bit-set", @@ -8234,36 +8118,36 @@ dependencies = [ [[package]] name = "wgpu-core-deps-apple" -version = "28.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87b7b696b918f337c486bf93142454080a32a37832ba8a31e4f48221890047da" +checksum = "0772ae958e9be0c729561d5e3fd9a19679bcdfb945b8b1a1969d9bfe8056d233" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-emscripten" -version = "28.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34b251c331f84feac147de3c4aa3aa45112622a95dd7ee1b74384fa0458dbd79" +checksum = "b06ac3444a95b0813ecfd81ddb2774b66220b264b3e2031152a4a29fda4da6b5" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-windows-linux-android" -version = "28.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ca976e72b2c9964eb243e281f6ce7f14a514e409920920dcda12ae40febaae" +checksum = "71197027d61a71748e4120f05a9242b2ad142e3c01f8c1b47707945a879a03c3" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-hal" -version = "28.0.1" +version = "27.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d6cb474beb218824dcc9e1ce679d973f719262789bfb27407da560cac20eeb" +checksum = "5b21cb61c57ee198bc4aff71aeadff4cbb80b927beb912506af9c780d64313ce" dependencies = [ "android_system_properties", "arrayvec", @@ -8277,6 +8161,7 @@ dependencies = [ "core-graphics-types 0.2.0", "glow", "glutin_wgl_sys", + "gpu-alloc", "gpu-allocator", "gpu-descriptor", "hashbrown 0.16.1", @@ -8303,20 +8188,21 @@ dependencies = [ "wasm-bindgen", "web-sys", "wgpu-types", - "windows 0.62.2", - "windows-core 0.62.2", + "windows 0.58.0", + "windows-core 0.58.0", ] [[package]] name = "wgpu-types" -version = "28.0.0" +version = "27.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e18308757e594ed2cd27dddbb16a139c42a683819d32a2e0b1b0167552f5840c" +checksum = "afdcf84c395990db737f2dd91628706cb31e86d72e53482320d368e52b5da5eb" dependencies = [ "bitflags 2.11.1", "bytemuck", "js-sys", "log", + "thiserror 2.0.18", "web-sys", ] @@ -8363,18 +8249,26 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" version = "0.4.1" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=sctk-0.20#f68595ee0e62fbd6589f4709b5aaa5c3c7ea5f6c" dependencies = [ "clipboard-win", "clipboard_macos", "clipboard_wayland", - "clipboard_x11", "dnd", "mime 0.1.0", "raw-window-handle", "thiserror 1.0.69", ] +[[package]] +name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core 0.58.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows" version = "0.61.3" @@ -8418,14 +8312,27 @@ dependencies = [ "windows-core 0.62.2", ] +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement 0.58.0", + "windows-interface 0.58.0", + "windows-result 0.2.0", + "windows-strings 0.1.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows-core" version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ - "windows-implement", - "windows-interface", + "windows-implement 0.60.2", + "windows-interface 0.59.3", "windows-link 0.1.3", "windows-result 0.3.4", "windows-strings 0.4.2", @@ -8437,8 +8344,8 @@ version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ - "windows-implement", - "windows-interface", + "windows-implement 0.60.2", + "windows-interface 0.59.3", "windows-link 0.2.1", "windows-result 0.4.1", "windows-strings 0.5.1", @@ -8466,6 +8373,17 @@ dependencies = [ "windows-threading 0.2.1", ] +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "windows-implement" version = "0.60.2" @@ -8477,6 +8395,17 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "windows-interface" version = "0.59.3" @@ -8520,6 +8449,15 @@ dependencies = [ "windows-link 0.2.1", ] +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-result" version = "0.3.4" @@ -8538,6 +8476,16 @@ dependencies = [ "windows-link 0.2.1", ] +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result 0.2.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows-strings" version = "0.4.2" @@ -8808,7 +8756,6 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winit" version = "0.31.0-beta.2" -source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366" dependencies = [ "bitflags 2.11.1", "cfg_aliases 0.2.1", @@ -8828,13 +8775,11 @@ dependencies = [ "winit-wayland", "winit-web", "winit-win32", - "winit-x11", ] [[package]] name = "winit-android" version = "0.31.0-beta.2" -source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366" dependencies = [ "android-activity", "bitflags 2.11.1", @@ -8849,7 +8794,6 @@ dependencies = [ [[package]] name = "winit-appkit" version = "0.31.0-beta.2" -source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366" dependencies = [ "bitflags 2.11.1", "block2 0.6.2", @@ -8871,7 +8815,6 @@ dependencies = [ [[package]] name = "winit-common" version = "0.31.0-beta.2" -source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366" dependencies = [ "memmap2 0.9.10", "objc2 0.6.4", @@ -8879,14 +8822,12 @@ dependencies = [ "smol_str", "tracing", "winit-core", - "x11-dl", "xkbcommon-dl", ] [[package]] name = "winit-core" version = "0.31.0-beta.2" -source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366" dependencies = [ "bitflags 2.11.1", "cursor-icon", @@ -8900,14 +8841,13 @@ dependencies = [ [[package]] name = "winit-orbital" version = "0.31.0-beta.2" -source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366" dependencies = [ "bitflags 2.11.1", "dpi", "libredox", "orbclient", "raw-window-handle", - "redox_syscall 0.7.4", + "redox_syscall 0.7.5", "smol_str", "tracing", "winit-core", @@ -8916,7 +8856,6 @@ dependencies = [ [[package]] name = "winit-uikit" version = "0.31.0-beta.2" -source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366" dependencies = [ "bitflags 2.11.1", "block2 0.6.2", @@ -8936,7 +8875,6 @@ dependencies = [ [[package]] name = "winit-wayland" version = "0.31.0-beta.2" -source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366" dependencies = [ "ahash", "bitflags 2.11.1", @@ -8962,7 +8900,6 @@ dependencies = [ [[package]] name = "winit-web" version = "0.31.0-beta.2" -source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366" dependencies = [ "atomic-waker", "bitflags 2.11.1", @@ -8984,7 +8921,6 @@ dependencies = [ [[package]] name = "winit-win32" version = "0.31.0-beta.2" -source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366" dependencies = [ "bitflags 2.11.1", "cursor-icon", @@ -8997,29 +8933,6 @@ dependencies = [ "winit-core", ] -[[package]] -name = "winit-x11" -version = "0.31.0-beta.2" -source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366" -dependencies = [ - "bitflags 2.11.1", - "bytemuck", - "calloop", - "cursor-icon", - "dpi", - "libc", - "percent-encoding", - "raw-window-handle", - "rustix 1.1.4", - "smol_str", - "tracing", - "winit-common", - "winit-core", - "x11-dl", - "x11rb", - "xkbcommon-dl", -] - [[package]] name = "winnow" version = "0.6.24" @@ -9031,9 +8944,9 @@ dependencies = [ [[package]] name = "winnow" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5" +checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1" dependencies = [ "memchr", ] @@ -9047,6 +8960,12 @@ dependencies = [ "wit-bindgen-rust-macro", ] +[[package]] +name = "wit-bindgen" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" + [[package]] name = "wit-bindgen-core" version = "0.51.0" @@ -9141,39 +9060,6 @@ dependencies = [ "either", ] -[[package]] -name = "x11-dl" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" -dependencies = [ - "libc", - "once_cell", - "pkg-config", -] - -[[package]] -name = "x11rb" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414" -dependencies = [ - "as-raw-xcb-connection", - "gethostname", - "libc", - "libloading", - "once_cell", - "rustix 1.1.4", - "x11rb-protocol", - "xcursor", -] - -[[package]] -name = "x11rb-protocol" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd" - [[package]] name = "xcursor" version = "0.3.10" @@ -9189,7 +9075,6 @@ checksum = "2fb433233f2df9344722454bc7e96465c9d03bff9d77c248f9e7523fe79585b5" [[package]] name = "xdg-shell-wrapper-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-panel#d518c7d25ef96f1a9696aa8cce008656bf66ece4" dependencies = [ "serde", "wayland-protocols-wlr", @@ -9274,9 +9159,9 @@ dependencies = [ [[package]] name = "xml" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8aa498d22c9bbaf482329839bc5620c46be275a19a812e9a22a2b07529a642a" +checksum = "636f85e5ca6488e96401b61eb7de54f4e44755c988af0f52cf90230c312a1a89" [[package]] name = "xml-rs" @@ -9370,7 +9255,7 @@ dependencies = [ "uds_windows", "uuid", "windows-sys 0.61.2", - "winnow 1.0.1", + "winnow 1.0.3", "zbus_macros", "zbus_names", "zvariant", @@ -9422,7 +9307,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7074f3e50b894eac91750142016d30d0a89be8e67dbfd9704fb875825760e52d" dependencies = [ "serde", - "winnow 1.0.1", + "winnow 1.0.3", "zvariant", ] @@ -9441,11 +9326,11 @@ dependencies = [ [[package]] name = "zbus_xml" -version = "5.1.0" +version = "5.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "441a0064125265655bccc3a6af6bef56814d9277ac83fce48b1cd7e160b80eac" +checksum = "a8067892e940ed1727dea64690378601603b31d62dfde019a5335fbb7c0e0ed9" dependencies = [ - "quick-xml 0.38.4", + "quick-xml 0.39.4", "serde", "zbus_names", "zvariant", @@ -9479,9 +9364,9 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df" +checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" dependencies = [ "zerofrom-derive", ] @@ -9594,7 +9479,7 @@ dependencies = [ "enumflags2", "serde", "url", - "winnow 1.0.1", + "winnow 1.0.3", "zvariant_derive", "zvariant_utils", ] @@ -9622,5 +9507,9 @@ dependencies = [ "quote", "serde", "syn 2.0.117", - "winnow 1.0.1", + "winnow 1.0.3", ] + +[[patch.unused]] +name = "winit-x11" +version = "0.31.0-beta.2" diff --git a/Cargo.toml b/Cargo.toml index f4f5b43..0095e99 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,39 +7,41 @@ resolver = "3" rust-version = "1.93" [workspace.dependencies] -cosmic-randr = { git = "https://github.com/pop-os/cosmic-randr" } +cosmic-randr = { path = "../cosmic-randr/lib" } tokio = { version = "1.49.0", features = ["macros"] } -iced_winit = { git = "https://github.com/pop-os/libcosmic", default-features = false } +# Yoda fork: direct path dep on iced_winit in libcosmic-yoda's submodule. +iced_winit = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/winit", default-features = false } -[workspace.dependencies.libcosmic] +# Yoda fork — libcosmic-yoda by path, replaces upstream git dep. +[workspace.dependencies.libcosmic-yoda] features = [ "dbus-config", "desktop", "multi-window", - "winit", + "wayland", "tokio", "qr_code", ] -git = "https://github.com/pop-os/libcosmic" +path = "/home/lionel/Projets/COSMIC/libcosmic" [workspace.dependencies.cosmic-config] -git = "https://github.com/pop-os/libcosmic" +path = "/home/lionel/Projets/COSMIC/libcosmic/cosmic-config" [workspace.dependencies.cosmic-bg-config] -git = "https://github.com/pop-os/cosmic-bg" +path = "../cosmic-bg/config" [workspace.dependencies.cosmic-comp-config] -git = "https://github.com/pop-os/cosmic-comp" +path = "../cosmic-comp/cosmic-comp-config" features = ["output"] [workspace.dependencies.cosmic-idle-config] -git = "https://github.com/pop-os/cosmic-idle" +path = "../cosmic-idle/cosmic-idle-config" [workspace.dependencies.cosmic-panel-config] -git = "https://github.com/pop-os/cosmic-panel" +path = "../cosmic-panel/cosmic-panel-config" [workspace.dependencies.cosmic-randr-shell] -git = "https://github.com/pop-os/cosmic-randr" +path = "../cosmic-randr/shell" [workspace.dependencies.sctk] version = "0.20" @@ -63,25 +65,31 @@ debug = true # cosmic-text = { git = "https://github.com/pop-os/cosmic-text//", rev = "b017d7c" } [patch.'https://github.com/pop-os/cosmic-protocols'] -cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d0e95be" } -cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d0e95be" } +cosmic-protocols = { path = "../cosmic-protocols" } +cosmic-client-toolkit = { path = "../cosmic-protocols/client-toolkit" } # [patch.'https://github.com/pop-os/cosmic-settings-daemon'] # cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon//", branch = "input_nobuild" } -# For development and testing purposes -# [patch.'https://github.com/pop-os/libcosmic'] -# libcosmic = { path = "../libcosmic" } -# cosmic-config = { path = "../libcosmic/cosmic-config" } -# cosmic-theme = { path = "../libcosmic/cosmic-theme" } -# iced_futures = { path = "../libcosmic/iced/futures" } -# iced_winit = { path = "../libcosmic/iced/winit" } +# Yoda fork: redirect every transitive dep that asks for pop-os/libcosmic +# (cosmic-bg-config, cosmic-comp-config, cosmic-idle-config, cosmic-panel-config, +# cosmic-settings-config, cosmic-settings-daemon-config) to our local paths so +# the whole graph resolves against a single cosmic-config / cosmic-theme / iced_*. +[patch.'https://github.com/pop-os/libcosmic'] +cosmic-config = { path = "/home/lionel/Projets/COSMIC/libcosmic/cosmic-config" } +cosmic-theme = { path = "/home/lionel/Projets/COSMIC/libcosmic/cosmic-theme" } +iced_futures = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/futures" } +iced_winit = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/winit" } -# libcosmic = { git = "https://github.com/pop-os/libcosmic//" } -# cosmic-config = { git = "https://github.com/pop-os/libcosmic//" } -# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//" } -# iced_futures = { git = "https://github.com/pop-os/libcosmic//" } -# iced_winit = { git = "https://github.com/pop-os/libcosmic//" } +[patch.'https://github.com/pop-os/cosmic-text.git'] +cosmic-text = { path = "../cosmic-text" } + +# Yoda wayland cut v5: redirect window_clipboard to the local fork +# (x11 gated behind opt-in feature). +[patch.'https://forge.aditua.com/leyoda/window_clipboard.git'] +window_clipboard = { path = "/home/lionel/Projets/COSMIC/window_clipboard" } +dnd = { path = "/home/lionel/Projets/COSMIC/window_clipboard/dnd" } +mime = { path = "/home/lionel/Projets/COSMIC/window_clipboard/mime" } # [patch.'https://github.com/pop-os/dbus-settings-bindings'] # cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" } diff --git a/cosmic-settings/Cargo.toml b/cosmic-settings/Cargo.toml index afee51c..d70603e 100644 --- a/cosmic-settings/Cargo.toml +++ b/cosmic-settings/Cargo.toml @@ -59,7 +59,7 @@ image = { version = "0.25", default-features = false, features = [ indexmap = "2.13.0" itertools = "0.14.0" itoa = "1.0.17" -libcosmic.workspace = true +libcosmic-yoda.workspace = true iced_winit.workspace = true locale1 = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } sysinfo = { version = "=0.38.0", optional = true } @@ -187,12 +187,12 @@ page-window-management = ["cosmic-comp-config", "dep:cosmic-settings-config"] page-workspaces = ["cosmic-comp-config"] # Other features -a11y = ["libcosmic/a11y"] +a11y = ["libcosmic-yoda/a11y"] ashpd = ["dep:ashpd"] cosmic-comp-config = ["dep:cosmic-comp-config"] -dbus-config = ["libcosmic/dbus-config", "cosmic-config/dbus"] -single-instance = ["libcosmic/single-instance"] +dbus-config = ["libcosmic-yoda/dbus-config", "cosmic-config/dbus"] +single-instance = ["libcosmic-yoda/single-instance"] test = [] -wayland = ["libcosmic/wayland", "dep:cosmic-panel-config", "dep:cosmic-randr", "iced_winit/cctk"] -wgpu = ["libcosmic/wgpu"] -xdg-portal = ["ashpd", "libcosmic/xdg-portal"] +wayland = ["libcosmic-yoda/wayland", "dep:cosmic-panel-config", "dep:cosmic-randr", "iced_winit/cctk"] +wgpu = ["libcosmic-yoda/wgpu"] +xdg-portal = ["ashpd", "libcosmic-yoda/xdg-portal"] diff --git a/cosmic-settings/src/pages/desktop/window_management.rs b/cosmic-settings/src/pages/desktop/window_management.rs index b3b130f..f112337 100644 --- a/cosmic-settings/src/pages/desktop/window_management.rs +++ b/cosmic-settings/src/pages/desktop/window_management.rs @@ -23,6 +23,7 @@ pub enum Message { ShowActiveWindowHint(bool), ShowMaximizeButton(bool), ShowMinimizeButton(bool), + WindowControlsPositionStart(bool), SetEdgeSnapThreshold(u32), Surface(surface::Action), } @@ -173,6 +174,19 @@ impl Page { .set_show_minimize(&config, value); } } + Message::WindowControlsPositionStart(left) => { + if let Ok(config) = cosmic::config::CosmicTk::config() { + let position = if left { + cosmic::widget::WindowControlsPosition::Start + } else { + cosmic::widget::WindowControlsPosition::End + }; + let _res = cosmic::config::COSMIC_TK + .write() + .unwrap() + .set_window_controls_position(&config, position); + } + } Message::ShowActiveWindowHint(value) => { self.show_active_hint = value; if let Err(err) = self.comp_config.set("active_hint", value) { @@ -270,6 +284,7 @@ pub fn window_controls() -> Section { maximize = fl!("window-controls", "maximize"); minimize = fl!("window-controls", "minimize"); active_window_hint = fl!("window-controls", "active-window-hint"); + position_start = fl!("window-controls", "position-start"); }); Section::default() @@ -292,6 +307,13 @@ pub fn window_controls() -> Section { settings::item::builder(&descriptions[minimize]) .toggler(cosmic::config::show_minimize(), Message::ShowMinimizeButton), ) + .add(settings::item::builder(&descriptions[position_start]).toggler( + matches!( + cosmic::config::window_controls_position(), + cosmic::widget::WindowControlsPosition::Start + ), + Message::WindowControlsPositionStart, + )) .apply(Element::from) .map(crate::pages::Message::WindowManagement) }) diff --git a/i18n/en/cosmic_settings.ftl b/i18n/en/cosmic_settings.ftl index 535477b..f5a614e 100644 --- a/i18n/en/cosmic_settings.ftl +++ b/i18n/en/cosmic_settings.ftl @@ -484,6 +484,7 @@ window-controls = Window controls .maximize = Show maximize button .minimize = Show minimize button .active-window-hint = Show active window hint + .position-start = Place buttons on the left (macOS style) focus-navigation = Focus navigation .focus-follows-cursor = Focus follows cursor diff --git a/i18n/fr/cosmic_settings.ftl b/i18n/fr/cosmic_settings.ftl index 95b488e..55965e3 100644 --- a/i18n/fr/cosmic_settings.ftl +++ b/i18n/fr/cosmic_settings.ftl @@ -322,6 +322,7 @@ window-controls = Contrôles des fenêtres .maximize = Afficher le bouton maximiser .minimize = Afficher le bouton minimiser .active-window-hint = Afficher l'indice de la fenêtre active + .position-start = Placer les boutons à gauche (style macOS) focus-navigation = Navigation par le focus .focus-follows-cursor = Le focus suit le curseur .focus-follows-cursor-delay = Délai de suivi du focus en ms diff --git a/page/Cargo.toml b/page/Cargo.toml index 7547599..d45d828 100644 --- a/page/Cargo.toml +++ b/page/Cargo.toml @@ -7,7 +7,7 @@ edition = "2024" derive_setters = "0.1.9" regex = "1.12.3" slotmap = "1.1.1" -libcosmic = { workspace = true } +libcosmic-yoda = { workspace = true } downcast-rs = "2.0.2" url = "2.5.8" slab = "0.4.12" diff --git a/subscriptions/sound/Cargo.toml b/subscriptions/sound/Cargo.toml index adf5891..0ea0154 100644 --- a/subscriptions/sound/Cargo.toml +++ b/subscriptions/sound/Cargo.toml @@ -10,7 +10,7 @@ publish = true cosmic-pipewire = { path = "../../crates/cosmic-pipewire" } futures = "0.3.32" intmap = "3.1.3" -libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false } +libcosmic-yoda = { path = "/home/lionel/Projets/COSMIC/libcosmic", default-features = false } numtoa = "1.0.0-alpha1" rustix = "1.1.3" tokio = { version = "1.49.0", features = ["process", "rt", "time"] } From 32d71847b6bf768857eab0afa5be2cf516ae6a88 Mon Sep 17 00:00:00 2001 From: Lionel DARNIS Date: Sat, 23 May 2026 20:49:24 +0200 Subject: [PATCH 21/24] chore: align subscriptions with local stack --- subscriptions/a11y-manager/Cargo.toml | 4 ++-- subscriptions/accessibility/Cargo.toml | 2 +- subscriptions/airplane-mode/Cargo.toml | 2 +- subscriptions/network-manager/Cargo.toml | 2 +- subscriptions/network-manager/src/devices.rs | 2 +- subscriptions/network-manager/src/lib.rs | 2 +- subscriptions/pulse/Cargo.toml | 2 +- subscriptions/pulse/src/lib.rs | 4 ++-- subscriptions/settings-daemon/Cargo.toml | 2 +- subscriptions/upower/Cargo.toml | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/subscriptions/a11y-manager/Cargo.toml b/subscriptions/a11y-manager/Cargo.toml index bfdf7c2..8bb0c2b 100644 --- a/subscriptions/a11y-manager/Cargo.toml +++ b/subscriptions/a11y-manager/Cargo.toml @@ -7,8 +7,8 @@ rust-version.workspace = true publish = true [dependencies] -cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols" } -iced_futures = { git = "https://github.com/pop-os/libcosmic" } +cosmic-protocols = { path = "../../../cosmic-protocols" } +iced_futures = { path = "../../../libcosmic/iced/futures" } num-derive = "0.4.2" num-traits = "0.2.19" sctk.workspace = true diff --git a/subscriptions/accessibility/Cargo.toml b/subscriptions/accessibility/Cargo.toml index 2a3b5e6..2491153 100644 --- a/subscriptions/accessibility/Cargo.toml +++ b/subscriptions/accessibility/Cargo.toml @@ -9,7 +9,7 @@ publish = true [dependencies] cosmic-dbus-a11y = { git = "https://github.com/pop-os/dbus-settings-bindings" } futures = "0.3.32" -iced_futures = { git = "https://github.com/pop-os/libcosmic" } +iced_futures = { path = "../../../libcosmic/iced/futures" } tokio = { version = "1.49.0", features = ["sync", "time"] } tracing = "0.1.44" zbus = "5.13" diff --git a/subscriptions/airplane-mode/Cargo.toml b/subscriptions/airplane-mode/Cargo.toml index 403f6fe..4fda29b 100644 --- a/subscriptions/airplane-mode/Cargo.toml +++ b/subscriptions/airplane-mode/Cargo.toml @@ -8,7 +8,7 @@ publish = true [dependencies] futures = "0.3.32" -iced_futures = { git = "https://github.com/pop-os/libcosmic" } +iced_futures = { path = "../../../libcosmic/iced/futures" } log = "0.4.29" rustix = "1.1.3" tokio = "1.49.0" diff --git a/subscriptions/network-manager/Cargo.toml b/subscriptions/network-manager/Cargo.toml index e40a2a8..c66a4ca 100644 --- a/subscriptions/network-manager/Cargo.toml +++ b/subscriptions/network-manager/Cargo.toml @@ -11,7 +11,7 @@ cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bi secret-service = { version = "5.1.0", features = ["rt-tokio-crypto-rust"] } nm-secret-agent-manager = { git = "https://github.com/pop-os/dbus-settings-bindings" } futures = "0.3.32" -iced_futures = { git = "https://github.com/pop-os/libcosmic" } +iced_futures = { path = "../../../libcosmic/iced/futures" } itertools = "0.14.0" secure-string = "0.3.0" thiserror = "2.0.18" diff --git a/subscriptions/network-manager/src/devices.rs b/subscriptions/network-manager/src/devices.rs index 4dbcdb6..4140728 100644 --- a/subscriptions/network-manager/src/devices.rs +++ b/subscriptions/network-manager/src/devices.rs @@ -188,7 +188,7 @@ pub fn subscription( conn, }, |Wrapper { - id, + id: _, has_popup, conn, }| { diff --git a/subscriptions/network-manager/src/lib.rs b/subscriptions/network-manager/src/lib.rs index 675b7bf..a23f84b 100644 --- a/subscriptions/network-manager/src/lib.rs +++ b/subscriptions/network-manager/src/lib.rs @@ -140,7 +140,7 @@ pub fn subscription( self.id.hash(state); } } - Subscription::run_with(Wrapper { id, conn }, |Wrapper { id, conn }| { + Subscription::run_with(Wrapper { id, conn }, |Wrapper { id: _, conn }| { let conn = conn.clone(); stream::channel( 50, diff --git a/subscriptions/pulse/Cargo.toml b/subscriptions/pulse/Cargo.toml index cc4760b..48c2adc 100644 --- a/subscriptions/pulse/Cargo.toml +++ b/subscriptions/pulse/Cargo.toml @@ -7,6 +7,6 @@ rust-version.workspace = true [dependencies] libpulse-binding = { version = "2.30.1" } rustix = { version = "1.1.3", features = ["pipe"] } -iced_futures = { git = "https://github.com/pop-os/libcosmic" } +iced_futures = { path = "../../../libcosmic/iced/futures" } futures = "0.3.32" log = "0.4.27" diff --git a/subscriptions/pulse/src/lib.rs b/subscriptions/pulse/src/lib.rs index b2a7779..233e2c8 100644 --- a/subscriptions/pulse/src/lib.rs +++ b/subscriptions/pulse/src/lib.rs @@ -281,7 +281,7 @@ impl PulseChannels { /// Set the speaker balance of the active sink. pub fn set_balance(&mut self, balance: f32) { if let Err(err) = self.tx.send(Request::Balance(self.index, balance)) { - log::error!("Failed to send new balance to channel"); + log::error!("Failed to send new balance to channel: {err}"); } else { self.pipe_tx .write_all(&[1]) @@ -292,7 +292,7 @@ impl PulseChannels { /// Set the volume of the active sink. pub fn set_volume(&mut self, volume: f32) { if let Err(err) = self.tx.send(Request::Volume(self.index, volume)) { - log::error!("Failed to send new volume to channel"); + log::error!("Failed to send new volume to channel: {err}"); } else { self.pipe_tx .write_all(&[1]) diff --git a/subscriptions/settings-daemon/Cargo.toml b/subscriptions/settings-daemon/Cargo.toml index aa67fbe..59160d0 100644 --- a/subscriptions/settings-daemon/Cargo.toml +++ b/subscriptions/settings-daemon/Cargo.toml @@ -7,7 +7,7 @@ publish = true [dependencies] futures = "0.3.32" -iced_futures = { git = "https://github.com/pop-os/libcosmic" } +iced_futures = { path = "../../../libcosmic/iced/futures" } log = "0.4.29" tokio = "1.49.0" tokio-stream = "0.1.18" diff --git a/subscriptions/upower/Cargo.toml b/subscriptions/upower/Cargo.toml index 4121a10..3a468c8 100644 --- a/subscriptions/upower/Cargo.toml +++ b/subscriptions/upower/Cargo.toml @@ -8,7 +8,7 @@ publish = true [dependencies] futures = "0.3.32" -iced_futures = { git = "https://github.com/pop-os/libcosmic" } +iced_futures = { path = "../../../libcosmic/iced/futures" } log = "0.4.29" tokio = "1.49.0" tokio-stream = "0.1.18" From 79612643236613716bb991831880e26771099373 Mon Sep 17 00:00:00 2001 From: Lionel DARNIS Date: Mon, 25 May 2026 09:55:11 +0200 Subject: [PATCH 22/24] yoda: use local dbus settings bindings --- Cargo.lock | 9 --------- cosmic-settings/Cargo.toml | 16 ++++++++-------- subscriptions/accessibility/Cargo.toml | 2 +- subscriptions/bluetooth/Cargo.toml | 2 +- subscriptions/network-manager/Cargo.toml | 4 ++-- subscriptions/upower/Cargo.toml | 2 +- 6 files changed, 13 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a1caacb..9d11069 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -104,7 +104,6 @@ dependencies = [ [[package]] name = "accounts-zbus" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75" dependencies = [ "zbus", ] @@ -825,7 +824,6 @@ dependencies = [ [[package]] name = "bluez-zbus" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75" dependencies = [ "futures-channel", "futures-util", @@ -1408,7 +1406,6 @@ dependencies = [ [[package]] name = "cosmic-dbus-a11y" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75" dependencies = [ "zbus", ] @@ -1416,7 +1413,6 @@ dependencies = [ [[package]] name = "cosmic-dbus-networkmanager" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75" dependencies = [ "bitflags 2.11.1", "derive_builder", @@ -3070,7 +3066,6 @@ checksum = "f558a64ac9af88b5ba400d99b579451af0d39c6d360980045b91aac966d705e2" [[package]] name = "hostname1-zbus" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75" dependencies = [ "zbus", ] @@ -4666,7 +4661,6 @@ checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" [[package]] name = "locale1" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75" dependencies = [ "zbus", ] @@ -5008,7 +5002,6 @@ dependencies = [ [[package]] name = "nm-secret-agent-manager" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75" dependencies = [ "zbus", ] @@ -7241,7 +7234,6 @@ dependencies = [ [[package]] name = "timedate-zbus" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75" dependencies = [ "zbus", ] @@ -7631,7 +7623,6 @@ checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "upower_dbus" version = "0.3.2" -source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75" dependencies = [ "serde", "serde_repr", diff --git a/cosmic-settings/Cargo.toml b/cosmic-settings/Cargo.toml index d70603e..4b20b58 100644 --- a/cosmic-settings/Cargo.toml +++ b/cosmic-settings/Cargo.toml @@ -9,7 +9,7 @@ publish = false xdgen = "0.1" [dependencies] -accounts-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } +accounts-zbus = { path = "../../dbus-settings-bindings/accounts-zbus", optional = true } anyhow = "1.0" ashpd = { version = "0.12", default-features = false, features = [ "tokio", @@ -21,8 +21,8 @@ color-eyre = "0.6.5" cosmic-bg-config.workspace = true cosmic-comp-config = { workspace = true, optional = true } cosmic-config.workspace = true -cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } -nm-secret-agent-manager = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } +cosmic-dbus-networkmanager = { path = "../../dbus-settings-bindings/networkmanager", optional = true } +nm-secret-agent-manager = { path = "../../dbus-settings-bindings/nm-secret-agent-manager", 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 } @@ -47,7 +47,7 @@ eyre = "0.6.12" freedesktop-desktop-entry = "0.8.1" futures = "0.3.32" hostname-validator = "1.1.1" -hostname1-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } +hostname1-zbus = { path = "../../dbus-settings-bindings/hostname1", optional = true } i18n-embed-fl = "0.10.0" image = { version = "0.25", default-features = false, features = [ "jpeg", @@ -61,7 +61,7 @@ itertools = "0.14.0" itoa = "1.0.17" libcosmic-yoda.workspace = true iced_winit.workspace = true -locale1 = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } +locale1 = { path = "../../dbus-settings-bindings/locale1", optional = true } sysinfo = { version = "=0.38.0", optional = true } mime-apps = { package = "cosmic-mime-apps", git = "https://github.com/pop-os/cosmic-mime-apps", optional = true } notify = "8.2.0" @@ -75,13 +75,13 @@ slab = "0.4.12" slotmap = "1.1.1" static_init = "1.0.4" sunrise = "3.0.0" -timedate-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } +timedate-zbus = { path = "../../dbus-settings-bindings/timedate", optional = true } tokio = { workspace = true, features = ["fs", "io-util", "process", "sync"] } tracing = "0.1.44" tracing-subscriber = { version = "0.3.22", 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 } +upower_dbus = { path = "../../dbus-settings-bindings/upower", optional = true } +bluez-zbus = { path = "../../dbus-settings-bindings/bluez", optional = true } url = "2.5.8" xkb-data = "0.2.2" xkeysym = { version = "0.2.1", optional = true } diff --git a/subscriptions/accessibility/Cargo.toml b/subscriptions/accessibility/Cargo.toml index 2491153..138f539 100644 --- a/subscriptions/accessibility/Cargo.toml +++ b/subscriptions/accessibility/Cargo.toml @@ -7,7 +7,7 @@ rust-version.workspace = true publish = true [dependencies] -cosmic-dbus-a11y = { git = "https://github.com/pop-os/dbus-settings-bindings" } +cosmic-dbus-a11y = { path = "../../../dbus-settings-bindings/a11y" } futures = "0.3.32" iced_futures = { path = "../../../libcosmic/iced/futures" } tokio = { version = "1.49.0", features = ["sync", "time"] } diff --git a/subscriptions/bluetooth/Cargo.toml b/subscriptions/bluetooth/Cargo.toml index 0fb5a0d..b6e9967 100644 --- a/subscriptions/bluetooth/Cargo.toml +++ b/subscriptions/bluetooth/Cargo.toml @@ -7,7 +7,7 @@ rust-version.workspace = true publish = true [dependencies] -bluez-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings" } +bluez-zbus = { path = "../../../dbus-settings-bindings/bluez" } futures = "0.3.32" iced_futures = { git = "https://github.com/pop-os/libcosmic" } tokio = "1.49.0" diff --git a/subscriptions/network-manager/Cargo.toml b/subscriptions/network-manager/Cargo.toml index c66a4ca..d72f126 100644 --- a/subscriptions/network-manager/Cargo.toml +++ b/subscriptions/network-manager/Cargo.toml @@ -7,9 +7,9 @@ rust-version.workspace = true publish = true [dependencies] -cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bindings" } +cosmic-dbus-networkmanager = { path = "../../../dbus-settings-bindings/networkmanager" } secret-service = { version = "5.1.0", features = ["rt-tokio-crypto-rust"] } -nm-secret-agent-manager = { git = "https://github.com/pop-os/dbus-settings-bindings" } +nm-secret-agent-manager = { path = "../../../dbus-settings-bindings/nm-secret-agent-manager" } futures = "0.3.32" iced_futures = { path = "../../../libcosmic/iced/futures" } itertools = "0.14.0" diff --git a/subscriptions/upower/Cargo.toml b/subscriptions/upower/Cargo.toml index 3a468c8..568daee 100644 --- a/subscriptions/upower/Cargo.toml +++ b/subscriptions/upower/Cargo.toml @@ -12,5 +12,5 @@ iced_futures = { path = "../../../libcosmic/iced/futures" } log = "0.4.29" tokio = "1.49.0" tokio-stream = "0.1.18" -upower_dbus = { git = "https://github.com/pop-os/dbus-settings-bindings" } +upower_dbus = { path = "../../../dbus-settings-bindings/upower" } zbus = "5.13.2" From 7bf97264ab62fabcb254487e160c560154b7c8ae Mon Sep 17 00:00:00 2001 From: Lionel DARNIS Date: Mon, 25 May 2026 18:10:22 +0200 Subject: [PATCH 23/24] chore: use local COSMIC support crates --- Cargo.lock | 18 ++---------------- Cargo.toml | 5 +---- cosmic-settings/Cargo.toml | 6 +++--- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9d11069..d44621e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1540,7 +1540,7 @@ dependencies = [ "cosmic-settings-accessibility-subscription", "cosmic-settings-airplane-mode-subscription", "cosmic-settings-bluetooth-subscription", - "cosmic-settings-config 0.1.0 (git+https://github.com/pop-os/cosmic-settings-daemon)", + "cosmic-settings-config", "cosmic-settings-daemon-config", "cosmic-settings-network-manager-subscription", "cosmic-settings-page", @@ -1660,19 +1660,6 @@ dependencies = [ "xkbcommon 0.9.0", ] -[[package]] -name = "cosmic-settings-config" -version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-settings-daemon#fa82bdf9fe7b5f5bd6008f32f393efd5e7a71c47" -dependencies = [ - "cosmic-config", - "ron 0.11.0", - "serde", - "serde_with", - "tracing", - "xkbcommon 0.9.0", -] - [[package]] name = "cosmic-settings-daemon" version = "0.1.1-yoda.1" @@ -1683,7 +1670,6 @@ dependencies = [ [[package]] name = "cosmic-settings-daemon-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-settings-daemon#fa82bdf9fe7b5f5bd6008f32f393efd5e7a71c47" dependencies = [ "cosmic-config", "serde", @@ -4472,7 +4458,7 @@ dependencies = [ "cosmic-client-toolkit", "cosmic-config", "cosmic-freedesktop-icons", - "cosmic-settings-config 0.1.0", + "cosmic-settings-config", "cosmic-settings-daemon", "cosmic-theme", "css-color", diff --git a/Cargo.toml b/Cargo.toml index 0095e99..d23d770 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,15 +61,12 @@ inherits = "release" lto = "off" debug = true -# [patch.'https://github.com/pop-os/cosmic-text'] -# cosmic-text = { git = "https://github.com/pop-os/cosmic-text//", rev = "b017d7c" } - [patch.'https://github.com/pop-os/cosmic-protocols'] cosmic-protocols = { path = "../cosmic-protocols" } cosmic-client-toolkit = { path = "../cosmic-protocols/client-toolkit" } # [patch.'https://github.com/pop-os/cosmic-settings-daemon'] -# cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon//", branch = "input_nobuild" } +# cosmic-settings-config = { path = "../cosmic-settings-daemon/config" } # Yoda fork: redirect every transitive dep that asks for pop-os/libcosmic # (cosmic-bg-config, cosmic-comp-config, cosmic-idle-config, cosmic-panel-config, diff --git a/cosmic-settings/Cargo.toml b/cosmic-settings/Cargo.toml index 4b20b58..604190b 100644 --- a/cosmic-settings/Cargo.toml +++ b/cosmic-settings/Cargo.toml @@ -25,10 +25,10 @@ cosmic-dbus-networkmanager = { path = "../../dbus-settings-bindings/networkmanag nm-secret-agent-manager = { path = "../../dbus-settings-bindings/nm-secret-agent-manager", 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-protocols = { path = "../../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 } +cosmic-settings-config = { path = "../../cosmic-settings-daemon/config", optional = true } cosmic-settings-page = { path = "../page" } cosmic-settings-accessibility-subscription = { path = "../subscriptions/accessibility", optional = true } cosmic-settings-a11y-manager-subscription = { path = "../subscriptions/a11y-manager", optional = true } @@ -40,7 +40,7 @@ cosmic-settings-sound-subscription = { path = "../subscriptions/sound", optional "auto-profile-init", ] } cosmic-settings-wallpaper = { path = "../pages/wallpapers" } -cosmic-settings-daemon-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", optional = true } +cosmic-settings-daemon-config = { path = "../../cosmic-settings-daemon/cosmic-settings-daemon-config", optional = true } derive_setters = "0.1.9" dirs = "6.0.0" eyre = "0.6.12" From 5a522610f1cff16ce3ddf14950f21482f17195d6 Mon Sep 17 00:00:00 2001 From: Lionel DARNIS Date: Tue, 26 May 2026 09:15:05 +0200 Subject: [PATCH 24/24] fix: adapt GPU enumeration to local wgpu --- cosmic-settings/src/pages/system/info.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cosmic-settings/src/pages/system/info.rs b/cosmic-settings/src/pages/system/info.rs index 69b3540..699d23a 100644 --- a/cosmic-settings/src/pages/system/info.rs +++ b/cosmic-settings/src/pages/system/info.rs @@ -36,7 +36,7 @@ impl Info { // Use wgpu to enumerate GPUs. Works cross-platform and doesn't require external tools let instance = wgpu::Instance::default(); - let adapters = instance.enumerate_adapters(wgpu::Backends::all()).await; + let adapters = instance.enumerate_adapters(wgpu::Backends::all()); // Track seen GPUs by (vendor, device) and by name to handle different scenarios: // - Same GPU via different backends (Vulkan/OpenGL) -> deduplicate by device ID or name