diff --git a/Assets/Fonts/NotoSansCJKtc-Regular.tres b/Assets/Fonts/CJK/NotoSansCJKtc-Regular.tres similarity index 100% rename from Assets/Fonts/NotoSansCJKtc-Regular.tres rename to Assets/Fonts/CJK/NotoSansCJKtc-Regular.tres diff --git a/Assets/Fonts/CJK/NotoSansCJKtc-Small.tres b/Assets/Fonts/CJK/NotoSansCJKtc-Small.tres new file mode 100644 index 000000000..07f32ecb6 --- /dev/null +++ b/Assets/Fonts/CJK/NotoSansCJKtc-Small.tres @@ -0,0 +1,9 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://Assets/Fonts/NotoSansCJKtc-Regular.otf" type="DynamicFontData" id=1] + +[resource] +size = 10 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 1 ) diff --git a/Assets/Fonts/Roboto-Bold.tres b/Assets/Fonts/Roboto-Bold.tres new file mode 100644 index 000000000..6ee5005fb --- /dev/null +++ b/Assets/Fonts/Roboto-Bold.tres @@ -0,0 +1,9 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://Assets/Fonts/Roboto-Bold.ttf" type="DynamicFontData" id=1] + +[resource] +size = 12 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 1 ) diff --git a/Assets/Fonts/Roboto-Bold.ttf b/Assets/Fonts/Roboto-Bold.ttf new file mode 100644 index 000000000..d3f01ad24 Binary files /dev/null and b/Assets/Fonts/Roboto-Bold.ttf differ diff --git a/Assets/Graphics/Patron Button Hover.png b/Assets/Graphics/Patron Button Hover.png new file mode 100644 index 000000000..3b1d9f575 Binary files /dev/null and b/Assets/Graphics/Patron Button Hover.png differ diff --git a/Assets/Graphics/Patron Button Hover.png.import b/Assets/Graphics/Patron Button Hover.png.import new file mode 100644 index 000000000..d074579d7 --- /dev/null +++ b/Assets/Graphics/Patron Button Hover.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Patron Button Hover.png-8fc60b776206b9abfa94306023859853.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Patron Button Hover.png" +dest_files=[ "res://.import/Patron Button Hover.png-8fc60b776206b9abfa94306023859853.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Graphics/Patron Button.png b/Assets/Graphics/Patron Button.png new file mode 100644 index 000000000..a0304a2bf Binary files /dev/null and b/Assets/Graphics/Patron Button.png differ diff --git a/Assets/Graphics/Patron Button.png.import b/Assets/Graphics/Patron Button.png.import new file mode 100644 index 000000000..1b296261c --- /dev/null +++ b/Assets/Graphics/Patron Button.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Patron Button.png-c0e5b2ecd47261e9d545cc77e7063cb1.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Patron Button.png" +dest_files=[ "res://.import/Patron Button.png-c0e5b2ecd47261e9d545cc77e7063cb1.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Graphics/Splash Art.png b/Assets/Graphics/Splash Art.png index 0119b4776..b02e2dc12 100644 Binary files a/Assets/Graphics/Splash Art.png and b/Assets/Graphics/Splash Art.png differ diff --git a/Main.tscn b/Main.tscn index 4beb5f4c9..296e028dc 100644 --- a/Main.tscn +++ b/Main.tscn @@ -941,6 +941,7 @@ size_flags_horizontal = 3 custom_constants/separation = 0 [node name="HViewportContainer" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline"] +editor/display_folded = true margin_right = 704.0 margin_bottom = 478.0 size_flags_horizontal = 3 @@ -1083,6 +1084,7 @@ size_flags_horizontal = 3 text = "Current frame: 1/1" [node name="PlaybackButtons" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons"] +editor/display_folded = true margin_left = 246.0 margin_right = 386.0 margin_bottom = 24.0 @@ -1216,6 +1218,7 @@ margin_right = 570.0 margin_bottom = 60.0 [node name="FrameAndButtonContainer" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer"] +editor/display_folded = true margin_top = 64.0 margin_right = 570.0 margin_bottom = 84.0 @@ -1247,6 +1250,7 @@ margin_right = 578.0 margin_bottom = 138.0 [node name="OnionSkinningButtons" type="VBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer"] +editor/display_folded = true margin_left = 582.0 margin_right = 681.0 margin_bottom = 138.0 @@ -1674,6 +1678,7 @@ current_path = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρι [node name="PreferencesDialog" parent="." instance=ExtResource( 64 )] [node name="OutlineDialog" parent="." instance=ExtResource( 65 )] +visible = false [node name="AboutDialog" parent="." instance=ExtResource( 66 )] diff --git a/Prefabs/Dialogs/PreferencesDialog.tscn b/Prefabs/Dialogs/PreferencesDialog.tscn index d547bc01d..801f8c60d 100644 --- a/Prefabs/Dialogs/PreferencesDialog.tscn +++ b/Prefabs/Dialogs/PreferencesDialog.tscn @@ -2,7 +2,8 @@ [ext_resource path="res://Scripts/Dialogs/PreferencesDialog.gd" type="Script" id=1] [ext_resource path="res://Assets/Fonts/Roboto-Regular.tres" type="DynamicFont" id=2] -[ext_resource path="res://Assets/Fonts/NotoSansCJKtc-Regular.tres" type="DynamicFont" id=3] +[ext_resource path="res://Assets/Fonts/CJK/NotoSansCJKtc-Regular.tres" type="DynamicFont" id=3] + [node name="PreferencesDialog" type="AcceptDialog"] margin_right = 200.0 diff --git a/Prefabs/Dialogs/SplashDialog.tscn b/Prefabs/Dialogs/SplashDialog.tscn index 0209cb5ba..a1c6fd6e7 100644 --- a/Prefabs/Dialogs/SplashDialog.tscn +++ b/Prefabs/Dialogs/SplashDialog.tscn @@ -1,14 +1,47 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://Scripts/Dialogs/SplashDialog.gd" type="Script" id=1] [ext_resource path="res://Assets/Graphics/Pixelorama Logo.png" type="Texture" id=2] -[ext_resource path="res://Assets/Graphics/Splash Art.png" type="Texture" id=3] -[ext_resource path="res://Assets/Fonts/Roboto-Small.tres" type="DynamicFont" id=4] +[ext_resource path="res://Assets/Graphics/Patron Button.png" type="Texture" id=3] +[ext_resource path="res://Assets/Graphics/Patron Button Hover.png" type="Texture" id=4] +[ext_resource path="res://Assets/Graphics/Splash Art.png" type="Texture" id=5] +[ext_resource path="res://Assets/Fonts/Roboto-Bold.tres" type="DynamicFont" id=6] +[ext_resource path="res://Assets/Fonts/Roboto-Small.tres" type="DynamicFont" id=7] + +[sub_resource type="Theme" id=1] +Button/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 ) +Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +Button/colors/font_color_hover = Color( 0.941176, 0.941176, 0.941176, 1 ) +Button/colors/font_color_pressed = Color( 1, 1, 1, 1 ) +Button/constants/hseparation = 2 +Button/fonts/font = null +Button/styles/disabled = null +Button/styles/focus = null +Button/styles/hover = null +Button/styles/normal = null +Button/styles/pressed = null +Label/colors/font_color = Color( 1, 1, 1, 1 ) +Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) +Label/colors/font_outline_modulate = Color( 1, 1, 1, 1 ) +Label/constants/line_spacing = 3 +Label/constants/shadow_as_outline = 0 +Label/constants/shadow_offset_x = 1 +Label/constants/shadow_offset_y = 1 +Label/fonts/font = null +Label/styles/normal = null + +[sub_resource type="StyleBoxFlat" id=2] +bg_color = Color( 0.219608, 0.188235, 0.270588, 1 ) +border_width_top = 18 +border_color = Color( 0.4, 0.403922, 0.4, 1 ) +expand_margin_top = 18.0 [node name="SplashDialog" type="WindowDialog"] -margin_right = 400.0 -margin_bottom = 399.0 -rect_min_size = Vector2( 400, 380 ) +margin_right = 600.0 +margin_bottom = 400.0 +rect_min_size = Vector2( 600, 560 ) +theme = SubResource( 1 ) +custom_styles/panel = SubResource( 2 ) script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false @@ -17,63 +50,266 @@ __meta__ = { [node name="Contents" type="VBoxContainer" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 +margin_top = 6.0 +margin_bottom = -12.0 -[node name="PixeloramaLogo" type="TextureRect" parent="Contents"] -margin_left = 50.0 -margin_right = 350.0 +[node name="HBoxContainer" type="HBoxContainer" parent="Contents"] +margin_right = 600.0 margin_bottom = 40.0 -size_flags_horizontal = 4 +custom_constants/separation = -25 + +[node name="PatronsLabel" type="Label" parent="Contents/HBoxContainer"] +margin_top = 26.0 +margin_right = 175.0 +margin_bottom = 40.0 +size_flags_horizontal = 3 +size_flags_vertical = 8 +text = "Patrons:" +align = 1 + +[node name="PixeloramaLogo" type="TextureRect" parent="Contents/HBoxContainer"] +margin_left = 150.0 +margin_right = 450.0 +margin_bottom = 40.0 +size_flags_horizontal = 3 texture = ExtResource( 2 ) +[node name="ChangesLabel" type="Label" parent="Contents/HBoxContainer"] +margin_left = 425.0 +margin_top = 26.0 +margin_right = 600.0 +margin_bottom = 40.0 +size_flags_horizontal = 3 +size_flags_vertical = 8 +text = "v0.6 Changes" +align = 1 + [node name="HSeparator" type="HSeparator" parent="Contents"] margin_top = 44.0 -margin_right = 400.0 +margin_right = 600.0 margin_bottom = 48.0 -[node name="SplashArt" type="TextureRect" parent="Contents"] -margin_left = 12.0 +[node name="PatronsArtNews" type="HBoxContainer" parent="Contents"] margin_top = 52.0 -margin_right = 387.0 -margin_bottom = 302.0 -rect_min_size = Vector2( 375, 250 ) +margin_right = 600.0 +margin_bottom = 336.0 +custom_constants/separation = 12 + +[node name="SpacerControl" type="Control" parent="Contents/PatronsArtNews"] +margin_right = 4.0 +margin_bottom = 284.0 +rect_min_size = Vector2( 4, 0 ) + +[node name="PatronsContainer" type="VBoxContainer" parent="Contents/PatronsArtNews"] +margin_left = 16.0 +margin_right = 158.0 +margin_bottom = 284.0 +size_flags_horizontal = 3 + +[node name="PatronsScroll" type="ScrollContainer" parent="Contents/PatronsArtNews/PatronsContainer"] +margin_right = 142.0 +margin_bottom = 284.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="VBoxContainer" type="VBoxContainer" parent="Contents/PatronsArtNews/PatronsContainer/PatronsScroll"] +margin_right = 142.0 +margin_bottom = 80.0 +size_flags_horizontal = 3 + +[node name="CenterContainer" type="CenterContainer" parent="Contents/PatronsArtNews/PatronsContainer/PatronsScroll/VBoxContainer"] +margin_right = 142.0 +margin_bottom = 80.0 +size_flags_horizontal = 3 + +[node name="PatronButton" type="TextureButton" parent="Contents/PatronsArtNews/PatronsContainer/PatronsScroll/VBoxContainer/CenterContainer"] +margin_left = 31.0 +margin_right = 111.0 +margin_bottom = 80.0 +mouse_default_cursor_shape = 2 +texture_normal = ExtResource( 3 ) +texture_hover = ExtResource( 4 ) + +[node name="ArtContainer" type="VBoxContainer" parent="Contents/PatronsArtNews"] +margin_left = 170.0 +margin_right = 430.0 +margin_bottom = 284.0 +size_flags_horizontal = 3 + +[node name="SplashArt" type="TextureButton" parent="Contents/PatronsArtNews/ArtContainer"] +margin_right = 260.0 +margin_bottom = 260.0 +rect_min_size = Vector2( 260, 260 ) +mouse_default_cursor_shape = 2 size_flags_horizontal = 4 -texture = ExtResource( 3 ) +texture_normal = ExtResource( 5 ) expand = true -[node name="ArtCredits" type="Button" parent="Contents"] -margin_top = 306.0 -margin_right = 400.0 -margin_bottom = 326.0 +[node name="ArtCredits" type="Button" parent="Contents/PatronsArtNews/ArtContainer"] +margin_top = 264.0 +margin_right = 260.0 +margin_bottom = 284.0 mouse_default_cursor_shape = 2 text = "Art by Erevoid" flat = true -[node name="ShowOnStartup" type="CheckBox" parent="Contents"] -margin_top = 330.0 -margin_right = 400.0 -margin_bottom = 354.0 -text = "Don't show on the next startup" +[node name="ChangelogContainer" type="VBoxContainer" parent="Contents/PatronsArtNews"] +margin_left = 442.0 +margin_right = 584.0 +margin_bottom = 284.0 +size_flags_horizontal = 3 + +[node name="ChangelogScroll" type="ScrollContainer" parent="Contents/PatronsArtNews/ChangelogContainer"] +margin_right = 142.0 +margin_bottom = 260.0 +rect_min_size = Vector2( 0, 260 ) + +[node name="Label2" type="Label" parent="Contents/PatronsArtNews/ChangelogContainer/ChangelogScroll"] +margin_right = 142.0 +margin_bottom = 592.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "Added +- Palettes. You can choose default ones or make your own! +- Multiple theme support to better match your style. +- Image sub-menu with new features (Outlines, Color invert, desaturation) for more editing power. +- Added a layer opacity slider, that lets you change the alpha values of layers. +- Added a better circle, filled circle and random brushes! +- Pixelorama goes worldwide with even more translations! +- Importing and exporting matrix spritesheets is now possible. +- Straight lines now have constrained angles if you press Ctrl. With a step of 15 angles." +autowrap = true + +[node name="SpacerControl2" type="Control" parent="Contents/PatronsArtNews"] +margin_left = 596.0 +margin_right = 600.0 +margin_bottom = 284.0 +rect_min_size = Vector2( 4, 0 ) + +[node name="HSeparator3" type="HSeparator" parent="Contents"] +margin_top = 340.0 +margin_right = 600.0 +margin_bottom = 344.0 + +[node name="Sponsors" type="HBoxContainer" parent="Contents"] +margin_top = 348.0 +margin_right = 600.0 +margin_bottom = 500.0 +size_flags_vertical = 3 + +[node name="PlatinumContainer" type="VBoxContainer" parent="Contents/Sponsors"] +margin_right = 240.0 +margin_bottom = 152.0 +rect_min_size = Vector2( 240, 0 ) +size_flags_horizontal = 5 + +[node name="Label" type="Label" parent="Contents/Sponsors/PlatinumContainer"] +margin_right = 240.0 +margin_bottom = 14.0 +text = "Platinum Sponsor" +align = 1 + +[node name="PlaceholderLabel" type="Label" parent="Contents/Sponsors/PlatinumContainer"] +margin_top = 65.0 +margin_right = 240.0 +margin_bottom = 80.0 +size_flags_vertical = 6 +custom_fonts/font = ExtResource( 6 ) +custom_colors/font_color = Color( 0.678431, 0.611765, 0.807843, 1 ) +text = "Platinum Sponsor Placeholder" +align = 1 + +[node name="TakeThisSpot" type="Button" parent="Contents/Sponsors/PlatinumContainer"] +margin_top = 132.0 +margin_right = 240.0 +margin_bottom = 152.0 +mouse_default_cursor_shape = 2 +text = "Take this spot!" +flat = true + +[node name="VSeparator" type="VSeparator" parent="Contents/Sponsors"] +margin_left = 244.0 +margin_right = 248.0 +margin_bottom = 152.0 + +[node name="GoldContainer" type="VBoxContainer" parent="Contents/Sponsors"] +margin_left = 252.0 +margin_right = 600.0 +margin_bottom = 152.0 +size_flags_horizontal = 3 + +[node name="Label" type="Label" parent="Contents/Sponsors/GoldContainer"] +margin_right = 348.0 +margin_bottom = 14.0 +text = "Gold Sponsors" +align = 1 + +[node name="PlaceholderLabel" type="Label" parent="Contents/Sponsors/GoldContainer"] +margin_top = 65.0 +margin_right = 348.0 +margin_bottom = 80.0 +size_flags_vertical = 6 +custom_fonts/font = ExtResource( 6 ) +custom_colors/font_color = Color( 0.678431, 0.611765, 0.807843, 1 ) +text = "Gold Sponsors Placeholder" +align = 1 + +[node name="TakeThisSpot" type="Button" parent="Contents/Sponsors/GoldContainer"] +margin_top = 132.0 +margin_right = 348.0 +margin_bottom = 152.0 +mouse_default_cursor_shape = 2 +text = "Take this spot!" +flat = true [node name="HSeparator2" type="HSeparator" parent="Contents"] -margin_top = 358.0 -margin_right = 400.0 -margin_bottom = 362.0 +margin_top = 504.0 +margin_right = 600.0 +margin_bottom = 508.0 -[node name="DevelopedBy" type="Label" parent="Contents"] -margin_top = 366.0 -margin_right = 400.0 -margin_bottom = 379.0 -custom_fonts/font = ExtResource( 4 ) +[node name="BottomHboxContainer" type="HBoxContainer" parent="Contents"] +margin_top = 512.0 +margin_right = 600.0 +margin_bottom = 542.0 + +[node name="ShowOnStartup" type="CheckBox" parent="Contents/BottomHboxContainer"] +margin_right = 188.0 +margin_bottom = 30.0 +mouse_default_cursor_shape = 2 +size_flags_horizontal = 3 +custom_fonts/font = ExtResource( 7 ) +text = "Don't show again" + +[node name="VBoxContainer" type="VBoxContainer" parent="Contents/BottomHboxContainer"] +margin_left = 192.0 +margin_right = 407.0 +margin_bottom = 30.0 +size_flags_horizontal = 3 + +[node name="DevelopedBy" type="Label" parent="Contents/BottomHboxContainer/VBoxContainer"] +margin_right = 215.0 +margin_bottom = 13.0 +custom_fonts/font = ExtResource( 7 ) text = "Pixelorama v0.6 - Developed by Orama Interactive" align = 1 -[node name="Copyright" type="Label" parent="Contents"] -margin_top = 383.0 -margin_right = 400.0 -margin_bottom = 396.0 -custom_fonts/font = ExtResource( 4 ) +[node name="Copyright" type="Label" parent="Contents/BottomHboxContainer/VBoxContainer"] +margin_top = 17.0 +margin_right = 215.0 +margin_bottom = 30.0 +custom_fonts/font = ExtResource( 7 ) text = "Copyright 2019-2020 Orama Interactive" align = 1 + +[node name="SpacerControl" type="Control" parent="Contents/BottomHboxContainer"] +margin_left = 411.0 +margin_right = 600.0 +margin_bottom = 30.0 +size_flags_horizontal = 3 [connection signal="about_to_show" from="." to="." method="_on_SplashDialog_about_to_show"] -[connection signal="pressed" from="Contents/ArtCredits" to="." method="_on_ArtCredits_pressed"] -[connection signal="toggled" from="Contents/ShowOnStartup" to="." method="_on_ShowOnStartup_toggled"] +[connection signal="pressed" from="Contents/PatronsArtNews/PatronsContainer/PatronsScroll/VBoxContainer/CenterContainer/PatronButton" to="." method="_on_PatronButton_pressed"] +[connection signal="pressed" from="Contents/PatronsArtNews/ArtContainer/SplashArt" to="." method="_on_ArtCredits_pressed"] +[connection signal="pressed" from="Contents/PatronsArtNews/ArtContainer/ArtCredits" to="." method="_on_ArtCredits_pressed"] +[connection signal="pressed" from="Contents/Sponsors/PlatinumContainer/TakeThisSpot" to="." method="_on_TakeThisSpot_pressed"] +[connection signal="pressed" from="Contents/Sponsors/GoldContainer/TakeThisSpot" to="." method="_on_TakeThisSpot_pressed"] +[connection signal="toggled" from="Contents/BottomHboxContainer/ShowOnStartup" to="." method="_on_ShowOnStartup_toggled"] diff --git a/Scripts/Dialogs/PreferencesDialog.gd b/Scripts/Dialogs/PreferencesDialog.gd index 606a8cc08..13aaf1d1a 100644 --- a/Scripts/Dialogs/PreferencesDialog.gd +++ b/Scripts/Dialogs/PreferencesDialog.gd @@ -67,7 +67,7 @@ func _on_Language_pressed(button : Button) -> void: TranslationServer.set_locale(Global.loaded_locales[index]) if "zh" in TranslationServer.get_locale(): - Global.control.theme.default_font = preload("res://Assets/Fonts/NotoSansCJKtc-Regular.tres") + Global.control.theme.default_font = preload("res://Assets/Fonts/CJK/NotoSansCJKtc-Regular.tres") else: Global.control.theme.default_font = preload("res://Assets/Fonts/Roboto-Regular.tres") diff --git a/Scripts/Dialogs/SplashDialog.gd b/Scripts/Dialogs/SplashDialog.gd index e45d1a32a..13e7eb426 100644 --- a/Scripts/Dialogs/SplashDialog.gd +++ b/Scripts/Dialogs/SplashDialog.gd @@ -1,11 +1,21 @@ extends WindowDialog +onready var art_by_label : Label = $Contents/PatronsArtNews/ArtContainer/ArtCredits +onready var show_on_startup_button : CheckBox = $Contents/BottomHboxContainer/ShowOnStartup +onready var developed_by_label : Label = $Contents/BottomHboxContainer/VBoxContainer/DevelopedBy + func _on_SplashDialog_about_to_show() -> void: var current_version : String = ProjectSettings.get_setting("application/config/Version") window_title = "Pixelorama" + " " + current_version - $Contents/DevelopedBy.text = "Pixelorama" + " " + current_version + " - " + tr("MADEBY_LABEL") + developed_by_label.text = "Pixelorama" + " " + current_version + " - " + tr("MADEBY_LABEL") - $Contents/ArtCredits.text = tr("Art by") + ": Erevos" + art_by_label.text = tr("Art by") + ": Erevos" + if "zh" in TranslationServer.get_locale(): + show_on_startup_button.add_font_override("font", preload("res://Assets/Fonts/CJK/NotoSansCJKtc-Small.tres")) + developed_by_label.add_font_override("font", preload("res://Assets/Fonts/CJK/NotoSansCJKtc-Small.tres")) + else: + show_on_startup_button.add_font_override("font", preload("res://Assets/Fonts/Roboto-Small.tres")) + developed_by_label.add_font_override("font", preload("res://Assets/Fonts/Roboto-Small.tres")) func _on_ArtCredits_pressed() -> void: OS.shell_open("https://www.instagram.com/erevos_art") @@ -14,4 +24,10 @@ func _on_ShowOnStartup_toggled(pressed : bool) -> void: if pressed: Global.config_cache.set_value("preferences", "startup", false) else: - Global.config_cache.set_value("preferences", "startup", true) \ No newline at end of file + Global.config_cache.set_value("preferences", "startup", true) + +func _on_PatronButton_pressed() -> void: + OS.shell_open("https://www.patreon.com/OramaInteractive") + +func _on_TakeThisSpot_pressed() -> void: + OS.shell_open("https://www.patreon.com/OramaInteractive") diff --git a/Scripts/Main.gd b/Scripts/Main.gd index d48036a42..15872a776 100644 --- a/Scripts/Main.gd +++ b/Scripts/Main.gd @@ -94,7 +94,7 @@ func _ready() -> void: TranslationServer.set_locale(OS.get_locale()) if "zh" in TranslationServer.get_locale(): - theme.default_font = preload("res://Assets/Fonts/NotoSansCJKtc-Regular.tres") + theme.default_font = preload("res://Assets/Fonts/CJK/NotoSansCJKtc-Regular.tres") else: theme.default_font = preload("res://Assets/Fonts/Roboto-Regular.tres") diff --git a/Translations/Translations.pot b/Translations/Translations.pot index 281c5eaae..fb9e214d5 100644 --- a/Translations/Translations.pot +++ b/Translations/Translations.pot @@ -607,5 +607,20 @@ msgstr "" msgid "Edit Palette" msgstr "" -msgid "Don't show on the next startup" +msgid "Platinum Sponsor" +msgstr "" + +msgid "Gold Sponsors" +msgstr "" + +msgid "Platinum Sponsor Placeholder" +msgstr "" + +msgid "Gold Sponsors Placeholder" +msgstr "" + +msgid "Don't show again" +msgstr "" + +msgid "Take this spot!" msgstr "" \ No newline at end of file diff --git a/Translations/de.po b/Translations/de.po index 42a85f9fd..4985e0f26 100644 --- a/Translations/de.po +++ b/Translations/de.po @@ -671,9 +671,27 @@ msgstr "Erstelle eine neue leere Palette" msgid "Edit Palette" msgstr "Bearbeite Palette" -msgid "Don't show on the next startup" +msgid "Platinum Sponsor" +msgstr "" + +msgid "Gold Sponsors" +msgstr "" + +msgid "Platinum Sponsor Placeholder" +msgstr "" + +msgid "Gold Sponsors Placeholder" +msgstr "" + +msgid "Don't show again" msgstr "Nicht beim nächsten Start" +msgid "Take this spot!" +msgstr "" + +#~ msgid "Don't show on the next startup" +#~ msgstr "Nicht beim nächsten Start" + #~ msgid "Language:" #~ msgstr "Sprache:" diff --git a/Translations/el.po b/Translations/el.po index cb3dbfb39..0acf8ce3f 100644 --- a/Translations/el.po +++ b/Translations/el.po @@ -670,8 +670,26 @@ msgstr "Δημιουργία νέας κενής παλέττας;" msgid "Edit Palette" msgstr "Επεξεργασία Παλέττας" -msgid "Don't show on the next startup" -msgstr "Να μην εμφανιστεί στην επόμενη εκκίνηση" +msgid "Platinum Sponsor" +msgstr "Πλατινένιος Σπόνσορας" + +msgid "Gold Sponsors" +msgstr "Χρυσοί Σπόνσορες" + +msgid "Platinum Sponsor Placeholder" +msgstr "Θέση για Πλατινένιο Σπόνσορα" + +msgid "Gold Sponsors Placeholder" +msgstr "Θέση για Χρυσούς Σπόνσορες" + +msgid "Don't show again" +msgstr "Να μην εμφανιστεί ξανά" + +msgid "Take this spot!" +msgstr "Πάρτε αυτή τη θέση!" + +#~ msgid "Don't show on the next startup" +#~ msgstr "Να μην εμφανιστεί στην επόμενη εκκίνηση" #~ msgid "Language:" #~ msgstr "Γλώσσα:" diff --git a/Translations/en.po b/Translations/en.po index b01119c3d..533ae82c9 100644 --- a/Translations/en.po +++ b/Translations/en.po @@ -662,8 +662,26 @@ msgstr "Create a new empty palette?" msgid "Edit Palette" msgstr "Edit Palette" -msgid "Don't show on the next startup" -msgstr "Don't show on the next startup" +msgid "Platinum Sponsor" +msgstr "Platinum Sponsor" + +msgid "Gold Sponsors" +msgstr "Gold Sponsors" + +msgid "Platinum Sponsor Placeholder" +msgstr "Platinum Sponsor Placeholder" + +msgid "Gold Sponsors Placeholder" +msgstr "Gold Sponsors Placeholder" + +msgid "Don't show again" +msgstr "Don't show again" + +msgid "Take this spot!" +msgstr "Take this spot!" + +#~ msgid "Don't show on the next startup" +#~ msgstr "Don't show on the next startup" #~ msgid "Language:" #~ msgstr "Language:" diff --git a/Translations/fr.po b/Translations/fr.po index 019546e8b..ec1f0fa51 100644 --- a/Translations/fr.po +++ b/Translations/fr.po @@ -690,7 +690,22 @@ msgstr "" msgid "Edit Palette" msgstr "" -msgid "Don't show on the next startup" +msgid "Platinum Sponsor" +msgstr "" + +msgid "Gold Sponsors" +msgstr "" + +msgid "Platinum Sponsor Placeholder" +msgstr "" + +msgid "Gold Sponsors Placeholder" +msgstr "" + +msgid "Don't show again" +msgstr "" + +msgid "Take this spot!" msgstr "" #~ msgid "Language:" diff --git a/Translations/pl.po b/Translations/pl.po index d6d1818c9..a0dc9484d 100644 --- a/Translations/pl.po +++ b/Translations/pl.po @@ -679,7 +679,22 @@ msgstr "" msgid "Edit Palette" msgstr "" -msgid "Don't show on the next startup" +msgid "Platinum Sponsor" +msgstr "" + +msgid "Gold Sponsors" +msgstr "" + +msgid "Platinum Sponsor Placeholder" +msgstr "" + +msgid "Gold Sponsors Placeholder" +msgstr "" + +msgid "Don't show again" +msgstr "" + +msgid "Take this spot!" msgstr "" #~ msgid "Language:" diff --git a/Translations/pt_BR.po b/Translations/pt_BR.po index 5a3322c74..f902ddb50 100644 --- a/Translations/pt_BR.po +++ b/Translations/pt_BR.po @@ -671,5 +671,20 @@ msgstr "Criar uma nova paleta vazia?" msgid "Edit Palette" msgstr "Editar Paleta" -msgid "Don't show on the next startup" +msgid "Platinum Sponsor" +msgstr "" + +msgid "Gold Sponsors" +msgstr "" + +msgid "Platinum Sponsor Placeholder" +msgstr "" + +msgid "Gold Sponsors Placeholder" +msgstr "" + +msgid "Don't show again" +msgstr "" + +msgid "Take this spot!" msgstr "" diff --git a/Translations/ru.po b/Translations/ru.po index b1cb5f296..2a6c7f7d1 100644 --- a/Translations/ru.po +++ b/Translations/ru.po @@ -678,7 +678,22 @@ msgstr "" msgid "Edit Palette" msgstr "" -msgid "Don't show on the next startup" +msgid "Platinum Sponsor" +msgstr "" + +msgid "Gold Sponsors" +msgstr "" + +msgid "Platinum Sponsor Placeholder" +msgstr "" + +msgid "Gold Sponsors Placeholder" +msgstr "" + +msgid "Don't show again" +msgstr "" + +msgid "Take this spot!" msgstr "" #~ msgid "Language:" diff --git a/Translations/zh_TW.po b/Translations/zh_TW.po index fa9bc7891..fa5b2e4d6 100644 --- a/Translations/zh_TW.po +++ b/Translations/zh_TW.po @@ -661,9 +661,27 @@ msgstr "新增空的色盤?" msgid "Edit Palette" msgstr "編輯色盤" -msgid "Don't show on the next startup" +msgid "Platinum Sponsor" +msgstr "" + +msgid "Gold Sponsors" +msgstr "" + +msgid "Platinum Sponsor Placeholder" +msgstr "" + +msgid "Gold Sponsors Placeholder" +msgstr "" + +msgid "Don't show again" msgstr "不再顯示" +msgid "Take this spot!" +msgstr "" + +#~ msgid "Don't show on the next startup" +#~ msgstr "不再顯示" + #~ msgid "Language:" #~ msgstr "語言:"