Merge branch 'master' into numpad-settings

Author: mmstick

Cargo.lock

@@ -8,7 +8,7 @@ rust-version = "1.80.0"
 
 [workspace.dependencies]
 cosmic-randr = { git = "https://github.com/pop-os/cosmic-randr" }
-tokio = { version = "1.40.0", features = ["macros"] }
+tokio = { version = "1.43.0", features = ["macros"] }
 
 [workspace.dependencies.libcosmic]
 features = ["multi-window", "winit", "tokio"]
@@ -42,26 +42,33 @@ inherits = "release"
 debug = true
 
 [profile.release]
+opt-level = "s"
 lto = "thin"
 
 # [patch.'https://github.com/smithay/client-toolkit/']
 # smithay-client-toolkit = { git = "https://github.com/smithay/client-toolkit//", rev = "c583de8" }
 
 [patch.'https://github.com/pop-os/cosmic-protocols']
-cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d218c76" }
-cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d218c76" }
+cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "ed2a481" }
+cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "ed2a481" }
+
+# [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 = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" }
-# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" }
-# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" }
+# libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "font" }
+# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "font" }
+# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "font" }
+# iced_futures = { git = "https://github.com/pop-os/libcosmic//", branch = "font" }
+
 # libcosmic = { path = "../libcosmic" }
 # cosmic-config = { path = "../libcosmic/cosmic-config" }
 # cosmic-theme = { path = "../libcosmic/cosmic-theme" }
 
 # [patch.'https://github.com/pop-os/dbus-settings-bindings']
 # cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }
 # upower_dbus = { path = "../dbus-settings-bindings/upower" }
+
 [patch."https://github.com/smithay/client-toolkit.git"]
 sctk = { package = "smithay-client-toolkit", version = "=0.19.2" }

Cargo.toml

@@ -6,6 +6,10 @@ The settings application for the [COSMIC desktop environment][cosmic-epoch].
 
 Translation files may be found in the [i18n directory](./i18n). New translations may copy the [English (en) localization](./i18n/en) of the project and rename `en` to the desired [ISO 639-1 language code][iso-codes]. Translations may be submitted through GitHub as an issue or pull request. Submissions by email or other means are also acceptable; with the preferred name and email to associate with the changes.
 
+## Distributors
+
+The accent palettes on the Appearance settings page are configurable through the cosmic-config directory at `/usr/share/cosmic/com.system76.CosmicSettings/v1/`. One at `accent_palette_dark`, and another at `accent_palette_light`. Examples can be found at [resources/accent_palette_dark.ron](./resources/accent_palette_dark.ron) and [resources/accent_palette_light.ron](./resources/accent_palette_light.ron). This can be copied locally to `~/.config/cosmic/com.system76.CosmicSettings/v1/` for testing, and then move to `/usr/share/cosmic` for packaging.
+
 ## Build
 
 ### Dependencies

README.md

@@ -12,15 +12,16 @@ ashpd = { version = "0.9", default-features = false, features = [
     "tokio",
 ], optional = true }
 async-channel = "2.3.1"
-chrono = "0.4.38"
-clap = { version = "4.5.17", features = ["derive"] }
+chrono = "0.4.39"
+clap = { version = "4.5.29", features = ["derive"] }
 color-eyre = "0.6.3"
 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 }
 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-randr-shell.workspace = true
 cosmic-randr = { workspace = true, optional = true }
 cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", optional = true }
@@ -32,25 +33,32 @@ derive_setters = "0.1.6"
 dirs = "5.0.1"
 downcast-rs = "1.2.1"
 eyre = "0.6.12"
-freedesktop-desktop-entry = "0.7.5"
-futures = "0.3.30"
+freedesktop-desktop-entry = "0.7.8"
+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.1"
-image = "0.25"
-indexmap = "2.5.0"
+i18n-embed-fl = "0.9.3"
+image = { version = "0.25", default-features = false, features = [
+    "jpeg",
+    "png",
+    "rayon",
+    "webp",
+    "hdr",
+] }
+indexmap = "2.7.1"
 itertools = "0.13.0"
