ardupilot-methodic-configurator 2.0.3__py3-none-any.whl → 2.0.5__py3-none-any.whl

ardupilot_methodic_configurator/frontend_tkinter_directory_selection.py

@@ -14,7 +14,8 @@ import tkinter as tk
 from argparse import ArgumentParser, Namespace
 from copy import deepcopy
 from logging import basicConfig as logging_basicConfig
-from logging import debug as logging_error
+from logging import debug as logging_debug
+from logging import error as logging_error
 from logging import getLevelName as logging_getLevelName
 from logging import info as logging_info
 from logging import warning as logging_warning
@@ -267,6 +268,9 @@ class VehicleDirectorySelectionWindow(BaseWindow):  # pylint: disable=too-many-i
         )
         introduction_label.pack(expand=False, fill=tk.X, padx=6, pady=6)
         template_dir, new_base_dir, vehicle_dir = LocalFilesystem.get_recently_used_dirs()
+        logging_debug("template_dir: %s", template_dir)  # this string is intentionally left untranslated
+        logging_debug("new_base_dir: %s", new_base_dir)  # this string is intentionally left untranslated
+        logging_debug("vehicle_dir: %s", vehicle_dir)  # this string is intentionally left untranslated
         self.create_option1_widgets(template_dir, new_base_dir, _("MyVehicleName"), fc_connected, connected_fc_vehicle_type)
         self.create_option2_widgets(vehicle_dir)
         self.create_option3_widgets(vehicle_dir)
@@ -485,17 +489,23 @@ class VehicleDirectorySelectionWindow(BaseWindow):  # pylint: disable=too-many-i
         new_vehicle_name = self.new_dir.get_selected_directory()
 
         if template_dir == "":
-            messagebox.showerror(_("Vehicle template directory"), _("Vehicle template directory cannot be empty"))
+            messagebox.showerror(_("Vehicle template directory"), _("Vehicle template directory must not be empty"))
             return
         if not LocalFilesystem.directory_exists(template_dir):
-            messagebox.showerror(_("Vehicle template directory"), _("Vehicle template directory does not exist"))
+            msg = _("Vehicle template directory {template_dir} does not exist").format(template_dir=template_dir)
+            logging_error(msg)
+            messagebox.showerror(_("Vehicle template directory"), msg)
             return
 
         if new_vehicle_name == "":
-            messagebox.showerror(_("New vehicle directory"), _("New vehicle name cannot be empty"))
+            messagebox.showerror(_("New vehicle directory"), _("New vehicle name must not be empty"))
             return
         if not LocalFilesystem.valid_directory_name(new_vehicle_name):
-            messagebox.showerror(_("New vehicle directory"), _("New vehicle name must not contain invalid characters"))
+            msg = _("New vehicle name {new_vehicle_name} must not contain invalid characters").format(
+                new_vehicle_name=new_vehicle_name
+            )
+            logging_error(msg)
+            messagebox.showerror(_("New vehicle directory"), msg)
             return
         new_vehicle_dir = LocalFilesystem.new_vehicle_dir(new_base_dir, new_vehicle_name)
 

ardupilot_methodic_configurator/frontend_tkinter_pair_tuple_combobox.py

@@ -27,7 +27,6 @@ from typing import Union
 from ardupilot_methodic_configurator import _
 from ardupilot_methodic_configurator.common_arguments import add_common_arguments
 from ardupilot_methodic_configurator.frontend_tkinter_autoresize_combobox import update_combobox_width
-from ardupilot_methodic_configurator.frontend_tkinter_rich_text import get_widget_font_family_and_size
 
 # SPDX-SnippetBegin
 # SPDX-License-Identifier: MPL-2.0
@@ -112,7 +111,6 @@ class PairTupleCombobox(ttk.Combobox):  # pylint: disable=too-many-ancestors
         if len(combo_values) == 0:
             return
         longest_value = max(combo_values, key=len)
-        # font = tkfont.nametofont(combo.cget('font'))
         font = tkfont.nametofont("TkDefaultFont")
         width = font.measure(longest_value + "0000") - event.width
         if width < 0:
@@ -262,9 +260,12 @@ def main() -> None:
     tuple_pairs = [(str(i), random_string) for i, random_string in enumerate(random_strings)]
     combobox = PairTupleCombobox(root, tuple_pairs, None, "Random Strings")
 
