Implement basic quick actions screen

Author: suchmememanyskill

example_configs/simulator.toml

@@ -13,4 +13,9 @@ heater_bed = [ 60, 70 ]
 [ui]
 dark_mode = true
 left_sidebar = ["files", "temperature", "move", "emergency_stop"]
-right_sidebar = ["fan", "macros", "console", "settings"]
+right_sidebar = ["fan", "macros", "console", "settings"]
+
+[quick_actions]
+Restart = ["RESTART"]
+"Firmware Restart" = ["FIRMWARE_RESTART"]
+Home = ["G28"]

moonraker-rs/src/connector/websocket_write.rs

@@ -92,7 +92,7 @@ impl MoonrakerConnectionWriteLoop {
         &mut self,
         frame: &Mutex<Option<Frame<'static>>>,
     ) -> Result<(), Error> {
-        println!("Got raw frame to send");
+        //println!("Got raw frame to send");
 
         if let Some(frame) = frame.lock().await.take() {
             self.websocket_writer.write_frame(frame).await?;

src/config/config.rs

@@ -1,7 +1,6 @@
 use std::collections::HashMap;
 
 use crate::config::{MoonrakerConfig, OptionalGcodeCommands, OptionalUiConfig};
-use moonraker_rs::printer_objects::TemperatureConfiguration;
 use serde::Deserialize;
 
 use super::DisplayConfig;
@@ -13,4 +12,5 @@ pub struct Config {
     pub heater_presets: Option<HashMap<String, Vec<u32>>>,
     pub gcode_commands: Option<OptionalGcodeCommands>,
     pub ui: Option<OptionalUiConfig>,
+    pub quick_actions: Option<HashMap<String, Vec<String>>>,
 }

src/main.rs

@@ -104,6 +104,8 @@ async fn main() -> Result<(), Box<dyn Error>> {
     let ui_settings = &config.ui.unwrap_or(OptionalUiConfig::default());
     register_set_ui_settings(&ui, &ui_settings);
 
+    register_execute_quick_action(&ui, &config.quick_actions, &moonraker_connection);
+
     tokio::task::block_in_place(|| {
         ui.run().unwrap();
     });

src/ui_functions/mod.rs

@@ -10,6 +10,7 @@ pub mod printer_firmware_restart;
 pub mod printer_execute_gcode_command;
 pub mod util_create_temperature_list; 
 pub mod settings_set_ui_settings;
+pub mod quick_action_execute;
 
 pub use util_format_bytes::*;
 pub use filesystem_download_thumbnail::*;
@@ -22,4 +23,5 @@ pub use printer_restart::*;
 pub use printer_firmware_restart::*;
 pub use printer_execute_gcode_command::*;
 pub use util_create_temperature_list::*;
-pub use settings_set_ui_settings::*;
+pub use settings_set_ui_settings::*;
+pub use quick_action_execute::*;

src/ui_functions/quick_action_execute.rs

@@ -0,0 +1,41 @@
+use std::{collections::HashMap, sync::Arc};
+
+use moonraker_rs::{moonraker_connection::MoonrakerConnection, requests::PrinterAdministrationRequestHandler};
+use slint::{ComponentHandle, ModelRc, SharedString, SharedVector, VecModel};
+
+use crate::{AppWindow, QuickActions};
+
+pub fn register_execute_quick_action(ui: &AppWindow, quick_actions: &Option<HashMap<String, Vec<String>>>, moonraker_connection: &Arc<MoonrakerConnection>)
+{
+    let mut quick_actions_map: HashMap<String, String> = HashMap::new();
+    let moonraker_connection = moonraker_connection.clone();
+
+    if let Some(quick_actions) = quick_actions 
+    {
+        quick_actions.iter()
+        .for_each(|f| {
+            quick_actions_map.insert(
+                f.0.clone(), 
+                f.1.join("\n"),
+            );
+        });
+    }
+
+    let keys : Vec<SharedString> = quick_actions_map.keys().map(|f| SharedString::from(f)).collect();
+    ui.global::<QuickActions>().set_quick_actions(ModelRc::new(VecModel::from(keys)));
+    ui.global::<QuickActions>().on_execute_quick_action(move |f| {
+        let moonraker_connection = moonraker_connection.clone();
+        let gcode = match quick_actions_map.get(f.as_str())
+        {
+            Some(s) => s.clone(),
+            None => return
+        };
+
+        tokio::spawn(async move {
+            if let Err(e) = moonraker_connection.run_gcode_script(&gcode).await
+            {
+                moonraker_connection.send_request_error(format!("Failed to send quick action '{}': {}", f.as_str(), e));
+            }
+        });
+    });
+}

ui/assets/action.svg

@@ -5,9 +5,16 @@ export component GhostButton inherits VerticalLayout {
     in property <color> text-color: Palette.foreground;
     callback clicked;
 
-    Rectangle {
+    states [
+        pressed when touch-area.pressed : {
+            container.background: Palette.selection-background;
+        }
+    ]
+
+    container := Rectangle {
         height: t.height * 2;
         min-width: t.width * 1.5;
+        border-radius: 10px;
         //background: red;
 
         t := Text {
@@ -16,7 +23,7 @@ export component GhostButton inherits VerticalLayout {
             font-weight: 600;
         }
 
-        TouchArea {
+        touch-area := TouchArea {
             clicked => { root.clicked(); }
         }
     }

ui/components/ghost-button.slint

@@ -8,7 +8,7 @@ export component TopBar inherits Rectangle {
     background: Palette.alternate-background;
 
     HorizontalLayout {
-        padding-top: 2px;
+        padding-bottom: 2px;
         padding-left: 10px;
         padding-right: 10px;
         spacing: 10px;

ui/components/top-bar.slint

@@ -26,4 +26,5 @@ export global Icons {
     out property <image> quick_action: @image-url("assets/quickaction.svg");
     out property <image> settings: @image-url("assets/settings.svg");
     out property <image> temperature: @image-url("assets/temperature.svg");
+    out property <image> action: @image-url("assets/action.svg");
 }