From ff47ae26c0b0d54e84324fce982f9f434afdcc0f Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Tue, 31 Dec 2019 03:02:53 +0200 Subject: [PATCH] Small UI changes --- Changelog.md | 2 +- Main.tscn | 132 +++++++++++++--------------- Prefabs/EditPalettePopup.tscn | 54 ++++++------ Scripts/Dialogs/ImportSprites.gd | 2 +- Scripts/Global.gd | 4 - Scripts/Main.gd | 25 ++---- Scripts/Palette/EditPalettePopup.gd | 6 +- 7 files changed, 98 insertions(+), 127 deletions(-) diff --git a/Changelog.md b/Changelog.md index 9d3731e70..c3e10b48d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -10,7 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Multiple theme support (Dark, Gray, Light, Godot, Gold) to better match your style (Thanks to Erevoid)! - 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 and filled circle brushes. They use Bresenham's circle algorithm to scale. +- Added a better circle and filled circle brushes. They use Bresenham's circle algorithm for scaling. - Added random brushes! Every time you draw, expect to see something different! To create random brushes, place the images you want your brush to have in the same folder, and put the symbol "%" in front of their filename. Examples, "%icon1.png", "%grass_green.png" - Pixelorama goes worldwide with even more translations! (German, French, Polish, Brazilian Portuguese, Russian, Traditional Chinese) - Importing spritesheets is now possible. diff --git a/Main.tscn b/Main.tscn index 9f6ed84fa..298149bdd 100644 --- a/Main.tscn +++ b/Main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=93 format=2] +[gd_scene load_steps=91 format=2] [ext_resource path="res://Themes & Styles/Dark Theme/Dark Theme.tres" type="Theme" id=1] [ext_resource path="res://Scripts/Main.gd" type="Script" id=2] @@ -58,18 +58,16 @@ [ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Merge_Down_Hover.png" type="Texture" id=56] [ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Merge_Down_Disabled.png" type="Texture" id=57] [ext_resource path="res://Prefabs/BrushButton.tscn" type="PackedScene" id=58] -[ext_resource path="res://Assets/Graphics/Canvas_split.png" type="Texture" id=59] -[ext_resource path="res://Assets/Graphics/Canvas_unsplit.png" type="Texture" id=60] -[ext_resource path="res://Prefabs/Dialogs/CreateNewImage.tscn" type="PackedScene" id=61] -[ext_resource path="res://Prefabs/Dialogs/ImportSprites.tscn" type="PackedScene" id=62] -[ext_resource path="res://Prefabs/Dialogs/ExportSprites.tscn" type="PackedScene" id=63] -[ext_resource path="res://Prefabs/Dialogs/ScaleImage.tscn" type="PackedScene" id=64] -[ext_resource path="res://Prefabs/Dialogs/PreferencesDialog.tscn" type="PackedScene" id=65] -[ext_resource path="res://Prefabs/Dialogs/OutlineDialog.tscn" type="PackedScene" id=66] -[ext_resource path="res://Prefabs/Dialogs/AboutDialog.tscn" type="PackedScene" id=67] -[ext_resource path="res://Prefabs/EditPalettePopup.tscn" type="PackedScene" id=68] -[ext_resource path="res://Prefabs/NewPaletteDialog.tscn" type="PackedScene" id=69] -[ext_resource path="res://Prefabs/PaletteImportFileDialog.tscn" type="PackedScene" id=70] +[ext_resource path="res://Prefabs/Dialogs/CreateNewImage.tscn" type="PackedScene" id=59] +[ext_resource path="res://Prefabs/Dialogs/ImportSprites.tscn" type="PackedScene" id=60] +[ext_resource path="res://Prefabs/Dialogs/ExportSprites.tscn" type="PackedScene" id=61] +[ext_resource path="res://Prefabs/Dialogs/ScaleImage.tscn" type="PackedScene" id=62] +[ext_resource path="res://Prefabs/Dialogs/PreferencesDialog.tscn" type="PackedScene" id=63] +[ext_resource path="res://Prefabs/Dialogs/OutlineDialog.tscn" type="PackedScene" id=64] +[ext_resource path="res://Prefabs/Dialogs/AboutDialog.tscn" type="PackedScene" id=65] +[ext_resource path="res://Prefabs/EditPalettePopup.tscn" type="PackedScene" id=66] +[ext_resource path="res://Prefabs/NewPaletteDialog.tscn" type="PackedScene" id=67] +[ext_resource path="res://Prefabs/PaletteImportFileDialog.tscn" type="PackedScene" id=68] [sub_resource type="InputEventKey" id=1] scancode = 88 @@ -929,7 +927,6 @@ 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 @@ -955,14 +952,22 @@ action_mode = 0 enabled_focus_mode = 0 script = ExtResource( 14 ) -[node name="ViewportandVerticalRuler" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers"] +[node name="HSplitContainer" type="HSplitContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers"] margin_top = 16.0 margin_right = 704.0 margin_bottom = 478.0 size_flags_vertical = 3 +custom_constants/autohide = 0 + +[node name="ViewportandVerticalRuler" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer"] +editor/display_folded = true +margin_right = 692.0 +margin_bottom = 462.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 custom_constants/separation = 0 -[node name="VerticalRuler" type="Button" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/ViewportandVerticalRuler"] +[node name="VerticalRuler" type="Button" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler"] margin_right = 16.0 margin_bottom = 462.0 rect_min_size = Vector2( 16, 0 ) @@ -978,28 +983,27 @@ action_mode = 0 enabled_focus_mode = 0 script = ExtResource( 15 ) -[node name="ViewportContainer" type="ViewportContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/ViewportandVerticalRuler"] -editor/display_folded = true +[node name="ViewportContainer" type="ViewportContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler"] margin_left = 16.0 -margin_right = 704.0 +margin_right = 692.0 margin_bottom = 462.0 size_flags_horizontal = 3 size_flags_vertical = 3 stretch = true -[node name="Viewport" type="Viewport" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/ViewportandVerticalRuler/ViewportContainer"] -size = Vector2( 688, 462 ) +[node name="Viewport" type="Viewport" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer"] +size = Vector2( 676, 462 ) handle_input_locally = false render_target_update_mode = 3 -[node name="Canvas" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/ViewportandVerticalRuler/ViewportContainer/Viewport" instance=ExtResource( 16 )] +[node name="Canvas" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport" instance=ExtResource( 16 )] -[node name="Camera2D" type="Camera2D" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/ViewportandVerticalRuler/ViewportContainer/Viewport"] +[node name="Camera2D" type="Camera2D" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport"] current = true zoom = Vector2( 0.15, 0.15 ) script = ExtResource( 17 ) -[node name="SelectionRectangle" type="Polygon2D" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/ViewportandVerticalRuler/ViewportContainer/Viewport"] +[node name="SelectionRectangle" type="Polygon2D" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport"] visible = false z_index = 1 color = Color( 0.0823529, 0.694118, 0.623529, 0.592157 ) @@ -1008,29 +1012,20 @@ invert_border = 0.5 polygon = PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0 ) script = ExtResource( 18 ) -[node name="ViewportSeparator" type="VSeparator" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer"] -visible = false -margin_left = 315.0 -margin_right = 319.0 -margin_bottom = 464.0 - -[node name="ViewportContainer2" type="ViewportContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer"] -editor/display_folded = true -visible = false -margin_left = 345.0 -margin_right = 686.0 -margin_bottom = 478.0 -size_flags_horizontal = 3 +[node name="ViewportContainer2" type="ViewportContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer"] +margin_left = 704.0 +margin_right = 704.0 +margin_bottom = 462.0 size_flags_vertical = 3 stretch = true -[node name="Viewport" type="Viewport" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportContainer2"] -size = Vector2( 341, 478 ) +[node name="Viewport" type="Viewport" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportContainer2"] +size = Vector2( 0, 462 ) handle_input_locally = false -render_target_update_mode = 0 +render_target_update_mode = 3 script = ExtResource( 19 ) -[node name="Camera2D2" type="Camera2D" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportContainer2/Viewport"] +[node name="Camera2D2" type="Camera2D" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportContainer2/Viewport"] current = true zoom = Vector2( 0.15, 0.15 ) script = ExtResource( 17 ) @@ -1357,6 +1352,8 @@ margin_bottom = 32.0 margin_right = 32.0 margin_bottom = 32.0 rect_min_size = Vector2( 32, 32 ) +hint_tooltip = "NEWPALETTE_HT" +mouse_default_cursor_shape = 2 texture_normal = ExtResource( 37 ) texture_hover = ExtResource( 38 ) @@ -1371,6 +1368,8 @@ items = [ "New Empty Palette", null, 0, false, false, 0, 0, null, "", false, "Im margin_left = 36.0 margin_right = 68.0 margin_bottom = 32.0 +hint_tooltip = "EDITPALETTE_HT" +mouse_default_cursor_shape = 2 texture_normal = ExtResource( 39 ) texture_hover = ExtResource( 40 ) @@ -1380,6 +1379,8 @@ margin_right = 175.0 margin_bottom = 32.0 grow_horizontal = 0 rect_min_size = Vector2( 103, 0 ) +hint_tooltip = "CHOOSEPALETTE_HT" +mouse_default_cursor_shape = 2 clip_text = true [node name="ScrollPalette" type="ScrollContainer" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/PaletteVBoxContainer"] @@ -1427,12 +1428,10 @@ size_flags_vertical = 3 custom_constants/separation = 6 [node name="CenterLayerButtons" type="CenterContainer" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer"] -editor/display_folded = true margin_right = 224.0 margin_bottom = 32.0 [node name="LayerButtons" type="HBoxContainer" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons"] -editor/display_folded = true margin_left = 6.0 margin_right = 218.0 margin_bottom = 32.0 @@ -1532,6 +1531,7 @@ margin_left = 48.0 margin_right = 154.0 margin_bottom = 17.0 rect_min_size = Vector2( 106, 0 ) +mouse_default_cursor_shape = 2 size_flags_vertical = 1 value = 100.0 @@ -1539,6 +1539,7 @@ value = 100.0 margin_left = 158.0 margin_right = 212.0 margin_bottom = 17.0 +mouse_default_cursor_shape = 2 value = 100.0 align = 1 @@ -1618,21 +1619,7 @@ scroll_horizontal_enabled = false [node name="ProjectBrushContainer" type="GridContainer" parent="BrushesPopup/TabContainer/Project"] columns = 5 -[node name="SplitScreenButton" type="TextureButton" parent="."] -anchor_left = 1.0 -anchor_right = 1.0 -margin_left = -236.921 -margin_top = 44.4745 -margin_right = -223.921 -margin_bottom = 57.4745 -hint_tooltip = "SPLITSCREEN_HT" -mouse_default_cursor_shape = 2 -size_flags_vertical = 0 -toggle_mode = true -texture_normal = ExtResource( 59 ) -texture_pressed = ExtResource( 60 ) - -[node name="CreateNewImage" parent="." instance=ExtResource( 61 )] +[node name="CreateNewImage" parent="." instance=ExtResource( 59 )] [node name="OpenSprite" type="FileDialog" parent="."] margin_right = 515.0 @@ -1661,17 +1648,17 @@ filters = PoolStringArray( "*.pxo ; Pixelorama Project" ) current_dir = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama" current_path = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama/" -[node name="ImportSprites" parent="." instance=ExtResource( 62 )] +[node name="ImportSprites" parent="." instance=ExtResource( 60 )] -[node name="ExportSprites" parent="." instance=ExtResource( 63 )] +[node name="ExportSprites" parent="." instance=ExtResource( 61 )] -[node name="ScaleImage" parent="." instance=ExtResource( 64 )] +[node name="ScaleImage" parent="." instance=ExtResource( 62 )] -[node name="PreferencesDialog" parent="." instance=ExtResource( 65 )] +[node name="PreferencesDialog" parent="." instance=ExtResource( 63 )] -[node name="OutlineDialog" parent="." instance=ExtResource( 66 )] +[node name="OutlineDialog" parent="." instance=ExtResource( 64 )] -[node name="AboutDialog" parent="." instance=ExtResource( 67 )] +[node name="AboutDialog" parent="." instance=ExtResource( 65 )] [node name="QuitDialog" type="ConfirmationDialog" parent="."] margin_right = 200.0 @@ -1685,12 +1672,12 @@ margin_bottom = 60.0 window_title = "Error!" dialog_text = "This is an error message!" -[node name="EditPalettePopup" parent="." instance=ExtResource( 68 )] +[node name="EditPalettePopup" parent="." instance=ExtResource( 66 )] visible = false -[node name="NewPaletteDialog" parent="." instance=ExtResource( 69 )] +[node name="NewPaletteDialog" parent="." instance=ExtResource( 67 )] -[node name="PaletteImportFileDialog" parent="." instance=ExtResource( 70 )] +[node name="PaletteImportFileDialog" parent="." instance=ExtResource( 68 )] filters = PoolStringArray( "*.json ; JavaScript Object Notation", "*.gpl ; Gimp Palette Library" ) current_dir = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama" current_path = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama/" @@ -1735,11 +1722,11 @@ visible = false [connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightMirroring/RightMirrorButtons/RightHorizontalMirroring" to="." method="_on_RightHorizontalMirroring_toggled"] [connection signal="toggled" from="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightMirroring/RightMirrorButtons/RightVerticalMirroring" to="." method="_on_RightVerticalMirroring_toggled"] [connection signal="pressed" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HorizontalRuler" to="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HorizontalRuler" method="_on_HorizontalRuler_pressed"] -[connection signal="pressed" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/ViewportandVerticalRuler/VerticalRuler" to="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/ViewportandVerticalRuler/VerticalRuler" method="_on_VerticalRuler_pressed"] -[connection signal="mouse_entered" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/ViewportandVerticalRuler/ViewportContainer" to="." method="_on_ViewportContainer_mouse_entered"] -[connection signal="mouse_exited" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/ViewportandVerticalRuler/ViewportContainer" to="." method="_on_ViewportContainer_mouse_exited"] -[connection signal="mouse_entered" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportContainer2" to="." method="_on_ViewportContainer_mouse_entered"] -[connection signal="mouse_exited" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportContainer2" to="." method="_on_ViewportContainer_mouse_exited"] +[connection signal="pressed" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/VerticalRuler" to="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/VerticalRuler" method="_on_VerticalRuler_pressed"] +[connection signal="mouse_entered" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer" to="." method="_on_ViewportContainer_mouse_entered"] +[connection signal="mouse_exited" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer" to="." method="_on_ViewportContainer_mouse_exited"] +[connection signal="mouse_entered" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportContainer2" to="." method="_on_ViewportContainer_mouse_entered"] +[connection signal="mouse_exited" from="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportContainer2" to="." method="_on_ViewportContainer_mouse_exited"] [connection signal="pressed" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/FirstFrame" to="." method="_on_FirstFrame_pressed"] [connection signal="pressed" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/PreviousFrame" to="." method="_on_PreviousFrame_pressed"] [connection signal="toggled" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/PlayBackwards" to="." method="_on_PlayBackwards_toggled"] @@ -1764,7 +1751,6 @@ visible = false [connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons/MergeDownLayer" to="." method="_on_MergeLayer_pressed"] [connection signal="value_changed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/OpacityCenter/OpacityContainer/OpacitySlider" to="." method="_on_OpacitySlider_value_changed"] [connection signal="value_changed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/OpacityCenter/OpacityContainer/OpacitySpinBox" to="." method="_on_OpacitySlider_value_changed"] -[connection signal="toggled" from="SplitScreenButton" to="." method="_on_SplitScreenButton_toggled"] [connection signal="popup_hide" from="CreateNewImage" to="." method="_can_draw_true"] [connection signal="file_selected" from="OpenSprite" to="." method="_on_OpenSprite_file_selected"] [connection signal="popup_hide" from="OpenSprite" to="." method="_on_ImportSprites_popup_hide"] diff --git a/Prefabs/EditPalettePopup.tscn b/Prefabs/EditPalettePopup.tscn index 9f14f789f..5eed442f4 100644 --- a/Prefabs/EditPalettePopup.tscn +++ b/Prefabs/EditPalettePopup.tscn @@ -10,7 +10,7 @@ visible = true margin_right = 600.0 margin_bottom = 550.0 -rect_min_size = Vector2( 600, 550 ) +rect_min_size = Vector2( 600, 570 ) window_title = "Edit Palette" script = ExtResource( 1 ) @@ -22,6 +22,7 @@ margin_top = 10.0 margin_right = -10.0 margin_bottom = -10.0 size_flags_horizontal = 3 +custom_constants/separation = 8 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"] margin_right = 580.0 @@ -63,44 +64,41 @@ margin_bottom = 44.0 texture_normal = ExtResource( 4 ) texture_hover = ExtResource( 5 ) -[node name="ColorNameContainer" type="HBoxContainer" parent="VBoxContainer"] -margin_top = 466.0 +[node name="PaletteOptions" type="GridContainer" parent="VBoxContainer"] +margin_top = 470.0 margin_right = 580.0 -margin_bottom = 490.0 +margin_bottom = 522.0 +columns = 2 -[node name="Label" type="Label" parent="VBoxContainer/ColorNameContainer"] -margin_top = 5.0 -margin_right = 79.0 -margin_bottom = 19.0 -text = "Color Name:" - -[node name="EditPaletteColorNameLineEdit" type="LineEdit" parent="VBoxContainer/ColorNameContainer"] -margin_left = 83.0 -margin_right = 580.0 -margin_bottom = 24.0 -size_flags_horizontal = 3 - -[node name="PaletteNameContainer" type="HBoxContainer" parent="VBoxContainer"] -margin_top = 494.0 -margin_right = 580.0 -margin_bottom = 518.0 - -[node name="Label" type="Label" parent="VBoxContainer/PaletteNameContainer"] +[node name="Label" type="Label" parent="VBoxContainer/PaletteOptions"] margin_top = 5.0 margin_right = 91.0 margin_bottom = 19.0 -text = "Palette Name:" +text = "Color Name:" -[node name="EditPaletteNameLineEdit" type="LineEdit" parent="VBoxContainer/PaletteNameContainer"] +[node name="EditPaletteColorNameLineEdit" type="LineEdit" parent="VBoxContainer/PaletteOptions"] margin_left = 95.0 margin_right = 580.0 margin_bottom = 24.0 size_flags_horizontal = 3 -[node name="WindowOptionsContainer" type="HBoxContainer" parent="VBoxContainer"] -margin_top = 522.0 +[node name="Label2" type="Label" parent="VBoxContainer/PaletteOptions"] +margin_top = 33.0 +margin_right = 91.0 +margin_bottom = 47.0 +text = "Palette Name:" + +[node name="EditPaletteNameLineEdit" type="LineEdit" parent="VBoxContainer/PaletteOptions"] +margin_left = 95.0 +margin_top = 28.0 margin_right = 580.0 -margin_bottom = 542.0 +margin_bottom = 52.0 +size_flags_horizontal = 3 + +[node name="WindowOptionsContainer" type="HBoxContainer" parent="VBoxContainer"] +margin_top = 530.0 +margin_right = 580.0 +margin_bottom = 550.0 size_flags_horizontal = 3 [node name="SpacerControl" type="Control" parent="VBoxContainer/WindowOptionsContainer"] @@ -134,6 +132,6 @@ size_flags_horizontal = 3 [connection signal="color_changed" from="VBoxContainer/HBoxContainer/EditPaletteColorPicker" to="." method="_on_EditPaletteColorPicker_color_changed"] [connection signal="pressed" from="VBoxContainer/HBoxContainer/ColorButtons/AddSwatchButton" to="." method="_on_AddSwatchButton_pressed"] [connection signal="pressed" from="VBoxContainer/HBoxContainer/ColorButtons/RemoveSwatchButton" to="." method="_on_RemoveSwatchButton_pressed"] -[connection signal="text_changed" from="VBoxContainer/ColorNameContainer/EditPaletteColorNameLineEdit" to="." method="_on_EditPaletteColorNameLineEdit_text_changed"] +[connection signal="text_changed" from="VBoxContainer/PaletteOptions/EditPaletteColorNameLineEdit" to="." method="_on_EditPaletteColorNameLineEdit_text_changed"] [connection signal="pressed" from="VBoxContainer/WindowOptionsContainer/EditPaletteSaveButton" to="." method="_on_EditPaletteSaveButton_pressed"] [connection signal="pressed" from="VBoxContainer/WindowOptionsContainer/EditPaletteCancelButton" to="." method="_on_EditPaletteCancelButton_pressed"] diff --git a/Scripts/Dialogs/ImportSprites.gd b/Scripts/Dialogs/ImportSprites.gd index 31876873e..0b8dfa226 100644 --- a/Scripts/Dialogs/ImportSprites.gd +++ b/Scripts/Dialogs/ImportSprites.gd @@ -107,5 +107,5 @@ func _on_ImportSprites_files_selected(paths : PoolStringArray) -> void: Global.canvas = Global.canvases[Global.canvases.size() - 1] Global.canvas.visible = true - OS.set_window_title(first_path.get_file() + " (imported) - Pixelorama") + OS.set_window_title(first_path.get_file() + " (" + tr("imported") + ") - Pixelorama") diff --git a/Scripts/Global.gd b/Scripts/Global.gd index 39f35cc75..46c9f4bf3 100644 --- a/Scripts/Global.gd +++ b/Scripts/Global.gd @@ -128,8 +128,6 @@ var canvas : Canvas var canvas_parent : Node var main_viewport : ViewportContainer var second_viewport : ViewportContainer -var viewport_separator : VSeparator -var split_screen_button : BaseButton var camera : Camera2D var camera2 : Camera2D var camera_preview : Camera2D @@ -241,8 +239,6 @@ func _ready() -> void: canvas_parent = canvas.get_parent() main_viewport = find_node_by_name(root, "ViewportContainer") second_viewport = find_node_by_name(root, "ViewportContainer2") - viewport_separator = find_node_by_name(root, "ViewportSeparator") - split_screen_button = find_node_by_name(root, "SplitScreenButton") camera = find_node_by_name(canvas_parent, "Camera2D") camera2 = find_node_by_name(root, "Camera2D2") camera_preview = find_node_by_name(root, "CameraPreview") diff --git a/Scripts/Main.gd b/Scripts/Main.gd index 87d23b6f1..25925b8b7 100644 --- a/Scripts/Main.gd +++ b/Scripts/Main.gd @@ -16,7 +16,7 @@ var previous_right_color := Color.white # Called when the node enters the scene tree for the first time. func _ready() -> void: get_tree().set_auto_accept_quit(false) - OS.set_window_title("(untitled) - Pixelorama") + OS.set_window_title("(" + tr("untitled") + ") - Pixelorama") # Set a minimum window size to prevent UI elements from collapsing on each other. # This property is only available in 3.2alpha or later, so use `set()` to fail gracefully if it doesn't exist. OS.set("min_window_size", Vector2(1152, 648)) @@ -343,7 +343,7 @@ func help_menu_id_pressed(id : int) -> void: func _on_OpenSprite_file_selected(path : String) -> void: var file := File.new() var err := file.open(path, File.READ) - if err != OK: #An error occured + if err != OK: # An error occured file.close() OS.alert("Can't load file") return @@ -357,7 +357,7 @@ func _on_OpenSprite_file_selected(path : String) -> void: var frame := 0 var frame_line := file.get_line() clear_canvases() - while frame_line == "--": #Load frames + while frame_line == "--": # Load frames var canvas : Canvas = load("res://Prefabs/Canvas.tscn").instance() Global.canvas = canvas var width := file.get_16() @@ -378,8 +378,8 @@ func _on_OpenSprite_file_selected(path : String) -> void: canvas.layers.append([image, tex, layer_name, true, layer_transparency]) layer_line = file.get_line() - var guide_line := file.get_line() #"guideline" no pun intended - while guide_line == "|": #Load guides + var guide_line := file.get_line() # "guideline" no pun intended + while guide_line == "|": # Load guides var guide := Guide.new() guide.default_color = Color.purple guide.type = file.get_8() @@ -401,7 +401,7 @@ func _on_OpenSprite_file_selected(path : String) -> void: frame += 1 Global.current_frame = frame - 1 - #Load tool options + # Load tool options Global.left_color_picker.color = file.get_var() Global.right_color_picker.color = file.get_var() Global.left_brush_size = file.get_8() @@ -415,7 +415,7 @@ func _on_OpenSprite_file_selected(path : String) -> void: for color in right_palette: Global.right_color_picker.get_picker().add_preset(color) - #Load custom brushes + # Load custom brushes Global.custom_brushes.resize(Global.brushes_from_files) Global.remove_brush_buttons() @@ -502,6 +502,7 @@ func clear_canvases() -> void: current_save_path = "" $ExportSprites.current_export_path = "" file_menu.set_item_text(5, "Export PNG...") + OS.set_window_title("(" + tr("untitled") + ") - Pixelorama") Global.undo_redo.clear_history(false) func _on_ImportSprites_popup_hide() -> void: @@ -823,16 +824,6 @@ func _on_FutureOnionSkinning_value_changed(value) -> void: func _on_BlueRedMode_toggled(button_pressed) -> void: Global.onion_skinning_blue_red = button_pressed -func _on_SplitScreenButton_toggled(button_pressed) -> void: - if button_pressed: - Global.viewport_separator.visible = true - Global.second_viewport.visible = true - $SplitScreenButton.hint_tooltip = tr("SPLITSCREEN_HIDE_HT") - else: - Global.viewport_separator.visible = false - Global.second_viewport.visible = false - $SplitScreenButton.hint_tooltip = tr("SPLITSCREEN_HT") - func _on_ColorSwitch_pressed() -> void: var temp: Color = Global.left_color_picker.color Global.left_color_picker.color = Global.right_color_picker.color diff --git a/Scripts/Palette/EditPalettePopup.gd b/Scripts/Palette/EditPalettePopup.gd index 55926d259..062fe44f4 100644 --- a/Scripts/Palette/EditPalettePopup.gd +++ b/Scripts/Palette/EditPalettePopup.gd @@ -2,10 +2,10 @@ extends WindowDialog onready var color_picker = $VBoxContainer/HBoxContainer/EditPaletteColorPicker onready var palette_grid = $VBoxContainer/HBoxContainer/Panel/EditPaletteGridContainer -onready var color_name_edit = $VBoxContainer/ColorNameContainer/EditPaletteColorNameLineEdit -onready var palette_name_edit = $VBoxContainer/PaletteNameContainer/EditPaletteNameLineEdit +onready var color_name_edit = $VBoxContainer/PaletteOptions/EditPaletteColorNameLineEdit +onready var palette_name_edit = $VBoxContainer/PaletteOptions/EditPaletteNameLineEdit -var palette_button = preload("res://Prefabs/PaletteButton.tscn"); +var palette_button = preload("res://Prefabs/PaletteButton.tscn") var current_palette : String var current_swatch := -1