diff --git a/Translations/Translations.pot b/Translations/Translations.pot index f51b0318f..eba764768 100644 --- a/Translations/Translations.pot +++ b/Translations/Translations.pot @@ -518,7 +518,10 @@ msgstr "" msgid "Developed by Orama Interactive" msgstr "" -msgid "Copyright 2019-2020 Orama Interactive" +msgid "Copyright 2019-2020 Orama Interactive and contributors" +msgstr "" + +msgid "©2019-2020 by Orama Interactive and contributors" msgstr "" msgid "Website" diff --git a/assets/graphics/splash_screen/artworks/jessmpz.png b/assets/graphics/splash_screen/artworks/jessmpz.png new file mode 100644 index 000000000..7b1e97105 Binary files /dev/null and b/assets/graphics/splash_screen/artworks/jessmpz.png differ diff --git a/assets/graphics/splash_screen/splash_screen_image_v0.7.png.import b/assets/graphics/splash_screen/artworks/jessmpz.png.import similarity index 63% rename from assets/graphics/splash_screen/splash_screen_image_v0.7.png.import rename to assets/graphics/splash_screen/artworks/jessmpz.png.import index baed10c0c..21a480779 100644 --- a/assets/graphics/splash_screen/splash_screen_image_v0.7.png.import +++ b/assets/graphics/splash_screen/artworks/jessmpz.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/splash_screen_image_v0.7.png-642d50de4be082a7004e97e4fa36146a.stex" +path="res://.import/jessmpz.png-dbccabb1c0fbf170a36de90e7a060bb2.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/graphics/splash_screen/splash_screen_image_v0.7.png" -dest_files=[ "res://.import/splash_screen_image_v0.7.png-642d50de4be082a7004e97e4fa36146a.stex" ] +source_file="res://assets/graphics/splash_screen/artworks/jessmpz.png" +dest_files=[ "res://.import/jessmpz.png-dbccabb1c0fbf170a36de90e7a060bb2.stex" ] [params] diff --git a/assets/graphics/splash_screen/artworks/roroto.png b/assets/graphics/splash_screen/artworks/roroto.png new file mode 100644 index 000000000..8da0b09ec Binary files /dev/null and b/assets/graphics/splash_screen/artworks/roroto.png differ diff --git a/assets/graphics/splash_screen/artworks/roroto.png.import b/assets/graphics/splash_screen/artworks/roroto.png.import new file mode 100644 index 000000000..c9eea6e1f --- /dev/null +++ b/assets/graphics/splash_screen/artworks/roroto.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/roroto.png-5bb796ce1a0c5bb768b883a88b3da539.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/splash_screen/artworks/roroto.png" +dest_files=[ "res://.import/roroto.png-5bb796ce1a0c5bb768b883a88b3da539.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_screen/artworks/wishdream.png b/assets/graphics/splash_screen/artworks/wishdream.png new file mode 100644 index 000000000..9b8492309 Binary files /dev/null and b/assets/graphics/splash_screen/artworks/wishdream.png differ diff --git a/assets/graphics/splash_screen/artworks/wishdream.png.import b/assets/graphics/splash_screen/artworks/wishdream.png.import new file mode 100644 index 000000000..7143de28d --- /dev/null +++ b/assets/graphics/splash_screen/artworks/wishdream.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/wishdream.png-2d4b51ec077caa274db44eee48928c59.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/splash_screen/artworks/wishdream.png" +dest_files=[ "res://.import/wishdream.png-2d4b51ec077caa274db44eee48928c59.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_screen/splash_screen_image_v0.7.png b/assets/graphics/splash_screen/splash_screen_image_v0.7.png deleted file mode 100644 index 96ba86bdb..000000000 Binary files a/assets/graphics/splash_screen/splash_screen_image_v0.7.png and /dev/null differ diff --git a/src/UI/Dialogs/AboutDialog.tscn b/src/UI/Dialogs/AboutDialog.tscn index 7babe940c..af9432176 100644 --- a/src/UI/Dialogs/AboutDialog.tscn +++ b/src/UI/Dialogs/AboutDialog.tscn @@ -199,7 +199,7 @@ margin_top = 375.0 margin_right = 576.0 margin_bottom = 388.0 custom_fonts/font = ExtResource( 5 ) -text = "Copyright 2019-2020 Orama Interactive" +text = "Copyright 2019-2020 Orama Interactive and contributors" align = 1 [connection signal="about_to_show" from="." to="." method="_on_AboutDialog_about_to_show"] [connection signal="popup_hide" from="." to="." method="_on_AboutDialog_popup_hide"] diff --git a/src/UI/Dialogs/SplashDialog.gd b/src/UI/Dialogs/SplashDialog.gd index 9a90c18eb..c459f2ee0 100644 --- a/src/UI/Dialogs/SplashDialog.gd +++ b/src/UI/Dialogs/SplashDialog.gd @@ -1,10 +1,20 @@ extends WindowDialog +var artworks := { + "Roroto Sic" : [preload("res://assets/graphics/splash_screen/artworks/roroto.png"), "https://www.instagram.com/roroto_sic/"], + "jess.mpz" : [preload("res://assets/graphics/splash_screen/artworks/jessmpz.png"), "https://www.instagram.com/jess.mpz/"], + "Wishdream" : [preload("res://assets/graphics/splash_screen/artworks/wishdream.png"), "https://twitter.com/WishdreamStar"] +} + +var chosen_artwork = "" + + func _on_SplashDialog_about_to_show() -> void: + var splash_art_texturerect : TextureRect = Global.find_node_by_name(self, "SplashArt") var art_by_label : Button = Global.find_node_by_name(self, "ArtistName") var show_on_startup_button : CheckBox = Global.find_node_by_name(self, "ShowOnStartup") - var developed_by_label : Label = Global.find_node_by_name(self, "DevelopedBy") + var copyright_label : Label = Global.find_node_by_name(self, "CopyrightLabel") var become_platinum : Button = Global.find_node_by_name(self, "BecomePlatinum") var become_gold : Button = Global.find_node_by_name(self, "BecomeGold") var become_patron : Button = Global.find_node_by_name(self, "BecomePatron") @@ -13,16 +23,21 @@ func _on_SplashDialog_about_to_show() -> void: show_on_startup_button.pressed = !Global.config_cache.get_value("preferences", "startup") window_title = "Pixelorama" + " " + Global.current_version - art_by_label.text = tr("Art by: %s") % "Wishdream" + chosen_artwork = artworks.keys()[randi() % artworks.size()] + splash_art_texturerect.texture = artworks[chosen_artwork][0] + + art_by_label.text = tr("Art by: %s") % chosen_artwork + art_by_label.hint_tooltip = artworks[chosen_artwork][1] + become_platinum.text = "- " + tr("Become a Platinum Sponsor") become_gold.text = "- " + tr("Become a Gold Sponsor") become_patron.text = "- " + tr("Become a Patron") 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")) + copyright_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")) + copyright_label.add_font_override("font", preload("res://assets/fonts/Roboto-Small.tres")) get_stylebox("panel", "WindowDialog").bg_color = Global.control.theme.get_stylebox("panel", "WindowDialog").bg_color get_stylebox("panel", "WindowDialog").border_color = Global.control.theme.get_stylebox("panel", "WindowDialog").border_color @@ -32,7 +47,7 @@ func _on_SplashDialog_about_to_show() -> void: func _on_ArtCredits_pressed() -> void: - OS.shell_open("https://twitter.com/WishdreamStar") + OS.shell_open(artworks[chosen_artwork][1]) func _on_ShowOnStartup_toggled(pressed : bool) -> void: diff --git a/src/UI/Dialogs/SplashDialog.tscn b/src/UI/Dialogs/SplashDialog.tscn index f84fa9b3a..2002b9d21 100644 --- a/src/UI/Dialogs/SplashDialog.tscn +++ b/src/UI/Dialogs/SplashDialog.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://src/UI/Dialogs/SplashDialog.gd" type="Script" id=1] -[ext_resource path="res://assets/graphics/splash_screen/splash_screen_image_v0.7.png" type="Texture" id=2] +[ext_resource path="res://assets/graphics/splash_screen/artworks/wishdream.png" type="Texture" id=2] [ext_resource path="res://assets/fonts/Roboto-Small.tres" type="DynamicFont" id=7] -[ext_resource path="res://assets/graphics/splash_screen/orama_64x64.png" type="Texture" id=8] [ext_resource path="res://assets/graphics/splash_screen/discord.png" type="Texture" id=9] [ext_resource path="res://assets/graphics/splash_screen/github_32px.png" type="Texture" id=10] [ext_resource path="res://assets/graphics/splash_screen/patreon_mark_white.png" type="Texture" id=11] @@ -16,8 +15,8 @@ expand_margin_top = 20.0 [node name="SplashDialog" type="WindowDialog"] margin_right = 640.0 -margin_bottom = 550.0 -rect_min_size = Vector2( 640, 550 ) +margin_bottom = 570.0 +rect_min_size = Vector2( 640, 572 ) custom_styles/panel = SubResource( 1 ) script = ExtResource( 1 ) __meta__ = { @@ -27,51 +26,52 @@ __meta__ = { [node name="Contents" type="VBoxContainer" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 +margin_bottom = -46.0 custom_constants/separation = 8 __meta__ = { "_edit_use_anchors_": false } [node name="SplashArt" type="TextureRect" parent="Contents"] -margin_right = 647.0 +margin_right = 640.0 margin_bottom = 406.0 rect_min_size = Vector2( 640, 406 ) texture = ExtResource( 2 ) expand = true -stretch_mode = 5 +stretch_mode = 6 -[node name="ArtBy" type="HBoxContainer" parent="Contents/SplashArt"] -anchor_left = 1.0 -anchor_right = 1.0 -margin_left = -117.0 -margin_top = 50.0 -margin_right = -10.0 -margin_bottom = 71.0 +[node name="ArtBy" type="HBoxContainer" parent="Contents"] +margin_top = 414.0 +margin_right = 640.0 +margin_bottom = 434.0 grow_horizontal = 0 -custom_constants/separation = -3 +custom_constants/separation = 0 __meta__ = { "_edit_use_anchors_": false } -[node name="ArtistName" type="Button" parent="Contents/SplashArt/ArtBy"] -margin_right = 77.0 -margin_bottom = 21.0 +[node name="SpacerControl" type="Control" parent="Contents/ArtBy"] +margin_right = 4.0 +margin_bottom = 20.0 +rect_min_size = Vector2( 4, 0 ) + +[node name="ArtistName" type="Button" parent="Contents/ArtBy"] +margin_left = 4.0 +margin_right = 81.0 +margin_bottom = 20.0 hint_tooltip = "https://twitter.com/WishdreamStar" mouse_default_cursor_shape = 2 -custom_colors/font_color = Color( 1, 1, 1, 1 ) -custom_colors/font_color_hover = Color( 0.764706, 0.764706, 0.764706, 1 ) -custom_colors/font_color_pressed = Color( 0.521569, 0.521569, 0.521569, 1 ) text = "Art by: %s" flat = true [node name="ButtonsPatronsLogos" type="HBoxContainer" parent="Contents"] -margin_top = 414.0 -margin_right = 647.0 -margin_bottom = 547.0 +margin_top = 442.0 +margin_right = 640.0 +margin_bottom = 546.0 [node name="SpacerControl" type="Control" parent="Contents/ButtonsPatronsLogos"] margin_right = 4.0 -margin_bottom = 133.0 +margin_bottom = 104.0 rect_min_size = Vector2( 4, 0 ) [node name="Buttons" type="VBoxContainer" parent="Contents/ButtonsPatronsLogos"] @@ -104,36 +104,35 @@ text = "Open Last Project" [node name="Info" type="HBoxContainer" parent="Contents/ButtonsPatronsLogos"] margin_left = 302.0 -margin_right = 639.0 -margin_bottom = 133.0 +margin_right = 640.0 +margin_bottom = 104.0 size_flags_horizontal = 3 size_flags_vertical = 3 -custom_constants/separation = 3 __meta__ = { "_edit_use_anchors_": false } [node name="Sponsors" type="HBoxContainer" parent="Contents/ButtonsPatronsLogos/Info"] -margin_right = 201.0 -margin_bottom = 133.0 +margin_right = 294.0 +margin_bottom = 104.0 size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/separation = 5 [node name="PatronContainer" type="VBoxContainer" parent="Contents/ButtonsPatronsLogos/Info/Sponsors"] -margin_right = 201.0 -margin_bottom = 133.0 +margin_right = 294.0 +margin_bottom = 104.0 size_flags_horizontal = 3 custom_constants/separation = 10 [node name="HBoxContainer" type="HBoxContainer" parent="Contents/ButtonsPatronsLogos/Info/Sponsors/PatronContainer"] -margin_right = 201.0 -margin_bottom = 48.0 +margin_right = 294.0 +margin_bottom = 31.0 custom_constants/separation = 0 [node name="SpacerControl" type="Control" parent="Contents/ButtonsPatronsLogos/Info/Sponsors/PatronContainer/HBoxContainer"] margin_right = 6.0 -margin_bottom = 48.0 +margin_bottom = 31.0 rect_min_size = Vector2( 6, 0 ) __meta__ = { "_edit_use_anchors_": false @@ -141,21 +140,21 @@ __meta__ = { [node name="PatronsLabel" type="Label" parent="Contents/ButtonsPatronsLogos/Info/Sponsors/PatronContainer/HBoxContainer"] margin_left = 6.0 -margin_right = 201.0 -margin_bottom = 48.0 -size_flags_horizontal = 3 +margin_right = 236.0 +margin_bottom = 31.0 +rect_min_size = Vector2( 230, 0 ) size_flags_vertical = 8 text = "Want your name or your company to be shown on the splash screen?" autowrap = true [node name="VBoxContainer" type="VBoxContainer" parent="Contents/ButtonsPatronsLogos/Info/Sponsors/PatronContainer"] -margin_top = 58.0 -margin_right = 201.0 -margin_bottom = 114.0 +margin_top = 41.0 +margin_right = 294.0 +margin_bottom = 97.0 custom_constants/separation = -2 [node name="BecomePlatinum" type="Button" parent="Contents/ButtonsPatronsLogos/Info/Sponsors/PatronContainer/VBoxContainer"] -margin_right = 201.0 +margin_right = 294.0 margin_bottom = 20.0 mouse_default_cursor_shape = 2 text = "- Become a Platinum Sponsor" @@ -164,7 +163,7 @@ align = 0 [node name="BecomeGold" type="Button" parent="Contents/ButtonsPatronsLogos/Info/Sponsors/PatronContainer/VBoxContainer"] margin_top = 18.0 -margin_right = 201.0 +margin_right = 294.0 margin_bottom = 38.0 mouse_default_cursor_shape = 2 text = "- Become a Gold Sponsor" @@ -173,7 +172,7 @@ align = 0 [node name="BecomePatron" type="Button" parent="Contents/ButtonsPatronsLogos/Info/Sponsors/PatronContainer/VBoxContainer"] margin_top = 36.0 -margin_right = 201.0 +margin_right = 294.0 margin_bottom = 56.0 mouse_default_cursor_shape = 2 text = "- Become a Patron" @@ -181,51 +180,21 @@ flat = true align = 0 [node name="VBoxContainer" type="VBoxContainer" parent="Contents/ButtonsPatronsLogos/Info"] -margin_left = 204.0 -margin_right = 337.0 -margin_bottom = 133.0 +margin_left = 298.0 +margin_right = 330.0 +margin_bottom = 104.0 size_flags_vertical = 3 custom_constants/separation = 5 alignment = 2 [node name="Branding" type="HBoxContainer" parent="Contents/ButtonsPatronsLogos/Info/VBoxContainer"] -margin_right = 133.0 +margin_right = 32.0 margin_bottom = 104.0 size_flags_vertical = 3 alignment = 2 -[node name="VBoxContainer" type="VBoxContainer" parent="Contents/ButtonsPatronsLogos/Info/VBoxContainer/Branding"] -margin_right = 97.0 -margin_bottom = 104.0 -size_flags_vertical = 3 -alignment = 1 - -[node name="Logo" type="TextureRect" parent="Contents/ButtonsPatronsLogos/Info/VBoxContainer/Branding/VBoxContainer"] -margin_top = 3.0 -margin_right = 97.0 -margin_bottom = 67.0 -texture = ExtResource( 8 ) -stretch_mode = 4 - -[node name="DevelopedBy" type="Label" parent="Contents/ButtonsPatronsLogos/Info/VBoxContainer/Branding/VBoxContainer"] -margin_top = 71.0 -margin_right = 97.0 -margin_bottom = 84.0 -custom_fonts/font = ExtResource( 7 ) -text = "Orama Interactive" -align = 1 - -[node name="Copyright" type="Label" parent="Contents/ButtonsPatronsLogos/Info/VBoxContainer/Branding/VBoxContainer"] -margin_top = 88.0 -margin_right = 97.0 -margin_bottom = 101.0 -custom_fonts/font = ExtResource( 7 ) -text = "Copyright 2019-2020" -align = 1 - [node name="Links" type="VBoxContainer" parent="Contents/ButtonsPatronsLogos/Info/VBoxContainer/Branding"] -margin_left = 101.0 -margin_right = 133.0 +margin_right = 32.0 margin_bottom = 104.0 [node name="GithubButton" type="TextureButton" parent="Contents/ButtonsPatronsLogos/Info/VBoxContainer/Branding/Links"] @@ -248,23 +217,47 @@ margin_bottom = 104.0 mouse_default_cursor_shape = 2 texture_normal = ExtResource( 11 ) -[node name="ShowOnStartup" type="CheckBox" parent="Contents/ButtonsPatronsLogos/Info/VBoxContainer"] -margin_left = 28.0 -margin_top = 109.0 -margin_right = 133.0 -margin_bottom = 133.0 +[node name="EmptySpacer" type="Control" parent="Contents/ButtonsPatronsLogos/Info"] +margin_left = 334.0 +margin_right = 338.0 +margin_bottom = 104.0 +rect_min_size = Vector2( 4, 0 ) + +[node name="CopyrightLabel" type="Label" parent="Contents"] +margin_top = 554.0 +margin_right = 640.0 +margin_bottom = 567.0 +size_flags_horizontal = 3 +custom_fonts/font = ExtResource( 7 ) +text = "©2019-2020 by Orama Interactive and contributors" +align = 1 + +[node name="HBoxContainer" type="HBoxContainer" parent="Contents/CopyrightLabel"] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_top = -6.0 +margin_right = -2.0 +margin_bottom = 5.0 +size_flags_vertical = 0 +custom_constants/separation = 0 +alignment = 2 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="ShowOnStartup" type="CheckBox" parent="Contents/CopyrightLabel/HBoxContainer"] +margin_left = 533.0 +margin_right = 638.0 +margin_bottom = 24.0 mouse_default_cursor_shape = 2 -size_flags_horizontal = 8 +size_flags_vertical = 0 custom_fonts/font = ExtResource( 7 ) text = "Don't show again" - -[node name="SpacerControl2" type="Control" parent="Contents/ButtonsPatronsLogos"] -margin_left = 643.0 -margin_right = 647.0 -margin_bottom = 133.0 -rect_min_size = Vector2( 4, 0 ) +__meta__ = { +"_edit_use_anchors_": false +} [connection signal="about_to_show" from="." to="." method="_on_SplashDialog_about_to_show"] -[connection signal="pressed" from="Contents/SplashArt/ArtBy/ArtistName" to="." method="_on_ArtCredits_pressed"] +[connection signal="pressed" from="Contents/ArtBy/ArtistName" to="." method="_on_ArtCredits_pressed"] [connection signal="pressed" from="Contents/ButtonsPatronsLogos/Buttons/NewBtn" to="." method="_on_NewBtn_pressed"] [connection signal="pressed" from="Contents/ButtonsPatronsLogos/Buttons/OpenBtn" to="." method="_on_OpenBtn__pressed"] [connection signal="pressed" from="Contents/ButtonsPatronsLogos/Buttons/OpenLastBtn" to="." method="_on_OpenLastBtn_pressed"] @@ -274,4 +267,4 @@ rect_min_size = Vector2( 4, 0 ) [connection signal="pressed" from="Contents/ButtonsPatronsLogos/Info/VBoxContainer/Branding/Links/GithubButton" to="." method="_on_GithubButton_pressed"] [connection signal="pressed" from="Contents/ButtonsPatronsLogos/Info/VBoxContainer/Branding/Links/DiscordButton" to="." method="_on_DiscordButton_pressed"] [connection signal="pressed" from="Contents/ButtonsPatronsLogos/Info/VBoxContainer/Branding/Links/PatreonButton" to="." method="_on_PatreonButton_pressed"] -[connection signal="toggled" from="Contents/ButtonsPatronsLogos/Info/VBoxContainer/ShowOnStartup" to="." method="_on_ShowOnStartup_toggled"] +[connection signal="toggled" from="Contents/CopyrightLabel/HBoxContainer/ShowOnStartup" to="." method="_on_ShowOnStartup_toggled"]