Merge branch 'master' into settings-page

Author: unsecretised

src/app/tile.rs

@@ -179,6 +179,7 @@ pub struct Tile {
 pub struct Hotkeys {
     pub toggle: HotKey,
     pub clipboard_hotkey: HotKey,
+    pub shells: HashMap<u32, String>,
 }
 
 impl Tile {

src/app/tile/elm.rs

@@ -60,12 +60,22 @@ pub fn new(hotkey: HotKey, config: &Config) -> (Tile, Task<Message>) {
     options.par_sort_by_key(|x| x.display_name.len());
     let options = AppIndex::from_apps(options);
 
+    let mut shells_map = HashMap::new();
+    for shell in &config.shells {
+        if let Some(hk_str) = &shell.hotkey
+            && let Ok(hk) = hk_str.parse::<HotKey>()
+        {
+            shells_map.insert(hk.id, shell.command.clone());
+        }
+    }
+
     let hotkeys = Hotkeys {
         toggle: hotkey,
         clipboard_hotkey: config
             .clipboard_hotkey
             .parse()
             .unwrap_or("SUPER+SHIFT+C".parse().unwrap()),
+        shells: shells_map,
     };
 
     let home = std::env::var("HOME").unwrap_or("/".to_string());

src/app/tile/update.rs

@@ -291,6 +291,10 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
         }
 
         Message::KeyPressed(hk_id) => {
+            if let Some(cmd) = tile.hotkeys.shells.get(&hk_id) {
+                return Task::done(Message::RunFunction(Function::RunShellCommand(cmd.clone())));
+            }
+
             let is_clipboard_hotkey = tile.hotkeys.clipboard_hotkey.id == hk_id;
             let is_open_hotkey = hk_id == tile.hotkeys.toggle.id;
 

src/config.rs

@@ -184,6 +184,7 @@ pub struct Shelly {
     pub icon_path: Option<String>,
     pub alias: String,
     pub alias_lc: String,
+    pub hotkey: Option<String>,
 }
 
 impl ToApp for Shelly {

src/main.rs

@@ -76,11 +76,18 @@ fn main() -> iced::Result {
         .parse()
         .unwrap_or("SUPER+SHIFT+C".parse().unwrap());
 
-    let hotkeys = vec![show_hide, cbhist];
+    let mut hotkeys = vec![show_hide, cbhist];
+    for shell in &config.shells {
+        if let Some(hk_str) = &shell.hotkey
+            && let Ok(hk) = hk_str.parse::<HotKey>()
+        {
+            hotkeys.push(hk);
+        }
+    }
 
     manager
         .register_all(&hotkeys)
-        .expect("Unable to register hotkey");
+        .expect("Unable to register hotkeys");
 
     info!("Hotkeys loaded");
     info!("Starting rustcast");