-    font_family, font_size = get_widget_font_family_and_size(combobox)
-    font_size -= 2 if platform_system() == "Windows" else 1
-    combobox.config(state="readonly", width=9, font=(font_family, font_size))
+    style = ttk.Style()
+    style.theme_use("alt")  # Use an alternative theme for better appearance
+
+    font_size = tkfont.nametofont("TkDefaultFont").cget("size")
+    font_size -= 2 if platform_system() == "Windows" else -1
+    combobox.config(state="readonly", width=9, font=("TkDefaultFont", font_size))
 
     # Pack the combobox into the main window
     combobox.pack(pady=10, padx=10)

ardupilot_methodic_configurator/frontend_tkinter_parameter_editor.py

@@ -151,13 +151,14 @@ class ParameterEditorWindow(BaseWindow):  # pylint: disable=too-many-instance-at
         self.param_download_progress_window: ProgressWindow
         self.tempcal_imu_progress_window: ProgressWindow
         self.file_upload_progress_window: ProgressWindow
+        self.skip_button: ttk.Button
         self.last_time_asked_to_save: float = 0
         self.gui_complexity = str(ProgramSettings.get_setting("gui_complexity"))
 
         self.root.title(
             _("Amilcar Lucas's - ArduPilot methodic configurator ") + __version__ + _(" - Parameter file editor and uploader")
         )
-        self.root.geometry("990x610")  # Set the window width
+        self.root.geometry("990x630")  # Set the window width and height
 
         # Bind the close_connection_and_quit function to the window close event
         self.root.protocol("WM_DELETE_WINDOW", self.close_connection_and_quit)
@@ -249,24 +250,23 @@ class ParameterEditorWindow(BaseWindow):  # pylint: disable=too-many-instance-at
         if self.gui_complexity != "simple":  # only display the combobox when not simple
             self.file_selection_combobox.pack(side=tk.TOP, anchor=tk.NW, pady=(4, 0))
 
-        font_family, _font_size = get_widget_font_family_and_size(file_selection_label)
-        self.legend_frame(config_subframe, font_family)
+        self.legend_frame(config_subframe)
 
         image_label = self.put_image_in_label(config_frame, LocalFilesystem.application_logo_filepath())
         image_label.pack(side=tk.RIGHT, anchor=tk.NE, padx=(4, 4), pady=(4, 0))
         image_label.bind("<Button-1>", lambda event: show_about_window(self.main_frame, version))  # noqa: ARG005
         show_tooltip(image_label, _("User Manual, Support Forum, Report a Bug, Licenses, Source Code"))
 
-    def legend_frame(self, config_subframe: ttk.Frame, font_family: str) -> None:  # pylint: disable=too-many-locals
+    def legend_frame(self, config_subframe: ttk.Frame) -> None:  # pylint: disable=too-many-locals
+        font_family, font_size = get_widget_font_family_and_size(config_subframe)
         style = ttk.Style()
-        style.configure("Legend.TLabelframe", font=(font_family, 9))  # type: ignore[no-untyped-call]
+        style.configure("Legend.TLabelframe", font=(font_family, font_size))  # type: ignore[no-untyped-call]
         legend_frame = ttk.LabelFrame(config_subframe, text=_("Legend"), style="Legend.TLabelframe")
         legend_left = ttk.Frame(legend_frame)
         legend_left.pack(side=tk.LEFT, anchor=tk.NW)
         show_tooltip(legend_frame, _("the meaning of the text background colors"), position_below=False)
 
-        font_size = 8
-        font = (font_family, font_size)
+        font = (font_family, font_size - 1 if font_size > 0 else font_size + 1)
         np_label = ttk.Label(legend_left, text=_("Normal parameter"), font=font)
         show_tooltip(np_label, _("Normal parameter - reusable in similar vehicles"))
         np_label.pack(side=tk.TOP, anchor=tk.NW)
@@ -361,8 +361,7 @@ class ParameterEditorWindow(BaseWindow):  # pylint: disable=too-many-instance-at
             command=self.on_upload_selected_click,
         )
         upload_selected_button.configure(state="normal" if self.flight_controller.master else "disabled")
