diff --git a/Cargo.lock b/Cargo.lock index f9ff403..8dacd98 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1745,7 +1745,7 @@ dependencies = [ [[package]] name = "cosmic-settings-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-settings-daemon#ee782f454a09310a28abe73653e6c82d06a79855" +source = "git+https://github.com/pop-os/cosmic-settings-daemon?branch=touchpad-toggle#3f14d97cfa129cdaed0d44eeed683f4c8ef2d4f6" dependencies = [ "cosmic-config", "ron 0.11.0", @@ -1766,7 +1766,7 @@ dependencies = [ [[package]] name = "cosmic-settings-daemon-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-settings-daemon#ee782f454a09310a28abe73653e6c82d06a79855" +source = "git+https://github.com/pop-os/cosmic-settings-daemon?branch=touchpad-toggle#3f14d97cfa129cdaed0d44eeed683f4c8ef2d4f6" dependencies = [ "cosmic-config", "serde", diff --git a/cosmic-settings/Cargo.toml b/cosmic-settings/Cargo.toml index 119b5aa..e365a45 100644 --- a/cosmic-settings/Cargo.toml +++ b/cosmic-settings/Cargo.toml @@ -22,12 +22,12 @@ 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 } +cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", branch = "touchpad-toggle", optional = true } cosmic-settings-page = { path = "../page" } cosmic-settings-subscriptions = { workspace = true, optional = true } 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 } +cosmic-settings-daemon-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", branch = "touchpad-toggle", optional = true } derive_setters = "0.1.8" dirs = "6.0.0" eyre = "0.6.12" diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs index 7389ce4..ae2f0d9 100644 --- a/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs +++ b/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs @@ -567,6 +567,7 @@ fn all_system_actions() -> &'static [Action] { Action::System(SystemAction::PlayPrev), Action::System(SystemAction::Screenshot), Action::System(SystemAction::Terminal), + Action::System(SystemAction::TouchpadToggle), Action::System(SystemAction::VolumeLower), Action::System(SystemAction::VolumeRaise), Action::System(SystemAction::WebBrowser), @@ -702,6 +703,7 @@ fn localize_action(action: &Action) -> String { SystemAction::PowerOff => fl!("system-shortcut", "poweroff"), SystemAction::Screenshot => fl!("system-shortcut", "screenshot"), SystemAction::Terminal => fl!("system-shortcut", "terminal"), + SystemAction::TouchpadToggle => fl!("system-shortcut", "touchpad-toggle"), SystemAction::VolumeLower => fl!("system-shortcut", "volume-lower"), SystemAction::VolumeRaise => fl!("system-shortcut", "volume-raise"), SystemAction::WebBrowser => fl!("system-shortcut", "web-browser"), diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/system.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/system.rs index 9dfa2eb..aaddcc6 100644 --- a/cosmic-settings/src/pages/input/keyboard/shortcuts/system.rs +++ b/cosmic-settings/src/pages/input/keyboard/shortcuts/system.rs @@ -115,6 +115,7 @@ pub const fn actions() -> &'static [Action] { Action::System(SystemAction::Terminal), Action::System(SystemAction::HomeFolder), Action::System(SystemAction::WebBrowser), + Action::System(SystemAction::TouchpadToggle), ] } diff --git a/i18n/en/cosmic_settings.ftl b/i18n/en/cosmic_settings.ftl index e83294d..8b8a456 100644 --- a/i18n/en/cosmic_settings.ftl +++ b/i18n/en/cosmic_settings.ftl @@ -699,6 +699,7 @@ system-shortcut = System .poweroff = Power off .screenshot = Take a screenshot .terminal = Open a terminal + .touchpad-toggle = Toggle touchpad .volume-lower = Decrease audio output volume .volume-raise = Increase audio output volume .web-browser = Open a web browser