On branch feat/godot-configurator

Changes to be committed:
	modified:   tools/configurator/components/bios_check/bios_check.gd
	new file:   tools/configurator/components/logs.tscn
	new file:   tools/configurator/components/logs/logs_popup_content.tscn
	modified:   tools/configurator/components/popup.tscn
	modified:   tools/configurator/data_list.json
	deleted:    tools/configurator/export/data_list.json
	modified:   tools/configurator/main.gd
	modified:   tools/configurator/main.tscn
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
This commit is contained in:
monkeyx-net 2024-08-02 21:25:39 +01:00
parent 7718b67a24
commit 7f9531aaf7
9 changed files with 105 additions and 404 deletions

View file

@ -64,6 +64,3 @@ func _ready():
func run_thread_command(command: String, parameters: Array, console: bool) -> void: func run_thread_command(command: String, parameters: Array, console: bool) -> void:
var result = await class_functions.run_command_in_thread(command, parameters, console) var result = await class_functions.run_command_in_thread(command, parameters, console)
#if result != null:
# print (result["output"])
# print ("Exit Code: " + str(result["exit_code"]))

View file

@ -0,0 +1,3 @@
[gd_scene format=3 uid="uid://1xnw3mdwvg8o"]
[node name="Logs" type="Node2D"]

View file

@ -0,0 +1,22 @@
[gd_scene format=3 uid="uid://db4ibvxq5wnxe"]
[node name="PopupContent" type="Control"]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="RichTextLabel" type="RichTextLabel" parent="."]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
focus_mode = 2
fit_content = true
scroll_following = true
context_menu_enabled = true
selection_enabled = true

View file

@ -68,4 +68,7 @@ theme_override_constants/margin_top = 6
theme_override_constants/margin_right = 10 theme_override_constants/margin_right = 10
theme_override_constants/margin_bottom = 6 theme_override_constants/margin_bottom = 6
[node name="RichTextLabel" type="RichTextLabel" parent="Panel/MarginContainer/VBoxContainer/ContentContainer/MarginContainer"]
layout_mode = 2
[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/MarginContainer/HBoxContainer/BackButton" to="." method="_on_back_pressed"] [connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/MarginContainer/HBoxContainer/BackButton" to="." method="_on_back_pressed"]

View file