-itoa = "1.0.11"
+itoa = "1.0.14"
 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.19.0"
-regex = "1.10.6"
+once_cell = "1.20.3"
+regex = "1.11.1"
 ron = "0.8"
 rust-embed = "8.5.0"
+sctk = { workspace = true, optional = true }
 secure-string = "0.3.0"
-serde = { version = "1.0.210", features = ["derive"] }
+serde = { version = "1.0.217", features = ["derive"] }
 slab = "0.4.9"
 slotmap = "1.0.7"
 static_init = "1.0.3"
@@ -59,32 +67,37 @@ tachyonix = "0.3.1"
 timedate-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
 tokio = { workspace = true, features = ["fs", "io-util", "sync"] }
 tracing = "0.1.41"
-tracing-subscriber = "0.3.18"
-udev = { version = "0.9.0", optional = true }
+tracing-subscriber = "0.3.19"
+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 }
-url = "2.5.2"
+url = "2.5.4"
 xkb-data = "0.2.1"
-zbus = { version = "4.4.0", features = ["tokio"], optional = true }
+zbus = { version = "4.4.0", default-features = false, features = [
+    "tokio",
+], optional = true }
 zbus_polkit = { version = "4.0.0" }
-ustr = "1.0.0"
 fontdb = "0.16.2"
 fixed_decimal = "0.5.6"
 mime = "0.3.17"
-rustix = "0.38.41"
+rustix = "0.38.44"
+gettext-rs = { version = "0.7.2", features = [
+    "gettext-system",
+], optional = true }
+async-fn-stream = "0.2.2"
 
 [dependencies.cosmic-settings-subscriptions]
 git = "https://github.com/pop-os/cosmic-settings-subscriptions"
 #TODO: only select features as needed
-features = ["network_manager", "pipewire", "pulse"]
+features = ["network_manager", "pipewire", "pulse", "bluetooth"]
 optional = true
 
 [dependencies.icu]
 version = "1.5.0"
 features = ["experimental", "compiled_data", "icu_datetime_experimental"]
 
 [dependencies.i18n-embed]
-version = "0.15.0"
+version = "0.15.3"
 features = ["fluent-system", "desktop-requester"]
 
 # Contains region-handling logic for Linux
@@ -95,9 +108,11 @@ optional = true
 
 [features]
 default = ["a11y", "dbus-config", "linux", "single-instance", "wgpu"]
+gettext = ["dep:gettext-rs"]
 
 # Default features for Linux
 linux = [
+    "page-accessibility",
     "page-about",
     "page-bluetooth",
     "page-date",
@@ -115,17 +130,23 @@ linux = [
 ]
 
 # Pages
+page-accessibility = ["dep:cosmic-protocols", "dep:sctk"]
 page-about = ["dep:cosmic-settings-system", "dep:hostname1-zbus", "dep:zbus"]
-page-bluetooth = ["dep:bluez-zbus", "dep:zbus"]
+page-bluetooth = [
+    "dep:bluez-zbus",
+    "dep:zbus",
+    "dep:cosmic-settings-subscriptions",
+]
 page-date = ["dep:timedate-zbus", "dep:zbus"]
 page-default-apps = ["dep:mime-apps"]
 page-input = [
+    "gettext",
     "dep:cosmic-comp-config",
     "dep:cosmic-settings-config",
     "dep:udev",
 ]
 page-networking = [
-    "ashpd",
+    "xdg-portal",
     "dep:cosmic-dbus-networkmanager",
     "dep:cosmic-settings-subscriptions",
     "dep:zbus",
@@ -145,4 +166,4 @@ single-instance = ["libcosmic/single-instance"]
 test = []
 wayland = ["libcosmic/wayland", "dep:cosmic-panel-config", "dep:cosmic-randr"]
 wgpu = ["libcosmic/wgpu"]
-xdg-portal = ["libcosmic/xdg-portal"]
+xdg-portal = ["ashpd", "libcosmic/xdg-portal"]