Merge pull request #736 from voylin/FixPseudolocalizationDemo4.0

Fixed some issues in Pseudo localization Demo 4.0-dev

gui/pseudolocalization/Pseudolocalization.gd

@@ -1,12 +1,12 @@
 extends Node2D
 
 func _ready():
-	$HBoxContainer/Pseudolocalization_options/accents.pressed = ProjectSettings.get("internationalization/pseudolocalization/replace_with_accents")
-	$HBoxContainer/Pseudolocalization_options/toggle.pressed = TranslationServer.pseudolocalization_enabled
-	$HBoxContainer/Pseudolocalization_options/fakebidi.pressed = ProjectSettings.get("internationalization/pseudolocalization/fake_bidi")
-	$HBoxContainer/Pseudolocalization_options/doublevowels.pressed = ProjectSettings.get("internationalization/pseudolocalization/double_vowels")
-	$HBoxContainer/Pseudolocalization_options/override.pressed = ProjectSettings.get("internationalization/pseudolocalization/override")
-	$HBoxContainer/Pseudolocalization_options/skipplaceholders.pressed = ProjectSettings.get("internationalization/pseudolocalization/skip_placeholders")
+	$HBoxContainer/Pseudolocalization_options/accents.button_pressed = ProjectSettings.get("internationalization/pseudolocalization/replace_with_accents")
+	$HBoxContainer/Pseudolocalization_options/toggle.button_pressed = TranslationServer.pseudolocalization_enabled
+	$HBoxContainer/Pseudolocalization_options/fakebidi.button_pressed = ProjectSettings.get("internationalization/pseudolocalization/fake_bidi")
+	$HBoxContainer/Pseudolocalization_options/doublevowels.button_pressed = ProjectSettings.get("internationalization/pseudolocalization/double_vowels")
+	$HBoxContainer/Pseudolocalization_options/override.button_pressed = ProjectSettings.get("internationalization/pseudolocalization/override")
+	$HBoxContainer/Pseudolocalization_options/skipplaceholders.button_pressed = ProjectSettings.get("internationalization/pseudolocalization/skip_placeholders")
 	$HBoxContainer/Pseudolocalization_options/prefix/TextEdit.text = ProjectSettings.get("internationalization/pseudolocalization/prefix")
 	$HBoxContainer/Pseudolocalization_options/suffix/TextEdit.text = ProjectSettings.get("internationalization/pseudolocalization/suffix")
 	$HBoxContainer/Pseudolocalization_options/exp_ratio/TextEdit.text = str(ProjectSettings.get("internationalization/pseudolocalization/expansion_ratio"))

gui/pseudolocalization/Pseudolocalization.tscn

@@ -1,171 +1,116 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=3 format=3 uid="uid://bcnmymjri4tt2"]
 
-[ext_resource path="res://icon.png" type="Texture2D" id=1]
-[ext_resource path="res://Pseudolocalization.gd" type="Script" id=2]
+[ext_resource type="Texture2D" uid="uid://ddpix5j1t4swg" path="res://icon.png" id="1"]
+[ext_resource type="Script" path="res://Pseudolocalization.gd" id="2"]
 
 [node name="Pseudolocalization" type="Node2D"]
-script = ExtResource( 2 )
+script = ExtResource( "2" )
 
 [node name="Title" type="Label" parent="."]
-offset_top = 27.0
+offset_left = 140.0
+offset_top = 19.0
 offset_right = 1024.0
-offset_bottom = 74.0
-custom_font_sizes/font_size = 30
+offset_bottom = 114.0
+theme_override_font_sizes/font_size = 30
 text = "Pseudolocalization Demo"
-align = 1
-valign = 1
-structured_text_bidi_override_options = []
-script = null
-__meta__ = {
-"_edit_use_anchors_": false
-}
+vertical_alignment = 1
 
 [node name="icon" type="Sprite2D" parent="Title"]
-position = Vector2(67.1489, 33.8245)
-scale = Vector2(1.26563, 1.26563)
-skew = 4.37114e-08
-texture = ExtResource( 1 )
-script = null
+position = Vector2(-66, 47)
+scale = Vector2(0.78563, 0.78563)
+texture = ExtResource( "1" )
 
 [node name="HBoxContainer" type="HBoxContainer" parent="."]
