From f376c4a36e308ab3796d17e73bc28fef62239868 Mon Sep 17 00:00:00 2001 From: Persephone Bubblegum-Holiday Date: Sat, 28 Jun 2025 17:24:41 -0700 Subject: [PATCH] update some ui things --- Scenes/GUI/EditorScreen.tscn | 32 ++++++++++++++------------------ Scripts/EditorScreen.gd | 2 +- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/Scenes/GUI/EditorScreen.tscn b/Scenes/GUI/EditorScreen.tscn index 3d97c93..dd782ce 100644 --- a/Scenes/GUI/EditorScreen.tscn +++ b/Scenes/GUI/EditorScreen.tscn @@ -198,14 +198,20 @@ offset_left = 4.0 offset_top = 4.0 offset_right = 260.0 offset_bottom = 36.0 -selected = 0 -item_count = 3 -popup/item_0/text = "Balcony Stage" -popup/item_0/id = 0 -popup/item_1/text = "Helen House" -popup/item_1/id = 1 -popup/item_2/text = "Chuck E's Corner" -popup/item_2/id = 2 +selected = 1 +item_count = 5 +popup/item_0/text = "Official Stages" +popup/item_0/id = 4 +popup/item_0/separator = true +popup/item_1/text = "Balcony Stage" +popup/item_1/id = 0 +popup/item_2/text = "Custom Stages" +popup/item_2/id = 3 +popup/item_2/separator = true +popup/item_3/text = "Helen House" +popup/item_3/id = 1 +popup/item_4/text = "Chuck E's Corner" +popup/item_4/id = 2 [node name="MenuButton" type="MenuButton" parent="MenuBar"] layout_mode = 0 @@ -959,16 +965,6 @@ offset_bottom = 145.0 tooltip_text = "Browse for a file." text = "Browse" -[node name="ShowWaitMessage" type="Label" parent="ShowtapeLoadScreen/DialogPanel"] -layout_mode = 0 -offset_left = 8.0 -offset_top = 148.0 -offset_right = 374.0 -offset_bottom = 197.0 -text = "If shows are taking a long time to load, -consider compressing the audio to MP3 or OGG" -vertical_alignment = 1 - [node name="CancelButton" type="Button" parent="ShowtapeLoadScreen/DialogPanel"] layout_mode = 0 offset_left = 309.0 diff --git a/Scripts/EditorScreen.gd b/Scripts/EditorScreen.gd index f34bf79..f051c24 100644 --- a/Scripts/EditorScreen.gd +++ b/Scripts/EditorScreen.gd @@ -677,7 +677,7 @@ func _on_showtape_load_open_button_pressed() -> void: $IncorrectShowtapeDialog.show() return if (header[3] != stages_info[current_stage]["ust_type"]): - $IncorrectShowtapeDialog.dialog_text = "This showtape is not compatible with the currently selected stage.\nShowtape stage type: " + header[3] + $IncorrectShowtapeDialog.dialog_text = "This showtape is not compatible with the currently selected stage.\nShowtape stage type: %s\n Current stage type: %s" % [ header[3], stages_info[current_stage]["ust_type"] ] $IncorrectShowtapeDialog.show() return show_name = header[2]