Add custom widgets

lucasssvaz · lucasssvaz · commit 0d6d21a347b6 · 2024-03-07T21:55:47.000-03:00
diff --git a/tools/config_editor/app.py b/tools/config_editor/app.py
@@ -43,12 +43,12 @@ class ConfigEditorApp(App):
     setting_enable_copy = True
 
     # Options to be set by the command line arguments
-    setting_target = None
-    setting_arduino_path = None
-    setting_arduino_branch = None
-    setting_idf_branch = None
-    setting_idf_commit = None
-    setting_debug_level = None
+    setting_target = ""
+    setting_arduino_path = ""
+    setting_arduino_branch = ""
+    setting_idf_branch = ""
+    setting_idf_commit = ""
+    setting_debug_level = ""
 
     ENABLE_COMMAND_PALETTE = False
     CSS_PATH = "style.tcss"
@@ -63,11 +63,11 @@ def on_button_pressed(self, event: Button.Pressed) -> None:
         if event.button.id == "compile-button":
             print("Compile button pressed")
             self.push_screen("compile")
-        elif event.button.id == "targets-button":
-            print("Targets button pressed")
+        elif event.button.id == "settings-button":
+            print("Settings button pressed")
             self.push_screen("settings")
-        elif event.button.id == "options-button":
-            print("Options button pressed")
+        elif event.button.id == "editor-button":
+            print("Editor button pressed")
             self.push_screen("editor")
         elif event.button.id == "quit-button":
             print("Quit button pressed")
@@ -79,15 +79,16 @@ def compose(self) -> ComposeResult:
         with Container(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("Select Targets", id="targets-button", classes="main-menu-button")
-            yield Button("Change Configuration Options", id="options-button", classes="main-menu-button")
+            yield Button("Change sdkconfig Flags", id="editor-button", classes="main-menu-button")
+            yield Button("Settings", id="settings-button", classes="main-menu-button")
             yield Button("Quit", id="quit-button", classes="main-menu-button")
 
     def on_mount(self) -> None:
         # Event handler called when the app is mounted for the first time
         self.title = "Configurator"
         self.sub_title = "Main Menu"
         print("App started. Initial Options:")
+        print("Enable Copy: " + str(self.setting_enable_copy))
         print("Target: " + str(self.setting_target))
         print("Arduino Path: " + str(self.setting_arduino_path))
         print("Arduino Branch: " + str(self.setting_arduino_branch))
diff --git a/tools/config_editor/editor.py b/tools/config_editor/editor.py
@@ -64,7 +64,7 @@ def on_resume(self) -> None:
 
     def compose(self) -> ComposeResult:
         # Compose editor screen
-        path = os.path.join(self.app.root_path, 'configs')
+        path = os.path.join(self.app.ROOT_PATH, 'configs')
         yield Header()
         with Container():
             yield DirectoryTree(path, id="tree-view")
diff --git a/tools/config_editor/settings.py b/tools/config_editor/settings.py
@@ -3,65 +3,60 @@
 from textual.containers import VerticalScroll, Container, Horizontal
 from textual.screen import Screen
 from textual.events import ScreenResume
-from textual.widgets import Header, RadioButton, Button, RadioSet
+from textual.widgets import Header, Button, Switch
+
+from widgets import LabelledInput, LabelledSelect
 
 class SettingsScreen(Screen):
     # Settings screen
 
-    # Temporary target string
-    temp_target_str = ""
-
-    def update_targets(self) -> None:
-        # Update the targets in the screen
-        self.temp_target_str = str(self.app.setting_target)
-        print("Target updated in screen: " + self.temp_target_str)
-
     def on_button_pressed(self, event: Button.Pressed) -> None:
         # Event handler called when a button is pressed
-        if event.button.id == "save-target-button":
-            for radiobutton in self.query("RadioButton"):
-                target_text = radiobutton.id[:-12] # Remove "-radiobutton" from the id
-                print(target_text + " " + str(radiobutton.value))
-                if radiobutton.value:
-                    self.temp_target_str = target_text
-            print("Save button pressed. Selected target: " + self.temp_target_str)
-            self.app.setting_target = str(self.temp_target_str)
+        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).value
+            print("Target setting updated: " + self.app.setting_target)
+
             self.dismiss()
-        elif event.button.id == "cancel-target-button":
+        elif event.button.id == "cancel-settings-button":
             print("Cancel button pressed")
             self.dismiss()
 
     @on(ScreenResume)
     def on_resume(self) -> None:
         # Event handler called every time the screen is activated
-        self.update_targets()
-        print("Targets screen resumed. Loaded target: " + self.temp_target_str)
-        for radiobutton in self.query("RadioButton"):
-            target_text = radiobutton.id[:-12] # Remove "-radiobutton" from the id
-            if target_text == self.temp_target_str:
-                radiobutton.value = True
-            else:
-                radiobutton.value = False
+        print("Settings screen resumed. Updating settings.")
+
+        # Update Target selection
+        self.query_one("#target-select", LabelledSelect).value = self.app.setting_target
 
     def compose(self) -> ComposeResult:
         # Compose the target selection screen
         yield Header()
