leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(appearance): disable wrapping for style text

Browse source 
Also updates all workspace members to Rust 2024, removes `once_cell` and updates dependencies.
This commit is contained in:
Vukašin Vojinović 2025-07-31 14:43:37 +02:00 • committed by Michael Murphy
parent f536038489
commit a0f7b31d89
14 changed files with 284 additions and 341 deletions
Download patch file Download diff file Expand all files Collapse all files

520
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

2
Cargo.toml
View file

@ -8,7 +8,7 @@ rust-version = "1.85.0"
[workspace.dependencies]
cosmic-randr = { git = "https://github.com/pop-os/cosmic-randr" }
tokio = { version = "1.43.0", features = ["macros"] }
tokio = { version = "1.47.0", features = ["macros"] }
[workspace.dependencies.libcosmic]
features = ["multi-window", "winit", "tokio"]

39
cosmic-settings/Cargo.toml
View file

@ -8,13 +8,13 @@ license = "GPL-3.0-only"
accounts-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
anyhow = "1.0"
as-result = "0.2.1"
ashpd = { version = "0.9", default-features = false, features = [
ashpd = { version = "0.11", default-features = false, features = [
"tokio",
], optional = true }
async-channel = "2.3.1"
chrono = "0.4.40"
clap = { version = "4.5.32", features = ["derive"] }
color-eyre = "0.6.3"
async-channel = "2.5.0"
chrono = "0.4.41"
clap = { version = "4.5.42", features = ["derive"] }
color-eyre = "0.6.5"
cosmic-bg-config.workspace = true
cosmic-comp-config = { workspace = true, optional = true }
cosmic-config.workspace = true
@ -31,15 +31,15 @@ cosmic-settings-system = { path = "../pages/system", optional = true }
cosmic-settings-wallpaper = { path = "../pages/wallpapers" }
cosmic-settings-daemon-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", optional = true }
derivative = "2.2.0"
derive_setters = "0.1.6"
dirs = "5.0.1"
downcast-rs = "1.2.1"
derive_setters = "0.1.8"
dirs = "6.0.0"
downcast-rs = "2.0.1"
eyre = "0.6.12"
freedesktop-desktop-entry = "0.7.9"
freedesktop-desktop-entry = "0.7.13"
futures = "0.3.31"
hostname-validator = "1.1.1"
hostname1-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
i18n-embed-fl = "0.9.3"
i18n-embed-fl = "0.10.0"
image = { version = "0.25", default-features = false, features = [
"jpeg",
"png",
@ -47,23 +47,22 @@ image = { version = "0.25", default-features = false, features = [
"webp",
"hdr",
] }
indexmap = "2.8.0"
itertools = "0.13.0"
indexmap = "2.10.0"
itertools = "0.14.0"
itoa = "1.0.15"
libcosmic.workspace = true
locale1 = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
mime-apps = { package = "cosmic-mime-apps", git = "https://github.com/pop-os/cosmic-mime-apps", optional = true }
notify = "6.1.1"
once_cell = "1.21.1"
regex = "1.11.1"
ron = "0.9.0"
rust-embed = "8.6.0"
ron = "0.10.1"
rust-embed = "8.7.2"
sctk = { workspace = true, optional = true }
secure-string = "0.3.0"
serde = { version = "1.0.219", features = ["derive"] }
slab = "0.4.9"
slab = "0.4.10"
slotmap = "1.0.7"
static_init = "1.0.3"
static_init = "1.0.4"
sunrise = "2.1.0"
tachyonix = "0.3.1"
timedate-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
@ -75,14 +74,14 @@ upower_dbus = { git = "https://github.com/pop-os/dbus-settings-bindings", option
bluez-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
url = "2.5.4"
xkb-data = "0.2.1"
zbus = { version = "5.7.1", default-features = false, features = [
zbus = { version = "5.9.0", default-features = false, features = [
"tokio",
], optional = true }
zbus_polkit = { version = "5.0.0", optional = true }
fontdb = "0.23.0"
fixed_decimal = "0.5.6"
mime = "0.3.17"
rustix = { version = "1.0.3", features = ["process"] }
rustix = { version = "1.0.8", features = ["process"] }
gettext-rs = { version = "0.7.2", features = [
"gettext-system",
], optional = true }
@ -96,7 +95,7 @@ version = "1.5.0"
features = ["experimental", "compiled_data", "icu_datetime_experimental"]
[dependencies.i18n-embed]
version = "0.15.3"
version = "0.16.0"
features = ["fluent-system", "desktop-requester"]
# Contains region-handling logic for Linux

4
cosmic-settings/src/localize.rs
View file

@ -5,14 +5,14 @@ use i18n_embed::{
DefaultLocalizer, LanguageLoader, Localizer,
fluent::{FluentLanguageLoader, fluent_language_loader},
};
use once_cell::sync::Lazy;
use rust_embed::RustEmbed;
use std::sync::LazyLock;
#[derive(RustEmbed)]
#[folder = "../i18n/"]
struct Localizations;
pub static LANGUAGE_LOADER: Lazy<FluentLanguageLoader> = Lazy::new(|| {
pub static LANGUAGE_LOADER: LazyLock<FluentLanguageLoader> = LazyLock::new(|| {
let loader: FluentLanguageLoader = fluent_language_loader!();
loader

1
cosmic-settings/src/pages/desktop/appearance/drawer.rs
View file

@ -2,7 +2,6 @@ use cosmic::app::{ContextDrawer, context_drawer};
use cosmic::config::CosmicTk;
use cosmic::cosmic_config::{Config, ConfigSet};
use cosmic::cosmic_theme::Spacing;
use cosmic::cosmic_theme::palette::{FromColor, Hsv, Srgb};
use cosmic::iced_core::{Color, Length};
use cosmic::widget::{
ColorPickerModel, color_picker::ColorPickerUpdate, container, flex_row, settings, text,

4
cosmic-settings/src/pages/desktop/appearance/mod.rs
View file

@ -15,9 +15,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, DARK_THEME_BUILDER_ID, Density, LIGHT_THEME_BUILDER_ID, Theme, ThemeBuilder,
};
use cosmic::cosmic_theme::{CornerRadii, Density, Theme, ThemeBuilder};
#[cfg(feature = "xdg-portal")]
use cosmic::dialog::file_chooser::{self, FileFilter};
use cosmic::iced_core::{Alignment, Length};

8
cosmic-settings/src/pages/desktop/appearance/style.rs
View file

@ -1,4 +1,4 @@
use cosmic::iced_core::{Alignment, Length};
use cosmic::iced_core::{Alignment, Length, text::Wrapping};
use cosmic::widget::icon::{from_name, icon};
use cosmic::widget::{button, container, settings, text};
use cosmic::{Apply, Element};
@ -72,7 +72,7 @@ pub fn section() -> Section<crate::pages::Message> {
.apply(container)
.width(Length::Fixed(191.0))
.class(style_container()),
text::body(&descriptions[round])
text::body(&descriptions[round]).wrapping(Wrapping::None)
]
.spacing(8)
.width(Length::FillPortion(1))
@ -97,7 +97,7 @@ pub fn section() -> Section<crate::pages::Message> {
.apply(container)
.width(Length::Fixed(191.0))
.class(style_container()),
text::body(&descriptions[slightly_round])
text::body(&descriptions[slightly_round]).wrapping(Wrapping::None)
]
.spacing(8)
.width(Length::FillPortion(1))
@ -123,7 +123,7 @@ pub fn section() -> Section<crate::pages::Message> {
.apply(container)
.width(Length::Fixed(191.0))
.class(style_container()),
text::body(&descriptions[square])
text::body(&descriptions[square]).wrapping(Wrapping::None)
]
.spacing(8)
.align_x(Alignment::Center)

7
cosmic-settings/src/pages/desktop/panel/applets_inner.rs
View file

@ -25,10 +25,9 @@ use cosmic::{
},
theme,
};
use once_cell::sync::Lazy;
use std::path::PathBuf;
use std::{borrow::Cow, fmt::Debug, mem, path::Path};
use std::path::{Path, PathBuf};
use std::{borrow::Cow, fmt::Debug, mem, sync::LazyLock};
use crate::{app, pages};
use cosmic_panel_config::CosmicPanelConfig;
@ -49,7 +48,7 @@ const MIME_TYPE: &str = "text/uri-list";
// radius is 8.0
const DRAG_START_DISTANCE_SQUARED: f32 = 64.0;
pub static APPLET_DND_ICON_ID: Lazy<window::Id> = Lazy::new(window::Id::unique);
pub static APPLET_DND_ICON_ID: LazyLock<window::Id> = LazyLock::new(window::Id::unique);
pub struct Page {
pub(crate) entity: page::Entity,

2
cosmic-settings/src/pages/desktop/panel/inner.rs
View file

@ -214,7 +214,7 @@ pub(crate) fn style<
PanelSize::M => 2,
PanelSize::L => 3,
PanelSize::XL => 4,
PanelSize::Custom(s) => 2,
PanelSize::Custom(_) => 2,
},
|v| {
if v == 0 {

8
cosmic-settings/src/pages/display/mod.rs
View file

@ -16,17 +16,17 @@ use cosmic_randr_shell::{
AdaptiveSyncAvailability, AdaptiveSyncState, List, Output, OutputKey, Transform,
};
use cosmic_settings_page::{self as page, Section, section};
use once_cell::sync::Lazy;
use slab::Slab;
use slotmap::{Key, SecondaryMap, SlotMap};
use std::sync::atomic::{AtomicBool, Ordering};
use std::{collections::BTreeMap, process::ExitStatus, sync::Arc};
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];
static DPI_SCALE_LABELS: Lazy<Vec<String>> =
Lazy::new(|| DPI_SCALES.iter().map(|scale| format!("{scale}%")).collect());
static DPI_SCALE_LABELS: LazyLock<Vec<String>> =
LazyLock::new(|| DPI_SCALES.iter().map(|scale| format!("{scale}%")).collect());
/// Display color depth options
#[allow(dead_code)]

6
page/Cargo.toml
View file

@ -4,11 +4,11 @@ version = "0.1.0"
edition = "2024"
[dependencies]
derive_setters = "0.1.6"
derive_setters = "0.1.8"
regex = "1.11.1"
slotmap = "1.0.7"
libcosmic = { workspace = true }
downcast-rs = "1.2.1"
downcast-rs = "2.0.1"
tokio.workspace = true
url = "2.5.4"
slab = "0.4.9"
slab = "0.4.10"

8
pages/system/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "cosmic-settings-system"
version = "0.1.0"
edition = "2021"
edition = "2024"
license = "GPL-3.0-only"
rust-version.workspace = true
@ -11,9 +11,9 @@ rust-version.workspace = true
byte-unit = "5.1.6"
const_format = "0.2.34"
concat-in-place = "1.1.0"
sysinfo = "0.31.4"
memchr = "2.7.4"
sysinfo = "0.36.1"
memchr = "2.7.5"
[dependencies.bumpalo]
version = "3.17.0"
version = "3.19.0"
features = ["collections"]

12
pages/wallpapers/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "cosmic-settings-wallpaper"
version = "0.1.0"
edition = "2021"
edition = "2024"
rust-version.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -10,7 +10,7 @@ rust-version.workspace = true
cosmic-bg-config = { workspace = true }
cosmic-config = { workspace = true }
cosmic-randr-shell = { workspace = true }
dirs = "5.0.1"
dirs = "6.0.0"
eyre = "0.6.12"
# Upstream version 5.0.0 has compilation error on Redox's toolchain
fast_image_resize = { git = "https://github.com/jackpot51/fast_image_resize.git", features = [
@ -19,9 +19,9 @@ fast_image_resize = { git = "https://github.com/jackpot51/fast_image_resize.git"
freedesktop-icons = { package = "cosmic-freedesktop-icons", git = "https://github.com/pop-os/freedesktop-icons" }
futures-lite = "2.6.0"
futures-util = "0.3.31"
image = "0.25.5"
infer = "0.16.0"
jxl-oxide = "0.11.3"
tokio = { version = "1.44.1", features = ["sync"] }
image = "0.25.6"
infer = "0.19.0"
jxl-oxide = "0.12.2"
tokio = { version = "1.47.0", features = ["sync"] }
tracing = "0.1.41"
walkdir = "=2.5.0"

4
pages/wallpapers/src/lib.rs
View file

@ -1,5 +1,5 @@
pub use cosmic_bg_config::{Color, Config, Entry, Gradient, ScalingMode, Source};
use eyre::{eyre, OptionExt};
use eyre::{OptionExt, eyre};
use fast_image_resize::SrcCropping;
use futures_lite::Stream;
use futures_util::StreamExt;
@ -9,7 +9,7 @@ use jxl_oxide::{EnumColourEncoding, JxlImage, PixelFormat};
use std::os::unix::ffi::OsStrExt;
use std::{
borrow::Cow,
collections::{hash_map::DefaultHasher, HashMap},
collections::{HashMap, hash_map::DefaultHasher},
hash::{Hash, Hasher},
io::Read,
path::{Path, PathBuf},