diff --git a/Assets/Graphics/GitHub-32px.png b/Assets/Graphics/GitHub-32px.png new file mode 100644 index 0000000..628da97 Binary files /dev/null and b/Assets/Graphics/GitHub-32px.png differ diff --git a/Assets/Graphics/GitHub-32px.png.import b/Assets/Graphics/GitHub-32px.png.import new file mode 100644 index 0000000..77d6d7a --- /dev/null +++ b/Assets/Graphics/GitHub-32px.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/GitHub-32px.png-f0799b422fdc85016656e9d1536a00fe.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/GitHub-32px.png" +dest_files=[ "res://.import/GitHub-32px.png-f0799b422fdc85016656e9d1536a00fe.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 diff --git a/Assets/Graphics/Patreon_Mark_White.png b/Assets/Graphics/Patreon_Mark_White.png new file mode 100644 index 0000000..05a14e6 Binary files /dev/null and b/Assets/Graphics/Patreon_Mark_White.png differ diff --git a/Assets/Graphics/Patreon_Mark_White.png.import b/Assets/Graphics/Patreon_Mark_White.png.import new file mode 100644 index 0000000..3f431a3 --- /dev/null +++ b/Assets/Graphics/Patreon_Mark_White.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Patreon_Mark_White.png-ab0f61140995a66f96bc191c3acdc68a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Patreon_Mark_White.png" +dest_files=[ "res://.import/Patreon_Mark_White.png-ab0f61140995a66f96bc191c3acdc68a.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/discord.png b/Assets/Graphics/discord.png new file mode 100644 index 0000000..5b98409 Binary files /dev/null and b/Assets/Graphics/discord.png differ diff --git a/Assets/Graphics/discord.png.import b/Assets/Graphics/discord.png.import new file mode 100644 index 0000000..b90fe61 --- /dev/null +++ b/Assets/Graphics/discord.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/discord.png-f7d58be303cc3a849af739ba38da37b2.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/discord.png" +dest_files=[ "res://.import/discord.png-f7d58be303cc3a849af739ba38da37b2.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/Main.tscn b/Main.tscn index 742a0c6..ed8c6bf 100644 --- a/Main.tscn +++ b/Main.tscn @@ -941,15 +941,15 @@ size_flags_horizontal = 4 text = "100% Zoom" [node name="EmptySpacer" type="Control" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions"] -margin_top = 71.0 +margin_top = 91.0 margin_right = 160.0 -margin_bottom = 83.0 +margin_bottom = 103.0 rect_min_size = Vector2( 0, 12 ) [node name="LeftMirrorButtons" type="HBoxContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions"] -margin_top = 87.0 +margin_top = 107.0 margin_right = 160.0 -margin_bottom = 104.0 +margin_bottom = 124.0 custom_constants/separation = 44 alignment = 1 @@ -1354,15 +1354,15 @@ size_flags_horizontal = 4 text = "100% Zoom" [node name="EmptySpacer" type="Control" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions"] -margin_top = 71.0 +margin_top = 91.0 margin_right = 160.0 -margin_bottom = 83.0 +margin_bottom = 103.0 rect_min_size = Vector2( 0, 12 ) [node name="RightMirrorButtons" type="HBoxContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions"] -margin_top = 87.0 +margin_top = 107.0 margin_right = 160.0 -margin_bottom = 104.0 +margin_bottom = 124.0 custom_constants/separation = 44 alignment = 1 diff --git a/Prefabs/Dialogs/SplashDialog.tscn b/Prefabs/Dialogs/SplashDialog.tscn index 948efc5..a03b5c5 100644 --- a/Prefabs/Dialogs/SplashDialog.tscn +++ b/Prefabs/Dialogs/SplashDialog.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=12 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] @@ -7,12 +7,15 @@ [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] +[ext_resource path="res://Assets/Graphics/orama_64x64.png" type="Texture" id=8] +[ext_resource path="res://Assets/Graphics/discord.png" type="Texture" id=9] +[ext_resource path="res://Assets/Graphics/GitHub-32px.png" type="Texture" id=10] +[ext_resource path="res://Assets/Graphics/Patreon_Mark_White.png" type="Texture" id=11] [node name="SplashDialog" type="WindowDialog"] -margin_right = 600.0 -margin_bottom = 400.0 +margin_right = 614.0 +margin_bottom = 590.0 rect_min_size = Vector2( 600, 560 ) -resizable = true script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false @@ -21,123 +24,150 @@ __meta__ = { [node name="Contents" type="VBoxContainer" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 6.0 -margin_bottom = -12.0 +custom_constants/separation = 0 +__meta__ = { +"_edit_use_anchors_": false +} [node name="HBoxContainer" type="HBoxContainer" parent="Contents"] -margin_right = 600.0 -margin_bottom = 40.0 -custom_constants/separation = -25 +margin_right = 617.0 +margin_bottom = 436.0 +custom_constants/separation = 0 -[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="Logo_ArtWork" type="VBoxContainer" parent="Contents/HBoxContainer"] +margin_right = 350.0 +margin_bottom = 436.0 +rect_min_size = Vector2( 350, 0 ) +custom_constants/separation = 15 -[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 = 600.0 -margin_bottom = 48.0 - -[node name="PatronsArtNews" type="HBoxContainer" parent="Contents"] -margin_top = 52.0 -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 +[node name="PixeloramaLogo" type="TextureRect" parent="Contents/HBoxContainer/Logo_ArtWork"] +margin_right = 350.0 +margin_bottom = 124.0 +rect_min_size = Vector2( 0, 80 ) size_flags_horizontal = 3 size_flags_vertical = 3 +texture = ExtResource( 2 ) +stretch_mode = 6 -[node name="VBoxContainer" type="VBoxContainer" parent="Contents/PatronsArtNews/PatronsContainer/PatronsScroll"] -margin_right = 142.0 -margin_bottom = 84.0 +[node name="CenterContainer" type="MarginContainer" parent="Contents/HBoxContainer/Logo_ArtWork"] +margin_top = 139.0 +margin_right = 350.0 +margin_bottom = 436.0 size_flags_horizontal = 3 +size_flags_vertical = 0 -[node name="CenterContainer" type="CenterContainer" parent="Contents/PatronsArtNews/PatronsContainer/PatronsScroll/VBoxContainer"] -margin_right = 142.0 -margin_bottom = 84.0 +[node name="ArtContainer" type="VBoxContainer" parent="Contents/HBoxContainer/Logo_ArtWork/CenterContainer"] +margin_right = 350.0 +margin_bottom = 297.0 size_flags_horizontal = 3 +size_flags_vertical = 3 +custom_constants/separation = 17 -[node name="PatronButton" type="TextureButton" parent="Contents/PatronsArtNews/PatronsContainer/PatronsScroll/VBoxContainer/CenterContainer"] -margin_left = 29.0 -margin_right = 113.0 -margin_bottom = 84.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 +[node name="SplashArt" type="TextureButton" parent="Contents/HBoxContainer/Logo_ArtWork/CenterContainer/ArtContainer"] +margin_left = 45.0 +margin_right = 305.0 margin_bottom = 260.0 rect_min_size = Vector2( 260, 260 ) mouse_default_cursor_shape = 2 -size_flags_horizontal = 4 +size_flags_horizontal = 6 texture_normal = ExtResource( 5 ) expand = true +stretch_mode = 5 -[node name="ArtCredits" type="Button" parent="Contents/PatronsArtNews/ArtContainer"] -margin_top = 264.0 -margin_right = 260.0 -margin_bottom = 284.0 +[node name="ArtCredits" type="Button" parent="Contents/HBoxContainer/Logo_ArtWork/CenterContainer/ArtContainer"] +margin_top = 277.0 +margin_right = 350.0 +margin_bottom = 297.0 mouse_default_cursor_shape = 2 +custom_constants/hseparation = 0 text = "Art by Erevoid" flat = true -[node name="ChangelogContainer" type="VBoxContainer" parent="Contents/PatronsArtNews"] -margin_left = 442.0 -margin_right = 584.0 -margin_bottom = 284.0 +[node name="VSeparator" type="VSeparator" parent="Contents/HBoxContainer"] +margin_left = 350.0 +margin_right = 354.0 +margin_bottom = 436.0 + +[node name="Buttons_Changelog" type="MarginContainer" parent="Contents/HBoxContainer"] +margin_left = 354.0 +margin_right = 617.0 +margin_bottom = 436.0 +size_flags_horizontal = 3 +custom_constants/margin_right = 10 +custom_constants/margin_top = 10 +custom_constants/margin_left = 10 +custom_constants/margin_bottom = 10 + +[node name="VBoxContainer" type="VBoxContainer" parent="Contents/HBoxContainer/Buttons_Changelog"] +margin_left = 10.0 +margin_top = 10.0 +margin_right = 253.0 +margin_bottom = 426.0 +size_flags_horizontal = 3 +custom_constants/separation = 10 + +[node name="Buttons" type="VBoxContainer" parent="Contents/HBoxContainer/Buttons_Changelog/VBoxContainer"] +margin_right = 243.0 +margin_bottom = 110.0 +size_flags_vertical = 3 +custom_constants/separation = 10 + +[node name="NewBtn" type="Button" parent="Contents/HBoxContainer/Buttons_Changelog/VBoxContainer/Buttons"] +margin_right = 243.0 +margin_bottom = 20.0 +text = "New" + +[node name="OpenBtn " type="Button" parent="Contents/HBoxContainer/Buttons_Changelog/VBoxContainer/Buttons"] +margin_top = 30.0 +margin_right = 243.0 +margin_bottom = 50.0 +text = "Open" + +[node name="OpenLastBtn" type="Button" parent="Contents/HBoxContainer/Buttons_Changelog/VBoxContainer/Buttons"] +margin_top = 60.0 +margin_right = 243.0 +margin_bottom = 80.0 +text = "Open Last Project" + +[node name="ImportBtn" type="Button" parent="Contents/HBoxContainer/Buttons_Changelog/VBoxContainer/Buttons"] +margin_top = 90.0 +margin_right = 243.0 +margin_bottom = 110.0 +text = "Import" + +[node name="HSeparator" type="HSeparator" parent="Contents/HBoxContainer/Buttons_Changelog/VBoxContainer"] +margin_top = 120.0 +margin_right = 243.0 +margin_bottom = 124.0 + +[node name="Changlog" type="VBoxContainer" parent="Contents/HBoxContainer/Buttons_Changelog/VBoxContainer"] +margin_top = 134.0 +margin_right = 243.0 +margin_bottom = 416.0 +size_flags_vertical = 3 +custom_constants/separation = 8 + +[node name="ChangesLabel" type="Label" parent="Contents/HBoxContainer/Buttons_Changelog/VBoxContainer/Changlog"] +margin_right = 243.0 +margin_bottom = 14.0 +size_flags_horizontal = 3 +size_flags_vertical = 8 +text = "v0.6 Changes" + +[node name="ChangelogContainer" type="VBoxContainer" parent="Contents/HBoxContainer/Buttons_Changelog/VBoxContainer/Changlog"] +margin_top = 22.0 +margin_right = 243.0 +margin_bottom = 282.0 size_flags_horizontal = 3 -[node name="ChangelogScroll" type="ScrollContainer" parent="Contents/PatronsArtNews/ChangelogContainer"] -margin_right = 142.0 +[node name="ChangelogScroll" type="ScrollContainer" parent="Contents/HBoxContainer/Buttons_Changelog/VBoxContainer/Changlog/ChangelogContainer"] +margin_right = 243.0 margin_bottom = 260.0 rect_min_size = Vector2( 0, 260 ) -[node name="Label" type="Label" parent="Contents/PatronsArtNews/ChangelogContainer/ChangelogScroll"] -margin_right = 142.0 -margin_bottom = 2921.0 +[node name="Label" type="Label" parent="Contents/HBoxContainer/Buttons_Changelog/VBoxContainer/Changlog/ChangelogContainer/ChangelogScroll"] +margin_right = 243.0 +margin_bottom = 1680.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "Added @@ -179,136 +209,231 @@ Fixed - Fixed bug where resizing the image on export was not working on Godot 3.2 - Issue #161" 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="HSeparator" type="HSeparator" parent="Contents"] +margin_top = 436.0 +margin_right = 617.0 +margin_bottom = 440.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 +[node name="MarginContainer" type="MarginContainer" parent="Contents"] +margin_top = 440.0 +margin_right = 617.0 +margin_bottom = 593.0 +size_flags_horizontal = 3 size_flags_vertical = 3 +custom_constants/margin_right = 10 +custom_constants/margin_top = 10 +custom_constants/margin_left = 10 +custom_constants/margin_bottom = 10 -[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="Info" type="HBoxContainer" parent="Contents/MarginContainer"] +margin_left = 10.0 +margin_top = 10.0 +margin_right = 607.0 +margin_bottom = 143.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +custom_constants/separation = 3 +__meta__ = { +"_edit_use_anchors_": false +} -[node name="Label" type="Label" parent="Contents/Sponsors/PlatinumContainer"] -margin_right = 240.0 +[node name="Sponsors" type="HBoxContainer" parent="Contents/MarginContainer/Info"] +margin_right = 362.0 +margin_bottom = 133.0 +size_flags_vertical = 3 +custom_constants/separation = 5 + +[node name="PlatinumContainer" type="VBoxContainer" parent="Contents/MarginContainer/Info/Sponsors"] +margin_right = 125.0 +margin_bottom = 133.0 +rect_min_size = Vector2( 125, 0 ) + +[node name="Label" type="Label" parent="Contents/MarginContainer/Info/Sponsors/PlatinumContainer"] +margin_right = 125.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 +[node name="PlaceholderLabel" type="Label" parent="Contents/MarginContainer/Info/Sponsors/PlatinumContainer"] +margin_top = 47.0 +margin_right = 125.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" +text = "Platinum +Sponsor" align = 1 -[node name="TakeThisSpot" type="Button" parent="Contents/Sponsors/PlatinumContainer"] -margin_top = 132.0 -margin_right = 240.0 -margin_bottom = 152.0 +[node name="TakeThisSpot" type="Button" parent="Contents/MarginContainer/Info/Sponsors/PlatinumContainer"] +margin_top = 113.0 +margin_right = 125.0 +margin_bottom = 133.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="VSeparator" type="VSeparator" parent="Contents/MarginContainer/Info/Sponsors"] +margin_left = 130.0 +margin_right = 134.0 +margin_bottom = 133.0 -[node name="GoldContainer" type="VBoxContainer" parent="Contents/Sponsors"] -margin_left = 252.0 -margin_right = 600.0 -margin_bottom = 152.0 +[node name="GoldContainer" type="VBoxContainer" parent="Contents/MarginContainer/Info/Sponsors"] +margin_left = 139.0 +margin_right = 264.0 +margin_bottom = 133.0 +rect_min_size = Vector2( 125, 0 ) size_flags_horizontal = 3 -[node name="Label" type="Label" parent="Contents/Sponsors/GoldContainer"] -margin_right = 348.0 +[node name="Label" type="Label" parent="Contents/MarginContainer/Info/Sponsors/GoldContainer"] +margin_right = 125.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 +[node name="PlaceholderLabel" type="Label" parent="Contents/MarginContainer/Info/Sponsors/GoldContainer"] +margin_top = 47.0 +margin_right = 125.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" +text = "Gold +Sponsors" align = 1 -[node name="TakeThisSpot" type="Button" parent="Contents/Sponsors/GoldContainer"] -margin_top = 132.0 -margin_right = 348.0 -margin_bottom = 152.0 +[node name="TakeThisSpot" type="Button" parent="Contents/MarginContainer/Info/Sponsors/GoldContainer"] +margin_top = 113.0 +margin_right = 125.0 +margin_bottom = 133.0 mouse_default_cursor_shape = 2 text = "Take this spot!" flat = true -[node name="HSeparator2" type="HSeparator" parent="Contents"] -margin_top = 504.0 -margin_right = 600.0 -margin_bottom = 508.0 +[node name="VSeparator2" type="VSeparator" parent="Contents/MarginContainer/Info/Sponsors"] +margin_left = 269.0 +margin_right = 273.0 +margin_bottom = 133.0 -[node name="BottomHboxContainer" type="HBoxContainer" parent="Contents"] -margin_top = 512.0 -margin_right = 600.0 -margin_bottom = 542.0 +[node name="PatronContainer" type="VBoxContainer" parent="Contents/MarginContainer/Info/Sponsors"] +margin_left = 278.0 +margin_right = 362.0 +margin_bottom = 133.0 +size_flags_horizontal = 3 +custom_constants/separation = 10 +alignment = 1 -[node name="ShowOnStartup" type="CheckBox" parent="Contents/BottomHboxContainer"] -margin_right = 188.0 -margin_bottom = 30.0 +[node name="PatronsLabel" type="Label" parent="Contents/MarginContainer/Info/Sponsors/PatronContainer"] +margin_right = 84.0 +margin_bottom = 14.0 +size_flags_horizontal = 3 +size_flags_vertical = 8 +text = "Patrons:" +align = 1 + +[node name="PatronButton" type="TextureButton" parent="Contents/MarginContainer/Info/Sponsors/PatronContainer"] +margin_top = 24.0 +margin_right = 84.0 +margin_bottom = 133.0 mouse_default_cursor_shape = 2 size_flags_horizontal = 3 +size_flags_vertical = 3 +texture_normal = ExtResource( 3 ) +texture_hover = ExtResource( 4 ) +stretch_mode = 5 + +[node name="VBoxContainer" type="VBoxContainer" parent="Contents/MarginContainer/Info"] +margin_left = 365.0 +margin_right = 597.0 +margin_bottom = 133.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +custom_constants/separation = 5 +alignment = 2 + +[node name="Branding" type="HBoxContainer" parent="Contents/MarginContainer/Info/VBoxContainer"] +margin_right = 232.0 +margin_bottom = 104.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +alignment = 2 + +[node name="VBoxContainer" type="VBoxContainer" parent="Contents/MarginContainer/Info/VBoxContainer/Branding"] +margin_left = 99.0 +margin_right = 196.0 +margin_bottom = 104.0 +size_flags_vertical = 3 +alignment = 1 + +[node name="Logo" type="TextureRect" parent="Contents/MarginContainer/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/MarginContainer/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/MarginContainer/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/MarginContainer/Info/VBoxContainer/Branding"] +margin_left = 200.0 +margin_right = 232.0 +margin_bottom = 104.0 + +[node name="TextureButton" type="TextureButton" parent="Contents/MarginContainer/Info/VBoxContainer/Branding/Links"] +margin_right = 32.0 +margin_bottom = 32.0 +texture_normal = ExtResource( 10 ) + +[node name="TextureButton2" type="TextureButton" parent="Contents/MarginContainer/Info/VBoxContainer/Branding/Links"] +margin_top = 36.0 +margin_right = 32.0 +margin_bottom = 68.0 +texture_normal = ExtResource( 9 ) + +[node name="TextureButton3" type="TextureButton" parent="Contents/MarginContainer/Info/VBoxContainer/Branding/Links"] +margin_top = 72.0 +margin_right = 32.0 +margin_bottom = 104.0 +texture_normal = ExtResource( 11 ) + +[node name="HBoxContainer" type="HBoxContainer" parent="Contents/MarginContainer/Info/VBoxContainer"] +margin_top = 109.0 +margin_right = 232.0 +margin_bottom = 133.0 +alignment = 2 + +[node name="ShowOnStartup" type="CheckBox" parent="Contents/MarginContainer/Info/VBoxContainer/HBoxContainer"] +margin_left = 127.0 +margin_right = 232.0 +margin_bottom = 24.0 +mouse_default_cursor_shape = 2 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/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/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"] +[connection signal="pressed" from="Contents/HBoxContainer/Logo_ArtWork/CenterContainer/ArtContainer/SplashArt" to="." method="_on_ArtCredits_pressed"] +[connection signal="pressed" from="Contents/HBoxContainer/Logo_ArtWork/CenterContainer/ArtContainer/ArtCredits" to="." method="_on_ArtCredits_pressed"] +[connection signal="pressed" from="Contents/HBoxContainer/Buttons_Changelog/VBoxContainer/Buttons/NewBtn" to="." method="_on_NewBtn_pressed"] +[connection signal="pressed" from="Contents/HBoxContainer/Buttons_Changelog/VBoxContainer/Buttons/OpenBtn " to="." method="_on_OpenBtn__pressed"] +[connection signal="pressed" from="Contents/HBoxContainer/Buttons_Changelog/VBoxContainer/Buttons/OpenLastBtn" to="." method="_on_OpenLastBtn_pressed"] +[connection signal="pressed" from="Contents/HBoxContainer/Buttons_Changelog/VBoxContainer/Buttons/ImportBtn" to="." method="_on_ImportBtn_pressed"] +[connection signal="pressed" from="Contents/MarginContainer/Info/Sponsors/PlatinumContainer/TakeThisSpot" to="." method="_on_TakeThisSpot_pressed"] +[connection signal="pressed" from="Contents/MarginContainer/Info/Sponsors/GoldContainer/TakeThisSpot" to="." method="_on_TakeThisSpot_pressed"] +[connection signal="pressed" from="Contents/MarginContainer/Info/Sponsors/PatronContainer/PatronButton" to="." method="_on_PatronButton_pressed"] +[connection signal="pressed" from="Contents/MarginContainer/Info/VBoxContainer/Branding/Links/TextureButton" to="." method="_on_GithubButton_pressed"] +[connection signal="pressed" from="Contents/MarginContainer/Info/VBoxContainer/Branding/Links/TextureButton2" to="." method="_on_DiscordButton_pressed"] +[connection signal="pressed" from="Contents/MarginContainer/Info/VBoxContainer/Branding/Links/TextureButton3" to="." method="_on_PatronButton_pressed"] +[connection signal="toggled" from="Contents/MarginContainer/Info/VBoxContainer/HBoxContainer/ShowOnStartup" to="." method="_on_ShowOnStartup_toggled"] diff --git a/Scripts/Dialogs/SplashDialog.gd b/Scripts/Dialogs/SplashDialog.gd index a2d2063..ea4b2e5 100644 --- a/Scripts/Dialogs/SplashDialog.gd +++ b/Scripts/Dialogs/SplashDialog.gd @@ -1,11 +1,11 @@ extends WindowDialog -onready var changes_label : Label = $Contents/HBoxContainer/ChangesLabel -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 -onready var platinum_placeholder_label : Label = $Contents/Sponsors/PlatinumContainer/PlaceholderLabel -onready var gold_placeholder_label : Label = $Contents/Sponsors/GoldContainer/PlaceholderLabel +onready var changes_label : Label = $"Contents/HBoxContainer/Buttons_Changelog/VBoxContainer/Changlog/ChangesLabel" +onready var art_by_label : Label = $"Contents/HBoxContainer/Logo_ArtWork/CenterContainer/ArtContainer/ArtCredits" +onready var show_on_startup_button : CheckBox = $"Contents/MarginContainer/Info/VBoxContainer/HBoxContainer/ShowOnStartup" +onready var developed_by_label : Label = $"Contents/MarginContainer/Info/VBoxContainer/Branding/VBoxContainer/DevelopedBy" +onready var platinum_placeholder_label : Label = $"Contents/MarginContainer/Info/Sponsors/PlatinumContainer/PlaceholderLabel" +onready var gold_placeholder_label : Label = $"Contents/MarginContainer/Info/Sponsors/GoldContainer/PlaceholderLabel" func _on_SplashDialog_about_to_show() -> void: if Global.config_cache.has_section_key("preferences", "startup"): @@ -13,7 +13,6 @@ func _on_SplashDialog_about_to_show() -> void: var current_version : String = ProjectSettings.get_setting("application/config/Version") window_title = "Pixelorama" + " " + current_version changes_label.text = current_version + " " + tr("Changes") - developed_by_label.text = "Pixelorama" + " " + current_version + " - " + tr("Developed by Orama Interactive") art_by_label.text = tr("Art by") + ": Erevos" if "zh" in TranslationServer.get_locale(): @@ -41,3 +40,26 @@ func _on_PatronButton_pressed() -> void: func _on_TakeThisSpot_pressed() -> void: OS.shell_open("https://www.patreon.com/OramaInteractive") + +func _on_GithubButton_pressed(): + OS.shell_open("https://github.com/Orama-Interactive/Pixelorama") + +func _on_DiscordButton_pressed(): + OS.shell_open("https://discord.gg/GTMtr8s") + + +func _on_NewBtn_pressed(): + Global.control.file_menu_id_pressed(0) + visible = false + +func _on_OpenBtn__pressed(): + Global.control.file_menu_id_pressed(1) + visible = false + +func _on_OpenLastBtn_pressed(): + Global.control.file_menu_id_pressed(2) + visible = false + +func _on_ImportBtn_pressed(): + Global.control.file_menu_id_pressed(5) + visible = false