fix: ctrl q closes application (#180)

* chore: information relating Validity support into Help

* chore: update CHANGELOG.md

* chore: add keybinding for closing the application

* chore: update CHANGELOG

Author: jotuel

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
+- Ctrl + Q quits application
+
 ### Changed
 
 - Improved Help theming and added open-fprintd link

src/app/application.rs

@@ -161,8 +161,7 @@ impl cosmic::Application for AppModel {
                             .on_press(Message::ConfirmDeleteAll),
                     )
                     .secondary_action(
-                        widget::button::standard(fl!("cancel"))
-                            .on_press(Message::CancelDeleteAll),
+                        widget::button::standard(fl!("cancel")).on_press(Message::CancelDeleteAll),
                     )
                     .into(),
             )
@@ -269,6 +268,7 @@ impl cosmic::Application for AppModel {
             Message::ClearDevice => self.on_clear_device(),
             Message::CancelClear => self.on_cancel_clear(),
             Message::ClearComplete(res) => self.on_clear_completion(res),
+            Message::CloseApplication => self.on_close(),
             Message::Register => self.on_register(),
             Message::OpenRepositoryUrl => self.on_clicked_link(),
             Message::ToggleContextPage(context_page) => self.on_context_page_toggle(context_page),

src/app/message.rs

@@ -44,6 +44,7 @@ pub enum Message {
     ClearDevice,
     CancelClear,
     ClearComplete(Result<(), AppError>),
+    CloseApplication,
     EnrolledFingers(Vec<String>),
     FingerSelected(String),
     VerifyFinger,
@@ -57,6 +58,13 @@ pub enum Message {
 
 // Section for handling of Messages
 impl AppModel {
+    /// Closes the application
+    ///
+    /// **Return** ***Task***::*done*()
+    pub(crate) fn on_close(&mut self) -> Task<cosmic::Action<Message>> {
+        Task::done(cosmic::app::Action::Close).map(cosmic::Action::Cosmic)
+    }
+
     /// Resets clear state
     ///
     /// **Returns** ***Task***()

src/app/subscription.rs

@@ -1,5 +1,8 @@
 use crate::app::{
-    Message, error::AppError, finger::Finger, fprint::{enroll_fingerprint_process, verify_finger_process}
+    Message,
+    error::AppError,
+    finger::Finger,
+    fprint::{enroll_fingerprint_process, verify_finger_process},
 };
 use ashpd::desktop::settings::{ColorScheme, Settings};
 use cosmic::iced::{
@@ -106,8 +109,9 @@ pub(crate) fn verify_subscription(data: VerifyData) -> Subscription<Message> {
                 &data.device_path,
                 &data.finger.as_finger_id().unwrap_or_default(),
                 &data.username,
-                &mut output)
-                .await
+                &mut output,
+            )
+            .await
             {
                 Ok(_) => {}
                 Err(e) => {
@@ -163,7 +167,7 @@ pub fn portal_theme_subscription(app_theme: crate::config::AppTheme) -> Subscrip
     }
 }
 
-/// **Returns** a subscription to key events 0-9, r, v, c, Ctrl + d, Tab, Shift + Tab, F1, and Ctrl + ,
+/// **Returns** a subscription to key events 0-9, r, v, c, Ctrl + d/,/q and F1
 pub fn key_subscription() -> Subscription<Message> {
     cosmic::iced::event::listen_raw(|event, _status, _window| {
         let Event::Keyboard(keyboard::Event::KeyPressed { key, modifiers, .. }) = event else {
@@ -175,13 +179,17 @@ pub fn key_subscription() -> Subscription<Message> {
         use cosmic::iced::keyboard::key::Named;
 
         match &key {
-            Key::Named(Named::F1) if !modifiers.control() && !modifiers.logo() && !modifiers.alt() => {
+            Key::Named(Named::F1)
+                if !modifiers.control() && !modifiers.logo() && !modifiers.alt() =>
+            {
                 Some(Message::ToggleContextPage(ContextPage::About))
             }
-            Key::Character(c) if modifiers.control() && c == "," => {
-                Some(Message::ToggleContextPage(ContextPage::Settings))
-            }
-            Key::Character(c) if modifiers.control() && c == "d" => Some(Message::Delete),
+            Key::Character(c) if modifiers.control() => match c.as_str() {
+                "," => Some(Message::ToggleContextPage(ContextPage::Settings)),
+                "q" => Some(Message::CloseApplication),
+                "d" => Some(Message::Delete),
+                _ => None,
+            },
             Key::Character(c) if !modifiers.control() && !modifiers.logo() && !modifiers.alt() => {
                 match c.as_str() {
                     "r" => Some(Message::Register),