diff --git a/Cargo.lock b/Cargo.lock index 50dc001..13cf911 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1257,7 +1257,7 @@ dependencies = [ [[package]] name = "cosmic-panel-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-panel#8c4d94591f552d4044e917be9b5ab90ddb572643" +source = "git+https://github.com/pop-os/cosmic-panel#5b83d226d5d726a4cbcc20b6b36f76e76c51c0bf" dependencies = [ "anyhow", "cosmic-config", @@ -1849,9 +1849,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -3936,9 +3936,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", diff --git a/cosmic-settings/src/app.rs b/cosmic-settings/src/app.rs index a26d17d..5c37232 100644 --- a/cosmic-settings/src/app.rs +++ b/cosmic-settings/src/app.rs @@ -21,7 +21,6 @@ use cosmic::iced::Subscription; use cosmic::widget::{button, row, text_input}; use cosmic::{ app::{Command, Core}, - cosmic_config::{config_state_subscription, config_subscription}, iced::{ self, event::{self, wayland, PlatformSpecific}, @@ -64,7 +63,6 @@ impl SettingsApp { PageCommands::Keyboard => self.pages.page_id::(), PageCommands::Mouse => self.pages.page_id::(), PageCommands::Network => None, - PageCommands::Notifications => self.pages.page_id::(), PageCommands::Power => None, PageCommands::RegionLanguage => self.pages.page_id::(), PageCommands::Sound => self.pages.page_id::(), diff --git a/cosmic-settings/src/main.rs b/cosmic-settings/src/main.rs index 2a9a0c8..117ec7a 100644 --- a/cosmic-settings/src/main.rs +++ b/cosmic-settings/src/main.rs @@ -57,8 +57,6 @@ pub enum PageCommands { Mouse, /// Network settings page Network, - /// Notifications settings page - Notifications, /// Power settings page Power, /// Region & Language settings page diff --git a/cosmic-settings/src/pages/desktop/mod.rs b/cosmic-settings/src/pages/desktop/mod.rs index 50560b1..7335fe7 100644 --- a/cosmic-settings/src/pages/desktop/mod.rs +++ b/cosmic-settings/src/pages/desktop/mod.rs @@ -3,7 +3,6 @@ pub mod appearance; pub mod dock; -pub mod notifications; pub mod options; pub mod panel; pub mod wallpaper; @@ -51,7 +50,6 @@ impl page::AutoBind for Page { .sub_page::() .sub_page::() .sub_page::() - .sub_page::() } } diff --git a/cosmic-settings/src/pages/desktop/notifications.rs b/cosmic-settings/src/pages/desktop/notifications.rs deleted file mode 100644 index 1a84ad9..0000000 --- a/cosmic-settings/src/pages/desktop/notifications.rs +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2023 System76 -// SPDX-License-Identifier: GPL-3.0-only - -use cosmic_settings_page::Section; -use cosmic_settings_page::{self as page, section}; -use slotmap::SlotMap; - -#[derive(Default)] -pub struct Page; - -impl page::Page for Page { - fn content( - &self, - sections: &mut SlotMap>, - ) -> Option { - Some(vec![sections.insert(Section::default())]) - } - - fn info(&self) -> page::Info { - page::Info::new("notifications", "preferences-system-notifications-symbolic") - .title(fl!("notifications")) - .description(fl!("notifications", "desc")) - } -} - -impl page::AutoBind for Page {}