Merge branch 'feat/godot' into cooker

Godot Update. GFix theme margin issues

 On branch cooker
 All conflicts fixed but you are still merging.

 Changes to be committed:
	new file:   .github/workflows/build-configurator.yml
	modified:   config/retrodeck/reference_lists/features.json
	modified:   tools/configurator/TabContainer.gd
	modified:   tools/configurator/components/bios_check/bios_popup_content.tscn
	modified:   tools/configurator/components/popup.tscn
	modified:   tools/configurator/main.tscn
	modified:   tools/configurator/project.godot
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
	modified:   tools/configurator/tk_about.gd
This commit is contained in:
Rekku 2024-08-17 19:01:28 +01:00
commit 726155c5d6
9 changed files with 1297 additions and 196 deletions

View file

@ -0,0 +1,69 @@
name: Release Godot Configurator
on:
# push:
# branches: [ cooker ]
# pull_request:
# branches: [ cooker ]
# manually run to help with version number/tag and sha256 value
workflow_dispatch:
env:
GODOT_VERSION: 4.2.2
EXPORT_NAME: RetroDECK-Configurator.x86_64
#match tag in project settings of Godot
TAG: RetroDECK-Configurator-v0.51
jobs:
export-linux:
name: Linux Export 🐧
runs-on: ubuntu-latest
defaults:
run:
shell: bash
working-directory: tools/configurator
container:
image: docker://barichello/godot-ci:4.2.2
steps:
- name: Checkout 🛎️
uses: actions/checkout@v4
with:
submodules: true
- name: Setup 💻
run: |
mkdir -v -p build/${EXPORT_NAME}-Linux-64bit ~/.local/share/godot/export_templates
mv /root/.local/share/godot/export_templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable
- name: Import resources once 📦
continue-on-error: true
run: godot --headless -v --import
- name: Linux Build 🔧
continue-on-error: true
# --export-release has to match the export template in Godot project
run: |
godot --headless -v --export-release "Linux/X11 64-bit" ~/$EXPORT_NAME
- name: Give execute permission ☑️
run: |
chmod +x ~/$EXPORT_NAME
- name: Create tar.gz archive 🗜️
run: |
tar zcvf ~/${EXPORT_NAME}.tar.gz ~/$EXPORT_NAME
# Create artifacts in action. Optional item
- name: Upload Linux x86_64 Artifact 🚀
uses: actions/upload-artifact@v4
with:
name: ${{env.EXPORT_NAME}}
path: ~/${{env.EXPORT_NAME}}.tar.gz
retention-days: 14
# Upload release linked to tag
# had to explicitly call folder reference
- name: Upload Release Asset 🚀
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: /github/home/RetroDECK-*
tag: ${{env.TAG}}
overwrite: true
file_glob: true

File diff suppressed because it is too large Load diff

View file

@ -2,8 +2,7 @@ extends TabContainer
func _ready(): func _ready():
focusFirstFocusableChild() #grab focus on first element to enable controller focusing focusFirstFocusableChild() #grab focus on first element to enable controller focusing
%l1_button.visible = true #
func _input(event): func _input(event):
if (event.is_action_pressed("next_tab")): if (event.is_action_pressed("next_tab")):
self.select_next_available() self.select_next_available()

View file

@ -8,6 +8,7 @@ layout_mode = 3
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
offset_right = -355.0
offset_bottom = -71.0 offset_bottom = -71.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2

View file

