fixed confirm/cancel buttons on windows

Author: 369px

lib/gui/terminal.py

@@ -41,15 +41,15 @@ def confirmation(self, message, event):
         root = context.get_root()
 
         cancel_img_tk = ImageTk.PhotoImage(cancel_image_resized)
-        self.cancel_container = tk.Frame(self, bd=0)  # Cancel button container
+        self.cancel_container = tk.Frame(self, bd=0, bg="#323232")  # Cancel button container
         self.cancel_container.place(x=width - 139, y=height - 22, anchor="nw")
         cancel_img = tk.Label(self.cancel_container, image=cancel_img_tk, bg="#323232")
         cancel_img.pack(side="left")
         cancel_text = tk.Label(self.cancel_container, text="Cancel", font=("Arial", 12), fg="#7c6f64",bg="#323232")
         cancel_text.pack(side="left")
 
         confirm_img_tk = ImageTk.PhotoImage(confirm_image_resized)
-        self.confirm_container = tk.Frame(self, bd=0)  # Confirm button container
+        self.confirm_container = tk.Frame(self, bd=0, bg="#323232")  # Confirm button container
         confirm_img = tk.Label(self.confirm_container, image=confirm_img_tk, bg="#323232")
         confirm_img.pack(side="left")
         confirm_text = tk.Label(self.confirm_container, text="Confirm", font=("Arial", 12), fg="#7c6f64",bg="#323232")
@@ -69,7 +69,9 @@ def confirmation(self, message, event):
 
         # Activate keyboard click events [Cancel (B) / Confirm (A)]
         root.bind("<b>", lambda e: self._on_cancel())
+        root.bind("<B>", lambda e: self._on_cancel())
         root.bind("<a>", lambda e: self._on_confirm(event))
+        root.bind("<A>", lambda e: self._on_confirm(event))
 
         # Set up file drop handling for drag-and-drop event
         _setup_file_drop(self,event)
@@ -119,7 +121,9 @@ def destroy_elements(self):
         # Unbind keyboard keys (Cancel - 'B' and Confirm - 'A')
         root = context.get_root()
         root.unbind("<b>")
+        root.unbind("<B>")
         root.unbind("<a>")
+        root.unbind("<A>")
         root.unbind("<Return>")
 
         # Unbind <<Drop>> event from root widget to disable drop functionality
@@ -235,7 +239,7 @@ def recreate_terminal(self):
         root = context.get_root()
 
         # Custom canvas creation (using TerminalCanvas subclass)
-        terminal_canvas = TerminalCanvas(root, height=155)
+        terminal_canvas = TerminalCanvas(root, height=155, bg="#323232")
 
         # Pack the terminal to the top or bottom as needed
         terminal_canvas.pack(fill="both", expand=True, side="top", pady=2)

lib/sd_card.py

@@ -255,11 +255,6 @@ def on_volume_name_enter(volume_name):
                     messagebox.showerror("Error", "Volume name cannot be empty!")
                     return
                 volume_name = volume_name.upper()  # Converti il nome in maiuscolo per evitare errori
-                identifier = get_disk_identifier(volume_name)
-
-                if not identifier:
-                    messagebox.showerror("Error", "Unable to get disk identifier.")
-                    return
 
                 # Crea lo script di formattazione
                 script = f"""
@@ -270,19 +265,35 @@ def on_volume_name_enter(volume_name):
 
                 try:
                     # Scrivi ed esegui lo script diskpart
-                    with open("format_script.txt", "w") as script_file:
+                    script_path = os.path.abspath("format_script.txt")
+                    with open(script_path, "w") as script_file:
                         script_file.write(script)
 
-                    # Esegui diskpart
-                    result = subprocess.run("diskpart /s format_script.txt", check=True, shell=True, capture_output=True, text=True)
+                    # Esegui diskpart con un metodo che nasconde la finestra
+                    startupinfo = subprocess.STARTUPINFO()
+                    startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
+                    
+                    result = subprocess.run(
+                        ["diskpart", "/s", script_path],
+                        capture_output=True,
+                        text=True,
+                        startupinfo=startupinfo
+                    )
 
                     # Debug: stampa l'output di diskpart
                     print(f"Diskpart Output (stdout): {result.stdout}")
                     print(f"Diskpart Output (stderr): {result.stderr}")
 
-                    os.remove("format_script.txt")
+                    if result.returncode != 0:
+                        raise subprocess.CalledProcessError(result.returncode, "diskpart", result.stdout, result.stderr)
+                        
+                    os.remove(script_path)  # Rimuovi il file temporaneo dello script
+
                     display.message(f"Formatting completed!\nYour SD card has been formatted with the name '{volume_name}'!")
 
+                    # Aggiorna la lista dei dispositivi SD
+                    refresh_sd_devices(sd_selector[0], sd_selector[1], sd_path[0])
+
                     # Chiamata al callback
                     try:
                         callback_thread = threading.Thread(target=callback)
@@ -295,6 +306,10 @@ def on_volume_name_enter(volume_name):
                     messagebox.showerror("Error", f"Error while formatting: {e}")
                     print(f"Error while formatting: {e}")
                     return False
+                except Exception as e:
+                    messagebox.showerror("Error", f"Unexpected error: {e}")
+                    print(f"Unexpected error: {e}")
+                    return False
 
             # Chiedi all'utente di inserire un nome valido per il volume
             display.user_input("Enter the name for your new volume:", on_volume_name_enter)