@ -1,348 +0,0 @@
{
"about_links": {
"example_site": {
"description": "An example description.",
"name": "Example Site",
"url": "https://example.com"
},
"rd_changelog": {
"description": "Opens the RetroDECK change log in your default browser",
"name": "Changelog",
"url": "https://retrodeck.readthedocs.io/en/latest/wiki_rd_versions/version-history/"
},
"rd_contactus": {
"description": "Opens the RetroDECK contact us section in your default browser",
"name": "Contact us",
"url": "https://github.com/XargonWan/RetroDECK"
},
"rd_credits": {
"description": "Opens the RetroDECK Credits in your default browser",
"name": "Credits",
"url": "https://retrodeck.readthedocs.io/en/latest/wiki_credits/donations-licenses/"
},
"rd_donate": {
"description": "Opens Donations page in your default browser",
"name": "Donate",
"url": "https://retrodeck.readthedocs.io/en/latest/wiki_credits/donations-licenses/"
},
"rd_licenses": {
"description": "Opens the RetroDECK licenses in your default browser",
"name": "Licences",
"url": "https://retrodeck.readthedocs.io/en/latest/wiki_credits/donations-licenses/"
},
"rd_web": {
"description": "Opens the RetroDECK Website in your default browser",
"name": "Website",
"url": "https://retrodeck.net/"
},
"rd_wiki": {
"description": "Opens the RetroDECK Wiki in your default browser",
"name": "Wiki",
"url": "https://retrodeck.readthedocs.io/en/latest/"
}
},
"emulators": {
"cemu": {
"description": "Wii U emulator",
"name": "Cemu",
"options": [
{
"resettable": true
}
],
"properties": [
{
"standalone": true
},
{
"abxy_button": {
"status": false
}
}
]
},
"citra": {
"description": "N3DS emulator",
"name": "Citra",
"options": [
{
"resettable": true
}
],
"properties": [
{
"standalone": true
},
{
"abxy_button": {
"status": false
}
}
]
},
"dolphin": {
"description": "Wii/GameCube emulator",
"name": "Dolphin",
"options": [
{
"resettable": true
}
],
"properties": [
{
"standalone": true
},
{
"abxy_button": {
"status": false
}
}
]
},
"duckstation": {
"description": "PSX emulator",
"name": "Duckstation",
"options": [
{
"resettable": true
}
],
"properties": [
{
"standalone": true
},
{
"abxy_button": {
"status": false
}
}
]
},
"example_emulator": {
"description": "An example emulator.",
"name": "Example Emulator",
"options": [
{
"resettable": true
}
],
"properties": [
{
"abxy_button": {
"status": false
},
"standalone": true
}
]
},
"gzdoom": {
"description": "Doom engine",
"name": "GZDoom",
"options": [
{
"resettable": true
}
],
"properties": [
{
"standalone": true
},
{
"abxy_button": {
"status": false
}
}
]
},
"mame": {
"description": "Multiple Arcade Machine Emulator",
"name": "MAME",
"options": [
{
"resettable": true
}
],
"properties": [
{
"standalone": true
},
{
"abxy_button": {
"status": false
}
}
]
},
"melonds": {
"description": "NDS emulator",
"name": "MelonDS",
"options": [
{
"resettable": true
}
],
"properties": [
{
"standalone": true
},
{
"abxy_button": {
"status": false
}
}
]
},
"pcsx2": {
"description": "PS2 emulator",
"name": "PCSX2",
"options": [
{
"resettable": true
}
],
"properties": [
{
"standalone": true
},
{
"abxy_button": {
"status": false
}
}
]
},
"ppsspp": {
"description": "PSP emulator",
"name": "PPSSPP",
"options": [
{
"resettable": true
}
],
"properties": [
{
"standalone": true
},
{
"abxy_button": {
"status": false
}
}
]
},
"primehack": {
"description": "Metroid Prime emulator",
"name": "Primehack",
"options": [
{
"resettable": true
}
],
"properties": [
{
"standalone": true
},
{
"abxy_button": {
"status": false
}
}
]
},
"rpcs3": {
"description": "PS3 emulator",
"name": "RPCS3",
"options": [
{
"resettable": true
}
],
"properties": [
{
"standalone": true
},
{
"abxy_button": {
"status": false
}
}
]
},
"ryujinx": {
"description": "Switch emulator",
"name": "Ryujinx",
"options": [
{
"resettable": true
}
],
"properties": [
{
"standalone": true
},
{
"abxy_button": {
"status": false
}
}
]
},
"vita3k": {
"description": "PS Vita emulator",
"name": "Vita3k",
"options": [
{
"resettable": true
}
],
"properties": [
{
"standalone": true
},
{
"abxy_button": {
"status": false
}
}
]
},
"xemu": {
"description": "XBOX emulator",
"name": "XEMU",
"options": [
{
"resettable": true
}
],
"properties": [
{
"standalone": true
},
{
"abxy_button": {
"status": false
}
}
]
},
"yuzu": {
"description": "Switch emulator",
"name": "Yuzu",
"options": [
{
"resettable": true
}
],
"properties": [
{
"standalone": true
},
{
"abxy_button": {
"status": false
}
}
]
}
}
}

View file

