Merge e1ec96f into 7bf0af5

Author: charlotrudel

.github/workflows/release_pipeline.yml

@@ -21,15 +21,15 @@ 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
 
       - name: Compress the build
         run: |
           cd dist
-          tar -czvf arduino_logique_macos.tar.gz arduino_logique
+          tar -chzvf arduino_logique_macos.tar.gz arduino_logique
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3

Assets/Icons/clock.png

@@ -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, CLOCK
+from dataCDLT import INPUT, OUTPUT, CLOCK
+
+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": {
@@ -181,13 +185,15 @@ def confirm_selection():
             self.microcontroller_label.config(text=self.selected_microcontroller)
             dialog.destroy()
 
-        confirm_button = tk.Button(dialog, text="Confirmer", command=confirm_selection)
+        confirm_button = Button(dialog, text="Confirmer", command=confirm_selection)
         confirm_button.pack(pady=10)
 
     def show_correspondence_table(self):
         """Displays the correspondence table between pin_io objects and microcontroller pins in a table format."""
         if self.selected_microcontroller is None:
-            messagebox.showwarning("Aucun microcontrôleur sélectionné", "Veuillez d'abord sélectionner un microcontrôleur.")
+            messagebox.showwarning(
+                "Aucun microcontrôleur sélectionné", "Veuillez d'abord sélectionner un microcontrôleur."
+            )
             return
 
         pin_mappings = MICROCONTROLLER_PINS.get(self.selected_microcontroller)
@@ -279,7 +285,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",
@@ -312,7 +318,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",
@@ -343,7 +349,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()
@@ -387,11 +393,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
@@ -424,9 +430,9 @@ def open_file(self):
 
                 for key, val in circuit_data.items():
                     if key == "_battery_pos_wire":
-                        battery_pos_wire_end = val['end']
+                        battery_pos_wire_end = val["end"]
                     elif key == "_battery_neg_wire":
-                        battery_neg_wire_end = val['end']
+                        battery_neg_wire_end = val["end"]
 
                 self.board.draw_blank_board_model(
                     x_o,
@@ -451,7 +457,9 @@ def open_file(self):
                 messagebox.showinfo("Ouvrir un fichier", f"Circuit chargé depuis {file_path}")
             except Exception as e:
                 print(f"Error loading file: {e}")
-                messagebox.showerror("Erreur d'ouverture", f"Une erreur s'est produite lors de l'ouverture du fichier:\n{e}")
+                messagebox.showerror(
+                    "Erreur d'ouverture", f"Une erreur s'est produite lors de l'ouverture du fichier:\n{e}"
+                )
                 raise e
         else:
             print("Open file cancelled.")
@@ -529,7 +537,7 @@ def save_file(self):
                     if "label" in comp_data:
                         comp_data["label"] = comp_data["type"]
                     if "wire" in key:
-                        comp_data.pop("XY", None) # Remove XY, will be recalculated anyway
+                        comp_data.pop("XY", None)  # Remove XY, will be recalculated anyway
                     if key == "_battery":
                         comp_data.pop("battery_rect", None)
                 # Save the data to a JSON file
@@ -539,7 +547,9 @@ def save_file(self):
                 messagebox.showinfo("Sauvegarde réussie", f"Circuit sauvegardé dans {file_path}")
             except (TypeError, KeyError) as e:
                 print(f"Error saving file: {e}")
-                messagebox.showerror("Erreur de sauvegarde", f"Une erreur s'est produite lors de la sauvegarde du fichier:\n{e}")
+                messagebox.showerror(
+                    "Erreur de sauvegarde", f"Une erreur s'est produite lors de la sauvegarde du fichier:\n{e}"
+                )
         else:
             print("Save file cancelled.")
 
@@ -568,7 +578,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):

menus.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="Gérer les composants",
             bg="#333333",  # Matching the sidebar's background to simulate transparency

sidebar.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, CLOCK
 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
@@ -79,7 +83,7 @@ def create_topbar(self, parent: tk.Tk):
         self.create_button("Clock", 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,
@@ -129,7 +133,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
@@ -145,7 +149,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