diff --git a/gui.py b/gui.py index c442c84..ab3772a 100755 --- a/gui.py +++ b/gui.py @@ -344,8 +344,8 @@ class JaAbbruchDialog(tk.Toplevel): self.transfer_folder = transfer_folder self.title(title) - self.geometry("750x480") # Noch größeres Fenster - self.minsize(700, 450) # Minimale Größe setzen + self.geometry("900x500") # Größeres Fenster für bessere Lesbarkeit + self.minsize(850, 480) # Minimale Größe erhöht # Hauptframe für besseres Layout main_frame = tk.Frame(self) @@ -370,7 +370,7 @@ class JaAbbruchDialog(tk.Toplevel): tk.Label(expected_inner, text="Erwartete Daten (Tomedo):", font=italic_font, bg='#ffffff', fg='#0066cc', anchor="w").pack(pady=(0, 8), fill=tk.X) expected_label = tk.Label(expected_inner, text=message.split('\n\n')[0], - font=normal_font, justify=tk.LEFT, wraplength=650, + font=normal_font, justify=tk.LEFT, wraplength=800, bg='#ffffff', fg='#000000', anchor="w") expected_label.pack(pady=(0, 0), fill=tk.X) @@ -384,31 +384,31 @@ class JaAbbruchDialog(tk.Toplevel): tk.Label(found_inner, text="Gefundene Daten (DICOM):", font=italic_font, bg='#ffffff', fg='#cc6600', anchor="w").pack(pady=(0, 8), fill=tk.X) found_label = tk.Label(found_inner, text=message.split('\n\n')[1], - font=normal_font, justify=tk.LEFT, wraplength=650, + font=normal_font, justify=tk.LEFT, wraplength=800, bg='#ffffff', fg='#000000', anchor="w") found_label.pack(pady=(0, 0), fill=tk.X) # Frage question_label = tk.Label(main_frame, text="Welche Daten sollen verwendet werden?", - font=bold_font, wraplength=650) + font=bold_font, wraplength=800) question_label.pack(pady=(0, 25)) # Button-Frame mit besserem Layout - Standard macOS Buttons btn_frame = tk.Frame(main_frame) btn_frame.pack(pady=15) - # Standard macOS Buttons (ttk.Button für besseres macOS-Aussehen) + # Standard macOS Buttons (ttk.Button für besseres macOS-Aussehen) - breiter für bessere Lesbarkeit yes_btn = create_macos_button(btn_frame, text="Tomedo-Daten übernehmen", - command=self.on_yes, width=25) + command=self.on_yes, width=30) yes_btn.pack(side=tk.LEFT, padx=10) no_btn = create_macos_button(btn_frame, text="Original-Daten behalten", - command=self.on_no, width=25) + command=self.on_no, width=30) no_btn.pack(side=tk.LEFT, padx=10) cancel_btn = create_macos_button(btn_frame, text="Abbruch", - command=self.on_cancel, width=18) + command=self.on_cancel, width=20) cancel_btn.pack(side=tk.LEFT, padx=10) self.center_window() @@ -481,8 +481,8 @@ class ConfirmKeepOriginalDialog(tk.Toplevel): self.transfer_folder = transfer_folder self.title("Bestätigung") - self.geometry("750x600") # Größeres Fenster für vollständige Datenanzeige - self.minsize(750, 600) # Minimale Größe erhöht + self.geometry("900x620") # Größeres Fenster für vollständige Datenanzeige und bessere Lesbarkeit + self.minsize(850, 600) # Minimale Größe erhöht main_frame = tk.Frame(self) main_frame.pack(fill=tk.BOTH, expand=True, padx=40, pady=30) @@ -512,7 +512,7 @@ class ConfirmKeepOriginalDialog(tk.Toplevel): tk.Label(tomedo_inner, text="Erwartete Daten (Tomedo):", font=italic_font, bg='#ffffff', fg='#0066cc', anchor="w").pack(pady=(0, 8), fill=tk.X) tomedo_label = tk.Label(tomedo_inner, text=tomedo_data, - font=normal_font, justify=tk.LEFT, wraplength=650, + font=normal_font, justify=tk.LEFT, wraplength=800, bg='#ffffff', fg='#000000', anchor="w") tomedo_label.pack(pady=(0, 0), fill=tk.X) @@ -526,36 +526,36 @@ class ConfirmKeepOriginalDialog(tk.Toplevel): tk.Label(original_inner, text="Gefundene Daten (DICOM):", font=italic_font, bg='#ffffff', fg='#cc6600', anchor="w").pack(pady=(0, 8), fill=tk.X) original_label = tk.Label(original_inner, text=original_data, - font=normal_font, justify=tk.LEFT, wraplength=650, + font=normal_font, justify=tk.LEFT, wraplength=800, bg='#ffffff', fg='#000000', anchor="w") original_label.pack(pady=(0, 0), fill=tk.X) # Frage question_label = tk.Label(main_frame, text="Sind Sie sicher, dass Sie die Original-Daten behalten möchten?", - font=bold_font, wraplength=650, justify=tk.CENTER) + font=bold_font, wraplength=800, justify=tk.CENTER) question_label.pack(pady=(0, 10)) info_label = tk.Label(main_frame, text="Die Tomedo-Daten sind der Standard und sollten normalerweise verwendet werden.", - font=normal_font, wraplength=650, justify=tk.CENTER, fg='#666666') + font=normal_font, wraplength=800, justify=tk.CENTER, fg='#666666') info_label.pack(pady=(0, 20)) # Button-Frame btn_frame = tk.Frame(main_frame) btn_frame.pack(pady=10) - # Buttons (macOS-Style) + # Buttons (macOS-Style) - breiter für bessere Lesbarkeit tomedo_btn = create_macos_button(btn_frame, text="Tomedo-Daten verwenden", - command=self.on_use_tomedo, width=22) + command=self.on_use_tomedo, width=28) tomedo_btn.pack(side=tk.LEFT, padx=8) keep_btn = create_macos_button(btn_frame, text="Original behalten", - command=self.on_keep_original, width=18) + command=self.on_keep_original, width=24) keep_btn.pack(side=tk.LEFT, padx=8) cancel_btn = create_macos_button(btn_frame, text="Abbruch", - command=self.on_cancel, width=15) + command=self.on_cancel, width=18) cancel_btn.pack(side=tk.LEFT, padx=8) self.center_window()