@ -11,6 +11,7 @@ signal signal_theme_changed
var custom_theme: Theme = $".".theme var custom_theme: Theme = $".".theme
var emu_select_option: OptionButton var emu_select_option: OptionButton
var emu_pick_option: OptionButton var emu_pick_option: OptionButton
var log_option: OptionButton
var tab_container: TabContainer var tab_container: TabContainer
var anim_logo: AnimatedSprite2D var anim_logo: AnimatedSprite2D
var anim_rekku: AnimatedSprite2D var anim_rekku: AnimatedSprite2D
@ -55,6 +56,7 @@ func _get_nodes() -> void:
tab_container = get_node("%TabContainer") tab_container = get_node("%TabContainer")
anim_logo = get_node("%logo_animated") anim_logo = get_node("%logo_animated")
anim_rekku = get_node("%rekku_animated") anim_rekku = get_node("%rekku_animated")
log_option = get_node("%logs_button")
func _connect_signals() -> void: func _connect_signals() -> void:
#signal_theme_changed.connect(_conf_theme) #signal_theme_changed.connect(_conf_theme)
@ -62,6 +64,7 @@ func _connect_signals() -> void:
signal_theme_changed.emit(theme_option.item_selected) signal_theme_changed.emit(theme_option.item_selected)
emu_select_option.item_selected.connect(_emu_select) emu_select_option.item_selected.connect(_emu_select)
emu_pick_option.item_selected.connect(_emu_pick) emu_pick_option.item_selected.connect(_emu_pick)
log_option.item_selected.connect(_load_log)
func _emu_select(index: int) -> void: func _emu_select(index: int) -> void:
emu_pick_option.visible = true emu_pick_option.visible = true
@ -75,6 +78,17 @@ func _emu_pick(index: int) -> void:
emu_pick_option.visible = true emu_pick_option.visible = true
_play_main_animations() _play_main_animations()
func _load_log(index: int) -> void:
match index:
1:
#https://docs.godotengine.org/en/stable/tutorials/scripting/singletons_autoload.html
#https://docs.godotengine.org/en/stable/classes/class_os.html
#https://docs.godotengine.org/en/stable/classes/class_os.html#class-os-method-get-environment
print ("Load log via dos and ref rdhome? or use Enviornment variable from godot")
load_popup("RetroDeck Log", "res://components/logs/logs_popup_content.tscn")
2:
load_popup("ES-DE Log", "res://components/logs/logs_popup_content.tscn")
func _play_main_animations() -> void: func _play_main_animations() -> void:
anim_logo.play() anim_logo.play()

View file

@ -97,7 +97,7 @@ grow_vertical = 2
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
tab_alignment = 1 tab_alignment = 1
current_tab = 5 current_tab = 2
script = ExtResource("3_id6l4") script = ExtResource("3_id6l4")
[node name="TK_SYSTEM" type="MarginContainer" parent="Background/MarginContainer/TabContainer"] [node name="TK_SYSTEM" type="MarginContainer" parent="Background/MarginContainer/TabContainer"]
@ -266,7 +266,6 @@ disabled = true
text = "TK_TATE" text = "TK_TATE"
[node name="TK_CONTROLS" type="MarginContainer" parent="Background/MarginContainer/TabContainer"] [node name="TK_CONTROLS" type="MarginContainer" parent="Background/MarginContainer/TabContainer"]
visible = false
layout_mode = 2 layout_mode = 2
theme_override_constants/margin_right = 240 theme_override_constants/margin_right = 240
@ -625,6 +624,7 @@ disabled = true
text = "TK_FTPBTN" text = "TK_FTPBTN"
[node name="TK_TROUBLESHOOT" type="MarginContainer" parent="Background/MarginContainer/TabContainer"] [node name="TK_TROUBLESHOOT" type="MarginContainer" parent="Background/MarginContainer/TabContainer"]
visible = false
layout_mode = 2 layout_mode = 2
theme_override_constants/margin_right = 240 theme_override_constants/margin_right = 240
@ -646,10 +646,20 @@ layout_mode = 2
layout_mode = 2 layout_mode = 2
text = "TK_CHECKCONN" text = "TK_CHECKCONN"
[node name="logs_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/troubleshoot_container"] [node name="logs_button" type="OptionButton" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer/troubleshoot_container"]
unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
disabled = true size_flags_horizontal = 4
text = "TK_LOGSBTN" item_count = 3
selected = 0
popup/item_0/text = "TK_LOGSBTN"
popup/item_0/id = 0
popup/item_0/disabled = true
popup/item_0/separator = true
popup/item_1/text = "RetroDECK Log"
popup/item_1/id = 1
popup/item_2/text = "ES_DE Log"
popup/item_2/id = 2
[node name="reset_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer"] [node name="reset_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer"]
layout_mode = 2 layout_mode = 2

File diff suppressed because one or more lines are too long