Made sidebars configurable

suchmememanyskill · suchmememanyskill · commit 9d87621dfc84 · 2025-10-02T02:32:19.000+02:00
diff --git a/build.rs b/build.rs
@@ -2,7 +2,7 @@ fn main() {
     slint_build::compile_with_config(
         "ui/main.slint",
         slint_build::CompilerConfiguration::new()
-            .with_style("material-dark".into())
+            .with_style("material".into())
             .embed_resources(slint_build::EmbedResourcesKind::EmbedForSoftwareRenderer),
     )
     .expect("Slint build failed");
diff --git a/example_configs/simulator.toml b/example_configs/simulator.toml
@@ -8,4 +8,9 @@ port = 7125
 
 [heater_presets]
 extruder = [ 200, 240, 280 ]
-heater_bed = [ 60, 70 ]
+heater_bed = [ 60, 70 ]
+
+[ui]
+dark_mode = false
+left_sidebar = ["files", "temperature", "move", "emergency_stop"]
+right_sidebar = ["fan", "macros", "console", "settings"]
diff --git a/src/config/config.rs b/src/config/config.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use crate::config::{MoonrakerConfig, OptionalGcodeCommands};
+use crate::config::{MoonrakerConfig, OptionalGcodeCommands, OptionalUiConfig};
 use moonraker_rs::printer_objects::TemperatureConfiguration;
 use serde::Deserialize;
 
@@ -12,4 +12,5 @@ pub struct Config {
     pub moonraker: Option<MoonrakerConfig>,
     pub heater_presets: Option<HashMap<String, Vec<u32>>>,
     pub gcode_commands: Option<OptionalGcodeCommands>,
+    pub ui: Option<OptionalUiConfig>,
 }
diff --git a/src/config/mod.rs b/src/config/mod.rs
@@ -6,6 +6,7 @@ pub mod display_default;
 pub mod display_fb;
 pub mod moonraker;
 pub mod gcode_commands;
+pub mod ui;
 
 pub use cli::*;
 pub use config::*;
@@ -15,3 +16,4 @@ pub use display_default::*;
 pub use display_fb::*;
 pub use moonraker::*;
 pub use gcode_commands::*;
+pub use ui::*;
diff --git a/src/config/ui.rs b/src/config/ui.rs
@@ -0,0 +1,40 @@
+use optional_struct::optional_struct;
+use serde::Deserialize;
+
+#[optional_struct]
+#[derive(Deserialize, Debug)]
+pub struct UiConfig {
+    pub dark_mode: bool,
+    pub left_sidebar: Vec<String>,
+    pub right_sidebar: Vec<String>,
+}
+
+impl UiConfig {
+    pub fn from_optional(ui_config : &OptionalUiConfig) -> UiConfig {
+        UiConfig {
+            dark_mode: ui_config.dark_mode.unwrap_or(UiConfig::default().dark_mode),
+            left_sidebar: ui_config.left_sidebar.clone().unwrap_or(UiConfig::default().left_sidebar),
+            right_sidebar: ui_config.right_sidebar.clone().unwrap_or(UiConfig::default().right_sidebar),
+        }
+    }
+}
+
+impl Default for UiConfig {
+    fn default() -> Self {
+        Self {
+            dark_mode: true,
+            left_sidebar: vec![
+                "files".into(),
+                "temperature".into(),
+                "move".into(),
+                "emergency_stop".into(),
+            ],
+            right_sidebar: vec![
+                "fan".into(),
+                "macros".into(),
+                "console".into(),
+                "settings".into(),
+            ],
+        }
+    }
+}
diff --git a/src/main.rs b/src/main.rs
@@ -8,7 +8,7 @@ use moonraker_rs::{
     cache::Cache, connector::{read_deserialize::OptionalPrinterEvent}, printer_objects::{NamedOptionalTemperatureFan, OptionalExtruder, OptionalHeaterBed, OptionalTemperatureFan, TemperatureConfiguration}, 
 };
 
-use crate::{config::{MoonrakerConfig, OptionalGcodeCommands}, event_loop::EventLoop, hardware::init_display, ui_functions::*};
+use crate::{config::{MoonrakerConfig, OptionalGcodeCommands, OptionalUiConfig}, event_loop::EventLoop, hardware::init_display, ui_functions::*};
 
 mod application_error;
 mod config;
@@ -101,6 +101,9 @@ async fn main() -> Result<(), Box<dyn Error>> {
     register_extruder_load_filament(&ui, &moonraker_connection, gcode_command_config);
     register_extruder_unload_filament(&ui, &moonraker_connection, gcode_command_config);
 
+    let ui_settings = &config.ui.unwrap_or(OptionalUiConfig::default());
+    register_set_ui_settings(&ui, &ui_settings);
+
     tokio::task::block_in_place(|| {
         ui.run().unwrap();
     });
diff --git a/src/ui_functions/mod.rs b/src/ui_functions/mod.rs
@@ -9,6 +9,7 @@ pub mod printer_restart;
 pub mod printer_firmware_restart;
 pub mod printer_execute_gcode_command;
 pub mod util_create_temperature_list; 
+pub mod settings_set_ui_settings;
 
 pub use util_format_bytes::*;
 pub use filesystem_download_thumbnail::*;
@@ -20,4 +21,5 @@ pub use printer_emergency_stop::*;
 pub use printer_restart::*;
 pub use printer_firmware_restart::*;
 pub use printer_execute_gcode_command::*;
-pub use util_create_temperature_list::*;
+pub use util_create_temperature_list::*;
+pub use settings_set_ui_settings::*;
diff --git a/src/ui_functions/settings_set_ui_settings.rs b/src/ui_functions/settings_set_ui_settings.rs
@@ -0,0 +1,34 @@
+use std::sync::Arc;
+
+use moonraker_rs::{moonraker_connection::MoonrakerConnection, requests::PrinterAdministrationRequestHandler};
+use slint::{ComponentHandle, ModelRc, VecModel};
+
+use crate::{config::{OptionalUiConfig, UiConfig}, AppWindow, PrinterAdministration, UiSettings};
+
+
+pub fn name_to_id(name : &str) -> i32
+{
+    match name {
+        "files" => 0,
+        "temperature" => 1,
+        "move" => 2,
+        "emergency_stop" => 3,
+        "fan" => 4,
+        "macros" => 5,
+        "console" => 6,
+        "settings" => 7,
+        _ => panic!("Unknown menu {} for left/right sidebar", name)
+    }
+}
+
+pub fn register_set_ui_settings(ui : &AppWindow, configuration : &OptionalUiConfig)
+{
+    let configuration = UiConfig::from_optional(configuration);
+
+    let left_sidebar: Vec<i32> = configuration.left_sidebar.iter().map(|f| name_to_id(f)).collect();
+    let right_sidebar: Vec<i32> = configuration.right_sidebar.iter().map(|f| name_to_id(f)).collect();
+
+    ui.global::<UiSettings>().set_dark_mode(configuration.dark_mode);
+    ui.global::<UiSettings>().set_left_sidebar(ModelRc::new(VecModel::from(left_sidebar)));
+    ui.global::<UiSettings>().set_right_sidebar(ModelRc::new(VecModel::from(right_sidebar)));
+}
diff --git a/ui/app-window.slint b/ui/app-window.slint
diff --git a/ui/main.slint b/ui/main.slint
@@ -1,7 +1,7 @@
 import { ProgressIndicator, Button, StyleMetrics, Palette, ScrollView, Slider, ComboBox, TabWidget } from "std-widgets.slint";
 import { VirtualKeyboardButton } from "virtual_keyboard.slint";
 import "../AdwaitaSans-Regular.ttf";
-import { TemperatureSensors, DisplayStatus, PrinterAdministration, GcodeCommands, Filesystem, Utils, Webhooks } from "state.slint";
+import { TemperatureSensors, DisplayStatus, PrinterAdministration, GcodeCommands, Filesystem, Utils, Webhooks, UiSettings } from "state.slint";
 import { Heater, TemperatureSensor, MoonrakerFile } from "types.slint";
 import { Icons } from "constants.slint";
 import { Page } from "components/page.slint";
@@ -89,20 +89,34 @@ component MainView inherits Rectangle
     property <bool> is_emergency_prompt_open: false;
     background: Palette.alternate-background;
 
+
+
     VerticalLayout { 
         TopBar {
 
         }
 
         HorizontalLayout {
-            VerticalLayout {
+            if UiSettings.left-sidebar.length > 0: VerticalLayout {
                 min-width: 50px;
                 spacing: 5px;
 
-                LeftSideIconButton { icon: Icons.print; checked: root.current-page == 0; clicked => { root.current-page = 0; } }
-                LeftSideIconButton { icon: Icons.temperature; checked: root.current-page == 1; clicked => { root.current-page = 1; } }
-                LeftSideIconButton { icon: Icons.move; checked: root.current-page == 2; clicked => { root.current-page = 2; } }
-                LeftSideIconButton { icon: Icons.emergency_stop; checked: root.current-page == 3; clicked => { is_emergency_prompt_open = true;  } foreground: red; }
+                for component in UiSettings.left-sidebar: LeftSideIconButton {
+                    icon: UiSettings.id-to-image[component];
+                    checked: root.current-page == component;
+                    clicked => { 
+                        if (component == 3) { 
+                            is_emergency_prompt_open = true;
+                        } else {
+                            current-page = component;
+                        }
+                    }
+                    foreground: component == 3 
+                        ? red
+                        : root.current-page == component 
+                            ? Palette.accent-foreground 
+                            : Palette.foreground;
+                }
             }
 
             Rectangle { 
@@ -118,14 +132,26 @@ component MainView inherits Rectangle
                 if root.current-page == 6: ExtruderPage {}
             }
 
-            VerticalLayout {
+            if UiSettings.right-sidebar.length > 0:VerticalLayout {
                 spacing: 5px;
                 min-width: 50px;
 
-                RightSideIconButton { icon: Icons.fan; checked: root.current-page == 4; clicked => { root.current-page = 4; } }
-                RightSideIconButton { icon: Icons.quick_action; checked: root.current-page == 5; clicked => { root.current-page = 5; }}
-                RightSideIconButton { icon: Icons.console; checked: root.current-page == 6; clicked => { root.current-page = 6; } }
-                RightSideIconButton { icon: Icons.settings; checked: root.current-page == 7; clicked => { root.current-page = 7; } }
+                for component in UiSettings.right-sidebar: RightSideIconButton {
+                    icon: UiSettings.id-to-image[component];
+                    checked: root.current-page == component;
+                    clicked => { 
+                        if (component == 3) { 
+                            is_emergency_prompt_open = true;
+                        } else {
+                            current-page = component;
+                        }
+                    }
+                    foreground: component == 3 
+                        ? red
+                        : root.current-page == component 
+                            ? Palette.accent-foreground 
+                            : Palette.foreground;
+                }
             }
         }
 
diff --git a/ui/state.slint b/ui/state.slint
@@ -1,4 +1,6 @@
 import { TemperatureSensor, HeaterFan, Heater, MoonrakerFile } from "types.slint";
+import { Palette } from "std-widgets.slint";
+import { Icons } from "constants.slint";
 
 export global TemperatureSensors 
 {
@@ -25,10 +27,10 @@ export global PrinterAdministration
 
 export global GcodeCommands
 {
-    in-out property <bool> extruder_extrude_available: false;
-    in-out property <bool> extruder_retract_available: false;
-    in-out property <bool> extruder_load_filament_available: false;
-    in-out property <bool> extruder_unload_filament_available: false;
+    in-out property <bool> extruder_extrude_available: true;
+    in-out property <bool> extruder_retract_available: true;
+    in-out property <bool> extruder_load_filament_available: true;
+    in-out property <bool> extruder_unload_filament_available: true;
 
     callback extruder_extrude();
     callback extruder_retract();
@@ -62,4 +64,19 @@ export global Utils
     pure callback prettify_name(name: string) -> string;
     pure callback create_temperature_lists(presets: [int]) -> [string];
     pure callback convert_temperature_back(preset : string) -> int;
+}
+
+export global UiSettings
+{
+    in-out property <bool> dark-mode;
+    in-out property <[int]> left-sidebar: [0,1,2,3];
+    in-out property <[int]> right-sidebar: [4,5,6,7];
+
+    changed dark-mode => {
+        // TODO: This doesn't work
+        debug("Dark mode changed to ");
+        Palette.color-scheme = dark-mode ? ColorScheme.dark : ColorScheme.light;
+    }
+
+    out property <[image]> id-to-image: [Icons.print, Icons.temperature, Icons.move, Icons.emergency_stop, Icons.fan, Icons.quick_action, Icons.console, Icons.settings];
 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ fn main() {`
`2`	`2`	`slint_build::compile_with_config(`
`3`	`3`	`"ui/main.slint",`
`4`	`4`	`slint_build::CompilerConfiguration::new()`
`5`		`- .with_style("material-dark".into())`
	`5`	`+ .with_style("material".into())`
`6`	`6`	`.embed_resources(slint_build::EmbedResourcesKind::EmbedForSoftwareRenderer),`
`7`	`7`	`)`
`8`	`8`	`.expect("Slint build failed");`