ardupilot-methodic-configurator 2.2.0__py3-none-any.whl → 2.4.0__py3-none-any.whl

ardupilot_methodic_configurator/frontend_tkinter_rich_text.py

@@ -11,10 +11,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
 # https://wiki.tcl-lang.org/page/Changing+Widget+Colors
 
 import tkinter as tk
-from platform import system as platform_system
 from tkinter import font as tkFont  # noqa: N812
 from tkinter import ttk
 
+from ardupilot_methodic_configurator.frontend_tkinter_font import get_safe_font_config, safe_font_nametofont
+
 
 class RichText(tk.Text):  # pylint: disable=too-many-ancestors
     """
@@ -44,12 +45,21 @@ class RichText(tk.Text):  # pylint: disable=too-many-ancestors
     def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
 
-        default_font = tkFont.nametofont("TkDefaultFont")
-        default_size = default_font.cget("size")
-
-        bold_font = tkFont.Font(**default_font.configure())  # type: ignore[arg-type]
-        italic_font = tkFont.Font(**default_font.configure())  # type: ignore[arg-type]
-        h1_font = tkFont.Font(**default_font.configure())  # type: ignore[arg-type]
+        default_font = safe_font_nametofont()
+        if default_font:
+            # Use the actual font configuration if available
+            bold_font = tkFont.Font(**default_font.configure())  # type: ignore[arg-type]
+            italic_font = tkFont.Font(**default_font.configure())  # type: ignore[arg-type]
+            h1_font = tkFont.Font(**default_font.configure())  # type: ignore[arg-type]
+            default_size = default_font.cget("size")
+        else:
+            # Get safe default font configuration
+            default_config = get_safe_font_config()
+            # Create fonts with safe config
+            bold_font = tkFont.Font(**default_config)  # type: ignore[arg-type]
+            italic_font = tkFont.Font(**default_config)  # type: ignore[arg-type]
+            h1_font = tkFont.Font(**default_config)  # type: ignore[arg-type]
+            default_size = int(default_config.get("size", 0))
 
         bold_font.configure(weight="bold")
         italic_font.configure(slant="italic")
@@ -76,11 +86,9 @@ def get_widget_font_family_and_size(widget: tk.Widget) -> tuple[str, int]:
     style = ttk.Style()
     widget_style = widget.cget("style")  # Get the style used by the widget
     font_name = style.lookup(widget_style, "font")
-    font_dict = tkFont.nametofont(font_name).config()
-
-    default_font_family = "Segoe UI" if platform_system() == "Windows" else "Helvetica"
-    default_font_size = 9 if platform_system() == "Windows" else -12
 
-    if font_dict is None:
-        return default_font_family, default_font_size
-    return font_dict.get("family", default_font_family), font_dict.get("size", default_font_size)
+    # Safely get platform-specific font configuration
+    font_dict = get_safe_font_config(font_name)
+    family = font_dict.get("family", "")
+    size = font_dict.get("size", 0)
+    return str(family), int(size)

ardupilot_methodic_configurator/frontend_tkinter_software_update.py

@@ -22,7 +22,11 @@ class UpdateDialog(BaseWindow):  # pylint: disable=too-many-instance-attributes
 
     def __init__(self, version_info: str, download_callback: Optional[Callable[[], bool]] = None) -> None:
         super().__init__()
-        self.root.title(_("Amilcar Lucas's - ArduPilot methodic configurator ") + __version__ + _(" - New version available"))
+        self.root.title(
+            _("Amilcar Lucas's - ArduPilot methodic configurator {version} - New version available").format(
+                version=__version__
+            )
+        )
         self.root.geometry("700x600")
         self.download_callback = download_callback
         self.root.protocol("WM_DELETE_WINDOW", self.on_cancel)

ardupilot_methodic_configurator/frontend_tkinter_template_overview.py

@@ -54,7 +54,7 @@ class ProgramSettingsProviderProtocol(Protocol):  # pylint: disable=too-few-publ
 IMAGE_HEIGHT_PX = 100
 
 
-class TemplateOverviewWindow(BaseWindow):
+class TemplateOverviewWindow(BaseWindow):  # pylint: disable=too-many-instance-attributes
     """
     Represents the window for viewing and managing ArduPilot vehicle templates.
 
