Removed the splash screen.

This commit is contained in:
Relintai 2020-11-29 00:23:44 +01:00
parent 40a38b0895
commit f23d21f230
19 changed files with 10 additions and 561 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

View File

@ -1,34 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/jessmpz.png-dbccabb1c0fbf170a36de90e7a060bb2.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/graphics/splash_screen/artworks/jessmpz.png"
dest_files=[ "res://.import/jessmpz.png-dbccabb1c0fbf170a36de90e7a060bb2.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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

View File

@ -1,34 +0,0 @@
[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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

View File

@ -1,34 +0,0 @@
[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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 967 B

View File

@ -1,34 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/discord.png-73d97a9585e0efb593d5a88792440de4.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/graphics/splash_screen/discord.png"
dest_files=[ "res://.import/discord.png-73d97a9585e0efb593d5a88792440de4.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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 802 B

View File

@ -1,34 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/github_32px.png-281ab32f2184cefb27bac8e948163a0c.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/graphics/splash_screen/github_32px.png"
dest_files=[ "res://.import/github_32px.png-281ab32f2184cefb27bac8e948163a0c.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=0.5

Binary file not shown.

Before

Width:  |  Height:  |  Size: 618 B

View File

@ -1,34 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/orama_64x64.png-90aebdfc06fab9fe377c4ad4b8cc7f0f.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/graphics/splash_screen/orama_64x64.png"
dest_files=[ "res://.import/orama_64x64.png-90aebdfc06fab9fe377c4ad4b8cc7f0f.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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -1,34 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/patreon_mark_white.png-333e31617952eb830c8e3f158ffcc047.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/graphics/splash_screen/patreon_mark_white.png"
dest_files=[ "res://.import/patreon_mark_white.png-333e31617952eb830c8e3f158ffcc047.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

View File

@ -80,10 +80,6 @@ func setup_application_window_size() -> void:
func show_splash_screen() -> void:
# Wait for the window to adjust itself, so the popup is correctly centered
yield(get_tree().create_timer(0.2), "timeout")
if Global.config_cache.get_value("preferences", "startup"):
$Dialogs/SplashDialog.popup_centered() # Splash screen
modulate = Color(0.5, 0.5, 0.5)
else:
Global.can_draw = true

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=16 format=2]
[gd_scene load_steps=15 format=2]
[ext_resource path="res://assets/themes/dark/theme.tres" type="Theme" id=1]
[ext_resource path="res://src/Main.gd" type="Script" id=2]
@ -10,7 +10,6 @@
[ext_resource path="res://src/UI/Dialogs/SaveSpriteHTML5.tscn" type="PackedScene" id=8]
[ext_resource path="res://src/UI/Dialogs/SaveSprite.tscn" type="PackedScene" id=11]
[ext_resource path="res://src/UI/Dialogs/OpenSprite.tscn" type="PackedScene" id=12]
[ext_resource path="res://src/UI/Dialogs/SplashDialog.tscn" type="PackedScene" id=27]
[ext_resource path="res://src/UI/Dialogs/CreateNewImage.tscn" type="PackedScene" id=28]
[ext_resource path="res://src/Preferences/PreferencesDialog.tscn" type="PackedScene" id=32]
[ext_resource path="res://src/UI/Dialogs/AboutDialog.tscn" type="PackedScene" id=34]
@ -51,18 +50,20 @@ __meta__ = {
[node name="PatternsPopup" parent="Dialogs" instance=ExtResource( 5 )]
[node name="SplashDialog" parent="Dialogs" instance=ExtResource( 27 )]
[node name="CreateNewImage" parent="Dialogs" instance=ExtResource( 28 )]
margin_right = 375.0
[node name="OpenSprite" parent="Dialogs" instance=ExtResource( 12 )]
current_dir = "/home/relintai/Projects/draw_gd"
current_path = "/home/relintai/Projects/draw_gd/"
[node name="SaveSprite" parent="Dialogs" instance=ExtResource( 11 )]
margin_left = 108.0
margin_top = 40.0
margin_right = 623.0
margin_bottom = 388.0
current_dir = "/home/relintai/Projects/draw_gd"
current_path = "/home/relintai/Projects/draw_gd/untitled"
[node name="SaveSpriteHTML5" parent="Dialogs" instance=ExtResource( 8 )]
@ -116,7 +117,7 @@ visible = false
visible = false
[node name="ModulateTween" type="Tween" parent="."]
[connection signal="popup_hide" from="Dialogs/SplashDialog" to="." method="_can_draw_true"]
[connection signal="popup_hide" from="Dialogs/CreateNewImage" to="." method="_can_draw_true"]
[connection signal="file_selected" from="Dialogs/OpenSprite" to="." method="_on_OpenSprite_file_selected"]
[connection signal="popup_hide" from="Dialogs/OpenSprite" to="." method="_on_OpenSprite_popup_hide"]

View File

@ -1,12 +1,12 @@
[gd_scene load_steps=6 format=2]
[gd_scene load_steps=5 format=2]
[ext_resource path="res://src/UI/Dialogs/AboutDialog.gd" type="Script" id=1]
[ext_resource path="res://assets/graphics/icons/icon.png" type="Texture" id=2]
[ext_resource path="res://assets/fonts/Roboto-Italic.tres" type="DynamicFont" id=3]
[ext_resource path="res://assets/graphics/splash_screen/orama_64x64.png" type="Texture" id=4]
[ext_resource path="res://assets/fonts/Roboto-Small.tres" type="DynamicFont" id=5]
[node name="AboutDialog" type="WindowDialog"]
visible = true
margin_right = 600.0
margin_bottom = 400.0
rect_min_size = Vector2( 600, 400 )
@ -82,7 +82,6 @@ text = "Donate"
margin_left = 512.0
margin_right = 576.0
margin_bottom = 64.0
texture = ExtResource( 4 )
[node name="HSeparator" type="HSeparator" parent="AboutUI"]
margin_top = 68.0
@ -201,6 +200,7 @@ margin_bottom = 388.0
custom_fonts/font = ExtResource( 5 )
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"]
[connection signal="pressed" from="AboutUI/IconsButtons/SloganAndLinks/VBoxContainer/LinkButtons/Website" to="." method="_on_Website_pressed"]

View File

@ -1,79 +0,0 @@
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 copyright_label : Label = Global.find_node_by_name(self, "CopyrightLabel")
if Global.config_cache.has_section_key("preferences", "startup"):
show_on_startup_button.pressed = !Global.config_cache.get_value("preferences", "startup")
window_title = "Pixelorama" + " " + Global.current_version
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]
if "zh" in TranslationServer.get_locale():
show_on_startup_button.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"))
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
if OS.get_name() == "HTML5":
$Contents/ButtonsPatronsLogos/Buttons/OpenLastBtn.visible = false
func _on_ArtCredits_pressed() -> void:
OS.shell_open(artworks[chosen_artwork][1])
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)
Global.config_cache.save("user://cache.ini")
func _on_PatreonButton_pressed() -> void:
OS.shell_open("https://www.patreon.com/OramaInteractive")
func _on_GithubButton_pressed() -> void:
OS.shell_open("https://github.com/Orama-Interactive/Pixelorama")
func _on_DiscordButton_pressed() -> void:
OS.shell_open("https://discord.gg/GTMtr8s")
func _on_NewBtn_pressed() -> void:
visible = false
Global.top_menu_container.file_menu_id_pressed(0)
func _on_OpenBtn__pressed() -> void:
visible = false
Global.top_menu_container.file_menu_id_pressed(1)
func _on_OpenLastBtn_pressed() -> void:
visible = false
Global.top_menu_container.file_menu_id_pressed(2)

View File

@ -1,231 +0,0 @@
[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/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/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]
[sub_resource type="StyleBoxFlat" id=1]
bg_color = Color( 0.0705882, 0.0705882, 0.0705882, 1 )
border_width_top = 20
border_color = Color( 0.403922, 0.403922, 0.403922, 1 )
expand_margin_top = 20.0
[node name="SplashDialog" type="WindowDialog"]
margin_right = 640.0
margin_bottom = 583.0
rect_min_size = Vector2( 640, 583 )
custom_styles/panel = SubResource( 1 )
script = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}
[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 = 640.0
margin_bottom = 406.0
rect_min_size = Vector2( 640, 406 )
texture = ExtResource( 2 )
expand = true
stretch_mode = 6
[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 = 0
__meta__ = {
"_edit_use_anchors_": false
}
[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
text = "Art by: %s"
flat = true
[node name="ButtonsPatronsLogos" type="HBoxContainer" parent="Contents"]
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 = 104.0
rect_min_size = Vector2( 4, 0 )
[node name="Buttons" type="VBoxContainer" parent="Contents/ButtonsPatronsLogos"]
margin_left = 8.0
margin_right = 298.0
margin_bottom = 80.0
rect_min_size = Vector2( 290, 0 )
size_flags_vertical = 0
custom_constants/separation = 10
[node name="NewBtn" type="Button" parent="Contents/ButtonsPatronsLogos/Buttons"]
margin_right = 290.0
margin_bottom = 20.0
mouse_default_cursor_shape = 2
text = "New"
[node name="OpenBtn" type="Button" parent="Contents/ButtonsPatronsLogos/Buttons"]
margin_top = 30.0
margin_right = 290.0
margin_bottom = 50.0
mouse_default_cursor_shape = 2
text = "Open"
[node name="OpenLastBtn" type="Button" parent="Contents/ButtonsPatronsLogos/Buttons"]
margin_top = 60.0
margin_right = 290.0
margin_bottom = 80.0
mouse_default_cursor_shape = 2
text = "Open Last Project"
[node name="Info" type="HBoxContainer" parent="Contents/ButtonsPatronsLogos"]
margin_left = 302.0
margin_right = 640.0
margin_bottom = 104.0
size_flags_horizontal = 3
size_flags_vertical = 3
__meta__ = {
"_edit_use_anchors_": false
}
[node name="SpacerControl" type="Control" parent="Contents/ButtonsPatronsLogos/Info"]
margin_right = 6.0
margin_bottom = 104.0
rect_min_size = Vector2( 6, 0 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="PatronContainer" type="VBoxContainer" parent="Contents/ButtonsPatronsLogos/Info"]
margin_left = 10.0
margin_right = 294.0
margin_bottom = 104.0
size_flags_horizontal = 3
[node name="PatronsLabel" type="Label" parent="Contents/ButtonsPatronsLogos/Info/PatronContainer"]
margin_right = 284.0
margin_bottom = 14.0
rect_min_size = Vector2( 230, 0 )
size_flags_vertical = 8
text = "Patrons:"
autowrap = true
[node name="PatronsLabel2" type="Label" parent="Contents/ButtonsPatronsLogos/Info/PatronContainer"]
margin_top = 18.0
margin_right = 284.0
margin_bottom = 32.0
rect_min_size = Vector2( 230, 0 )
size_flags_vertical = 8
text = "Hugo Locurcio"
autowrap = true
[node name="VBoxContainer" type="VBoxContainer" parent="Contents/ButtonsPatronsLogos/Info"]
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 = 32.0
margin_bottom = 104.0
size_flags_vertical = 3
alignment = 2
[node name="Links" type="VBoxContainer" parent="Contents/ButtonsPatronsLogos/Info/VBoxContainer/Branding"]
margin_right = 32.0
margin_bottom = 104.0
[node name="GithubButton" type="TextureButton" parent="Contents/ButtonsPatronsLogos/Info/VBoxContainer/Branding/Links"]
margin_right = 32.0
margin_bottom = 32.0
mouse_default_cursor_shape = 2
texture_normal = ExtResource( 10 )
[node name="DiscordButton" type="TextureButton" parent="Contents/ButtonsPatronsLogos/Info/VBoxContainer/Branding/Links"]
margin_top = 36.0
margin_right = 32.0
margin_bottom = 68.0
mouse_default_cursor_shape = 2
texture_normal = ExtResource( 9 )
[node name="PatreonButton" type="TextureButton" parent="Contents/ButtonsPatronsLogos/Info/VBoxContainer/Branding/Links"]
margin_top = 72.0
margin_right = 32.0
margin_bottom = 104.0
mouse_default_cursor_shape = 2
texture_normal = ExtResource( 11 )
[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_vertical = 0
custom_fonts/font = ExtResource( 7 )
text = "Don't show again"
__meta__ = {
"_edit_use_anchors_": false
}
[connection signal="about_to_show" from="." to="." method="_on_SplashDialog_about_to_show"]
[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"]
[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/CopyrightLabel/HBoxContainer/ShowOnStartup" to="." method="_on_ShowOnStartup_toggled"]