-offset_left = 13.0
-offset_top = 102.0
-offset_right = 1025.0
-offset_bottom = 560.0
+offset_left = 19.0
+offset_top = 142.0
+offset_right = 1031.0
+offset_bottom = 600.0
 size_flags_vertical = 3
-custom_constants/separation = 40
-script = null
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="Pseudolocalization_options" type="VBoxContainer" parent="HBoxContainer"]
-offset_right = 466.0
-offset_bottom = 458.0
 layout_direction = 2
+offset_right = 502.0
+offset_bottom = 458.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
-script = null
 
 [node name="toggle" type="CheckButton" parent="HBoxContainer/Pseudolocalization_options"]
-offset_right = 466.0
-offset_bottom = 40.0
+offset_right = 502.0
+offset_bottom = 31.0
 size_flags_horizontal = 3
 text = "Toggle Pseudolocalization"
-script = null
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="accents" type="CheckButton" parent="HBoxContainer/Pseudolocalization_options"]
-offset_top = 44.0
-offset_right = 466.0
-offset_bottom = 84.0
+offset_top = 35.0
+offset_right = 502.0
+offset_bottom = 66.0
 size_flags_horizontal = 3
 text = "Toggle Accents"
-script = null
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="doublevowels" type="CheckButton" parent="HBoxContainer/Pseudolocalization_options"]
-offset_top = 88.0
-offset_right = 466.0
-offset_bottom = 128.0
+offset_top = 70.0
+offset_right = 502.0
+offset_bottom = 101.0
 size_flags_horizontal = 3
 text = "Toggle Double Vowels"
-script = null
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="fakebidi" type="CheckButton" parent="HBoxContainer/Pseudolocalization_options"]
-offset_top = 132.0
-offset_right = 466.0
-offset_bottom = 172.0
-rect_pivot_offset = Vector2(-370, -80)
+offset_top = 105.0
+offset_right = 502.0
+offset_bottom = 136.0
 size_flags_horizontal = 3
 text = "Toggle Fake Bidi"
-script = null
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="override" type="CheckButton" parent="HBoxContainer/Pseudolocalization_options"]
-offset_top = 176.0
-offset_right = 466.0
-offset_bottom = 216.0
-rect_pivot_offset = Vector2(-370, -80)
+offset_top = 140.0
+offset_right = 502.0
+offset_bottom = 171.0
 size_flags_horizontal = 3
 text = "Toggle Override"
-script = null
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="skipplaceholders" type="CheckButton" parent="HBoxContainer/Pseudolocalization_options"]
-offset_top = 220.0
-offset_right = 466.0
-offset_bottom = 260.0
-rect_pivot_offset = Vector2(-370, -80)
+offset_top = 175.0
+offset_right = 502.0
+offset_bottom = 206.0
 size_flags_horizontal = 3
 text = "Skip Placeholders"
-script = null
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="exp_ratio" type="HBoxContainer" parent="HBoxContainer/Pseudolocalization_options"]
-offset_top = 264.0
-offset_right = 466.0
-offset_bottom = 290.0
+offset_top = 210.0
+offset_right = 502.0
+offset_bottom = 241.0
 size_flags_vertical = 0
-script = null
 
 [node name="MarginContainer" type="MarginContainer" parent="HBoxContainer/Pseudolocalization_options/exp_ratio"]
-offset_right = 3.0
-offset_bottom = 26.0
-custom_constants/margin_left = 3
-script = null
+offset_bottom = 31.0
 
 [node name="Label" type="Label" parent="HBoxContainer/Pseudolocalization_options/exp_ratio"]
-offset_left = 7.0
+offset_left = 4.0
 offset_right = 141.0
-offset_bottom = 26.0
+offset_bottom = 31.0
 size_flags_horizontal = 2
 size_flags_vertical = 1
 size_flags_stretch_ratio = 4.0
 text = "Expansion Ratio : "
-valign = 1
-structured_text_bidi_override_options = []
-script = null
 