@@ -109,8 +109,8 @@ class TemplateOverviewWindow(BaseWindow):
 
     def _configure_window(self) -> None:
         """Configure the main window properties."""
-        title = _("Amilcar Lucas's - ArduPilot methodic configurator {} - Template Overview and selection")
-        self.root.title(title.format(__version__))
+        title = _("Amilcar Lucas's - ArduPilot methodic configurator {version} - Template Overview and selection")
+        self.root.title(title.format(version=__version__))
 
         # Scale window geometry for HiDPI displays
         scaled_width = int(1200 * self.dpi_scaling_factor)
@@ -131,14 +131,22 @@ class TemplateOverviewWindow(BaseWindow):
         # Initialize image label
         self.image_label = ttk.Label(self.top_frame)
 
-        # Initialize treeview
+        # Initialize treeview with scrollbar
+        self.tree_frame = ttk.Frame(self.main_frame)
         columns = TemplateOverview.columns()
-        self.tree = ttk.Treeview(self.main_frame, columns=columns, show="headings")
+        self.tree = ttk.Treeview(self.tree_frame, columns=columns, show="headings")
+
+        # Create vertical scrollbar
+        self.scrollbar = ttk.Scrollbar(self.tree_frame, orient=tk.VERTICAL, command=self.tree.yview)
+        self.tree.configure(yscrollcommand=self.scrollbar.set)
 
     def _get_instruction_text(self) -> str:
         """Get the instruction text for the user interface."""
-        instruction_text = _("Please double-click the template below that most resembles your own vehicle components")
-        instruction_text += _("\nit does not need to exactly match your vehicle's components.")
+        instruction_text = _("Double-click the template below that best matches your vehicle's components.")
+        instruction_text += _("\nDon't worry about finding a perfect match - choose the closest one available.")
+        instruction_text += _(
+            "\nIf unsure, select the 'empty' template for your firmware version (provides minimal starting configuration)."
+        )
         return instruction_text
 
     def _setup_layout(self) -> None:
@@ -155,6 +163,13 @@ class TemplateOverviewWindow(BaseWindow):
         scaled_pady_value = int(IMAGE_HEIGHT_PX * self.dpi_scaling_factor / 2)
         self.image_label.pack(side=tk.RIGHT, anchor=tk.NE, padx=scaled_padx, pady=scaled_pady_value)
 
+        # Pack tree frame
+        self.tree_frame.pack(fill=tk.BOTH, expand=True)
+
+        # Pack treeview and scrollbar within tree frame
+        self.tree.pack(side=tk.LEFT, fill=tk.BOTH, expand=True)
+        self.scrollbar.pack(side=tk.RIGHT, fill=tk.Y)
+
     def run_app(self) -> None:
         """Run the TemplateOverviewWindow application."""
         if isinstance(self.root, tk.Toplevel):
@@ -173,7 +188,6 @@ class TemplateOverviewWindow(BaseWindow):
         self._setup_treeview_columns()
         self._populate_treeview(connected_fc_vehicle_type)
         self._adjust_treeview_column_widths()
-        self.tree.pack(fill=tk.BOTH, expand=True)
 
     def _setup_treeview_style(self) -> None:
         """Setup treeview styling with DPI scaling."""
@@ -251,7 +265,7 @@ class TemplateOverviewWindow(BaseWindow):
             # Update the column's width property to accommodate the largest text width
             # Scale the padding and multiplication factor for HiDPI
             scaled_padding = int(10 * self.dpi_scaling_factor)
-            self.tree.column(col, width=int(max_width * 0.6 + scaled_padding))
+            self.tree.column(col, width=int(min(max_width * 0.6 + scaled_padding, 300)))
 
     def _bind_events(self) -> None:
         """Bind events to the treeview."""