refactor: Export-Dialoge als eigenes Panel (erster Node-Schnitt)
Neunter Schritt der Controller-Zerlegung und der erste mit Signalen statt
reiner Funktionen. `ExportPanel` (src/whiteboard/view/export_panel.gd) besitzt
die Dialoge "Kür exportieren" und "Export abgeschlossen" und meldet nur die
Auswahl:
export_requested(pfad, format, abschnitt, danach öffnen)
Der Controller prüft, ob die Datei existiert, fragt über den bestehenden
`confirm_dialog` nach dem Überschreiben, schreibt über `ExportService` und
ruft `panel.show_done()`. Das Panel fasst kein Dateisystem an — so bleibt die
Überschreib-Bestätigung an einer Stelle statt in zwei Dialogen.
- Szene: neuer Knoten `ExportPanel` mit Skript, beide Dialoge und ihre
Kindknoten darunter umgehängt (parent-Pfade sind absolut).
- Tests greifen jetzt über `controller.export_panel.*` zu.
Controller: 8.304 -> 8.245 Zeilen. Suite grün.
This commit is contained in:
parent
c9fb6ebed6
commit
27b7fd0907
8 changed files with 213 additions and 121 deletions
|
|
@ -4,7 +4,7 @@ Stand: 2026-11-13
|
|||
|
||||
Ziel: Der Controller war mit **9.092 Zeilen und 465 Funktionen** der größte
|
||||
Baustein im Projekt; die Roadmap nennt < 1.500 Zeilen pro Datei. Nach den
|
||||
Etappen 1–8 sind es 8.304 Zeilen. Diese Notiz
|
||||
Etappen 1–9 sind es 8.245 Zeilen. Diese Notiz
|
||||
hält die Reihenfolge fest, damit der Umbau in Etappen mit grüner Suite
|
||||
passiert und nicht als Big Bang.
|
||||
|
||||
|
|
@ -29,6 +29,7 @@ passiert und nicht als Big Bang.
|
|||
| `SeasonComparisonText` | Zeilen für den Saisonvergleichs-Dialog | 175 | nur Daten | 2 ✅ |
|
||||
| `ValidationReportView` | Zeilen für den Prüfdialog | 300 | nur Daten | 3 ✅ |
|
||||
| `ExportService` | SVG/PDF schreiben, Pfade und Dateinamen | 90 | Dateisystem | 4 ✅ |
|
||||
| `ExportPanel` | Export- und Abschlussdialog (Node mit Signalen) | 130 | Szene | 9 ✅ |
|
||||
| `RulesContext` | Regelsatz: Bibliothek, Paket, drei Dokumente | 80 | keine | 5 ✅ |
|
||||
| `SeasonPanelModel` | Inhalt der drei Dropdowns | 120 | keine | 6 ✅ |
|
||||
| `SyncSummaryText` | Text der Sync-Zusammenfassung | 60 | keine | 7 ✅ |
|
||||
|
|
@ -144,7 +145,31 @@ Timeline-Labels sowie die 3D-Anbindung.
|
|||
Zuletzt: Element-Dialog, Feature-Auswahl, Fußzuordnung, Levelableitung. Der
|
||||
größte UI-Block und der, an dem am meisten hängt.
|
||||
|
||||
## Nächster Durchgang: Node-Schnitt
|
||||
## Erster Node-Schnitt (2026-11-13)
|
||||
|
||||
`ExportPanel` (`src/whiteboard/view/export_panel.gd`) besitzt jetzt die
|
||||
beiden Exportdialoge und meldet nur die Auswahl:
|
||||
|
||||
```
|
||||
Panel ──export_requested(pfad, format, abschnitt, danach öffnen)──▶ Controller
|
||||
```
|
||||
|
||||
Der Controller prüft, ob die Datei existiert (`_confirm_overwrite` bleibt die
|
||||
einzige Stelle dafür), schreibt über `ExportService` und ruft
|
||||
`panel.show_done()`. Das Panel fasst kein Dateisystem an.
|
||||
|
||||
Was beim Umhängen der Szene zu beachten war:
|
||||
|
||||
- `parent=` in `.tscn` ist **absolut** ab Wurzel, nicht relativ zum vorigen
|
||||
Knoten. Nach dem Umhängen müssen auch alle Kindknoten ihren Pfad ändern
|
||||
(`ExportDialog/…` → `ExportPanel/ExportDialog/…`), sonst verschwinden sie
|
||||
beim Instanziieren mit „Parent path … has vanished".
|
||||
- Der neue Knoten braucht `script = ExtResource(...)` **und** eine
|
||||
`ext_resource`-Zeile; ohne Skript bleibt eine typisierte `@onready`-Zuweisung
|
||||
still null.
|
||||
- `load_steps` in der Kopfzeile muss mitwachsen.
|
||||
|
||||
## Nächster Durchgang: weitere Node-Schnitte
|
||||
|
||||
Die vier verbleibenden Blöcke (Sync-Orchestrierung, Hub, Playback-Rest,
|
||||
Element-Inspector) lassen sich nicht mehr als reine Funktionen herausziehen;
|
||||
|
|
@ -156,8 +181,7 @@ sie brauchen eigene Nodes mit Signalen. Geprüft am 2026-11-13:
|
|||
- **Das ist harmlos:** Alle Dialoge nutzen `unique_name_in_owner`, `%Name`
|
||||
löst szenenweit auf. Ein Umhängen bricht weder den Controller noch die
|
||||
Skripte, nur den Zugriff über Pfade (den gibt es hier nicht).
|
||||
- **Der Aufwand liegt bei den Tests:** `run_export_tests` und
|
||||
`run_sync_tests` greifen direkt auf Controller-Felder zu
|
||||
- **Der Aufwand liegt bei den Tests:** `run_sync_tests` greift direkt auf Controller-Felder zu
|
||||
(`controller.export_dialog`, `controller.export_done_label`,
|
||||
`controller.routine_manager_dialog`, `controller.cleanup_conflicts_dialog`).
|
||||
Diese Zugriffe wandern auf `controller.<panel>.<feld>`.
|
||||
|
|
|
|||
|
|
@ -270,9 +270,10 @@ Schritte.
|
|||
- [ ] `WhiteboardController` in Services/Panels zerlegen: Datei-I/O, Sync,
|
||||
Playback, Validierung, Element-Inspector, Section-Liste. Ziel: < 1.500
|
||||
Zeilen pro Datei, keine 100 `%`-Lookups in einem Skript. In Etappen nach
|
||||
`docs/refactor-whiteboard-controller.md`; Stand 2026-11-13: 8.304 Zeilen; `HelpContent`, `SeasonComparisonText`,
|
||||
`docs/refactor-whiteboard-controller.md`; Stand 2026-11-13: 8.245 Zeilen; `HelpContent`, `SeasonComparisonText`,
|
||||
`ValidationReportView`, `ExportService`, `RulesContext`,
|
||||
`SeasonPanelModel`, `SyncSummaryText` und `PlaybackPose` ausgelagert.
|
||||
`SeasonPanelModel`, `SyncSummaryText`, `PlaybackPose` und `ExportPanel`
|
||||
(erster Node-Schnitt) ausgelagert.
|
||||
- [ ] Gemeinsamer Test-Harness (oder gdUnit4), Timeout pro Testlauf,
|
||||
Coverage; CI auf dem Gitea-/Forgejo-Remote mit `tools/test.sh` und
|
||||
`tools/check_export.sh`.
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
[gd_scene load_steps=22 format=3]
|
||||
[gd_scene load_steps=23 format=3]
|
||||
|
||||
[ext_resource type="Script" path="res://src/whiteboard/ctrl/whiteboard_controller.gd" id="1_controller"]
|
||||
[ext_resource type="Script" path="res://src/whiteboard/view/rink_canvas.gd" id="2_canvas"]
|
||||
[ext_resource type="Script" path="res://src/whiteboard/view/timeline_label_lane.gd" id="3_label_lane"]
|
||||
[ext_resource type="Script" path="res://src/whiteboard/view/export_panel.gd" id="3_export_panel"]
|
||||
[ext_resource type="Texture2D" path="res://assets/icons/tools/select.svg" id="4_tool_select"]
|
||||
[ext_resource type="Texture2D" path="res://assets/icons/tools/line.svg" id="5_tool_line"]
|
||||
[ext_resource type="Texture2D" path="res://assets/icons/tools/arc_left.svg" id="6_tool_arc_left"]
|
||||
|
|
@ -1648,7 +1649,11 @@ theme_override_colors/font_color = Color(0.580392, 0.639216, 0.721569, 1)
|
|||
theme_override_font_sizes/font_size = 12
|
||||
text = "Geschwindigkeit = Strecke / Zeit"
|
||||
|
||||
[node name="ExportDialog" type="ConfirmationDialog" parent="."]
|
||||
[node name="ExportPanel" type="Node" parent="."]
|
||||
unique_name_in_owner = true
|
||||
script = ExtResource("3_export_panel")
|
||||
|
||||
[node name="ExportDialog" type="ConfirmationDialog" parent="ExportPanel"]
|
||||
unique_name_in_owner = true
|
||||
title = "Kür exportieren"
|
||||
size = Vector2i(480, 520)
|
||||
|
|
@ -1656,7 +1661,7 @@ wrap_controls = false
|
|||
ok_button_text = "Exportieren"
|
||||
cancel_button_text = "Abbrechen"
|
||||
|
||||
[node name="ExportScroll" type="ScrollContainer" parent="ExportDialog"]
|
||||
[node name="ExportScroll" type="ScrollContainer" parent="ExportPanel/ExportDialog"]
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
|
|
@ -1670,39 +1675,39 @@ grow_vertical = 2
|
|||
horizontal_scroll_mode = 0
|
||||
follow_focus = true
|
||||
|
||||
[node name="ExportBox" type="VBoxContainer" parent="ExportDialog/ExportScroll"]
|
||||
[node name="ExportBox" type="VBoxContainer" parent="ExportPanel/ExportDialog/ExportScroll"]
|
||||
layout_mode = 2
|
||||
size_flags_horizontal = 3
|
||||
theme_override_constants/separation = 4
|
||||
|
||||
[node name="ExportNameLabel" type="Label" parent="ExportDialog/ExportScroll/ExportBox"]
|
||||
[node name="ExportNameLabel" type="Label" parent="ExportPanel/ExportDialog/ExportScroll/ExportBox"]
|
||||
layout_mode = 2
|
||||
text = "Dateiname"
|
||||
|
||||
[node name="ExportNameEdit" type="LineEdit" parent="ExportDialog/ExportScroll/ExportBox"]
|
||||
[node name="ExportNameEdit" type="LineEdit" parent="ExportPanel/ExportDialog/ExportScroll/ExportBox"]
|
||||
unique_name_in_owner = true
|
||||
custom_minimum_size = Vector2(0, 48)
|
||||
layout_mode = 2
|
||||
|
||||
[node name="ExportFormatLabel" type="Label" parent="ExportDialog/ExportScroll/ExportBox"]
|
||||
[node name="ExportFormatLabel" type="Label" parent="ExportPanel/ExportDialog/ExportScroll/ExportBox"]
|
||||
layout_mode = 2
|
||||
text = "Format"
|
||||
|
||||
[node name="ExportFormatOption" type="OptionButton" parent="ExportDialog/ExportScroll/ExportBox"]
|
||||
[node name="ExportFormatOption" type="OptionButton" parent="ExportPanel/ExportDialog/ExportScroll/ExportBox"]
|
||||
unique_name_in_owner = true
|
||||
custom_minimum_size = Vector2(0, 48)
|
||||
layout_mode = 2
|
||||
|
||||
[node name="ExportScopeLabel" type="Label" parent="ExportDialog/ExportScroll/ExportBox"]
|
||||
[node name="ExportScopeLabel" type="Label" parent="ExportPanel/ExportDialog/ExportScroll/ExportBox"]
|
||||
layout_mode = 2
|
||||
text = "Umfang"
|
||||
|
||||
[node name="ExportScopeOption" type="OptionButton" parent="ExportDialog/ExportScroll/ExportBox"]
|
||||
[node name="ExportScopeOption" type="OptionButton" parent="ExportPanel/ExportDialog/ExportScroll/ExportBox"]
|
||||
unique_name_in_owner = true
|
||||
custom_minimum_size = Vector2(0, 48)
|
||||
layout_mode = 2
|
||||
|
||||
[node name="ExportHint" type="Label" parent="ExportDialog/ExportScroll/ExportBox"]
|
||||
[node name="ExportHint" type="Label" parent="ExportPanel/ExportDialog/ExportScroll/ExportBox"]
|
||||
custom_minimum_size = Vector2(0, 34)
|
||||
layout_mode = 2
|
||||
theme_override_colors/font_color = Color(0.580392, 0.639216, 0.721569, 1)
|
||||
|
|
@ -1710,7 +1715,7 @@ theme_override_font_sizes/font_size = 12
|
|||
text = "Ziel: export-Ordner im App-Datenverzeichnis · der absolute Pfad erscheint nach dem Export"
|
||||
autowrap_mode = 3
|
||||
|
||||
[node name="ExportOpenAfterCheck" type="CheckBox" parent="ExportDialog/ExportScroll/ExportBox"]
|
||||
[node name="ExportOpenAfterCheck" type="CheckBox" parent="ExportPanel/ExportDialog/ExportScroll/ExportBox"]
|
||||
unique_name_in_owner = true
|
||||
custom_minimum_size = Vector2(0, 44)
|
||||
layout_mode = 2
|
||||
|
|
@ -1718,7 +1723,7 @@ button_pressed = true
|
|||
text = "Nach dem Export öffnen"
|
||||
tooltip_text = "Ergebnis nach dem Export mit dem Standardprogramm öffnen"
|
||||
|
||||
[node name="ExportDoneDialog" type="AcceptDialog" parent="."]
|
||||
[node name="ExportDoneDialog" type="AcceptDialog" parent="ExportPanel"]
|
||||
unique_name_in_owner = true
|
||||
title = "Export abgeschlossen"
|
||||
size = Vector2i(660, 320)
|
||||
|
|
@ -1726,7 +1731,7 @@ wrap_controls = false
|
|||
exclusive = false
|
||||
ok_button_text = "Schließen"
|
||||
|
||||
[node name="ExportDoneBox" type="VBoxContainer" parent="ExportDoneDialog"]
|
||||
[node name="ExportDoneBox" type="VBoxContainer" parent="ExportPanel/ExportDoneDialog"]
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
|
|
@ -1739,7 +1744,7 @@ grow_horizontal = 2
|
|||
grow_vertical = 2
|
||||
theme_override_constants/separation = 4
|
||||
|
||||
[node name="ExportDoneLabel" type="RichTextLabel" parent="ExportDoneDialog/ExportDoneBox"]
|
||||
[node name="ExportDoneLabel" type="RichTextLabel" parent="ExportPanel/ExportDoneDialog/ExportDoneBox"]
|
||||
unique_name_in_owner = true
|
||||
custom_minimum_size = Vector2(0, 96)
|
||||
layout_mode = 2
|
||||
|
|
@ -1749,26 +1754,26 @@ scroll_active = false
|
|||
selection_enabled = true
|
||||
autowrap_mode = 3
|
||||
|
||||
[node name="ExportDoneButtons" type="HFlowContainer" parent="ExportDoneDialog/ExportDoneBox"]
|
||||
[node name="ExportDoneButtons" type="HFlowContainer" parent="ExportPanel/ExportDoneDialog/ExportDoneBox"]
|
||||
layout_mode = 2
|
||||
theme_override_constants/h_separation = 6
|
||||
theme_override_constants/v_separation = 8
|
||||
|
||||
[node name="ExportOpenButton" type="Button" parent="ExportDoneDialog/ExportDoneBox/ExportDoneButtons"]
|
||||
[node name="ExportOpenButton" type="Button" parent="ExportPanel/ExportDoneDialog/ExportDoneBox/ExportDoneButtons"]
|
||||
unique_name_in_owner = true
|
||||
custom_minimum_size = Vector2(140, 48)
|
||||
layout_mode = 2
|
||||
text = "Öffnen"
|
||||
tooltip_text = "Datei mit dem Standardprogramm öffnen"
|
||||
|
||||
[node name="ExportFolderButton" type="Button" parent="ExportDoneDialog/ExportDoneBox/ExportDoneButtons"]
|
||||
[node name="ExportFolderButton" type="Button" parent="ExportPanel/ExportDoneDialog/ExportDoneBox/ExportDoneButtons"]
|
||||
unique_name_in_owner = true
|
||||
custom_minimum_size = Vector2(180, 48)
|
||||
layout_mode = 2
|
||||
text = "Ordner anzeigen"
|
||||
tooltip_text = "Exportordner im Dateimanager öffnen"
|
||||
|
||||
[node name="ExportCopyPathButton" type="Button" parent="ExportDoneDialog/ExportDoneBox/ExportDoneButtons"]
|
||||
[node name="ExportCopyPathButton" type="Button" parent="ExportPanel/ExportDoneDialog/ExportDoneBox/ExportDoneButtons"]
|
||||
unique_name_in_owner = true
|
||||
custom_minimum_size = Vector2(170, 48)
|
||||
layout_mode = 2
|
||||
|
|
|
|||
|
|
@ -311,16 +311,7 @@ const UPDATE_FILE_NAMES := {
|
|||
@onready var cloud_auth_user_code: Label = %CloudAuthUserCode
|
||||
@onready var cloud_auth_code_edit: LineEdit = %CloudAuthCodeEdit
|
||||
@onready var cloud_auth_code_hint: Label = %CloudAuthCodeHint
|
||||
@onready var export_dialog: ConfirmationDialog = %ExportDialog
|
||||
@onready var export_name_edit: LineEdit = %ExportNameEdit
|
||||
@onready var export_format_option: OptionButton = %ExportFormatOption
|
||||
@onready var export_scope_option: OptionButton = %ExportScopeOption
|
||||
@onready var export_open_after_check: CheckBox = %ExportOpenAfterCheck
|
||||
@onready var export_done_dialog: AcceptDialog = %ExportDoneDialog
|
||||
@onready var export_done_label: RichTextLabel = %ExportDoneLabel
|
||||
@onready var export_open_button: Button = %ExportOpenButton
|
||||
@onready var export_folder_button: Button = %ExportFolderButton
|
||||
@onready var export_copy_path_button: Button = %ExportCopyPathButton
|
||||
@onready var export_panel: ExportPanel = %ExportPanel
|
||||
|
||||
var _routine: Routine
|
||||
var _active_section: RoutineSection
|
||||
|
|
@ -456,7 +447,6 @@ func _ready() -> void:
|
|||
_setup_program_controls()
|
||||
_setup_upgrade_controls()
|
||||
_setup_adult_category_controls()
|
||||
_setup_export_controls()
|
||||
labels_toggle.set_pressed_no_signal(rink_canvas.labels_visible)
|
||||
_update_child_translations(self)
|
||||
|
||||
|
|
@ -521,10 +511,11 @@ func _ready() -> void:
|
|||
calibrate_button.pressed.connect(_open_calibration_dialog)
|
||||
reset_timing_button.pressed.connect(_reset_selected_timing)
|
||||
calibration_dialog.confirmed.connect(_on_calibration_confirmed)
|
||||
export_dialog.confirmed.connect(_on_export_confirmed)
|
||||
export_open_button.pressed.connect(_on_export_open_pressed)
|
||||
export_folder_button.pressed.connect(_on_export_folder_pressed)
|
||||
export_copy_path_button.pressed.connect(_on_export_copy_path_pressed)
|
||||
export_panel.export_requested.connect(_on_export_requested)
|
||||
export_panel.open_requested.connect(_on_export_open_pressed)
|
||||
export_panel.folder_requested.connect(_on_export_folder_pressed)
|
||||
export_panel.copy_requested.connect(_on_export_copy_path_pressed)
|
||||
export_panel.message_requested.connect(_show_message)
|
||||
sync_settings_dialog.confirmed.connect(_on_sync_settings_confirmed)
|
||||
sync_provider_option.item_selected.connect(_on_sync_provider_selected)
|
||||
sync_connect_button.pressed.connect(_on_sync_connect_pressed)
|
||||
|
|
@ -5652,18 +5643,6 @@ func _confirm_overwrite(path: String, action: Callable) -> void:
|
|||
confirm_dialog.popup_centered(Vector2i(480, 180))
|
||||
|
||||
|
||||
func _setup_export_controls() -> void:
|
||||
export_format_option.clear()
|
||||
export_format_option.add_item("SVG (Vektor)", 0)
|
||||
export_format_option.add_item("PNG (hochauflösend)", 1)
|
||||
export_format_option.add_item("PDF (Laufwege mit Zeit)", 2)
|
||||
export_scope_option.clear()
|
||||
export_scope_option.add_item("Gesamte Kür", 0)
|
||||
export_scope_option.add_item("Aktiver Abschnitt", 1)
|
||||
export_format_option.select(0)
|
||||
export_scope_option.select(0)
|
||||
|
||||
|
||||
func _maximize_window_on_desktop() -> void:
|
||||
# Desktop builds start maximized. Mobile and web keep the window shape the
|
||||
# OS or browser provides, and headless test runs have no real window.
|
||||
|
|
@ -7063,22 +7042,11 @@ func _exit_tree() -> void:
|
|||
|
||||
|
||||
func _open_export_dialog() -> void:
|
||||
if _routine == null:
|
||||
return
|
||||
|
||||
export_name_edit.text = _routine.title
|
||||
if export_name_edit.text.strip_edges().is_empty():
|
||||
export_name_edit.text = "kuer"
|
||||
export_format_option.select(0)
|
||||
export_scope_option.select(0)
|
||||
var dialog_size := _fit_dialog_size(Vector2i(480, 520))
|
||||
export_dialog.popup_centered(dialog_size)
|
||||
# AcceptDialog shrinks to its content minimum on popup; restore the target
|
||||
# size so the scroll area has room. popup_centered already centered it for
|
||||
# the requested size.
|
||||
export_dialog.size = dialog_size
|
||||
export_name_edit.grab_focus()
|
||||
export_name_edit.select_all()
|
||||
export_panel.open_for(
|
||||
_routine,
|
||||
_active_section,
|
||||
_fit_dialog_size(Vector2i(480, 520))
|
||||
)
|
||||
|
||||
|
||||
## Keeps dialogs inside the visible viewport (important on Android portrait).
|
||||
|
|
@ -7092,44 +7060,23 @@ func _fit_dialog_size(preferred: Vector2i) -> Vector2i:
|
|||
)
|
||||
|
||||
|
||||
func _on_export_confirmed() -> void:
|
||||
var name := export_name_edit.text.strip_edges()
|
||||
if name.is_empty():
|
||||
_show_message("Bitte einen Dateinamen eingeben.")
|
||||
return
|
||||
|
||||
var stem := ExportService.normalize_stem(name)
|
||||
var scope_section_id := ""
|
||||
var scope_suffix := ""
|
||||
if export_scope_option.selected == 1:
|
||||
if _active_section == null:
|
||||
_show_message("Kein aktiver Abschnitt vorhanden.")
|
||||
return
|
||||
scope_section_id = _active_section.section_id
|
||||
scope_suffix = "_" + ExportService.normalize_stem(_active_section.title)
|
||||
|
||||
var format := export_format_option.get_item_id(
|
||||
export_format_option.selected
|
||||
)
|
||||
var extension := "svg"
|
||||
if format == 1:
|
||||
extension = "png"
|
||||
elif format == 2:
|
||||
extension = "pdf"
|
||||
var path := EXPORTS_DIR.path_join(stem + scope_suffix + "." + extension)
|
||||
func _on_export_requested(
|
||||
path: String,
|
||||
format: int,
|
||||
section_id: String,
|
||||
open_after: bool
|
||||
) -> void:
|
||||
if FileAccess.file_exists(path):
|
||||
_confirm_overwrite(
|
||||
path,
|
||||
_perform_export.bind(path, format, scope_section_id)
|
||||
)
|
||||
_confirm_overwrite(path, _perform_export.bind(path, format, section_id, open_after))
|
||||
return
|
||||
await _perform_export(path, format, scope_section_id)
|
||||
await _perform_export(path, format, section_id, open_after)
|
||||
|
||||
|
||||
func _perform_export(
|
||||
path: String,
|
||||
format: int,
|
||||
scope_section_id: String
|
||||
scope_section_id: String,
|
||||
open_after: bool = false
|
||||
) -> void:
|
||||
ExportService.ensure_dir()
|
||||
|
||||
|
|
@ -7145,23 +7092,17 @@ func _perform_export(
|
|||
if success:
|
||||
_last_export_path = ProjectSettings.globalize_path(path)
|
||||
_show_export_done()
|
||||
if export_open_after_check.button_pressed:
|
||||
if open_after:
|
||||
_open_path_externally(_last_export_path)
|
||||
else:
|
||||
_show_message("Export fehlgeschlagen.")
|
||||
|
||||
|
||||
func _show_export_done() -> void:
|
||||
export_done_label.text = (
|
||||
"Exportiert nach:\n%s\n\n"
|
||||
+ "Du kannst die Datei direkt öffnen oder den Ordner anzeigen."
|
||||
) % _last_export_path
|
||||
export_open_button.disabled = not FileAccess.file_exists(_last_export_path)
|
||||
export_folder_button.disabled = _last_export_path.is_empty()
|
||||
export_copy_path_button.text = "Pfad kopieren"
|
||||
var dialog_size := _fit_dialog_size(Vector2i(660, 320))
|
||||
export_done_dialog.popup_centered(dialog_size)
|
||||
export_done_dialog.size = dialog_size
|
||||
export_panel.show_done(
|
||||
_last_export_path,
|
||||
_fit_dialog_size(Vector2i(660, 320))
|
||||
)
|
||||
|
||||
|
||||
func _open_path_externally(path: String) -> Error:
|
||||
|
|
@ -7199,7 +7140,7 @@ func _on_export_copy_path_pressed() -> void:
|
|||
if _last_export_path.is_empty():
|
||||
return
|
||||
DisplayServer.clipboard_set(_last_export_path)
|
||||
export_copy_path_button.text = "Kopiert"
|
||||
export_panel.set_copy_label("Kopiert")
|
||||
|
||||
|
||||
func export_svg_to_path(path: String, section_id: String = "") -> bool:
|
||||
|
|
|
|||
120
rinkplanner/src/whiteboard/view/export_panel.gd
Normal file
120
rinkplanner/src/whiteboard/view/export_panel.gd
Normal file
|
|
@ -0,0 +1,120 @@
|
|||
class_name ExportPanel
|
||||
extends Node
|
||||
|
||||
## The export dialogs: file name, format and scope, plus the "done" dialog.
|
||||
##
|
||||
## The panel only collects choices and reports them — it never touches the
|
||||
## file system. The controller decides about existing files, writes the
|
||||
## document and opens it, so the overwrite confirmation stays in one place.
|
||||
|
||||
signal export_requested(
|
||||
path: String,
|
||||
format: int,
|
||||
section_id: String,
|
||||
open_after: bool
|
||||
)
|
||||
signal open_requested
|
||||
signal folder_requested
|
||||
signal copy_requested
|
||||
signal message_requested(text: String)
|
||||
|
||||
const FORMAT_EXTENSIONS := ["svg", "png", "pdf"]
|
||||
|
||||
@onready var dialog: ConfirmationDialog = %ExportDialog
|
||||
@onready var name_edit: LineEdit = %ExportNameEdit
|
||||
@onready var format_option: OptionButton = %ExportFormatOption
|
||||
@onready var scope_option: OptionButton = %ExportScopeOption
|
||||
@onready var open_after_check: CheckBox = %ExportOpenAfterCheck
|
||||
@onready var done_dialog: AcceptDialog = %ExportDoneDialog
|
||||
@onready var done_label: RichTextLabel = %ExportDoneLabel
|
||||
@onready var open_button: Button = %ExportOpenButton
|
||||
@onready var folder_button: Button = %ExportFolderButton
|
||||
@onready var copy_button: Button = %ExportCopyPathButton
|
||||
|
||||
var _active_section: RoutineSection
|
||||
|
||||
|
||||
func _ready() -> void:
|
||||
format_option.clear()
|
||||
format_option.add_item("SVG (Vektor)", 0)
|
||||
format_option.add_item("PNG (hochauflösend)", 1)
|
||||
format_option.add_item("PDF (Laufwege mit Zeit)", 2)
|
||||
scope_option.clear()
|
||||
scope_option.add_item("Gesamte Kür", 0)
|
||||
scope_option.add_item("Aktiver Abschnitt", 1)
|
||||
format_option.select(0)
|
||||
scope_option.select(0)
|
||||
|
||||
dialog.confirmed.connect(_on_confirmed)
|
||||
open_button.pressed.connect(func() -> void: open_requested.emit())
|
||||
folder_button.pressed.connect(func() -> void: folder_requested.emit())
|
||||
copy_button.pressed.connect(func() -> void: copy_requested.emit())
|
||||
|
||||
|
||||
## Fills and shows the export dialog. [param size] is the pre-fitted dialog
|
||||
## size the controller computed for the current viewport.
|
||||
func open_for(
|
||||
routine: Routine,
|
||||
active_section: RoutineSection,
|
||||
size: Vector2i
|
||||
) -> void:
|
||||
if routine == null:
|
||||
return
|
||||
_active_section = active_section
|
||||
name_edit.text = routine.title
|
||||
if name_edit.text.strip_edges().is_empty():
|
||||
name_edit.text = "kuer"
|
||||
format_option.select(0)
|
||||
scope_option.select(0)
|
||||
dialog.popup_centered(size)
|
||||
# AcceptDialog shrinks to its content minimum on popup; restore the target
|
||||
# size so the scroll area has room.
|
||||
dialog.size = size
|
||||
name_edit.grab_focus()
|
||||
name_edit.select_all()
|
||||
|
||||
|
||||
func _on_confirmed() -> void:
|
||||
var name := name_edit.text.strip_edges()
|
||||
if name.is_empty():
|
||||
message_requested.emit("Bitte einen Dateinamen eingeben.")
|
||||
return
|
||||
|
||||
var suffix := ""
|
||||
var section_id := ""
|
||||
if scope_option.selected == 1:
|
||||
if _active_section == null:
|
||||
message_requested.emit("Kein aktiver Abschnitt vorhanden.")
|
||||
return
|
||||
section_id = _active_section.section_id
|
||||
suffix = "_" + ExportService.normalize_stem(_active_section.title)
|
||||
|
||||
var format := format_option.get_item_id(format_option.selected)
|
||||
var extension: String = FORMAT_EXTENSIONS[clampi(format, 0, 2)]
|
||||
export_requested.emit(
|
||||
ExportService.build_path(
|
||||
ExportService.normalize_stem(name),
|
||||
suffix,
|
||||
extension
|
||||
),
|
||||
format,
|
||||
section_id,
|
||||
open_after_check.button_pressed
|
||||
)
|
||||
|
||||
|
||||
## Shows the "export done" dialog for [param path].
|
||||
func show_done(path: String, size: Vector2i) -> void:
|
||||
done_label.text = (
|
||||
"Exportiert nach:\n%s\n\n"
|
||||
+ "Du kannst die Datei direkt öffnen oder den Ordner anzeigen."
|
||||
) % path
|
||||
open_button.disabled = path.is_empty() or not FileAccess.file_exists(path)
|
||||
folder_button.disabled = path.is_empty()
|
||||
copy_button.text = "Pfad kopieren"
|
||||
done_dialog.popup_centered(size)
|
||||
done_dialog.size = size
|
||||
|
||||
|
||||
func set_copy_label(text: String) -> void:
|
||||
copy_button.text = text
|
||||
1
rinkplanner/src/whiteboard/view/export_panel.gd.uid
Normal file
1
rinkplanner/src/whiteboard/view/export_panel.gd.uid
Normal file
|
|
@ -0,0 +1 @@
|
|||
uid://hld4jpokdv6s
|
||||
|
|
@ -295,12 +295,12 @@ func _run() -> void:
|
|||
return
|
||||
|
||||
_check(
|
||||
controller.export_format_option.item_count == 3
|
||||
and controller.export_format_option.get_item_text(2).contains("PDF"),
|
||||
controller.export_panel.format_option.item_count == 3
|
||||
and controller.export_panel.format_option.get_item_text(2).contains("PDF"),
|
||||
"export dialog offers the PDF format"
|
||||
)
|
||||
_check(
|
||||
controller.export_open_after_check.button_pressed,
|
||||
controller.export_panel.open_after_check.button_pressed,
|
||||
"export dialog opens the result by default"
|
||||
)
|
||||
|
||||
|
|
@ -310,7 +310,7 @@ func _run() -> void:
|
|||
await process_frame
|
||||
controller._open_export_dialog()
|
||||
await process_frame
|
||||
var export_dialog := controller.export_dialog
|
||||
var export_dialog := controller.export_panel.dialog
|
||||
var scroll := export_dialog.get_node("ExportScroll") as ScrollContainer
|
||||
var ok_button := export_dialog.get_ok_button()
|
||||
_check(
|
||||
|
|
@ -373,21 +373,21 @@ func _run() -> void:
|
|||
controller._last_export_path = ProjectSettings.globalize_path(pdf_path)
|
||||
controller._show_export_done()
|
||||
_check(
|
||||
controller.export_done_dialog.visible,
|
||||
controller.export_panel.done_dialog.visible,
|
||||
"export completion dialog opens"
|
||||
)
|
||||
_check(
|
||||
controller.export_done_label.text.contains(
|
||||
controller.export_panel.done_label.text.contains(
|
||||
ProjectSettings.globalize_path(pdf_path)
|
||||
),
|
||||
"export completion dialog shows the absolute path"
|
||||
)
|
||||
_check(
|
||||
not controller.export_open_button.disabled
|
||||
and not controller.export_folder_button.disabled,
|
||||
not controller.export_panel.open_button.disabled
|
||||
and not controller.export_panel.folder_button.disabled,
|
||||
"export completion dialog enables open and folder buttons"
|
||||
)
|
||||
controller.export_done_dialog.hide()
|
||||
controller.export_panel.done_dialog.hide()
|
||||
DirAccess.remove_absolute(pdf_path)
|
||||
|
||||
_check(
|
||||
|
|
|
|||
|
|
@ -1803,7 +1803,7 @@ func _run() -> void:
|
|||
FileAccess.file_exists(controller._last_export_path),
|
||||
"the comparison PDF was written"
|
||||
)
|
||||
controller.export_done_dialog.hide()
|
||||
controller.export_panel.done_dialog.hide()
|
||||
controller._on_upgrade_apply_pressed()
|
||||
_check(
|
||||
controller.get_season() == "2025/26",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue