Removed some errors.

Resize windows
 Emeulator selection highlight

 On branch cooker
 Changes to be committed:
	new file:   assets/themes/emulators.tres
	modified:   data_list.json
	modified:   export_presets.cfg
	modified:   main.gd
	modified:   main.tscn
	deleted:    rekku_animated.tscn
	modified:   res/pixel_ui_theme/RetroDECKTheme.tres
	modified:   res/pixel_ui_theme/random_icon.tres
	modified:   scripts/class_functions.gd
	modified:   tk_about.gd
This commit is contained in:
monkeyx-net 2024-08-12 12:52:55 +01:00
parent 05b7f9c559
commit 2c51d4113f
10 changed files with 132 additions and 310 deletions

View file

@ -0,0 +1,14 @@
[gd_resource type="StyleBoxFlat" format=3 uid="uid://ba3l3ja1jbqpx"]
[resource]
bg_color = Color(0.6, 0.168627, 0.6, 0.372549)
border_width_left = 3
border_width_top = 3
border_width_right = 3
border_width_bottom = 3
border_color = Color(0.990271, 0.937624, 0.986034, 1)
border_blend = true
corner_radius_top_left = 3
corner_radius_top_right = 3
corner_radius_bottom_right = 3
corner_radius_bottom_left = 3

View file

@ -405,4 +405,4 @@
]
}
}
}
}

View file

@ -8,7 +8,7 @@ custom_features=""
export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path=""
export_path="./godot_configurator.x86_64"
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false

View file

@ -27,6 +27,7 @@ func _ready():
data_handler.add_emaultor()
data_handler.modify_emulator_test()
$Background/locale_option.selected = class_functions.map_locale_id(OS.get_locale_language())
"""
# load json data
#app_data = data_handler.load_data()
@ -91,7 +92,7 @@ func _emu_select(index: int) -> void:
func _emu_pick(index: int) -> void:
emu_pick_option.visible = true
_play_main_animations()
func _load_log(index: int) -> void:
var log_content:String
match index:

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=37 format=3 uid="uid://61f6m4r1mpan"]
[gd_scene load_steps=38 format=3 uid="uid://61f6m4r1mpan"]
[ext_resource type="Texture2D" uid="uid://bv6vh33cnfaw4" path="res://icon.svg" id="1_axfei"]
[ext_resource type="Script" path="res://main.gd" id="1_obpq7"]
@ -13,6 +13,7 @@
[ext_resource type="Texture2D" uid="uid://d2lm4mfx1gt86" path="res://assets/graphics/retrodeck_base_shake0.png" id="5_7rjbt"]
[ext_resource type="Script" path="res://helper_text.gd" id="5_cprkf"]
[ext_resource type="Texture2D" uid="uid://dxdhjp18rgmr4" path="res://res/flags/united_kingdom_32.png" id="5_exkn2"]
[ext_resource type="StyleBox" uid="uid://ba3l3ja1jbqpx" path="res://assets/themes/emulators.tres" id="5_rjtkn"]
[ext_resource type="Texture2D" uid="uid://cjv6lhd4g63m3" path="res://assets/graphics/retrodeck_base_shake1.png" id="6_d43n7"]
[ext_resource type="Texture2D" uid="uid://cru43y7hco6kh" path="res://res/flags/italy_32.png" id="6_fiylw"]
[ext_resource type="Texture2D" uid="uid://m5283vouicmb" path="res://assets/icons/pixelitos/128/duckstation.png" id="6_winpq"]
@ -81,18 +82,14 @@ grow_vertical = 2
theme = ExtResource("1_xyph5")
script = ExtResource("1_obpq7")
metadata/bios_type = 0
metadata/_edit_horizontal_guides_ = [-2575.0]
[node name="Background" type="Panel" parent="."]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -500.0
offset_top = -350.0
offset_right = 500.0
offset_bottom = 200.0
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
offset_bottom = -55.0
grow_horizontal = 2
grow_vertical = 2
@ -349,6 +346,7 @@ follow_focus = true
[node name="VBoxContainer" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_EMULATORS/ScrollContainer"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="controls_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_EMULATORS/ScrollContainer/VBoxContainer"]
layout_mode = 2
@ -361,16 +359,16 @@ text = "TK_EMULATORS"
layout_mode = 2
[node name="GridContainer" type="GridContainer" parent="Background/MarginContainer/TabContainer/TK_EMULATORS/ScrollContainer/VBoxContainer"]
custom_minimum_size = Vector2(700, 400)
layout_mode = 2
size_flags_vertical = 3
theme_override_constants/h_separation = 10
theme_override_constants/v_separation = 10
columns = 4
columns = 6
[node name="Button3" type="Button" parent="Background/MarginContainer/TabContainer/TK_EMULATORS/ScrollContainer/VBoxContainer/GridContainer"]
layout_mode = 2
tooltip_text = "RetroARCH"
theme_override_styles/focus = ExtResource("5_rjtkn")
text = "RetroArch"
icon = ExtResource("4_xcuib")
icon_alignment = 1
@ -380,6 +378,7 @@ expand_icon = true
[node name="Button4" type="Button" parent="Background/MarginContainer/TabContainer/TK_EMULATORS/ScrollContainer/VBoxContainer/GridContainer"]
layout_mode = 2
tooltip_text = "MAME"
theme_override_styles/focus = ExtResource("5_rjtkn")
text = "MAME"
icon = ExtResource("36_r80tt")
icon_alignment = 1
@ -388,6 +387,7 @@ vertical_icon_alignment = 0
[node name="Button" type="Button" parent="Background/MarginContainer/TabContainer/TK_EMULATORS/ScrollContainer/VBoxContainer/GridContainer"]
layout_mode = 2
tooltip_text = "Duckstation"
theme_override_styles/focus = ExtResource("5_rjtkn")
text = "DuckSation"
icon = ExtResource("6_winpq")
icon_alignment = 1
@ -396,6 +396,7 @@ vertical_icon_alignment = 0
[node name="Button2" type="Button" parent="Background/MarginContainer/TabContainer/TK_EMULATORS/ScrollContainer/VBoxContainer/GridContainer"]
layout_mode = 2
tooltip_text = "Melon DS"
theme_override_styles/focus = ExtResource("5_rjtkn")
text = "MelonDS"
icon = ExtResource("7_4otos")
icon_alignment = 1
@ -404,6 +405,7 @@ vertical_icon_alignment = 0
[node name="Button5" type="Button" parent="Background/MarginContainer/TabContainer/TK_EMULATORS/ScrollContainer/VBoxContainer/GridContainer"]
layout_mode = 2
tooltip_text = "PSPSSPP"
theme_override_styles/focus = ExtResource("5_rjtkn")
text = "PSPSSPP"
icon = ExtResource("8_akxf7")
icon_alignment = 1
@ -412,15 +414,16 @@ vertical_icon_alignment = 0
[node name="Button6" type="Button" parent="Background/MarginContainer/TabContainer/TK_EMULATORS/ScrollContainer/VBoxContainer/GridContainer"]
layout_mode = 2
tooltip_text = "PSPSSPP"
theme_override_styles/focus = ExtResource("5_rjtkn")
text = "GZ DOOM"
icon = ExtResource("9_iu6bj")
icon_alignment = 1
vertical_icon_alignment = 0
expand_icon = true
[node name="Button7" type="Button" parent="Background/MarginContainer/TabContainer/TK_EMULATORS/ScrollContainer/VBoxContainer/GridContainer"]
layout_mode = 2
tooltip_text = "CITRA"
theme_override_styles/focus = ExtResource("5_rjtkn")
text = "CITRA"
icon = ExtResource("10_wbaif")
icon_alignment = 1
@ -429,6 +432,7 @@ vertical_icon_alignment = 0
[node name="OptionButton" type="OptionButton" parent="Background/MarginContainer/TabContainer/TK_EMULATORS/ScrollContainer/VBoxContainer/GridContainer"]
layout_mode = 2
tooltip_text = "Dolphin"
theme_override_styles/focus = ExtResource("5_rjtkn")
alignment = 1
icon_alignment = 1
vertical_icon_alignment = 0
@ -961,9 +965,10 @@ anchor_left = 1.0
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
offset_left = -240.0
offset_top = -175.0
offset_bottom = 45.0
offset_left = -254.0
offset_top = -277.0
offset_right = -13.0
offset_bottom = -57.0
grow_horizontal = 0
grow_vertical = 2
@ -999,10 +1004,10 @@ scroll_active = false
[node name="status_label" type="Label" parent="Background/side_logo"]
unique_name_in_owner = true
layout_mode = 0
offset_left = -1.0
offset_top = 412.0
offset_right = 106.0
offset_bottom = 453.0
offset_left = 46.0
offset_top = 605.5
offset_right = 153.0
offset_bottom = 646.5
text = "Status:"
[node name="status_code_label" type="Label" parent="Background/side_logo/status_label"]
@ -1075,28 +1080,9 @@ stream = ExtResource("3_xivj6")
volume_db = -11.243
[node name="CanvasModulate" type="CanvasModulate" parent="."]
visible = false
position = Vector2(134, 151)
color = Color(0.858824, 0.890196, 1, 1)
[node name="coltroller_guide" type="PanelContainer" parent="."]
layout_mode = 1
anchors_preset = 12
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_top = -38.0
grow_horizontal = 2
grow_vertical = 0
[node name="controller_guide_text" type="RichTextLabel" parent="coltroller_guide"]
layout_mode = 2
theme_override_colors/default_color = Color(1, 1, 1, 0.607843)
theme_override_font_sizes/normal_font_size = 23
text = "(A) Accept (B) Back (L/R) Tab Switch (Menu) Exit"
fit_content = true
scroll_active = false
[node name="rekku" type="Control" parent="."]
visible = false
layout_mode = 1
@ -1105,7 +1091,9 @@ anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.5
anchor_bottom = 1.0
offset_left = -0.00012207
offset_top = 5.0
offset_right = -0.00012207
offset_bottom = 5.0
grow_horizontal = 2
grow_vertical = 0
@ -1148,6 +1136,24 @@ This is mot working on the following systems: Switch, WiiU."
scroll_following = true
script = ExtResource("5_cprkf")
[node name="coltroller_guide" type="PanelContainer" parent="."]
layout_mode = 1
anchors_preset = 12
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_top = -52.0
grow_horizontal = 2
grow_vertical = 0
[node name="controller_guide_text" type="RichTextLabel" parent="coltroller_guide"]
layout_mode = 2
theme_override_colors/default_color = Color(1, 1, 1, 0.607843)
theme_override_font_sizes/normal_font_size = 23
text = "(A) Accept (B) Back (L/R) Tab Switch (Menu) Exit"
fit_content = true
scroll_active = false
[connection signal="pressed" from="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/game_control_container/GridContainer/quick_resume_adv_button" to="." method="_on_quickresume_advanced_pressed"]
[connection signal="pressed" from="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container/bios_button" to="." method="_on_bios_button_pressed"]
[connection signal="pressed" from="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container/bios_button_expert" to="." method="_on_bios_button_expert_pressed"]

View file

@ -1,52 +0,0 @@
[gd_scene load_steps=7 format=3 uid="uid://cb4fvsgnwsf4q"]
[ext_resource type="Texture2D" uid="uid://jw1s5l1dhufg" path="res://assets/graphics/Rekku/rekku-idle.png" id="1_rnwrc"]
[ext_resource type="Texture2D" uid="uid://pjf86q3d6375" path="res://assets/graphics/Rekku/rekku-blink-up.png" id="2_idjj5"]
[ext_resource type="Texture2D" uid="uid://dym6yad66luyl" path="res://assets/graphics/Rekku/rekku-blink-down.png" id="3_tdr5m"]
[ext_resource type="Texture2D" uid="uid://dp0lb1sy2cl0i" path="res://assets/graphics/Rekku/rekku-speak1.png" id="4_2j71n"]
[ext_resource type="Texture2D" uid="uid://r7fihohhmfau" path="res://assets/graphics/Rekku/rekku-speak2.png" id="5_uqvm4"]
[sub_resource type="SpriteFrames" id="SpriteFrames_e62bh"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": ExtResource("1_rnwrc")
}, {
"duration": 1.0,
"texture": ExtResource("2_idjj5")
}, {
"duration": 1.0,
"texture": ExtResource("3_tdr5m")
}, {
"duration": 1.0,
"texture": ExtResource("4_2j71n")
}, {
"duration": 1.0,
"texture": ExtResource("5_uqvm4")
}, {
"duration": 1.0,
"texture": ExtResource("4_2j71n")
}, {
"duration": 1.0,
"texture": ExtResource("4_2j71n")
}, {
"duration": 1.0,
"texture": ExtResource("5_uqvm4")
}, {
"duration": 1.0,
"texture": ExtResource("5_uqvm4")
}, {
"duration": 1.0,
"texture": ExtResource("3_tdr5m")
}],
"loop": false,
"name": &"default",
"speed": 5.0
}]
[node name="rekku_animated" type="AnimatedSprite2D"]
position = Vector2(1113, 566)
scale = Vector2(0.238281, 0.270508)
sprite_frames = SubResource("SpriteFrames_e62bh")
frame = 9
frame_progress = 1.0

File diff suppressed because one or more lines are too long

4
tools/configurator/res/pixel_ui_theme/random_icon.tres Executable file → Normal file
View file

@ -1,6 +1,6 @@
[gd_resource type="AtlasTexture" load_steps=2 format=2]
[gd_resource type="AtlasTexture" load_steps=2 format=3]
[ext_resource path="res://pixel_ui_theme/8x8_ui_icons.png" type="Texture" id=1]
[ext_resource type="Texture" uid="uid://cxyml1owhi6de" path="res://res/pixel_ui_theme/8x8_ui_icons.png" id="1"]
[resource]
atlas = ExtResource( 1 )

View file

@ -81,3 +81,22 @@ func import_text_file(file_path: String) -> String:
content += file.get_line() + "\n"
file.close
return content
func map_locale_id(current_locale: String) -> int:
var int_locale: int
match current_locale:
"en":
int_locale = 0
"it":
int_locale = 1
"de":
int_locale = 2
"se":
int_locale = 3
"uk":
int_locale = 4
"jp":
int_locale = 5
"cn":
int_locale = 6
return int_locale

View file

@ -10,7 +10,7 @@ var donate_button: Button
var contactus_button: Button
var licenses_button: Button
#var tk_about: Dictionary
signal signal_theme_changed
#signal signal_theme_changed
var app_data = AppData.new()
func _ready():