Merge branch 'pop-os:master' into master

Author: feikedonia

Cargo.lock

@@ -52,6 +52,9 @@ lto = "thin"
 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 = "font" }

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

@@ -132,7 +132,11 @@ 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", "dep:cosmic-settings-subscriptions"]
+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 = [
@@ -142,7 +146,7 @@ page-input = [
     "dep:udev",
 ]
 page-networking = [
-    "ashpd",
+    "xdg-portal",
     "dep:cosmic-dbus-networkmanager",
     "dep:cosmic-settings-subscriptions",
     "dep:zbus",
@@ -162,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"]

cosmic-settings/Cargo.toml

@@ -25,8 +25,7 @@ use cosmic::app::context_drawer::ContextDrawer;
 use cosmic::app::DbusActivationMessage;
 #[cfg(feature = "wayland")]
 use cosmic::cctk::{sctk::output::OutputInfo, wayland_client::protocol::wl_output::WlOutput};
-use cosmic::iced::futures::SinkExt;
-use cosmic::iced::{stream, Subscription};
+use cosmic::iced::Subscription;
 use cosmic::widget::{self, button, row, text_input};
 use cosmic::{
     app::{Core, Task},
@@ -58,13 +57,13 @@ use std::{borrow::Cow, str::FromStr};
 #[allow(clippy::struct_excessive_bools)]
 #[allow(clippy::module_name_repetitions)]
 pub struct SettingsApp {
+    last_active_page: Box<str>,
     active_page: page::Entity,
     active_context_page: Option<page::Entity>,
     loaded_pages: BTreeSet<page::Entity>,
     config: Config,
     core: Core,
     nav_model: nav_bar::Model,
-    page_sender: Option<tokio::sync::mpsc::Sender<crate::pages::Message>>,
     pages: page::Binder<crate::pages::Message>,
     search_active: bool,
     search_id: cosmic::widget::Id,
@@ -143,7 +142,6 @@ impl SettingsApp {
 #[derive(Clone, Debug)]
 pub enum Message {
     CloseContextDrawer,
-    DelayedInit(page::Entity),
     #[cfg(feature = "wayland")]
     DesktopInfo,
     Error(String),
@@ -157,7 +155,6 @@ pub enum Message {
     PageMessage(crate::pages::Message),
     #[cfg(feature = "wayland")]
     PanelConfig(CosmicPanelConfig),
-    RegisterSubscriptionSender(tokio::sync::mpsc::Sender<pages::Message>),
     SearchActivate,
     SearchChanged(String),
     SearchClear,
@@ -182,14 +179,16 @@ impl cosmic::Application for SettingsApp {
     }
 
     fn init(core: Core, flags: Self::Flags) -> (Self, Task<Self::Message>) {
+        let config = Config::new();
+
         let mut app = SettingsApp {
             active_page: page::Entity::default(),
             active_context_page: None,
+            last_active_page: config.active_page(),
             loaded_pages: BTreeSet::new(),
-            config: Config::new(),
+            config,
             core,
             nav_model: nav_bar::Model::default(),
-            page_sender: None,
             pages: page::Binder::default(),
             search_active: false,
             search_id: cosmic::widget::Id::unique(),
@@ -219,12 +218,13 @@ impl cosmic::Application for SettingsApp {
             Some(p) => app.subtask_to_page(&p),
             None => app
                 .pages
-                .find_page_by_id(&app.config.active_page)
+                .find_page_by_id(&app.last_active_page)
                 .map(|(id, _info)| id),
         }
         .unwrap_or(desktop_id);
 
-        (app, cosmic::task::message(Message::DelayedInit(active_id)))
+        let task = app.activate_page(active_id);
+        (app, task)
     }
 
     fn nav_model(&self) -> Option<&nav_bar::Model> {
@@ -282,22 +282,6 @@ impl cosmic::Application for SettingsApp {
 
     fn subscription(&self) -> Subscription<Message> {
         Subscription::batch(vec![
-            // Creates a channel that listens to messages from pages.
-            // The sender is given back to the application so that it may pass it on.
-            Subscription::run_with_id(
-                std::any::TypeId::of::<Self>(),
-                stream::channel(4, move |mut output| async move {
-                    let (tx, mut rx) = tokio::sync::mpsc::channel::<pages::Message>(4);
-
-                    let _res = output.send(Message::RegisterSubscriptionSender(tx)).await;
-
-                    while let Some(event) = rx.recv().await {
-                        let _res = output.send(Message::PageMessage(event)).await;
-                    }
-
-                    futures::future::pending::<()>().await;
-                }),
-            ),
             #[cfg(feature = "ashpd")]
             crate::subscription::daytime().map(|daytime| {
                 Message::PageMessage(pages::Message::Appearance(appearance::Message::Daytime(
@@ -750,19 +734,6 @@ impl cosmic::Application for SettingsApp {
             Message::Error(error) => {
                 tracing::error!(error, "error occurred");
             }
-
-            Message::RegisterSubscriptionSender(sender) => {
-                self.page_sender = Some(sender);
-            }
-
-            // It is necessary to delay init to allow time for the page sender to be initialized
-            Message::DelayedInit(active_id) => {
-                if self.page_sender.is_none() {
-                    return cosmic::task::message(Message::DelayedInit(active_id));
-                }
-
-                return self.activate_page(active_id);
-            }
         }
 
         Task::none()
@@ -849,25 +820,18 @@ impl SettingsApp {
                 .unwrap_or(iced::Task::none())
                 .map(Message::PageMessage)
                 .map(Into::into);
-            self.config.active_page = Box::from(&*self.pages.info[page].id);
-            self.config
-                .set_active_page(Box::from(&*self.pages.info[page].id));
+            self.last_active_page = Box::from(&*self.pages.info[page].id);
+            self.config.set_active_page(self.last_active_page.clone());
         }
 
         self.search_clear();
         self.search_active = false;
         self.activate_navbar(page);
-
-        let sender = self
-            .page_sender
-            .clone()
-            .expect("sender should be available");
-
         self.loaded_pages.insert(page);
 
         let page_task = self
             .pages
-            .on_enter(page, sender)
+            .on_enter(page)
             .map(Message::PageMessage)
             .map(Into::into);
 
@@ -1029,11 +993,9 @@ impl SettingsApp {
                     }
                 }
 
-                if let Some(ref sender) = self.page_sender {
-                    for page in load {
-                        self.loaded_pages.insert(page);
-                        tasks.push(self.pages.on_enter(page, sender.clone()));
-                    }
+                for page in load {
+                    self.loaded_pages.insert(page);
+                    tasks.push(self.pages.on_enter(page));
                 }
 
                 for page in unload {

cosmic-settings/src/app.rs

@@ -1,56 +1,60 @@
 // Copyright 2023 System76 <[email protected]>
 // SPDX-License-Identifier: GPL-3.0-only
 
-use cosmic::cosmic_config::{self, ConfigGet, ConfigSet};
+use cosmic::{
+    cosmic_config::{self, ConfigGet, ConfigSet},
+    cosmic_theme::palette::Srgba,
+};
 
 const NAME: &str = "com.system76.CosmicSettings";
 
-const ACTIVE_PAGE: &str = "active-page";
+const ACTIVE_PAGE: &str = "active_page";
+const ACCENT_PALETTE_DARK: &str = "accent_palette_dark";
+const ACCENT_PALETTE_LIGHT: &str = "accent_palette_light";
 
 #[must_use]
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Config {
-    pub cosmic_config: Option<cosmic_config::Config>,
-    pub active_page: Box<str>,
+    config: cosmic_config::Config,
+    state: cosmic_config::Config,
 }
 
 impl Config {
     pub fn new() -> Self {
-        let mut config = Self::default();
-
-        let context = match cosmic_config::Config::new(NAME, 1) {
-            Ok(context) => context,
+        let config = match cosmic_config::Config::new(NAME, 1) {
+            Ok(config) => config,
             Err(why) => {
-                tracing::warn!(?why, "failed to get config");
-                return Self::default();
+                panic!("failed to get {NAME} config: {:?}", why);
             }
         };
 
-        if let Ok(page) = context.get::<Box<str>>(ACTIVE_PAGE) {
-            config.active_page = page;
-        }
+        let state = match cosmic_config::Config::new_state(NAME, 1) {
+            Ok(state) => state,
+            Err(why) => {
+                panic!("failed to get {NAME} state: {:?}", why);
+            }
+        };
 
-        config.cosmic_config = Some(context);
+        Self { config, state }
+    }
 
-        config
+    pub fn accent_palette_dark(&self) -> Result<Vec<Srgba>, cosmic_config::Error> {
+        self.config.get::<Vec<Srgba>>(ACCENT_PALETTE_DARK)
     }
 
-    pub fn set_active_page(&mut self, page: Box<str>) {
-        if let Some(context) = self.cosmic_config.as_ref() {
-            if let Err(why) = context.set::<Box<str>>(ACTIVE_PAGE, page.clone()) {
-                tracing::error!(?why, "failed to store active page ID");
-            }
-        }
+    pub fn accent_palette_light(&self) -> Result<Vec<Srgba>, cosmic_config::Error> {
+        self.config.get::<Vec<Srgba>>(ACCENT_PALETTE_LIGHT)
+    }
 
-        self.active_page = page;
+    pub fn active_page(&self) -> Box<str> {
+        self.state
+            .get::<Box<str>>(ACTIVE_PAGE)
+            .unwrap_or_else(|_| Box::from("desktop"))
     }
-}
 
-impl Default for Config {
-    fn default() -> Self {
-        Self {
-            cosmic_config: None,
-            active_page: Box::from("desktop"),
+    pub fn set_active_page(&self, page: Box<str>) {
+        if let Err(why) = self.state.set::<Box<str>>(ACTIVE_PAGE, page.clone()) {
+            tracing::error!(?why, "failed to store active page ID");
         }
     }
 }

cosmic-settings/src/config.rs

@@ -14,7 +14,6 @@ use cosmic_settings_page::{
     Entity,
 };
 use slotmap::SlotMap;
-use tokio::sync::mpsc;
 use tracing::error;
 
 use super::{wayland, AccessibilityEvent, AccessibilityRequest};
@@ -114,28 +113,29 @@ impl page::Page<crate::pages::Message> for Page {
         ])
     }
 
-    fn on_enter(
-        &mut self,
-        sender: mpsc::Sender<crate::pages::Message>,
-    ) -> cosmic::Task<crate::pages::Message> {
+    fn on_enter(&mut self) -> cosmic::Task<crate::pages::Message> {
         if self.wayland_thread.is_none() {
             match wayland::spawn_wayland_connection() {
                 Ok((tx, mut rx)) => {
                     self.wayland_thread = Some(tx);
-                    tokio::task::spawn(async move {
-                        while let Some(event) = rx.recv().await {
-                            let _ = sender
-                                .send(crate::pages::Message::AccessibilityMagnifier(
-                                    Message::Event(event),
+
+                    return cosmic::Task::stream(async_fn_stream::fn_stream(
+                        |emitter| async move {
+                            while let Some(event) = rx.recv().await {
+                                let _ = emitter
+                                    .emit(crate::pages::Message::AccessibilityMagnifier(
+                                        Message::Event(event),
+                                    ))
+                                    .await;
+                            }
+
+                            let _ = emitter
+                                .emit(crate::pages::Message::AccessibilityMagnifier(
+                                    Message::ProtocolUnavailable,
                                 ))
                                 .await;
-                        }
-                        let _ = sender
-                            .send(crate::pages::Message::AccessibilityMagnifier(
-                                Message::ProtocolUnavailable,
-                            ))
-                            .await;
-                    });
+                        },
+                    ));
                 }
                 Err(err) => {
                     tracing::warn!(