chore: add log-out shortcut

pop-os · Jan 18, 2025 · fc37d1e · fc37d1e
1 parent d6b76fc
commit fc37d1e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cosmic-settings/Cargo.toml b/cosmic-settings/Cargo.toml
@@ -23,7 +23,7 @@ cosmic-idle-config.workspace = true
 cosmic-panel-config = { workspace = true, 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 = "log-out", optional = true }
 cosmic-settings-page = { path = "../page" }
 cosmic-settings-system = { path = "../pages/system", optional = true }
 cosmic-settings-wallpaper = { path = "../pages/wallpapers" }
@@ -37,7 +37,13 @@ futures = "0.3.30"
 hostname-validator = "1.1.1"
 hostname1-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
 i18n-embed-fl = "0.9.1"
-image = { version = "0.25", default-features = false, features = ["jpeg", "png", "rayon", "webp", "hdr"] }
+image = { version = "0.25", default-features = false, features = [
+    "jpeg",
+    "png",
+    "rayon",
+    "webp",
+    "hdr",
+] }
 indexmap = "2.5.0"
 itertools = "0.13.0"
 itoa = "1.0.11"

diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs
@@ -525,6 +525,7 @@ fn all_system_actions() -> &'static [Action] {
         Action::System(SystemAction::KeyboardBrightnessDown),
         Action::System(SystemAction::KeyboardBrightnessUp),
         Action::System(SystemAction::Launcher),
+        Action::System(SystemAction::LogOut),
         Action::System(SystemAction::LockScreen),
         Action::System(SystemAction::Mute),
         Action::System(SystemAction::MuteMic),
@@ -654,6 +655,7 @@ fn localize_action(action: &Action) -> String {
             }
             SystemAction::KeyboardBrightnessUp => fl!("system-shortcut", "keyboard-brightness-up"),
             SystemAction::Launcher => fl!("system-shortcut", "launcher"),
+            SystemAction::LogOut => fl!("system-shortcut", "log-out"),
             SystemAction::LockScreen => fl!("system-shortcut", "lock-screen"),
             SystemAction::Mute => fl!("system-shortcut", "mute"),
             SystemAction::MuteMic => fl!("system-shortcut", "mute-mic"),

diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/system.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/system.rs
@@ -81,6 +81,7 @@ pub const fn actions() -> &'static [Action] {
         Action::System(SystemAction::WorkspaceOverview),
         Action::System(SystemAction::WindowSwitcher),
         Action::System(SystemAction::WindowSwitcherPrevious),
+        Action::System(SystemAction::LogOut),
         Action::System(SystemAction::LockScreen),
         Action::System(SystemAction::VolumeLower),
         Action::System(SystemAction::VolumeRaise),

diff --git a/i18n/en/cosmic_settings.ftl b/i18n/en/cosmic_settings.ftl
@@ -625,6 +625,7 @@ system-shortcut = System
     .keyboard-brightness-down = Decrease keyboard brightness
     .keyboard-brightness-up = Increase keyboard brightness
     .launcher = Open the launcher
+    .log-out = Log Out
     .lock-screen = Lock the screen
     .mute = Mute audio output
     .mute-mic = Mutes microphone input