-[node name="TextEdit" type="TextEdit" parent="HBoxContainer/Pseudolocalization_options/exp_ratio"]
-offset_left = 375.0
-offset_right = 466.0
-offset_bottom = 26.0
+[node name="TextEdit" type="LineEdit" parent="HBoxContainer/Pseudolocalization_options/exp_ratio"]
+offset_left = 403.0
+offset_right = 502.0
+offset_bottom = 31.0
 size_flags_horizontal = 3
-structured_text_bidi_override_options = []
-script = null
 
 [node name="prefix" type="Control" parent="HBoxContainer/Pseudolocalization_options"]
-offset_top = 294.0
-offset_right = 466.0
-offset_bottom = 294.0
+offset_top = 245.0
+offset_right = 502.0
+offset_bottom = 245.0
 size_flags_horizontal = 3
-script = null
 
-[node name="TextEdit" type="TextEdit" parent="HBoxContainer/Pseudolocalization_options/prefix"]
+[node name="TextEdit" type="LineEdit" parent="HBoxContainer/Pseudolocalization_options/prefix"]
 offset_left = 5.0
 offset_top = 32.8613
 offset_right = 385.0
 offset_bottom = 62.8613
 size_flags_horizontal = 3
-structured_text_bidi_override_options = []
-script = null
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="Label" type="Label" parent="HBoxContainer/Pseudolocalization_options/prefix"]
 offset_left = 6.0
@@ -173,30 +118,19 @@ offset_top = 2.86133
 offset_right = 297.0
 offset_bottom = 28.8613
 text = "Pseudolocalization Prefix :"
-structured_text_bidi_override_options = []
-script = null
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="suffix" type="Control" parent="HBoxContainer/Pseudolocalization_options"]
-offset_top = 298.0
-offset_right = 466.0
-offset_bottom = 298.0
+offset_top = 249.0
+offset_right = 502.0
+offset_bottom = 249.0
 size_flags_horizontal = 3
-script = null
 
-[node name="TextEdit" type="TextEdit" parent="HBoxContainer/Pseudolocalization_options/suffix"]
+[node name="TextEdit" type="LineEdit" parent="HBoxContainer/Pseudolocalization_options/suffix"]
 offset_left = 3.811
 offset_top = 106.592
 offset_right = 383.811
 offset_bottom = 136.592
 size_flags_horizontal = 3
-structured_text_bidi_override_options = []
-script = null
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="Label" type="Label" parent="HBoxContainer/Pseudolocalization_options/suffix"]
 offset_left = 6.0
@@ -204,124 +138,75 @@ offset_top = 76.5923
 offset_right = 297.0
 offset_bottom = 102.592
 text = "Pseudolocalization Suffix :"
-structured_text_bidi_override_options = []
-script = null
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="Pseudolocalizer" type="VBoxContainer" parent="HBoxContainer"]
 offset_left = 506.0
-offset_right = 972.0
+offset_right = 1008.0
 offset_bottom = 458.0
 grow_horizontal = 0
 size_flags_horizontal = 3
 size_flags_vertical = 3
-script = null
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="Label" type="Label" parent="HBoxContainer/Pseudolocalizer"]
-offset_right = 466.0
+offset_right = 502.0
 offset_bottom = 26.0
 size_flags_horizontal = 3
 size_flags_vertical = 5
 text = "Pseudolocalization key :"
-structured_text_bidi_override_options = []
-script = null
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="Key" type="TextEdit" parent="HBoxContainer/Pseudolocalizer"]
 offset_top = 30.0
-offset_right = 466.0
-offset_bottom = 143.0
+offset_right = 502.0
+offset_bottom = 145.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 text = "The quick brown fox jumped over the lazy dog."
-wrap_enabled = true
-structured_text_bidi_override_options = []
-script = null
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="margin" type="MarginContainer" parent="HBoxContainer/Pseudolocalizer"]
-offset_top = 147.0
-offset_bottom = 152.0
+offset_top = 149.0
+offset_bottom = 149.0
 size_flags_horizontal = 0
 size_flags_vertical = 0
-custom_constants/margin_top = 5
-script = null
 
 [node name="Pseudolocalize" type="Button" parent="HBoxContainer/Pseudolocalizer"]
-offset_left = 170.0
-offset_top = 156.0
-offset_right = 295.0
-offset_bottom = 185.0
+offset_left = 189.0
+offset_top = 153.0
+offset_right = 312.0
+offset_bottom = 184.0
 size_flags_horizontal = 6
 text = "Pseudolocalize"
