Improve main menu's look'n'feel, #65

lampe-games · Dec 27, 2023 · f8211c2 · f8211c2
1 parent df68c87
commit f8211c2
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 24 deletions.
diff --git a/assets/translations/main_menu.csv b/assets/translations/main_menu.csv
@@ -0,0 +1,9 @@
+keys,en,pl
+PLAY,Play,Gra
+OPTIONS,Options,Opcje
+CREDITS,Credits,Twórcy
+QUIT,Quit,Wyjście
+BACK,Back,Wstecz
+CORE_CONTRIBUTORS,Core contributors,Kluczowi współtwórcy
+ASSETS,Assets,Treści multimedialne
+START,Start,Rozpocznij
diff --git a/assets/translations/main_menu.csv.import b/assets/translations/main_menu.csv.import
@@ -0,0 +1,17 @@
+[remap]
+
+importer="csv_translation"
+type="Translation"
+uid="uid://dysxs8mlbjhl8"
+
+[deps]
+
+files=["res://assets/translations/main_menu.en.translation", "res://assets/translations/main_menu.pl.translation"]
+
+source_file="res://assets/translations/main_menu.csv"
+dest_files=["res://assets/translations/main_menu.en.translation", "res://assets/translations/main_menu.pl.translation"]
+
+[params]
+
+compress=true
+delimiter=0
diff --git a/project.godot b/project.godot
@@ -112,7 +112,7 @@ shift_selecting={
 
 [internationalization]
 
-locale/translations=PackedStringArray("res://assets/translations/match.en.translation", "res://assets/translations/match.pl.translation")
+locale/translations=PackedStringArray("res://assets/translations/match.en.translation", "res://assets/translations/match.pl.translation", "res://assets/translations/main_menu.en.translation", "res://assets/translations/main_menu.pl.translation")
 
 [layer_names]
 

diff --git a/source/main-menu/Credits.gd b/source/main-menu/Credits.gd
@@ -1,5 +1,16 @@
 extends Control
 
+@onready var _rich_text_label = find_child("RichTextLabel")
+
+
+func _ready():
+	_rich_text_label.text = (
+		_rich_text_label
+		. text
+		. replace("CORE_CONTRIBUTORS", tr("CORE_CONTRIBUTORS"))
+		. replace("ASSETS", tr("ASSETS"))
+	)
+
 
 func _on_back_button_pressed():
 	get_tree().change_scene_to_file("res://source/main-menu/Main.tscn")
diff --git a/source/main-menu/Credits.tscn b/source/main-menu/Credits.tscn
@@ -1,5 +1,6 @@
-[gd_scene load_steps=3 format=3 uid="uid://ds57esabi07np"]
+[gd_scene load_steps=4 format=3 uid="uid://ds57esabi07np"]
 
+[ext_resource type="Theme" uid="uid://c2kgsk4ffhbwo" path="res://source/resources/main_menu.theme" id="1_7ubwb"]
 [ext_resource type="Script" path="res://source/main-menu/Credits.gd" id="1_33n17"]
 [ext_resource type="PackedScene" uid="uid://dij5xr8swlfdx" path="res://source/main-menu/Background.tscn" id="2_txygx"]
 
@@ -10,6 +11,7 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
+theme = ExtResource("1_7ubwb")
 script = ExtResource("1_33n17")
 
 [node name="Background" parent="." instance=ExtResource("2_txygx")]
@@ -47,11 +49,12 @@ size_flags_vertical = 3
 
 [node name="RichTextLabel" type="RichTextLabel" parent="MarginContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
+theme_override_font_sizes/normal_font_size = 20
 bbcode_enabled = true
-text = "[center][u]Core contributors:[/u]
+text = "[center][u]CORE_CONTRIBUTORS:[/u]
 - Pawel Lampe (Scony) | Lampe Games
 
-[u]Assets:[/u]
+[u]ASSETS:[/u]
 - 3D Space Kit by Kenney.nl"
 fit_content = true
 
@@ -61,9 +64,7 @@ size_flags_vertical = 3
 
 [node name="Button" type="Button" parent="MarginContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
-focus_mode = 0
-text = "Back
-"
+text = "BACK"
 
 [node name="Panel" type="Panel" parent="MarginContainer"]
 show_behind_parent = true

diff --git a/source/main-menu/Main.tscn b/source/main-menu/Main.tscn
@@ -1,6 +1,7 @@
-[gd_scene load_steps=3 format=3 uid="uid://ctyd01bv020i8"]
+[gd_scene load_steps=4 format=3 uid="uid://ctyd01bv020i8"]
 
 [ext_resource type="Script" path="res://source/main-menu/Main.gd" id="1_2uj2d"]
+[ext_resource type="Theme" uid="uid://c2kgsk4ffhbwo" path="res://source/resources/main_menu.theme" id="1_sc713"]
 [ext_resource type="PackedScene" uid="uid://dij5xr8swlfdx" path="res://source/main-menu/Background.tscn" id="2_depxw"]
 
 [node name="Main" type="Control"]
@@ -10,6 +11,7 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
+theme = ExtResource("1_sc713")
 script = ExtResource("1_2uj2d")
 
 [node name="Background" parent="." instance=ExtResource("2_depxw")]
@@ -44,23 +46,19 @@ alignment = 1
 
 [node name="Button" type="Button" parent="MarginContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
-focus_mode = 0
-text = "Play"
+text = "PLAY"
 
 [node name="Button2" type="Button" parent="MarginContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
-focus_mode = 0
-text = "Options"
+text = "OPTIONS"
 
 [node name="Button3" type="Button" parent="MarginContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
-focus_mode = 0
-text = "Credits"
+text = "CREDITS"
 
 [node name="Button4" type="Button" parent="MarginContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
-focus_mode = 0
-text = "Quit"
+text = "QUIT"
 
 [node name="Panel" type="Panel" parent="MarginContainer"]
 show_behind_parent = true

diff --git a/source/main-menu/Options.tscn b/source/main-menu/Options.tscn
@@ -1,5 +1,6 @@
-[gd_scene load_steps=3 format=3 uid="uid://bawu5eau3t4ek"]
+[gd_scene load_steps=4 format=3 uid="uid://bawu5eau3t4ek"]
 
+[ext_resource type="Theme" uid="uid://c2kgsk4ffhbwo" path="res://source/resources/main_menu.theme" id="1_a5uwh"]
 [ext_resource type="Script" path="res://source/main-menu/Options.gd" id="1_msrcd"]
 [ext_resource type="PackedScene" uid="uid://dij5xr8swlfdx" path="res://source/main-menu/Background.tscn" id="2_mgrkx"]
 
@@ -80,13 +81,14 @@ text = "Mouse movement restricted to the game window"
 
 [node name="Button" type="Button" parent="MarginContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
-focus_mode = 0
-text = "Back"
+theme = ExtResource("1_a5uwh")
+text = "BACK"
 
 [node name="Panel" type="Panel" parent="MarginContainer"]
 show_behind_parent = true
 layout_mode = 2
 mouse_filter = 2
+theme = ExtResource("1_a5uwh")
 
 [connection signal="item_selected" from="MarginContainer/MarginContainer/VBoxContainer/PanelContainer/VBoxContainer/Screen" to="." method="_on_screen_item_selected"]
 [connection signal="pressed" from="MarginContainer/MarginContainer/VBoxContainer/PanelContainer2/VBoxContainer/MouseMovementRestricted" to="." method="_on_mouse_movement_restricted_pressed"]

diff --git a/source/main-menu/Play.tscn b/source/main-menu/Play.tscn
@@ -1,7 +1,8 @@
-[gd_scene load_steps=3 format=3 uid="uid://baeshrvg30aer"]
+[gd_scene load_steps=4 format=3 uid="uid://baeshrvg30aer"]
 
 [ext_resource type="Script" path="res://source/main-menu/Play.gd" id="1_o62d3"]
 [ext_resource type="PackedScene" uid="uid://dij5xr8swlfdx" path="res://source/main-menu/Background.tscn" id="2_xtk15"]
+[ext_resource type="Theme" uid="uid://c2kgsk4ffhbwo" path="res://source/resources/main_menu.theme" id="3_qwd67"]
 
 [node name="Play" type="Control"]
 layout_mode = 3
@@ -400,22 +401,22 @@ popup/item_2/id = 2
 
 [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
+theme = ExtResource("3_qwd67")
 theme_override_constants/separation = 4
 
 [node name="StartButton" type="Button" parent="MarginContainer/MarginContainer/VBoxContainer/VBoxContainer"]
 layout_mode = 2
-focus_mode = 0
-text = "Start"
+text = "START"
 
 [node name="BackButton" type="Button" parent="MarginContainer/MarginContainer/VBoxContainer/VBoxContainer"]
 layout_mode = 2
-focus_mode = 0
-text = "Back"
+text = "BACK"
 
 [node name="Panel" type="Panel" parent="MarginContainer"]
 show_behind_parent = true
 layout_mode = 2
 mouse_filter = 2
+theme = ExtResource("3_qwd67")
 
 [connection signal="item_selected" from="MarginContainer/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer2/HBoxContainer/MapList" to="." method="_on_map_list_item_selected"]
 [connection signal="pressed" from="MarginContainer/MarginContainer/VBoxContainer/VBoxContainer/StartButton" to="." method="_on_start_button_pressed"]

diff --git a/source/resources/main_menu.theme b/source/resources/main_menu.theme