Merge pull request #611 from WallK/feat/godot-configurator-w

Update to Godot 4.2, Theme and general clean up and fixes

tools/configurator/main.tscn

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

tools/configurator/project.godot

@@ -12,7 +12,7 @@ config_version=5
 
 config/name="RetroDECK Configurator"
 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/show_image=false
 config/icon="res://icon.svg"
@@ -22,6 +22,12 @@ config/icon="res://icon.svg"
 window/size/viewport_width=1280
 window/size/viewport_height=800
 window/size/borderless=true
+window/size/transparent=true
+window/per_pixel_transparency/allowed=true
+
+[gui]
+
+theme/custom="res://res/pixel_ui_theme/RetroDECKTheme.tres"
 
 [input]
 

tools/configurator/res/pixel_ui_theme/8x8_ui_elements_blood.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://tgcmj4gepxwg"
-path="res://.godot/imported/8x8_ui_elements_blood.png-b2df6c89c98c06a51d230898568a93c6.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://res/pixel_ui_theme/8x8_ui_elements_blood.png"
-dest_files=["res://.godot/imported/8x8_ui_elements_blood.png-b2df6c89c98c06a51d230898568a93c6.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

tools/configurator/res/pixel_ui_theme/8x8_ui_elements_dark_fade.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://bsnb7om0sg0ma"
-path="res://.godot/imported/8x8_ui_elements_dark_fade.png-48c9da1b7c452274b9e8ce15d3053229.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://res/pixel_ui_theme/8x8_ui_elements_dark_fade.png"
-dest_files=["res://.godot/imported/8x8_ui_elements_dark_fade.png-48c9da1b7c452274b9e8ce15d3053229.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

tools/configurator/res/pixel_ui_theme/8x8_ui_elements_leather.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://o34a2y0u8slm"
-path="res://.godot/imported/8x8_ui_elements_leather.png-21f3174165d29931c6131cfdc539ffe0.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://res/pixel_ui_theme/8x8_ui_elements_leather.png"
-dest_files=["res://.godot/imported/8x8_ui_elements_leather.png-21f3174165d29931c6131cfdc539ffe0.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

tools/configurator/res/pixel_ui_theme/8x8_ui_elements_magic.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://cxv22bwc6xa8q"
-path="res://.godot/imported/8x8_ui_elements_magic.png-27db53166c96171ccc01b069ab189c60.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://res/pixel_ui_theme/8x8_ui_elements_magic.png"
-dest_files=["res://.godot/imported/8x8_ui_elements_magic.png-27db53166c96171ccc01b069ab189c60.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

tools/configurator/res/pixel_ui_theme/8x8_ui_elements_nature.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://iqpw5c3ieu30"
-path="res://.godot/imported/8x8_ui_elements_nature.png-8c8e065ca2771242f592942635ef1e08.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://res/pixel_ui_theme/8x8_ui_elements_nature.png"
-dest_files=["res://.godot/imported/8x8_ui_elements_nature.png-8c8e065ca2771242f592942635ef1e08.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

tools/configurator/res/pixel_ui_theme/8x8_ui_elements_paper.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://comfskqtrcsl"
-path="res://.godot/imported/8x8_ui_elements_paper.png-7d1e0aff16cc7e2a132d55b8be170dfe.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://res/pixel_ui_theme/8x8_ui_elements_paper.png"
-dest_files=["res://.godot/imported/8x8_ui_elements_paper.png-7d1e0aff16cc7e2a132d55b8be170dfe.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

tools/configurator/res/pixel_ui_theme/8x8_ui_elements_rose.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://bap8dnalffjv4"
-path="res://.godot/imported/8x8_ui_elements_rose.png-8bf55c8f7e8293bf05c16c20c8fabe63.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://res/pixel_ui_theme/8x8_ui_elements_rose.png"
-dest_files=["res://.godot/imported/8x8_ui_elements_rose.png-8bf55c8f7e8293bf05c16c20c8fabe63.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

tools/configurator/res/pixel_ui_theme/8x8_ui_elements_sky.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://2yyh6cnkokeb"
-path="res://.godot/imported/8x8_ui_elements_sky.png-47e0410f2a74f0201fb1bd9c5b4113e7.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://res/pixel_ui_theme/8x8_ui_elements_sky.png"
-dest_files=["res://.godot/imported/8x8_ui_elements_sky.png-47e0410f2a74f0201fb1bd9c5b4113e7.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

tools/configurator/res/pixel_ui_theme/LoginScreen.tscn

@@ -1,53 +0,0 @@
-[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"]
-
-[node name="Control" type="Control"]
-layout_mode = 3
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-theme = ExtResource("1")
-
-[node name="Panel" type="Panel" parent="."]
-layout_mode = 0
-anchor_left = 0.5
-anchor_top = 0.5
-anchor_right = 0.5
-anchor_bottom = 0.5
-
-[node name="MarginContainer" type="MarginContainer" parent="Panel"]
-layout_mode = 0
-anchor_right = 1.0
-anchor_bottom = 1.0
-
-[node name="VBoxContainer" type="VBoxContainer" parent="Panel/MarginContainer"]
-layout_mode = 2
-
-[node name="LineEdit" type="LineEdit" parent="Panel/MarginContainer/VBoxContainer"]
-layout_mode = 2
-placeholder_text = "Username"
-
-[node name="LineEdit2" type="LineEdit" parent="Panel/MarginContainer/VBoxContainer"]
-layout_mode = 2
-placeholder_text = "Password"
-secret = true
-
-[node name="HSeparator" type="HSeparator" parent="Panel/MarginContainer/VBoxContainer"]
-layout_mode = 2
-
-[node name="HBoxContainer" type="HBoxContainer" parent="Panel/MarginContainer/VBoxContainer"]
-layout_mode = 2
-
-[node name="Button" type="Button" parent="Panel/MarginContainer/VBoxContainer/HBoxContainer"]
-layout_mode = 2
-text = "Log In"
-
-[node name="VSeparator" type="VSeparator" parent="Panel/MarginContainer/VBoxContainer/HBoxContainer"]
-layout_mode = 2
-
-[node name="LinkButton" type="LinkButton" parent="Panel/MarginContainer/VBoxContainer/HBoxContainer"]
-layout_mode = 2
-size_flags_vertical = 6
-text = "Sign Up"
-underline = 1

tools/configurator/res/pixel_ui_theme/README.txt

@@ -1,31 +0,0 @@
-Godot Pixel Theme
-Version: 1.2
-Author: Thowsen Media
------------------------------
-
- - Changelog -
-1.2:
-	- Added several new pre-made color-themes: Blood, Leather, Magic, Nature, Paper, Rose and Sky
-	- Removed unused file from the zip.
-1.1:
-	Bugfixes
------------------------------
-Thanks for purchasing my Pixel UI Theme for Godot 3.
-
-Along with this readme, you should find the following files:
-
-8x8_ui_elements.png	This spritesheet/textureatlas are the various textures for the StyleBoxTextures for the various controls such as buttons, panels, etc.
-8x8_ui_icons.png		These are a bunch of 8x8 pixel size UI Icons which is included in this asset.
-PixelTheme.tres		This is the theme file - plop it onto your main control, or set it in Project Settings (gui/theme/custom) or just search for 'Theme' in the Project -> Project Settings dialogue.
-
-# Customization
-If you'd like to customize the theme, you may duplicate the PixelTheme.tres file by right-clicking it.
-Alternatively, you can easily open the 8x8_ui_elements.png file in your favorite image editor such as Photoshop/Gimp/Krita and add a color layer using a 'Color' or 'Overlay' blend mode.
-
-If you have any problems, or have feature requests, don't hesitate to comment on the itch.io page.
-
-# License
-You can use it for commercial and non-commercial work, for as many projects as you want. Please don't redistribute or resell the theme, though!
-
-Thank you
-- Peter