-script = null
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="margin2" type="MarginContainer" parent="HBoxContainer/Pseudolocalizer"]
-offset_top = 189.0
-offset_bottom = 194.0
+offset_top = 188.0
+offset_bottom = 188.0
 size_flags_horizontal = 0
 size_flags_vertical = 0
-custom_constants/margin_top = 5
-script = null
 
 [node name="Label2" type="Label" parent="HBoxContainer/Pseudolocalizer"]
-offset_top = 198.0
-offset_right = 466.0
-offset_bottom = 224.0
+offset_top = 192.0
+offset_right = 502.0
+offset_bottom = 218.0
 text = "Pseudolocalization result :"
-structured_text_bidi_override_options = []
-script = null
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="Result" type="TextEdit" parent="HBoxContainer/Pseudolocalizer"]
-offset_top = 228.0
-offset_right = 466.0
-offset_bottom = 341.0
+offset_top = 222.0
+offset_right = 502.0
+offset_bottom = 338.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
-custom_colors/font_color = Color(1, 1, 1, 1)
-custom_colors/font_readonly_color = Color(1, 1, 1, 1)
-readonly = true
-wrap_enabled = true
-structured_text_bidi_override_options = []
-script = null
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="A2Z" type="Label" parent="HBoxContainer/Pseudolocalizer"]
-offset_top = 345.0
-offset_right = 466.0
+offset_top = 342.0
+offset_right = 502.0
 offset_bottom = 458.0
 size_flags_vertical = 7
-custom_font_sizes/font_size = 16
-custom_colors/font_color = Color(0.0235294, 0.94902, 1, 1)
 text = "ABCDEFGHIJKLMNOPQRSTUVWXYZ
 abcdefghijklmnopqrstuvwxyz"
-align = 1
-valign = 1
-structured_text_bidi_override_options = []
-script = null
 
 [node name="MarginContainer" type="MarginContainer" parent="HBoxContainer"]
 offset_left = 1012.0
 offset_right = 1012.0
 offset_bottom = 458.0
-script = null
 
 [connection signal="toggled" from="HBoxContainer/Pseudolocalization_options/toggle" to="." method="_on_toggle_toggled"]
 [connection signal="toggled" from="HBoxContainer/Pseudolocalization_options/accents" to="." method="_on_accents_toggled"]

gui/pseudolocalization/README.md

@@ -4,7 +4,7 @@ A demo showcasing the Pseudolocalization feature in Godot
 
 Language: GDScript
 
-Renderer: Vulkan
+Renderer: Vulkan Mobile
 
 ## Screenshots
 

gui/pseudolocalization/icon.png.import

@@ -1,8 +1,9 @@
 [remap]
 
 importer="texture"
-type="StreamTexture2D"
-path="res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+type="CompressedTexture2D"
+uid="uid://ddpix5j1t4swg"
+path="res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex"
 metadata={
 "vram_texture": false
 }
@@ -10,7 +11,7 @@ metadata={
 [deps]
 
 source_file="res://icon.png"
-dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"]
+dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex"]
 
 [params]
 
@@ -20,7 +21,6 @@ compress/hdr_compression=1
 compress/bptc_ldr=0
 compress/normal_map=0
 compress/channel_pack=0
-compress/streamed=false
 mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
@@ -28,7 +28,7 @@ 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_as_srgb=false
+process/hdr_clamp_exposure=false
 process/size_limit=0
 detect_3d/compress_to=1
-svg/scale=1.0

gui/pseudolocalization/project.godot

@@ -6,15 +6,20 @@
 ;   [section] ; section goes between []
 ;   param=value ; assign values to parameters
 
-config_version=4
+config_version=5
 
 [application]
 
 config/name="Pseudolocalization"
 run/main_scene="res://Pseudolocalization.tscn"
 config/icon="res://icon.png"
+config/features=PackedStringArray("4.0")
 
 [internationalization]
 
 pseudolocalization/use_pseudolocalization=true
 pseudolocalization/double_vowels=true
+
+[rendering]
+
+vulkan/rendering/back_end=1