diff --git a/material_maker/windows/about/about.gd b/material_maker/windows/about/about.gd index 5c739049..71d5801e 100644 --- a/material_maker/windows/about/about.gd +++ b/material_maker/windows/about/about.gd @@ -1,11 +1,25 @@ extends WindowDialog +onready var application_name_label = $HBoxContainer/VBoxContainer/HBoxContainer3/VBoxContainer/ApplicationName +onready var authors_grid = $HBoxContainer/VBoxContainer/VBoxContainer/Authors + +const CONTRIBUTORS = [ + { name="Rodolphe Suescun", contribution="Lead developer" }, + { name="Hugo Locurcio", contribution="Lots of contributions, mostly related to UI and rendering" }, +] func _ready() -> void: if Engine.editor_hint: - $VBoxContainer/VBoxContainer1/ApplicationName.text = "Material Maker" + application_name_label.text = "Material Maker" else: - $VBoxContainer/VBoxContainer1/ApplicationName.text = ProjectSettings.get_setting("application/config/name")+" v"+ProjectSettings.get_setting("application/config/actual_release") + application_name_label.text = ProjectSettings.get_setting("application/config/name")+" v"+ProjectSettings.get_setting("application/config/actual_release") + for c in CONTRIBUTORS: + var label : Label = Label.new() + label.text = c.name + authors_grid.add_child(label) + label = Label.new() + label.text = c.contribution + authors_grid.add_child(label) func open_url(url) -> void: OS.shell_open(url) diff --git a/material_maker/windows/about/about.tscn b/material_maker/windows/about/about.tscn index feed715c..02ddd334 100644 --- a/material_maker/windows/about/about.tscn +++ b/material_maker/windows/about/about.tscn @@ -11,42 +11,40 @@ [ext_resource path="res://material_maker/windows/about/facebook.png" type="Texture" id=9] [node name="About" type="WindowDialog"] -margin_right = 200.0 -margin_bottom = 289.0 +margin_right = 664.0 +margin_bottom = 377.0 window_title = "About..." script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} -[node name="VBoxContainer" type="VBoxContainer" parent="."] +[node name="HBoxContainer" type="HBoxContainer" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 10.0 -margin_top = 10.0 -margin_right = -9.0 -margin_bottom = -8.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer"] +margin_right = 612.0 +margin_bottom = 377.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 custom_constants/separation = 8 __meta__ = { "_edit_use_anchors_": false } -[node name="VBoxContainer1" type="VBoxContainer" parent="VBoxContainer"] -margin_left = 43.0 -margin_right = 138.0 -margin_bottom = 99.0 -size_flags_horizontal = 4 -size_flags_vertical = 2 -custom_constants/separation = 5 +[node name="HBoxContainer3" type="HBoxContainer" parent="HBoxContainer/VBoxContainer"] +margin_left = 94.0 +margin_right = 517.0 +margin_bottom = 80.0 +size_flags_horizontal = 6 -[node name="ApplicationName" type="Label" parent="VBoxContainer/VBoxContainer1"] -margin_right = 95.0 -margin_bottom = 14.0 -text = "Material Maker" -align = 1 - -[node name="MMLogo" type="TextureRect" parent="VBoxContainer/VBoxContainer1"] -margin_left = 7.0 -margin_top = 19.0 -margin_right = 87.0 -margin_bottom = 99.0 +[node name="MMLogo" type="TextureRect" parent="HBoxContainer/VBoxContainer/HBoxContainer3"] +margin_right = 80.0 +margin_bottom = 80.0 rect_min_size = Vector2( 80, 80 ) size_flags_horizontal = 4 size_flags_vertical = 3 @@ -54,15 +52,64 @@ texture = ExtResource( 6 ) expand = true stretch_mode = 1 -[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"] -margin_left = 30.0 -margin_top = 123.0 -margin_right = 151.0 -margin_bottom = 155.0 -size_flags_horizontal = 4 -size_flags_vertical = 6 +[node name="Control" type="Control" parent="HBoxContainer/VBoxContainer/HBoxContainer3"] +margin_left = 84.0 +margin_right = 104.0 +margin_bottom = 80.0 +rect_min_size = Vector2( 20, 0 ) -[node name="Godot" type="TextureButton" parent="VBoxContainer/HBoxContainer2"] +[node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer/VBoxContainer/HBoxContainer3"] +margin_left = 108.0 +margin_top = 20.0 +margin_right = 423.0 +margin_bottom = 59.0 +size_flags_vertical = 4 + +[node name="ApplicationName" type="Label" parent="HBoxContainer/VBoxContainer/HBoxContainer3/VBoxContainer"] +margin_right = 95.0 +margin_bottom = 14.0 +size_flags_horizontal = 0 +size_flags_vertical = 0 +text = "Material Maker" +align = 1 + +[node name="Control" type="Control" parent="HBoxContainer/VBoxContainer/HBoxContainer3/VBoxContainer"] +margin_top = 18.0 +margin_right = 315.0 +margin_bottom = 21.0 +rect_min_size = Vector2( 0, 3 ) + +[node name="Copyright" type="Label" parent="HBoxContainer/VBoxContainer/HBoxContainer3/VBoxContainer"] +margin_top = 25.0 +margin_right = 315.0 +margin_bottom = 39.0 +size_flags_horizontal = 0 +size_flags_vertical = 6 +text = "© 2018-2021 Rodolphe Suescun and contributors" +align = 1 + +[node name="VBoxContainer" type="TabContainer" parent="HBoxContainer/VBoxContainer"] +margin_top = 88.0 +margin_right = 612.0 +margin_bottom = 369.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="Authors" type="GridContainer" parent="HBoxContainer/VBoxContainer/VBoxContainer"] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 4.0 +margin_top = 32.0 +margin_right = -4.0 +margin_bottom = -4.0 +custom_constants/hseparation = 30 +columns = 2 + +[node name="Godot" type="HBoxContainer" parent="HBoxContainer/VBoxContainer/VBoxContainer/Authors"] +margin_right = 125.0 +margin_bottom = 32.0 + +[node name="Godot" type="TextureButton" parent="HBoxContainer/VBoxContainer/VBoxContainer/Authors/Godot"] margin_right = 32.0 margin_bottom = 32.0 rect_min_size = Vector2( 32, 32 ) @@ -71,96 +118,133 @@ texture_normal = ExtResource( 4 ) expand = true stretch_mode = 4 -[node name="Label" type="Label" parent="VBoxContainer/HBoxContainer2"] +[node name="Label" type="Label" parent="HBoxContainer/VBoxContainer/VBoxContainer/Authors/Godot"] margin_left = 36.0 -margin_right = 121.0 -margin_bottom = 31.0 -text = "Based on -Godot Engine" +margin_top = 9.0 +margin_right = 125.0 +margin_bottom = 23.0 +text = " Godot Engine" align = 1 -[node name="VBoxContainer3" type="VBoxContainer" parent="VBoxContainer"] -margin_left = 22.0 -margin_top = 179.0 -margin_right = 158.0 -margin_bottom = 271.0 -size_flags_horizontal = 4 -size_flags_vertical = 8 -custom_constants/separation = 4 +[node name="Label" type="Label" parent="HBoxContainer/VBoxContainer/VBoxContainer/Authors"] +margin_left = 155.0 +margin_top = 9.0 +margin_right = 604.0 +margin_bottom = 23.0 +size_flags_horizontal = 3 +text = "99% of Material Maker's code is the awesome Godot Engine" +autowrap = true -[node name="RZLogo" type="TextureRect" parent="VBoxContainer/VBoxContainer3"] -margin_left = 36.0 -margin_right = 100.0 -margin_bottom = 64.0 -rect_min_size = Vector2( 64, 64 ) +[node name="License" type="TextEdit" parent="HBoxContainer/VBoxContainer/VBoxContainer"] +visible = false +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 4.0 +margin_top = 32.0 +margin_right = -4.0 +margin_bottom = -4.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "Copyright (c) 2018-2021 Rodolphe Suescun and contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." +readonly = true +wrap_enabled = true + +[node name="HBoxContainer" type="HBoxContainer" parent="HBoxContainer/VBoxContainer"] +margin_top = 377.0 +margin_right = 612.0 +margin_bottom = 377.0 +size_flags_horizontal = 3 + +[node name="SocialNetworks" type="VBoxContainer" parent="HBoxContainer"] +margin_left = 616.0 +margin_right = 664.0 +margin_bottom = 377.0 +size_flags_vertical = 3 + +[node name="RZLogo" type="TextureRect" parent="HBoxContainer/SocialNetworks"] +margin_top = 5.0 +margin_right = 48.0 +margin_bottom = 53.0 +rect_min_size = Vector2( 48, 48 ) size_flags_horizontal = 4 -size_flags_vertical = 4 +size_flags_vertical = 6 texture = ExtResource( 8 ) expand = true -[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/VBoxContainer3"] -margin_top = 68.0 -margin_right = 136.0 -margin_bottom = 92.0 -size_flags_horizontal = 4 - -[node name="Facebook" type="TextureButton" parent="VBoxContainer/VBoxContainer3/HBoxContainer"] -margin_right = 24.0 -margin_bottom = 24.0 -rect_min_size = Vector2( 24, 24 ) -hint_tooltip = "Facebook" -mouse_default_cursor_shape = 2 -texture_normal = ExtResource( 9 ) -expand = true -stretch_mode = 4 - -[node name="Twitter" type="TextureButton" parent="VBoxContainer/VBoxContainer3/HBoxContainer"] -margin_left = 28.0 -margin_right = 52.0 -margin_bottom = 24.0 -rect_min_size = Vector2( 24, 24 ) -hint_tooltip = "Twitter" -mouse_default_cursor_shape = 2 -texture_normal = ExtResource( 3 ) -expand = true -stretch_mode = 4 - -[node name="Youtube" type="TextureButton" parent="VBoxContainer/VBoxContainer3/HBoxContainer"] -margin_left = 56.0 -margin_right = 80.0 -margin_bottom = 24.0 -rect_min_size = Vector2( 24, 24 ) -hint_tooltip = "YouTube" -mouse_default_cursor_shape = 2 -texture_normal = ExtResource( 7 ) -expand = true -stretch_mode = 4 - -[node name="Github" type="TextureButton" parent="VBoxContainer/VBoxContainer3/HBoxContainer"] -margin_left = 84.0 -margin_right = 108.0 -margin_bottom = 24.0 -rect_min_size = Vector2( 24, 24 ) -hint_tooltip = "GitHub" -mouse_default_cursor_shape = 2 -texture_normal = ExtResource( 2 ) -expand = true -stretch_mode = 4 - -[node name="ItchIo" type="TextureButton" parent="VBoxContainer/VBoxContainer3/HBoxContainer"] -margin_left = 112.0 -margin_right = 136.0 -margin_bottom = 24.0 -rect_min_size = Vector2( 24, 24 ) +[node name="ItchIo" type="TextureButton" parent="HBoxContainer/SocialNetworks"] +margin_top = 69.0 +margin_right = 48.0 +margin_bottom = 117.0 +rect_min_size = Vector2( 48, 48 ) hint_tooltip = "itch.io" mouse_default_cursor_shape = 2 +size_flags_horizontal = 4 +size_flags_vertical = 6 texture_normal = ExtResource( 5 ) expand = true stretch_mode = 4 -[connection signal="pressed" from="VBoxContainer/HBoxContainer2/Godot" to="." method="open_url" binds= [ "https://godotengine.org/" ]] -[connection signal="pressed" from="VBoxContainer/VBoxContainer3/HBoxContainer/Facebook" to="." method="open_url" binds= [ "https://www.facebook.com/RodzLabs" ]] -[connection signal="pressed" from="VBoxContainer/VBoxContainer3/HBoxContainer/Twitter" to="." method="open_url" binds= [ "https://twitter.com/R0dZill4" ]] -[connection signal="pressed" from="VBoxContainer/VBoxContainer3/HBoxContainer/Youtube" to="." method="open_url" binds= [ "https://www.youtube.com/channel/UCTDByv9i3ul_qQ98zUYlNAQ" ]] -[connection signal="pressed" from="VBoxContainer/VBoxContainer3/HBoxContainer/Github" to="." method="open_url" binds= [ "https://github.com/RodZill4/godot-procedural-textures" ]] -[connection signal="pressed" from="VBoxContainer/VBoxContainer3/HBoxContainer/ItchIo" to="." method="open_url" binds= [ "https://rodzilla.itch.io/material-maker" ]] +[node name="Github" type="TextureButton" parent="HBoxContainer/SocialNetworks"] +margin_top = 132.0 +margin_right = 48.0 +margin_bottom = 180.0 +rect_min_size = Vector2( 48, 48 ) +hint_tooltip = "GitHub" +mouse_default_cursor_shape = 2 +size_flags_horizontal = 4 +size_flags_vertical = 6 +texture_normal = ExtResource( 2 ) +expand = true +stretch_mode = 4 + +[node name="Twitter" type="TextureButton" parent="HBoxContainer/SocialNetworks"] +margin_top = 196.0 +margin_right = 48.0 +margin_bottom = 244.0 +rect_min_size = Vector2( 48, 48 ) +hint_tooltip = "Twitter" +mouse_default_cursor_shape = 2 +size_flags_horizontal = 4 +size_flags_vertical = 6 +texture_normal = ExtResource( 3 ) +expand = true +stretch_mode = 4 + +[node name="Youtube" type="TextureButton" parent="HBoxContainer/SocialNetworks"] +margin_top = 259.0 +margin_right = 48.0 +margin_bottom = 307.0 +rect_min_size = Vector2( 48, 48 ) +hint_tooltip = "YouTube" +mouse_default_cursor_shape = 2 +size_flags_horizontal = 4 +size_flags_vertical = 6 +texture_normal = ExtResource( 7 ) +expand = true +stretch_mode = 4 + +[node name="Facebook" type="TextureButton" parent="HBoxContainer/SocialNetworks"] +margin_top = 323.0 +margin_right = 48.0 +margin_bottom = 371.0 +rect_min_size = Vector2( 48, 48 ) +hint_tooltip = "Facebook" +mouse_default_cursor_shape = 2 +size_flags_horizontal = 4 +size_flags_vertical = 6 +texture_normal = ExtResource( 9 ) +expand = true +stretch_mode = 4 + +[connection signal="pressed" from="HBoxContainer/VBoxContainer/VBoxContainer/Authors/Godot/Godot" to="." method="open_url" binds= [ "https://godotengine.org/" ]] +[connection signal="pressed" from="HBoxContainer/SocialNetworks/ItchIo" to="." method="open_url" binds= [ "https://rodzilla.itch.io/material-maker" ]] +[connection signal="pressed" from="HBoxContainer/SocialNetworks/Github" to="." method="open_url" binds= [ "https://github.com/RodZill4/godot-procedural-textures" ]] +[connection signal="pressed" from="HBoxContainer/SocialNetworks/Twitter" to="." method="open_url" binds= [ "https://twitter.com/R0dZill4" ]] +[connection signal="pressed" from="HBoxContainer/SocialNetworks/Youtube" to="." method="open_url" binds= [ "https://www.youtube.com/channel/UCTDByv9i3ul_qQ98zUYlNAQ" ]] +[connection signal="pressed" from="HBoxContainer/SocialNetworks/Facebook" to="." method="open_url" binds= [ "https://www.facebook.com/RodzLabs" ]] diff --git a/material_maker/windows/about/facebook.png b/material_maker/windows/about/facebook.png index b98896a5..0c4fc541 100644 Binary files a/material_maker/windows/about/facebook.png and b/material_maker/windows/about/facebook.png differ