@ -18,6 +18,7 @@ layout_mode = 1
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
offset_right = -357.0
offset_bottom = -70.0 offset_bottom = -70.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=52 format=3 uid="uid://61f6m4r1mpan"] [gd_scene load_steps=50 format=3 uid="uid://61f6m4r1mpan"]
[ext_resource type="Texture2D" uid="uid://bv6vh33cnfaw4" path="res://icon.svg" id="1_axfei"] [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"] [ext_resource type="Script" path="res://main.gd" id="1_obpq7"]
@ -20,11 +20,11 @@
[ext_resource type="Texture2D" uid="uid://cyqo650hjucw6" path="res://assets/graphics/retrodeck_base_shake2.png" id="7_mo842"] [ext_resource type="Texture2D" uid="uid://cyqo650hjucw6" path="res://assets/graphics/retrodeck_base_shake2.png" id="7_mo842"]
[ext_resource type="Texture2D" uid="uid://cti2vt14gxisl" path="res://res/flags/germany_32.png" id="7_qgxid"] [ext_resource type="Texture2D" uid="uid://cti2vt14gxisl" path="res://res/flags/germany_32.png" id="7_qgxid"]
[ext_resource type="Texture2D" uid="uid://c7i7mr38qxa4f" path="res://assets/icons/pixelitos/128/org.ppsspp.PPSSPP.png" id="8_akxf7"] [ext_resource type="Texture2D" uid="uid://c7i7mr38qxa4f" path="res://assets/icons/pixelitos/128/org.ppsspp.PPSSPP.png" id="8_akxf7"]
[ext_resource type="Texture2D" uid="uid://6x4onimvsynx" path="res://assets/icons/pixelitos/128/net.rpcs3.RPCS3.png" id="8_ec4gt"]
[ext_resource type="Texture2D" uid="uid://bojog0xvms7hr" path="res://assets/graphics/retrodeck_base_shake3.png" id="8_l3t5c"] [ext_resource type="Texture2D" uid="uid://bojog0xvms7hr" path="res://assets/graphics/retrodeck_base_shake3.png" id="8_l3t5c"]
[ext_resource type="Texture2D" uid="uid://bns0ot5pbf03h" path="res://res/flags/sweden_32.png" id="8_lptln"] [ext_resource type="Texture2D" uid="uid://bns0ot5pbf03h" path="res://res/flags/sweden_32.png" id="8_lptln"]
[ext_resource type="Texture2D" uid="uid://uko0ikrtjkj" path="res://assets/graphics/retrodeck_base_shake4.png" id="9_8eqo6"] [ext_resource type="Texture2D" uid="uid://uko0ikrtjkj" path="res://assets/graphics/retrodeck_base_shake4.png" id="9_8eqo6"]
[ext_resource type="Texture2D" uid="uid://dhsorn3kcfdcv" path="res://res/flags/ukraine_32.png" id="9_dp7oa"] [ext_resource type="Texture2D" uid="uid://dhsorn3kcfdcv" path="res://res/flags/ukraine_32.png" id="9_dp7oa"]
[ext_resource type="Texture2D" uid="uid://djpgrd6fs7u2w" path="res://assets/icons/pixelitos/128/org.zdoom.GZDoom.png" id="9_iu6bj"]
[ext_resource type="Texture2D" uid="uid://dtwjo7co226dw" path="res://res/flags/japan_32.png" id="10_e8mt0"] [ext_resource type="Texture2D" uid="uid://dtwjo7co226dw" path="res://res/flags/japan_32.png" id="10_e8mt0"]
[ext_resource type="Texture2D" uid="uid://bevamv2c8knnn" path="res://assets/icons/pixelitos/128/org.citra_emu.citra.png" id="10_wbaif"] [ext_resource type="Texture2D" uid="uid://bevamv2c8knnn" path="res://assets/icons/pixelitos/128/org.citra_emu.citra.png" id="10_wbaif"]
[ext_resource type="Texture2D" uid="uid://dbvjugxp84gsj" path="res://assets/icons/pixelitos/128/org.DolphinEmu.dolphin-emu.png" id="11_61sak"] [ext_resource type="Texture2D" uid="uid://dbvjugxp84gsj" path="res://assets/icons/pixelitos/128/org.DolphinEmu.dolphin-emu.png" id="11_61sak"]
@ -40,24 +40,12 @@
[ext_resource type="Texture2D" uid="uid://by0oj188x350g" path="res://res/Rekku/blink2.png" id="35_dxwop"] [ext_resource type="Texture2D" uid="uid://by0oj188x350g" path="res://res/Rekku/blink2.png" id="35_dxwop"]
[ext_resource type="Texture2D" uid="uid://cfa5mn3dsdvw6" path="res://assets/icons/kenney_input-prompts-pixel-16/Tiles/tile_0729.png" id="36_3qttl"] [ext_resource type="Texture2D" uid="uid://cfa5mn3dsdvw6" path="res://assets/icons/kenney_input-prompts-pixel-16/Tiles/tile_0729.png" id="36_3qttl"]
[ext_resource type="Texture2D" uid="uid://kx8eypf4ffvu" path="res://res/Rekku/mouth-base.png" id="36_qon8n"] [ext_resource type="Texture2D" uid="uid://kx8eypf4ffvu" path="res://res/Rekku/mouth-base.png" id="36_qon8n"]
[ext_resource type="Texture2D" uid="uid://chd6d8tx081hm" path="res://assets/icons/pixelitos/128/org.mamedev.MAME.png" id="36_r80tt"]
[ext_resource type="Texture2D" uid="uid://b6gl8sltbak7v" path="res://res/Rekku/mouth-O.png" id="37_2mdp6"] [ext_resource type="Texture2D" uid="uid://b6gl8sltbak7v" path="res://res/Rekku/mouth-O.png" id="37_2mdp6"]
[ext_resource type="Texture2D" uid="uid://dpi351mmxu7x6" path="res://assets/icons/kenney_input-prompts-pixel-16/Tiles/tile_0797.png" id="38_prt7u"] [ext_resource type="Texture2D" uid="uid://dpi351mmxu7x6" path="res://assets/icons/kenney_input-prompts-pixel-16/Tiles/tile_0797.png" id="38_prt7u"]
[ext_resource type="Texture2D" uid="uid://ckyvec3wqx3t" path="res://assets/icons/kenney_input-prompts-pixel-16/Tiles/tile_0798.png" id="39_5ft88"] [ext_resource type="Texture2D" uid="uid://ckyvec3wqx3t" path="res://assets/icons/kenney_input-prompts-pixel-16/Tiles/tile_0798.png" id="39_5ft88"]
[ext_resource type="Texture2D" uid="uid://n4hywdifr1q4" path="res://assets/icons/kenney_input-prompts-pixel-16/Tiles/tile_0763.png" id="39_m4qgd"] [ext_resource type="Texture2D" uid="uid://n4hywdifr1q4" path="res://assets/icons/kenney_input-prompts-pixel-16/Tiles/tile_0763.png" id="39_m4qgd"]
[ext_resource type="Texture2D" uid="uid://bwcc0mjxxm0w1" path="res://assets/icons/kenney_input-prompts-pixel-16/Tiles/tile_0764.png" id="40_pnuor"] [ext_resource type="Texture2D" uid="uid://bwcc0mjxxm0w1" path="res://assets/icons/kenney_input-prompts-pixel-16/Tiles/tile_0764.png" id="40_pnuor"]
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_icgo5"]
bg_color = Color(0.941176, 0.388235, 0.917647, 1)
border_width_left = 5
border_width_top = 5
border_width_right = 5
border_width_bottom = 5
corner_radius_top_left = 3
corner_radius_top_right = 3
corner_radius_bottom_right = 3
corner_radius_bottom_left = 3
[sub_resource type="SpriteFrames" id="SpriteFrames_lhf2y"] [sub_resource type="SpriteFrames" id="SpriteFrames_lhf2y"]
animations = [{ animations = [{
"frames": [{ "frames": [{
@ -161,7 +149,8 @@ layout_mode = 1
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
offset_bottom = -60.0 offset_right = -333.0
offset_bottom = -61.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
@ -169,106 +158,105 @@ 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_GRAPHICS" type="MarginContainer" parent="Background/MarginContainer/TabContainer"] [node name="TK_GRAPHICS" type="MarginContainer" parent="Background/MarginContainer/TabContainer"]
visible = false visible = false
layout_mode = 2 layout_mode = 2
theme_override_constants/margin_right = 240
[node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS"] [node name="VBoxContainer" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS"]
layout_mode = 2
size_flags_vertical = 3
follow_focus = true
[node name="VBoxContainer" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer"]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
theme_override_constants/separation = 64 theme_override_constants/separation = 64
[node name="decorations_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer"] [node name="decorations_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/VBoxContainer"]
layout_mode = 2 layout_mode = 2
[node name="decorations_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/decorations_container"] [node name="decorations_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/VBoxContainer/decorations_container"]
layout_mode = 2 layout_mode = 2
text = "TK_DECORATIONS" text = "TK_DECORATIONS"
[node name="decorations_separator" type="HSeparator" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/decorations_container"] [node name="decorations_separator" type="HSeparator" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/VBoxContainer/decorations_container"]
layout_mode = 2 layout_mode = 2
[node name="GridContainer" type="GridContainer" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/decorations_container"] [node name="GridContainer" type="GridContainer" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/VBoxContainer/decorations_container"]
layout_mode = 2 layout_mode = 2
columns = 2 columns = 2
[node name="borders" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/decorations_container/GridContainer"] [node name="borders" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/VBoxContainer/decorations_container/GridContainer"]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
button_pressed = true button_pressed = true
text = "TK_BORDERS" text = "TK_BORDERS"
[node name="borders_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/decorations_container/GridContainer"] [node name="borders_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/VBoxContainer/decorations_container/GridContainer"]
layout_mode = 2 layout_mode = 2
disabled = true disabled = true
text = "TK_ADVANCED" text = "TK_ADVANCED"
[node name="wide_screen" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/decorations_container/GridContainer"] [node name="wide_screen" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/VBoxContainer/decorations_container/GridContainer"]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
text = "TK_WSCREEN" text = "TK_WSCREEN"
[node name="wide_screen_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/decorations_container/GridContainer"] [node name="wide_screen_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/VBoxContainer/decorations_container/GridContainer"]
layout_mode = 2 layout_mode = 2
disabled = true disabled = true
text = "TK_ADVANCED" text = "TK_ADVANCED"
[node name="shaders" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/decorations_container/GridContainer"] [node name="shaders" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/VBoxContainer/decorations_container/GridContainer"]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
disabled = true disabled = true
button_pressed = true button_pressed = true
text = "TK_SHADERS" text = "TK_SHADERS"
[node name="shaders_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/decorations_container/GridContainer"] [node name="shaders_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/VBoxContainer/decorations_container/GridContainer"]
layout_mode = 2 layout_mode = 2
disabled = true disabled = true
text = "TK_ADVANCED" text = "TK_ADVANCED"
[node name="extra_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer"] [node name="extra_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/VBoxContainer"]
layout_mode = 2 layout_mode = 2
[node name="decorations_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/extra_container"] [node name="decorations_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/VBoxContainer/extra_container"]
layout_mode = 2 layout_mode = 2
text = "TK_EXTRA" text = "TK_EXTRA"
[node name="decorations_separator" type="HSeparator" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/extra_container"] [node name="decorations_separator" type="HSeparator" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/VBoxContainer/extra_container"]
layout_mode = 2 layout_mode = 2
[node name="GridContainer" type="GridContainer" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/extra_container"] [node name="GridContainer" type="GridContainer" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/VBoxContainer/extra_container"]
layout_mode = 2 layout_mode = 2
columns = 2 columns = 2
[node name="wide_screen" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/extra_container/GridContainer"] [node name="wide_screen" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/VBoxContainer/extra_container/GridContainer"]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
disabled = true disabled = true
button_pressed = true button_pressed = true
text = "TK_MODS" text = "TK_MODS"
[node name="wide_screen_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/extra_container/GridContainer"] [node name="wide_screen_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/VBoxContainer/extra_container/GridContainer"]
layout_mode = 2 layout_mode = 2
disabled = true disabled = true
text = "TK_ADVANCED" text = "TK_ADVANCED"
[node name="tate_mode" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/ScrollContainer/VBoxContainer/extra_container/GridContainer"] [node name="tate_mode" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS/VBoxContainer/extra_container/GridContainer"]
layout_mode = 2 layout_mode = 2
disabled = true disabled = true
text = "TK_TATE" text = "TK_TATE"
[node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_GRAPHICS"]
visible = false
layout_mode = 2
size_flags_vertical = 3
follow_focus = true
[node name="TK_CONTROLS" type="MarginContainer" parent="Background/MarginContainer/TabContainer"] [node name="TK_CONTROLS" type="MarginContainer" parent="Background/MarginContainer/TabContainer"]
visible = false visible = false
layout_mode = 2 layout_mode = 2
theme_override_constants/margin_right = 240
[node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_CONTROLS"] [node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_CONTROLS"]
layout_mode = 2 layout_mode = 2
@ -328,9 +316,7 @@ button_pressed = true
text = "TK_HOTKEYSOUND" text = "TK_HOTKEYSOUND"
[node name="TK_SYSTEM" type="MarginContainer" parent="Background/MarginContainer/TabContainer"] [node name="TK_SYSTEM" type="MarginContainer" parent="Background/MarginContainer/TabContainer"]
visible = false
layout_mode = 2 layout_mode = 2
theme_override_constants/margin_right = 240
[node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_SYSTEM"] [node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_SYSTEM"]
layout_mode = 2 layout_mode = 2
@ -351,14 +337,14 @@ text = "TK_SYSTEM"
[node name="controls_separator" type="HSeparator" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container"] [node name="controls_separator" type="HSeparator" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container"]
layout_mode = 2 layout_mode = 2
[node name="GridContainer" type="GridContainer" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer"] [node name="GridContainer2" type="GridContainer" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer"]
layout_mode = 2 layout_mode = 2
size_flags_vertical = 3 size_flags_vertical = 3
theme_override_constants/h_separation = 10 theme_override_constants/h_separation = 10
theme_override_constants/v_separation = 10 theme_override_constants/v_separation = 10
columns = 6 columns = 6
[node name="Button3" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer"] [node name="Button3" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer2"]
layout_mode = 2 layout_mode = 2
tooltip_text = "RetroARCH" tooltip_text = "RetroARCH"
theme_override_styles/focus = ExtResource("5_rjtkn") theme_override_styles/focus = ExtResource("5_rjtkn")
@ -366,52 +352,32 @@ text = "RetroArch"
icon = ExtResource("4_xcuib") icon = ExtResource("4_xcuib")
icon_alignment = 1 icon_alignment = 1
vertical_icon_alignment = 0 vertical_icon_alignment = 0
expand_icon = true
[node name="Button4" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer"] [node name="Button8" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer2"]
layout_mode = 2 layout_mode = 2
tooltip_text = "MAME"
theme_override_styles/focus = ExtResource("5_rjtkn") theme_override_styles/focus = ExtResource("5_rjtkn")
text = "MAME" text = "Dolphin"
icon = ExtResource("36_r80tt") icon = ExtResource("11_61sak")
icon_alignment = 1 icon_alignment = 1
vertical_icon_alignment = 0 vertical_icon_alignment = 0
[node name="Button6" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer"] [node name="Button7" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer2"]
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
[node name="Button7" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer"]
visible = false
layout_mode = 2 layout_mode = 2
tooltip_text = "CITRA" tooltip_text = "CITRA"
theme_override_styles/focus = ExtResource("5_rjtkn") theme_override_styles/focus = ExtResource("5_rjtkn")
text = "CITRA" text = "RPCS3"
icon = ExtResource("10_wbaif") icon = ExtResource("8_ec4gt")
icon_alignment = 1 icon_alignment = 1
vertical_icon_alignment = 0 vertical_icon_alignment = 0
[node name="controls_container2" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer"] [node name="Button5" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer2"]
layout_mode = 2 layout_mode = 2
tooltip_text = "PSPSSPP"
[node name="controls_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container2"] theme_override_styles/focus = ExtResource("5_rjtkn")
layout_mode = 2 text = "PSPSSPP"
text = "TK_EMULATOR" icon = ExtResource("8_akxf7")
icon_alignment = 1
[node name="controls_separator" type="HSeparator" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/controls_container2"] vertical_icon_alignment = 0
layout_mode = 2
[node name="GridContainer2" type="GridContainer" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer"]
layout_mode = 2
size_flags_vertical = 3
theme_override_constants/h_separation = 10
theme_override_constants/v_separation = 10
columns = 6
[node name="Button" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer2"] [node name="Button" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer2"]
layout_mode = 2 layout_mode = 2
@ -431,16 +397,7 @@ icon = ExtResource("7_4otos")
icon_alignment = 1 icon_alignment = 1
vertical_icon_alignment = 0 vertical_icon_alignment = 0
[node name="Button5" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer2"] [node name="Button9" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer2"]
layout_mode = 2
tooltip_text = "PSPSSPP"
theme_override_styles/focus = ExtResource("5_rjtkn")
text = "PSPSSPP"
icon = ExtResource("8_akxf7")
icon_alignment = 1
vertical_icon_alignment = 0
[node name="Button7" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer2"]
visible = false visible = false
layout_mode = 2 layout_mode = 2
tooltip_text = "CITRA" tooltip_text = "CITRA"
@ -450,73 +407,52 @@ icon = ExtResource("10_wbaif")
icon_alignment = 1 icon_alignment = 1
vertical_icon_alignment = 0 vertical_icon_alignment = 0
[node name="Button8" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer2"] [node name="GridContainer3" type="GridContainer" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer"]
visible = false
layout_mode = 2 layout_mode = 2
theme_override_styles/focus = ExtResource("5_rjtkn") columns = 2
text = "Dolphin"
icon = ExtResource("11_61sak")
icon_alignment = 1
vertical_icon_alignment = 0
[node name="HSeparator" type="HSeparator" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer"] [node name="quick_resume" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer3"]
layout_mode = 2
[node name="HBoxContainer" type="HBoxContainer" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer"]
layout_mode = 2
[node name="game_control_label" type="Label" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/HBoxContainer"]
layout_mode = 2
theme_override_styles/normal = SubResource("StyleBoxFlat_icgo5")
text = "TK_GAME_SETTINGS"
[node name="VSeparator" type="VSeparator" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/HBoxContainer"]
layout_mode = 2
[node name="GridContainer" type="GridContainer" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/HBoxContainer"]
layout_mode = 2
columns = 3
[node name="quick_resume" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/HBoxContainer/GridContainer"]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
button_pressed = true button_pressed = true
text = "TK_QRESUME" text = "TK_QRESUME"
metadata/description = "This is a test description set to this element" metadata/description = "This is a test description set to this element"
[node name="quick_resume_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/HBoxContainer/GridContainer"] [node name="quick_resume_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer3"]
layout_mode = 2 layout_mode = 2
text = "TK_ADVANCED" text = "TK_ADVANCED"
[node name="rewind" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/HBoxContainer/GridContainer"] [node name="rewind" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer3"]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
text = "TK_REWIND" text = "TK_REWIND"
metadata/description = "This is another, very long and convoluted, description, that I put too much commas in to make in LONGER and more SOPHISTICATED. And I did it twice!!!This is another, very long and convoluted, description, that I put too much commas in to make in LONGER and more SOPHISTICATED." metadata/description = "This is another, very long and convoluted, description, that I put too much commas in to make in LONGER and more SOPHISTICATED. And I did it twice!!!This is another, very long and convoluted, description, that I put too much commas in to make in LONGER and more SOPHISTICATED."
[node name="rewind_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/HBoxContainer/GridContainer"] [node name="rewind_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer3"]
layout_mode = 2 layout_mode = 2
disabled = true disabled = true
text = "TK_ADVANCED" text = "TK_ADVANCED"
[node name="quit_confirm" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/HBoxContainer/GridContainer"] [node name="quit_confirm" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer3"]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
button_pressed = true button_pressed = true
text = "TK_CONFIRMEXIT" text = "TK_CONFIRMEXIT"
[node name="quit_confirm_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/HBoxContainer/GridContainer"] [node name="quit_confirm_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer3"]
layout_mode = 2 layout_mode = 2
disabled = true disabled = true
text = "TK_ADVANCED" text = "TK_ADVANCED"
[node name="cheats" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/HBoxContainer/GridContainer"] [node name="cheats" type="CheckButton" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer3"]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
disabled = true disabled = true
text = "TK_CHEATS, TK_SOON" text = "TK_CHEATS, TK_SOON"
[node name="cheats_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/HBoxContainer/GridContainer"] [node name="cheats_adv_button" type="Button" parent="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer3"]
layout_mode = 2 layout_mode = 2
disabled = true disabled = true
text = "TK_ADVANCED" text = "TK_ADVANCED"
@ -524,7 +460,6 @@ text = "TK_ADVANCED"
[node name="TK_TOOLS" type="MarginContainer" parent="Background/MarginContainer/TabContainer"] [node name="TK_TOOLS" type="MarginContainer" parent="Background/MarginContainer/TabContainer"]
visible = false visible = false
layout_mode = 2 layout_mode = 2
theme_override_constants/margin_right = 240
[node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_TOOLS"] [node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_TOOLS"]
layout_mode = 2 layout_mode = 2
@ -632,7 +567,6 @@ text = "TK_MOVEFILES"
[node name="TK_NETWORK" type="MarginContainer" parent="Background/MarginContainer/TabContainer"] [node name="TK_NETWORK" type="MarginContainer" parent="Background/MarginContainer/TabContainer"]
visible = false visible = false
layout_mode = 2 layout_mode = 2
theme_override_constants/margin_right = 240
[node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_NETWORK"] [node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_NETWORK"]
layout_mode = 2 layout_mode = 2
@ -784,8 +718,8 @@ 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
[node name="VBoxContainer" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT"] [node name="VBoxContainer" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT"]
layout_mode = 2 layout_mode = 2
@ -860,7 +794,6 @@ offset_bottom = 35.0
[node name="TK_CONFIGURATOR" type="MarginContainer" parent="Background/MarginContainer/TabContainer"] [node name="TK_CONFIGURATOR" type="MarginContainer" parent="Background/MarginContainer/TabContainer"]
visible = false visible = false
layout_mode = 2 layout_mode = 2
theme_override_constants/margin_right = 240
[node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_CONFIGURATOR"] [node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_CONFIGURATOR"]
layout_mode = 2 layout_mode = 2
@ -945,7 +878,6 @@ popup/item_4/id = 4
[node name="TK_ABOUT" type="MarginContainer" parent="Background/MarginContainer/TabContainer"] [node name="TK_ABOUT" type="MarginContainer" parent="Background/MarginContainer/TabContainer"]
visible = false visible = false
layout_mode = 2 layout_mode = 2
theme_override_constants/margin_right = 240
script = ExtResource("4_m4rto") script = ExtResource("4_m4rto")
[node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_ABOUT"] [node name="ScrollContainer" type="ScrollContainer" parent="Background/MarginContainer/TabContainer/TK_ABOUT"]
@ -1044,9 +976,10 @@ grow_horizontal = 0
grow_vertical = 2 grow_vertical = 2
[node name="TextureRect" type="TextureRect" parent="Background/side_logo"] [node name="TextureRect" type="TextureRect" parent="Background/side_logo"]
visible = false
layout_mode = 0 layout_mode = 0
offset_left = 20.0 offset_left = -82.0
offset_top = -75.0 offset_top = -120.0
offset_right = 247.0 offset_right = 247.0
offset_bottom = 676.0 offset_bottom = 676.0
texture = ExtResource("15_qdvxo") texture = ExtResource("15_qdvxo")
@ -1084,10 +1017,10 @@ anchor_left = 0.5
anchor_top = 1.0 anchor_top = 1.0
anchor_right = 0.5 anchor_right = 0.5
anchor_bottom = 1.0 anchor_bottom = 1.0
offset_left = 409.0 offset_left = 303.0
offset_top = -337.0 offset_top = -437.0
offset_right = 638.0 offset_right = 638.0
offset_bottom = -12.0 offset_bottom = -7.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 0 grow_vertical = 0
theme_override_styles/panel = SubResource("StyleBoxTexture_rf0rc") theme_override_styles/panel = SubResource("StyleBoxTexture_rf0rc")
@ -1099,10 +1032,10 @@ anchor_left = 0.5
anchor_top = 0.5 anchor_top = 0.5
anchor_right = 0.5 anchor_right = 0.5
anchor_bottom = 0.5 anchor_bottom = 0.5
offset_left = -111.5 offset_left = -152.5
offset_top = -153.5 offset_top = -201.0
offset_right = 110.5 offset_right = 167.5
offset_bottom = 159.5 offset_bottom = 213.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
text = "Rekku: text = "Rekku:
@ -1114,8 +1047,8 @@ scroll_following = true
script = ExtResource("5_cprkf") script = ExtResource("5_cprkf")
[node name="rekku_sprite" type="Sprite2D" parent="Background/side_logo/rekku"] [node name="rekku_sprite" type="Sprite2D" parent="Background/side_logo/rekku"]
position = Vector2(510.5, -577.508) position = Vector2(466, -653.5)
scale = Vector2(0.249024, 0.262711) scale = Vector2(0.271484, 0.264648)
texture = ExtResource("32_omdu2") texture = ExtResource("32_omdu2")
[node name="blink_anim" type="AnimatedSprite2D" parent="Background/side_logo/rekku/rekku_sprite"] [node name="blink_anim" type="AnimatedSprite2D" parent="Background/side_logo/rekku/rekku_sprite"]
@ -1134,6 +1067,7 @@ stream = ExtResource("3_xivj6")
volume_db = -11.243 volume_db = -11.243
[node name="CanvasModulate" type="CanvasModulate" parent="."] [node name="CanvasModulate" type="CanvasModulate" parent="."]
visible = false
position = Vector2(134, 151) position = Vector2(134, 151)
color = Color(0.858824, 0.890196, 1, 1) color = Color(0.858824, 0.890196, 1, 1)
@ -1145,7 +1079,7 @@ anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
offset_left = 5.0 offset_left = 5.0
offset_top = -69.0 offset_top = -69.0
offset_right = -235.0 offset_right = -337.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 0 grow_vertical = 0
@ -1192,10 +1126,10 @@ stretch_mode = 0
[node name="r1_button" type="TextureButton" parent="coltroller_guide/controller_guide_text"] [node name="r1_button" type="TextureButton" parent="coltroller_guide/controller_guide_text"]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 0 layout_mode = 0
offset_left = 946.0 offset_left = 832.0
offset_top = -7.0 offset_top = -8.0
offset_right = 1030.0 offset_right = 916.0
offset_bottom = 52.0 offset_bottom = 51.0
texture_normal = ExtResource("39_5ft88") texture_normal = ExtResource("39_5ft88")
texture_pressed = ExtResource("40_pnuor") texture_pressed = ExtResource("40_pnuor")
stretch_mode = 0 stretch_mode = 0
@ -1221,10 +1155,10 @@ anchor_left = 1.0
anchor_top = 1.0 anchor_top = 1.0
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
offset_left = -166.0 offset_left = -217.0
offset_top = -34.0 offset_top = -46.0
offset_right = -107.0 offset_right = -158.0
offset_bottom = -5.0 offset_bottom = -17.0
grow_horizontal = 0 grow_horizontal = 0
grow_vertical = 0 grow_vertical = 0
item_count = 7 item_count = 7
@ -1251,7 +1185,7 @@ popup/item_6/text = ""
popup/item_6/icon = ExtResource("11_ri2fv") popup/item_6/icon = ExtResource("11_ri2fv")
popup/item_6/id = 6 popup/item_6/id = 6
[connection signal="pressed" from="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/HBoxContainer/GridContainer/quick_resume_adv_button" to="." method="_on_quickresume_advanced_pressed"] [connection signal="pressed" from="Background/MarginContainer/TabContainer/TK_SYSTEM/ScrollContainer/VBoxContainer/GridContainer3/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" 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"] [connection signal="pressed" from="Background/MarginContainer/TabContainer/TK_TOOLS/ScrollContainer/VBoxContainer/scan_container/bios_button_expert" to="." method="_on_bios_button_expert_pressed"]
[connection signal="pressed" from="coltroller_guide/controller_guide_text/exit_button" to="." method="_on_exit_button_pressed"] [connection signal="pressed" from="coltroller_guide/controller_guide_text/exit_button" to="." method="_on_exit_button_pressed"]

View file

@ -27,8 +27,8 @@ data_handler="*res://scripts/data_handler.gd"
window/size/viewport_width=1280 window/size/viewport_width=1280
window/size/viewport_height=800 window/size/viewport_height=800
window/size/borderless=true
window/size/transparent=true window/size/transparent=true
window/stretch/mode="canvas_items"
window/per_pixel_transparency/allowed=true window/per_pixel_transparency/allowed=true
[filesystem] [filesystem]

File diff suppressed because one or more lines are too long

View file

@ -21,28 +21,34 @@ func _ready():
var web_data = app_data.about_links[id] var web_data = app_data.about_links[id]
match id: match id:
"rd_web": "rd_web":
%website_button.text = web_data.name
%website_button.tooltip_text = web_data.description %website_button.tooltip_text = web_data.description
%website_button.editor_description = web_data.url %website_button.editor_description = web_data.url
"rd_changelog": "rd_changelog":
%changelog_button.text = web_data.name
%changelog_button.tooltip_text = web_data.description %changelog_button.tooltip_text = web_data.description
%changelog_button.editor_description = web_data.url %changelog_button.editor_description = web_data.url
"rd_wiki": "rd_wiki":
%wiki_button.text = web_data.name
%wiki_button.tooltip_text = web_data.description %wiki_button.tooltip_text = web_data.description
%wiki_button.editor_description = web_data.url %wiki_button.editor_description = web_data.url
"rd_credits": "rd_credits":
%credits_button.text = web_data.name
%credits_button.tooltip_text = web_data.description %credits_button.tooltip_text = web_data.description
%credits_button.editor_description = web_data.url %credits_button.editor_description = web_data.url
"rd_donate": "rd_donate":
%donate_button.text = web_data.name
%donate_button.tooltip_text = web_data.description %donate_button.tooltip_text = web_data.description
%donate_button.editor_description = web_data.url %donate_button.editor_description = web_data.url
"rd_contactus": "rd_contactus":
%contactus_button.text = web_data.name
%contactus_button.tooltip_text = web_data.description %contactus_button.tooltip_text = web_data.description
%contactus_button.editor_description = web_data.url %contactus_button.editor_description = web_data.url
"rd_licenses": "rd_licenses":
%licenses_button.text = web_data.name
%licenses_button.tooltip_text = web_data.description %licenses_button.tooltip_text = web_data.description
%licenses_button.editor_description = web_data.url %licenses_button.editor_description = web_data.url
func _get_nodes() -> void: func _get_nodes() -> void:
website_button = get_node("%website_button") website_button = get_node("%website_button")
changelog_button = get_node("%changelog_button") changelog_button = get_node("%changelog_button")