-        with VerticalScroll(id="target-scroll-container"):
-            with RadioSet(id="target-radioset"):
-                yield RadioButton("All", value=True, classes="target-radiobutton", id="all-radiobutton")
-                yield RadioButton("ESP32", classes="target-radiobutton", id="esp32-radiobutton")
-                yield RadioButton("ESP32-S2", classes="target-radiobutton", id="esp32s2-radiobutton")
-                yield RadioButton("ESP32-S3", classes="target-radiobutton", id="esp32s3-radiobutton")
-                yield RadioButton("ESP32-C2 (ESP8684)", classes="target-radiobutton", id="esp32c2-radiobutton")
-                yield RadioButton("ESP32-C3", classes="target-radiobutton", id="esp32c3-radiobutton")
-                yield RadioButton("ESP32-C6", classes="target-radiobutton", id="esp32c6-radiobutton")
-                yield RadioButton("ESP32-H2", classes="target-radiobutton", id="esp32h2-radiobutton")
-        with Horizontal(id="target-button-container"):
-            yield Button("Save", id="save-target-button", classes="target-button")
-            yield Button("Cancel", id="cancel-target-button", classes="target-button")
+        with VerticalScroll(id="settings-scroll-container"):
+            target_options = [
+                ("All", "all"),
+                ("ESP32", "esp32"),
+                ("ESP32-S2", "esp32s2"),
+                ("ESP32-S3", "esp32s3"),
+                ("ESP32-C2 (ESP8684)", "esp32c2"),
+                ("ESP32-C3", "esp32c3"),
+                ("ESP32-C6", "esp32c6"),
+                ("ESP32-H2", "esp32h2")
+            ]
+            yield LabelledSelect("Compilation Target", target_options, id="target-select", classes="settings-select", allow_blank=False)
+            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)
+
+        with Horizontal(id="settings-button-container"):
+            yield Button("Save", id="save-settings-button", classes="settings-button")
+            yield Button("Cancel", id="cancel-settings-button", classes="settings-button")
 
     def on_mount(self) -> None:
         # Event handler called when the screen is mounted for the first time
-        self.sub_title = "Target Selection"
-        self.query_one("#all-radiobutton", RadioButton).focus()
-        print("Targets screen mounted")
+        self.sub_title = "Settings"
+        print("Settings screen mounted")
diff --git a/tools/config_editor/style.tcss b/tools/config_editor/style.tcss
@@ -14,8 +14,8 @@ Button {
 # Main Screen
 
 Button.main-menu-button {
-        min-width: 100%;
-        max-width: 0.4fr;
+    min-width: 100%;
+    max-width: 0.4fr;
 }
 
 #main-menu-container {
@@ -53,31 +53,35 @@ Button.main-menu-button {
     margin: 1 2;
 }
 
-# Targets Screen
+# Settings Screen
 
-#target-radioset {
+#settings-radioset {
     align: center middle;
     width: 0.4fr;
 }
 
-#target-scroll-container {
+#settings-scroll-container {
     align: center middle;
 }
 
-#target-button-container {
+#settings-button-container {
     width: 100%;
     max-height: 20%;
     min-height: 5;
     align: center middle;
 }
 
-.target-button {
+.settings-button {
     margin: 1;
     min-width: 100%;
     max-width: 0.2fr;
     align: center middle;
 }
 
+.settings-labelled-input {
+    margin: 1;
+}
+
 # Editor Screen
 
 #tree-view {
diff --git a/tools/config_editor/widgets.py b/tools/config_editor/widgets.py
@@ -0,0 +1,65 @@
+from textual.widget import Widget
+
+from textual.widgets import Input, Label, Select
+
+class LabelledInput(Widget):
+    DEFAULT_CSS = """
+    LabelledInput {
+        width: 1fr;
+        height: 4;
+    }
+    LabelledInput Label {
+        padding-left: 1;
+    }
+    """
+
+    def __init__(self,
+                 label,
+                 *,
+                 placeholder="",
+                 value="",
+                 name=None,
+                 id=None,
+                 classes=None,
+                 disabled=False):
+        super().__init__(name=name, id=id, classes=classes, disabled=disabled)
+        self.label = label
+        self.placeholder = placeholder
+        self.value = value
+
+    def compose(self):
+        yield Label(f"{self.label}:")
+        yield Input(placeholder=self.placeholder, value=self.value)
+
+
+class LabelledSelect(Widget):
+    DEFAULT_CSS = """
+    LabelledSelect {
+        height: 4;
+    }
+    LabelledSelect Label {
+        padding-left: 1;
+    }
+    """
+
+    def __init__(self,
+                 label,
+                 options,
+                 *,
+                 prompt="Select",
+                 allow_blank=True,
+                 value=Select.BLANK,
+                 name=None,
+                 id=None,
+                 classes=None,
+                 disabled=False):
+        super().__init__(name=name, id=id, classes=classes, disabled=disabled)
+        self.label = label
+        self.options = options
+        self.value = value
+        self.prompt = prompt
+        self.allow_blank = allow_blank
+
+    def compose(self):
+        yield Label(f"{self.label}:")
+        yield Select(options=self.options, value=self.value, prompt=self.prompt, allow_blank=self.allow_blank)
