Update to Godot 4.2

Update theme
Create custom theme (WIP)
Theme cleanup
This commit is contained in:
WallK 2023-12-15 16:37:37 +02:00
parent 70efa031b4
commit b5670420f2
9 changed files with 2498 additions and 3307 deletions

View file

@ -1,6 +1,5 @@
[gd_scene load_steps=15 format=3 uid="uid://qk2gw74anwlq"] [gd_scene load_steps=15 format=3 uid="uid://qk2gw74anwlq"]
[ext_resource type="Theme" uid="uid://yqkvsb5q7pab" path="res://res/pixel_ui_theme/PixelTheme.tres" id="1_36ht7"]
[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"]
[ext_resource type="AudioStream" uid="uid://dig4pco500pyt" path="res://res/configurator.mp3" id="3_xivj6"] [ext_resource type="AudioStream" uid="uid://dig4pco500pyt" path="res://res/configurator.mp3" id="3_xivj6"]
@ -67,7 +66,6 @@ offset_right = -3.0
offset_bottom = -62.0 offset_bottom = -62.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
theme = ExtResource("1_36ht7")
script = ExtResource("1_obpq7") script = ExtResource("1_obpq7")
[node name="Panel" type="Panel" parent="."] [node name="Panel" type="Panel" parent="."]
@ -95,13 +93,10 @@ grow_vertical = 2
[node name="TabContainer" type="TabContainer" parent="MarginContainer"] [node name="TabContainer" type="TabContainer" parent="MarginContainer"]
layout_mode = 2 layout_mode = 2
theme = ExtResource("1_36ht7")
tab_alignment = 1 tab_alignment = 1
[node name="System" type="TabBar" parent="MarginContainer/TabContainer"] [node name="System" type="TabBar" parent="MarginContainer/TabContainer"]
visible = false
layout_mode = 2 layout_mode = 2
theme = ExtResource("1_36ht7")
[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/TabContainer/System"] [node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/TabContainer/System"]
layout_mode = 2 layout_mode = 2
@ -175,7 +170,6 @@ text = "Advanced"
[node name="Graphics" type="TabBar" parent="MarginContainer/TabContainer"] [node name="Graphics" type="TabBar" parent="MarginContainer/TabContainer"]
visible = false visible = false
layout_mode = 2 layout_mode = 2
theme = ExtResource("1_36ht7")
[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/TabContainer/Graphics"] [node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/TabContainer/Graphics"]
layout_mode = 2 layout_mode = 2
@ -264,8 +258,8 @@ disabled = true
text = "TATE Mode (coming soon)" text = "TATE Mode (coming soon)"
[node name="Controls" type="TabBar" parent="MarginContainer/TabContainer"] [node name="Controls" type="TabBar" parent="MarginContainer/TabContainer"]
visible = false
layout_mode = 2 layout_mode = 2
theme = ExtResource("1_36ht7")
[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/TabContainer/Controls"] [node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/TabContainer/Controls"]
layout_mode = 0 layout_mode = 0
@ -327,7 +321,6 @@ text = "Hotkey Activation Sound (coming soon)
[node name="Tools" type="TabBar" parent="MarginContainer/TabContainer"] [node name="Tools" type="TabBar" parent="MarginContainer/TabContainer"]
visible = false visible = false
layout_mode = 2 layout_mode = 2
theme = ExtResource("1_36ht7")
[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/TabContainer/Tools"] [node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/TabContainer/Tools"]
layout_mode = 2 layout_mode = 2
@ -438,8 +431,8 @@ text = "Move User Files"
layout_mode = 2 layout_mode = 2
[node name="Network" type="TabBar" parent="MarginContainer/TabContainer"] [node name="Network" type="TabBar" parent="MarginContainer/TabContainer"]
visible = false
layout_mode = 2 layout_mode = 2
theme = ExtResource("1_36ht7")
[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/TabContainer/Network"] [node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/TabContainer/Network"]
layout_mode = 2 layout_mode = 2
@ -592,7 +585,6 @@ text = "Start FTP Server"
[node name="Troubleshoot" type="TabBar" parent="MarginContainer/TabContainer"] [node name="Troubleshoot" type="TabBar" parent="MarginContainer/TabContainer"]
visible = false visible = false
layout_mode = 2 layout_mode = 2
theme = ExtResource("1_36ht7")
[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/TabContainer/Troubleshoot"] [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/TabContainer/Troubleshoot"]
layout_mode = 0 layout_mode = 0
@ -646,7 +638,6 @@ text = "Full RetroDECK Reset"
[node name="Configurator" type="TabBar" parent="MarginContainer/TabContainer"] [node name="Configurator" type="TabBar" parent="MarginContainer/TabContainer"]
visible = false visible = false
layout_mode = 2 layout_mode = 2
theme = ExtResource("1_36ht7")
[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/TabContainer/Configurator"] [node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/TabContainer/Configurator"]
layout_mode = 2 layout_mode = 2
@ -714,7 +705,6 @@ text = "|| ------( )--------"
[node name="About" type="TabBar" parent="MarginContainer/TabContainer"] [node name="About" type="TabBar" parent="MarginContainer/TabContainer"]
visible = false visible = false
layout_mode = 2 layout_mode = 2
theme = ExtResource("1_36ht7")
[node name="Icon" type="Sprite2D" parent="MarginContainer/TabContainer/About"] [node name="Icon" type="Sprite2D" parent="MarginContainer/TabContainer/About"]
visible = false visible = false

View file

@ -12,7 +12,7 @@ config_version=5
config/name="RetroDECK Configurator" config/name="RetroDECK Configurator"
run/main_scene="res://main.tscn" run/main_scene="res://main.tscn"
config/features=PackedStringArray("4.1", "GL Compatibility") config/features=PackedStringArray("4.2", "GL Compatibility")
boot_splash/bg_color=Color(0.141176, 0.141176, 0.141176, 0) boot_splash/bg_color=Color(0.141176, 0.141176, 0.141176, 0)
boot_splash/show_image=false boot_splash/show_image=false
config/icon="res://icon.svg" config/icon="res://icon.svg"
@ -23,6 +23,10 @@ window/size/viewport_width=1280
window/size/viewport_height=800 window/size/viewport_height=800
window/size/borderless=true window/size/borderless=true
[gui]
theme/custom="res://res/pixel_ui_theme/RetroDECKTheme.tres"
[input] [input]
ui_accept={ ui_accept={

View file

@ -1,12 +1,14 @@
[gd_scene load_steps=2 format=3 uid="uid://df1jvroo4xcx4"] [gd_scene load_steps=2 format=3 uid="uid://df1jvroo4xcx4"]
[ext_resource type="Theme" uid="uid://dnpvxewkoebee" path="res://pixel_ui_theme/PixelTheme.tres" id="1"] [ext_resource type="Theme" uid="uid://dnpvxewkoebee" path="res://res/pixel_ui_theme/PixelTheme_leather.tres" id="1"]
[node name="Control" type="Control"] [node name="Control" type="Control"]
layout_mode = 3 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
grow_horizontal = 2
grow_vertical = 2
theme = ExtResource("1") theme = ExtResource("1")
[node name="Panel" type="Panel" parent="."] [node name="Panel" type="Panel" parent="."]

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long