-        if self.gui_complexity != "simple" or self.flight_controller.master:
-            upload_selected_button.pack(side=tk.LEFT, padx=(8, 8))  # Add padding on both sides of the upload selected button
+        upload_selected_button.pack(side=tk.LEFT, padx=(8, 8))  # Add padding on both sides of the upload selected button
         show_tooltip(
             upload_selected_button,
             _(
@@ -375,11 +374,19 @@ class ParameterEditorWindow(BaseWindow):  # pylint: disable=too-many-instance-at
         )
 
         # Create skip button
-        skip_button = ttk.Button(buttons_frame, text=_("Skip parameter file"), command=self.on_skip_click)
-        if self.gui_complexity != "simple" or not self.flight_controller.master:
-            skip_button.pack(side=tk.RIGHT, padx=(8, 8))  # Add right padding to the skip button
+        self.skip_button = ttk.Button(buttons_frame, text=_("Skip parameter file"), command=self.on_skip_click)
+        self.skip_button.configure(
+            state=(
+                "normal"
+                if self.gui_complexity != "simple"
+                or self._configuration_step_is_optional(self.current_file)
+                or not self.flight_controller.master
+                else "disabled"
+            )
+        )
+        self.skip_button.pack(side=tk.RIGHT, padx=(8, 8))  # Add right padding to the skip button
         show_tooltip(
-            skip_button,
+            self.skip_button,
             _(
                 "Skip to the next intermediate parameter file without uploading any changes to the flight "
                 "controller\nIf changes have been made to the current file it will ask if you want to save them"
@@ -637,6 +644,7 @@ class ParameterEditorWindow(BaseWindow):  # pylint: disable=too-many-instance-at
             self.documentation_frame.refresh_documentation_labels(selected_file)
             self.documentation_frame.update_why_why_now_tooltip(selected_file)
             self.repopulate_parameter_table(selected_file)
+            self._update_skip_button_state()
 
     def _update_progress_bar_from_file(self, selected_file: str) -> None:
         if self.local_filesystem.configuration_phases:
@@ -827,6 +835,31 @@ class ParameterEditorWindow(BaseWindow):  # pylint: disable=too-many-instance-at
                 logging_info(_("All parameters uploaded to the flight controller successfully"))
         self.local_filesystem.write_last_uploaded_filename(self.current_file)
 
+    def _configuration_step_is_optional(self, file_name: str, threshold_pct: int = 20) -> bool:
+        # Check if the configuration step for the given file is optional
+        mandatory_text, _mandatory_url = self.local_filesystem.get_documentation_text_and_url(file_name, "mandatory")
+        # Extract percentage from mandatory_text like "80% mandatory (20% optional)"
+        percentage = 0
+        if mandatory_text:
+            try:
+                percentage = int(mandatory_text.split("%")[0])
+            except (ValueError, IndexError):
+                percentage = 0
+
+        return percentage <= threshold_pct
+
+    def _update_skip_button_state(self) -> None:
+        """Update the skip button state based on whether the current configuration step is optional."""
+        if hasattr(self, "skip_button"):
+            skip_button_state = (
+                "normal"
+                if self.gui_complexity != "simple"
+                or self._configuration_step_is_optional(self.current_file)
+                or not self.flight_controller.master
+                else "disabled"
+            )
+            self.skip_button.configure(state=skip_button_state)
+
     def on_skip_click(self, _event: Union[None, tk.Event] = None) -> None:
         self.write_changes_to_intermediate_parameter_file()
         # Find the next filename in the file_parameters dictionary
@@ -838,17 +871,7 @@ class ParameterEditorWindow(BaseWindow):  # pylint: disable=too-many-instance-at
             # Skip files with mandatory_level == 0
             while next_file_index < len(files):
                 next_file = files[next_file_index]
-                mandatory_text, _mandatory_url = self.local_filesystem.get_documentation_text_and_url(next_file, "mandatory")
-                # Extract percentage from mandatory_text like "80% mandatory (20% optional)"
-                percentage = 0
-                if mandatory_text:
-                    try:
-                        percentage = int(mandatory_text.split("%")[0])
-                    except (ValueError, IndexError):
-                        percentage = 0
-
-                # If the file has mandatory_level > 0, use it
-                if percentage > 0:
+                if not self._configuration_step_is_optional(next_file, 0):
                     break
 
                 next_file_index += 1

ardupilot_methodic_configurator/frontend_tkinter_parameter_editor_documentation_frame.py

@@ -9,12 +9,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
 """
 
 import tkinter as tk
+from platform import system as platform_system
 from tkinter import ttk
 from webbrowser import open as webbrowser_open  # to open the blog post documentation
 
 from ardupilot_methodic_configurator import _
 from ardupilot_methodic_configurator.backend_filesystem import LocalFilesystem
 from ardupilot_methodic_configurator.backend_filesystem_program_settings import ProgramSettings
+from ardupilot_methodic_configurator.frontend_tkinter_rich_text import get_widget_font_family_and_size
 from ardupilot_methodic_configurator.frontend_tkinter_show import show_tooltip
 
 
@@ -28,12 +30,17 @@ class DocumentationFrame:
     functionality to open these links in a web browser.
     """
 
+    BLOG_LABEL = _("💬 Forum Blog:") if platform_system() == "Windows" else _("Forum Blog:")
+    WIKI_LABEL = _("📖 Wiki:") if platform_system() == "Windows" else _("Wiki:")
+    EXTERNAL_TOOL_LABEL = _("🔧 External tool:") if platform_system() == "Windows" else _("External tool:")
+    MANDATORY_LABEL = _("❗ Mandatory:") if platform_system() == "Windows" else _("Mandatory:")
+
     DOCUMENTATION_SECTIONS = (
-        (_("Forum Blog:"), _("ArduPilot's forum Methodic configuration Blog post relevant for the current file")),
-        (_("Wiki:"), _("ArduPilot's wiki page relevant for the current file")),
-        (_("External tool:"), _("External tool or documentation relevant for the current file")),
+        (BLOG_LABEL, _("ArduPilot's forum Methodic configuration Blog post relevant for the current file")),
+        (WIKI_LABEL, _("ArduPilot's wiki page relevant for the current file")),
+        (EXTERNAL_TOOL_LABEL, _("External tool or documentation relevant for the current file")),
         (
-            _("Mandatory:"),
+            MANDATORY_LABEL,
             _(
                 "Mandatory level of the current file,\n"
                 "100% you MUST use this file to configure the vehicle,\n"
@@ -139,29 +146,30 @@ class DocumentationFrame:
         self.documentation_frame.config(text=frame_title)
 
         blog_text, blog_url = self.local_filesystem.get_documentation_text_and_url(current_file, "blog")
-        self._refresh_documentation_label(_("Forum Blog:"), _(blog_text) if blog_text else "", blog_url)
+        self._refresh_documentation_label(self.BLOG_LABEL, _(blog_text) if blog_text else "", blog_url)
         wiki_text, wiki_url = self.local_filesystem.get_documentation_text_and_url(current_file, "wiki")
-        self._refresh_documentation_label(_("Wiki:"), _(wiki_text) if wiki_text else "", wiki_url)
+        self._refresh_documentation_label(self.WIKI_LABEL, _(wiki_text) if wiki_text else "", wiki_url)
         external_tool_text, external_tool_url = self.local_filesystem.get_documentation_text_and_url(
             current_file, "external_tool"
         )
         self._refresh_documentation_label(
-            _("External tool:"), _(external_tool_text) if external_tool_text else "", external_tool_url
+            self.EXTERNAL_TOOL_LABEL, _(external_tool_text) if external_tool_text else "", external_tool_url
         )
         mandatory_text, _mandatory_url = self.local_filesystem.get_documentation_text_and_url(current_file, "mandatory")
         self._refresh_mandatory_level(current_file, mandatory_text)
 
     def _refresh_documentation_label(self, label_key: str, text: str, url: str, url_expected: bool = True) -> None:
         label = self.documentation_labels[label_key]
+        font_family, font_size = get_widget_font_family_and_size(label)
         if url:
             # Create a font with underline attribute
-            underlined_font = ("TkDefaultFont", 10, "underline")
+            underlined_font = (font_family, font_size, "underline")
             label.config(text=text, foreground="blue", cursor="hand2", font=underlined_font)
             label.bind("<Button-1>", lambda event: webbrowser_open(url))  # noqa: ARG005
             show_tooltip(label, url)
         else:
             # Use regular font without underline
-            regular_font = ("TkDefaultFont", 10)
+            regular_font = (font_family, font_size)
             label.config(text=text, foreground="black", cursor="arrow", font=regular_font)
             label.bind("<Button-1>", lambda event: None)  # noqa: ARG005
             if url_expected: