Add remaining settings

Author: lucasssvaz

tools/config_editor/app.py

@@ -21,7 +21,7 @@
 
 try:
     from textual.app import App, ComposeResult
-    from textual.containers import Container
+    from textual.containers import VerticalScroll
     from textual.widgets import Button, Header, Label
 except ImportError:
     print("Please install the \"textual-dev\" package before running this script.")
@@ -76,7 +76,7 @@ def on_button_pressed(self, event: Button.Pressed) -> None:
     def compose(self) -> ComposeResult:
         # Compose main menu
         yield Header()
-        with Container(id="main-menu-container"):
+        with VerticalScroll(id="main-menu-container"):
             yield Label("ESP32 Arduino Static Libraries Configuration Editor", id="main-menu-title")
             yield Button("Compile Static Libraries", id="compile-button", classes="main-menu-button")
             yield Button("Change sdkconfig Flags", id="editor-button", classes="main-menu-button")

tools/config_editor/settings.py

@@ -3,22 +3,48 @@
 from textual.containers import VerticalScroll, Container, Horizontal
 from textual.screen import Screen
 from textual.events import ScreenResume
-from textual.widgets import Header, Button, Switch
+from textual.widgets import Header, Button, Switch, Label
 
 from widgets import LabelledInput, LabelledSelect
 
 class SettingsScreen(Screen):
     # Settings screen
 
+    target_select: LabelledSelect
+    enable_copy_switch: Switch
+    arduino_path_input: LabelledInput
+    arduino_branch_input: LabelledInput
+    idf_branch_input: LabelledInput
+    idf_commit_input: LabelledInput
+    idf_debug_select: LabelledSelect
+
     def on_button_pressed(self, event: Button.Pressed) -> None:
         # Event handler called when a button is pressed
         if event.button.id == "save-settings-button":
             print("Save button pressed")
 
-            # Update the target setting
-            self.app.setting_target = self.query_one("#target-select", LabelledSelect).get_select_value()
+            self.app.setting_target = self.target_select.get_select_value()
             print("Target setting updated: " + self.app.setting_target)
 
+            self.app.setting_enable_copy = self.enable_copy_switch.value
+            print("Enable copy setting updated: " + str(self.app.setting_enable_copy))
+
+            if self.enable_copy_switch.value:
+                self.app.setting_arduino_path = self.arduino_path_input.get_input_value()
+                print("Arduino path setting updated: " + self.app.setting_arduino_path)
+
+            self.app.setting_arduino_branch = self.arduino_branch_input.get_input_value()
+            print("Arduino branch setting updated: " + self.app.setting_arduino_branch)
+
+            self.app.setting_idf_branch = self.idf_branch_input.get_input_value()
+            print("IDF branch setting updated: " + self.app.setting_idf_branch)
+
+            self.app.setting_idf_commit = self.idf_commit_input.get_input_value()
+            print("IDF commit setting updated: " + self.app.setting_idf_commit)
+
+            self.app.setting_debug_level = self.idf_debug_select.get_select_value()
+            print("Debug level setting updated: " + self.app.setting_debug_level)
+
             self.dismiss()
         elif event.button.id == "cancel-settings-button":
             print("Cancel button pressed")
@@ -28,9 +54,13 @@ def on_button_pressed(self, event: Button.Pressed) -> None:
     def on_resume(self) -> None:
         # Event handler called every time the screen is activated
         print("Settings screen resumed. Updating settings.")
-
-        # Update Target selection
-        self.query_one("#target-select", LabelledSelect).set_select_value(self.app.setting_target)
+        self.target_select.set_select_value(self.app.setting_target)
+        self.enable_copy_switch.value = self.app.setting_enable_copy
+        self.arduino_path_input.set_input_value(self.app.setting_arduino_path)
+        self.arduino_branch_input.set_input_value(self.app.setting_arduino_branch)
+        self.idf_branch_input.set_input_value(self.app.setting_idf_branch)
+        self.idf_commit_input.set_input_value(self.app.setting_idf_commit)
+        self.idf_debug_select.set_select_value(self.app.setting_debug_level)
 
     def compose(self) -> ComposeResult:
         # Compose the target selection screen
@@ -46,11 +76,38 @@ def compose(self) -> ComposeResult:
                 ("ESP32-C6", "esp32c6"),
                 ("ESP32-H2", "esp32h2")
             ]
-            yield LabelledSelect("Compilation Target", target_options, id="target-select", classes="settings-select", allow_blank=False)
+            self.target_select = LabelledSelect("Compilation Target", target_options, allow_blank=False, id="target-select")
+            yield self.target_select
+
             with Horizontal(id="settings-enable-copy-container"):
-                yield Switch(id="enable-copy-switch", classes="settings-switch", value=self.app.setting_enable_copy)
-                yield LabelledInput("Arduino-esp32 Path", placeholder="Path to your arduino-esp32 installation", value=self.app.setting_arduino_path)
-            yield LabelledInput("Arduino-esp32 Branch", placeholder="Leave empty to use default", value=self.app.setting_arduino_branch)
+                yield Label("Copy to arduino-esp32 after compilation", id="enable-copy-label")
+
+                self.enable_copy_switch = Switch(value=self.app.setting_enable_copy, id="enable-copy-switch")
+                yield self.enable_copy_switch
+
+            self.arduino_path_input = LabelledInput("Arduino-esp32 Path", placeholder="Path to your arduino-esp32 installation", value=self.app.setting_arduino_path, id="arduino-path-input")
+            yield self.arduino_path_input
+
+            self.arduino_branch_input = LabelledInput("Arduino-esp32 Branch", placeholder="Leave empty to use default", value=self.app.setting_arduino_branch, id="arduino-branch-input")
+            yield self.arduino_branch_input
+
+            self.idf_branch_input = LabelledInput("ESP-IDF Branch", placeholder="Leave empty to use default", value=self.app.setting_idf_branch, id="idf-branch-input")
+            yield self.idf_branch_input
+
+            self.idf_commit_input = LabelledInput("ESP-IDF Commit", placeholder="Leave empty to use default", value=self.app.setting_idf_commit, id="idf-commit-input")
+            yield self.idf_commit_input
+
+            debug_options = [
+                ("Default", "default"),
+                ("None", "none"),
+                ("Error", "error"),
+                ("Warning", "warning"),
+                ("Info", "info"),
+                ("Debug", "debug"),
+                ("Verbose", "verbose")
+            ]
+            self.idf_debug_select = LabelledSelect("ESP-IDF Debug Level", debug_options, allow_blank=False, id="idf-debug-select")
+            yield self.idf_debug_select
 
         with Horizontal(id="settings-button-container"):
             yield Button("Save", id="save-settings-button", classes="settings-button")

tools/config_editor/style.tcss

@@ -55,11 +55,6 @@ Button.main-menu-button {
 
 # Settings Screen
 
-#settings-radioset {
-    align: center middle;
-    width: 0.4fr;
-}
-
 #settings-scroll-container {
     align: center middle;
     padding: 1;
@@ -79,10 +74,6 @@ Button.main-menu-button {
     align: center middle;
 }
 
-.settings-labelled-input {
-    margin: 1;
-}
-
 # Editor Screen
 
 #tree-view {

tools/config_editor/widgets.py

@@ -5,8 +5,8 @@
 class LabelledInput(Widget):
     DEFAULT_CSS = """
     LabelledInput {
-        width: 1fr;
         height: 4;
+        margin-bottom: 1;
     }
     LabelledInput Label {
         padding-left: 1;
@@ -47,6 +47,7 @@ class LabelledSelect(Widget):
     DEFAULT_CSS = """
     LabelledSelect {
         height: 4;
+        margin-bottom: 1;
     }
     LabelledSelect Label {
         padding-left: 1;