From d243e4509485323c2ae319ebead6ec74fb5ad9ee Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Fri, 15 Sep 2023 10:52:55 -0400 Subject: [PATCH] update: remove some settings that are't used --- app/src/pages/desktop/mod.rs | 11 +----- app/src/pages/desktop/options.rs | 59 -------------------------------- 2 files changed, 1 insertion(+), 69 deletions(-) diff --git a/app/src/pages/desktop/mod.rs b/app/src/pages/desktop/mod.rs index b60a6f5..1daf743 100644 --- a/app/src/pages/desktop/mod.rs +++ b/app/src/pages/desktop/mod.rs @@ -14,9 +14,6 @@ use cosmic_settings_page as page; #[derive(Debug, Default)] #[allow(clippy::struct_excessive_bools)] pub struct Page { - pub top_left_hot_corner: bool, - pub show_workspaces_button: bool, - pub show_applications_button: bool, pub show_minimize_button: bool, pub show_maximize_button: bool, } @@ -37,23 +34,17 @@ impl page::AutoBind for Page { } } -#[derive(Clone, Debug)] +#[derive(Copy, Clone, Debug)] pub enum Message { - ShowWorkspacesButton(bool), - ShowApplicationsButton(bool), ShowMinimizeButton(bool), ShowMaximizeButton(bool), - TopLeftHotCorner(bool), } impl Page { pub fn update(&mut self, message: Message) { match message { - Message::ShowApplicationsButton(value) => self.show_applications_button = value, Message::ShowMaximizeButton(value) => self.show_maximize_button = value, Message::ShowMinimizeButton(value) => self.show_minimize_button = value, - Message::ShowWorkspacesButton(value) => self.show_workspaces_button = value, - Message::TopLeftHotCorner(value) => self.top_left_hot_corner = value, } } } diff --git a/app/src/pages/desktop/options.rs b/app/src/pages/desktop/options.rs index 5c80c05..5056328 100644 --- a/app/src/pages/desktop/options.rs +++ b/app/src/pages/desktop/options.rs @@ -26,8 +26,6 @@ impl page::Page for Page { ) -> Option { Some(vec![ sections.insert(super_key_action()), - sections.insert(hot_corner()), - sections.insert(top_panel()), sections.insert(window_controls()), sections.insert(panel_dock_links()), ]) @@ -47,28 +45,6 @@ impl page::AutoBind for Page { } } -pub fn hot_corner() -> Section { - Section::default() - .title(fl!("hot-corner")) - .descriptions(vec![fl!("hot-corner", "top-left-corner")]) - .view::(|binder, _page, section| { - let desktop = binder - .page::() - .expect("desktop page not found"); - - let descriptions = §ion.descriptions; - settings::view_section(§ion.title) - .add(settings::item( - &descriptions[0], - toggler(None, desktop.top_left_hot_corner, |value| { - Message::TopLeftHotCorner(value) - }), - )) - .apply(Element::from) - .map(crate::pages::Message::Desktop) - }) -} - pub fn super_key_action() -> Section { Section::default() .title(fl!("super-key-action")) @@ -97,41 +73,6 @@ pub fn super_key_action() -> Section { }) } -pub fn top_panel() -> Section { - Section::default() - .title(fl!("top-panel")) - .descriptions(vec![ - fl!("top-panel", "workspaces"), - fl!("top-panel", "applications"), - ]) - .view::(|binder, _page, section| { - let desktop = binder - .page::() - .expect("desktop page not found"); - let descriptions = §ion.descriptions; - - settings::view_section(§ion.title) - .add(settings::item( - &descriptions[0], - toggler( - None, - desktop.show_workspaces_button, - Message::ShowWorkspacesButton, - ), - )) - .add(settings::item( - &descriptions[1], - toggler( - None, - desktop.show_applications_button, - Message::ShowApplicationsButton, - ), - )) - .apply(Element::from) - .map(crate::pages::Message::Desktop) - }) -} - pub fn window_controls() -> Section { Section::default() .title(fl!("window-controls"))