diff --git a/Cargo.lock b/Cargo.lock index 0ebf91f64..5ce8960d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1787,7 +1787,7 @@ dependencies = [ [[package]] name = "cosmic-settings-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-settings-daemon#ef024bfd06bf9fbd57246a25c91d1fdd28153d05" +source = "git+https://github.com/Areopagitics/cosmic-settings-daemon//?branch=master#18377ab244436d7907e22cb3c2a9597dbc2f6a2b" dependencies = [ "cosmic-config", "ron 0.11.0", diff --git a/Cargo.toml b/Cargo.toml index ec53772df..cacf0071c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,8 +59,8 @@ debug = true # cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d0e95be" } # cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d0e95be" } -# [patch.'https://github.com/pop-os/cosmic-settings-daemon'] -# cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon//", branch = "input_nobuild" } +[patch.'https://github.com/pop-os/cosmic-settings-daemon'] +cosmic-settings-config = { git = "https://github.com/Areopagitics/cosmic-settings-daemon//", branch = "master" } # For development and testing purposes # [patch.'https://github.com/pop-os/libcosmic'] diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs index ff5cf3fd2..d4fc9c6e9 100644 --- a/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs +++ b/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs @@ -641,6 +641,7 @@ fn localize_action(action: &Action) -> String { Action::Maximize => fl!("manage-windows", "maximize"), Action::Fullscreen => fl!("manage-windows", "fullscreen"), Action::Minimize => fl!("manage-windows", "minimize"), + Action::ShowDesktop => fl!("manage-windows", "show-desktop"), Action::Move(Direction::Down) => fl!("move-windows", "direction", direction = "down"), Action::Move(Direction::Right) => fl!("move-windows", "direction", direction = "right"), Action::Move(Direction::Left) => fl!("move-windows", "direction", direction = "left"), @@ -681,6 +682,7 @@ fn localize_action(action: &Action) -> String { Action::PreviousWorkspace => fl!("nav-shortcuts", "prev-workspace"), Action::Resizing(ResizeDirection::Inwards) => fl!("manage-windows", "resize-inwards"), Action::Resizing(ResizeDirection::Outwards) => fl!("manage-windows", "resize-outwards"), + Action::SwapWindow => fl!("window-tiling", "swap-window"), Action::SwitchOutput(Direction::Down) => fl!("nav-shortcuts", "output", direction = "down"), Action::SwitchOutput(Direction::Left) => fl!("nav-shortcuts", "output", direction = "left"), diff --git a/i18n/en/cosmic_settings.ftl b/i18n/en/cosmic_settings.ftl index 9be7a31d0..71af7e550 100644 --- a/i18n/en/cosmic_settings.ftl +++ b/i18n/en/cosmic_settings.ftl @@ -675,6 +675,8 @@ manage-windows = Manage windows .resize-inwards = Resize window inwards .resize-outwards = Resize window outwards .toggle-sticky = Toggle sticky window + .show-desktop = Show desktop + move-windows = Move windows .direction = Move window { $direction ->