Merge 6bb9fe6 into 518a5a1

Author: charlotrudel

.github/workflows/release_pipeline.yml

@@ -21,7 +21,7 @@ jobs:
           python-version: '3.x'
 
       - name: Install PyInstaller
-        run: pip install pyinstaller pyserial
+        run: pip install pyinstaller pyserial tkmacosx
 
       - name: Build with PyInstaller
         run: pyinstaller arduino_logique.spec

menus.py

@@ -8,16 +8,20 @@
 from dataclasses import dataclass
 import os
 import tkinter as tk
-from tkinter import messagebox, filedialog, ttk
 import json
 import subprocess
 import platform
-from typing import Callable
 import serial.tools.list_ports  # type: ignore
 
 from breadboard import Breadboard
 
-from dataCDLT import INPUT, OUTPUT, USED
+from dataCDLT import INPUT, OUTPUT
+
+if os.name == "darwin":
+    from tkinter import messagebox, filedialog, ttk
+    from tkmacosx import Button # type: ignore
+else:
+    from tkinter import Button, messagebox, filedialog, ttk
 
 MICROCONTROLLER_PINS = {
     "Arduino Mega": {
@@ -173,7 +177,7 @@ def confirm_selection():
             print(f"{selected_option} selected.")
             dialog.destroy()
 
-        confirm_button = tk.Button(dialog, text="Confirm", command=confirm_selection)
+        confirm_button = Button(dialog, text="Confirm", command=confirm_selection)
         confirm_button.pack(pady=10)
 
     def show_correspondence_table(self):
@@ -260,7 +264,7 @@ def create_menu(self, menu_name, options, menu_commands):
         - options (list): List of options under the menu.
         """
         # Create the menu button
-        btn = tk.Button(
+        btn = Button(
             self.menu_bar,
             text=menu_name,
             bg="#333333",
@@ -293,7 +297,7 @@ def select_menu_item(option):
 
         # Populate the dropdown with menu options
         for option in options:
-            option_btn = tk.Button(
+            option_btn = Button(
                 dropdown,
                 text=option,
                 bg="#333333",
@@ -324,7 +328,7 @@ def toggle_dropdown(self, menu_name):
         - menu_name (str): The name of the menu to toggle.
         """
         for child in self.menu_bar.winfo_children():
-            if isinstance(child, tk.Button) and hasattr(child, "dropdown"):
+            if isinstance(child, Button) and hasattr(child, "dropdown"):
                 if child["text"] == menu_name:
                     if child.dropdown.winfo_ismapped():
                         child.dropdown.place_forget()
@@ -368,11 +372,11 @@ def close_dropdown(self, event):
             and not any(
                 self.is_descendant(event.widget, child.dropdown)
                 for child in self.menu_bar.winfo_children()
-                if isinstance(child, tk.Button) and hasattr(child, "dropdown")
+                if isinstance(child, Button) and hasattr(child, "dropdown")
             )
         ):
             for child in self.menu_bar.winfo_children():
-                if isinstance(child, tk.Button) and hasattr(child, "dropdown"):
+                if isinstance(child, Button) and hasattr(child, "dropdown"):
                     child.dropdown.place_forget()
 
     # Menu Handler Functions
@@ -549,7 +553,7 @@ def confirm_selection():
                 self.serial_port.com_port = selected_option
                 dialog.destroy()
 
-            confirm_button = tk.Button(dialog, text="Confirm", command=confirm_selection)
+            confirm_button = Button(dialog, text="Confirm", command=confirm_selection)
             confirm_button.pack(pady=10)
 
     def open_documentation(self):

sidebar.py

@@ -7,7 +7,6 @@
 from dataclasses import dataclass
 from pathlib import Path
 import tkinter as tk
-from tkinter import messagebox, font
 import os
 from typing import Callable, Tuple
 import subprocess
@@ -18,6 +17,12 @@
 from dataCDLT import FREE, USED
 from object_model.circuit_object_model import Chip, get_all_available_chips, get_chip_modification_times
 
+if os.name == "darwin":
+    from tkinter import messagebox, font
+    from tkmacosx import Button # type: ignore
+else:
+    from tkinter import Button, messagebox, font
+
 
 @dataclass
 class SidebarGrid:
@@ -217,7 +222,7 @@ def display_chips(self, chips: list[Tuple[Chip, tk.PhotoImage]]):
         for index, (chip, chip_image) in enumerate(display_chips):
             row = index // self.sidebar_grid.columns
             col = index % self.sidebar_grid.columns
-            btn = tk.Button(
+            btn = Button(
                 self.chips_inner_frame,
                 image=chip_image,
                 text=chip.chip_type,
@@ -257,7 +262,7 @@ def create_manage_button(self, sidebar_frame):
         """
         Creates the 'Manage Components' button at the bottom of the sidebar without an icon.
         """
-        manage_button = tk.Button(
+        manage_button = Button(
             sidebar_frame,
             text="Manage Components",
             bg="#333333",  # Matching the sidebar's background to simulate transparency

toolbar.py

@@ -5,16 +5,20 @@
 for selecting connection colors. The Toolbar class manages the state and behavior of these buttons and handles user
 interactions for placing wires and pin_ios on a canvas.
 """
-
+import os
 from dataclasses import dataclass
 from pathlib import Path
 import tkinter as tk
-from tkinter import messagebox, colorchooser
-import os
+
 from component_sketch import ComponentSketcher
 from dataCDLT import INPUT, OUTPUT, FREE
 from utils import resource_path
 
+if os.name == "darwin":
+    from tkinter import messagebox, colorchooser
+    from tkmacosx import Button # type: ignore
+else:
+    from tkinter import Button, messagebox, colorchooser
 
 @dataclass
 class WirePlacementInfo:
@@ -45,7 +49,7 @@ def __init__(self, parent: tk.Tk, canvas: tk.Canvas, sketcher: ComponentSketcher
         self.sketcher = sketcher
         self.current_dict_circuit = current_dict_circuit
         self.selected_color = "#479dff"
-        self.buttons: dict[str, tk.Button] = {}
+        self.buttons: dict[str, Button] = {}
         self.tool_mode = None
         self.wire_info: WirePlacementInfo = WirePlacementInfo(0, None, None)
         self.cursor_indicator_id = None
@@ -78,7 +82,7 @@ def create_topbar(self, parent: tk.Tk):
         self.create_button("Output", left_frame, images)
 
         # Create the color chooser and Delete button in the right frame
-        self.color_button = tk.Button(
+        self.color_button = Button(
             right_frame,
             bg=self.selected_color,
             width=2,
@@ -128,7 +132,7 @@ def create_button(self, action: str, parent_frame: tk.Frame, images: dict[str, t
         """
         image = images.get(action.lower())
         if image:
-            btn = tk.Button(
+            btn = Button(
                 parent_frame,
                 image=image,
                 bg="#505050",  # Inactive background
@@ -144,7 +148,7 @@ def create_button(self, action: str, parent_frame: tk.Frame, images: dict[str, t
             btn.image = image  # type: ignore
         else:
             # Fallback button with text if image is not available
-            btn = tk.Button(
+            btn = Button(
                 parent_frame,
                 text=action,
                 bg="#505050",  # Inactive background