diff --git a/Changelog.md b/Changelog.md index 1df4c3ed1..df60ae748 100644 --- a/Changelog.md +++ b/Changelog.md @@ -14,7 +14,7 @@ Martin Novák (novhack), luiq54, Schweini07, Marco Galli (Gaarco), Matheus Peseg - You can now group multiple frames with tags. - You can now export your projects to .gif files. - A new rotation method has been added, "Upscale, Rotate and Downscale". It's similar to Rotsprite. -- A HSV Adjust dialog has been added in the Images menu. +- An HSV Adjust dialog has been added in the Images menu. - Pattern filling is now possible. If the user chooses a brush that is not the pixel or a circle brush and uses the bucket tool, the brush image is used as a pattern that fills the area. - Users can now change keyboard shortcut bindings for tools, in the Preferences. - Importing .pngs as palettes is now possible. diff --git a/Main.tscn b/Main.tscn index f3a3c1c4b..4d48334d1 100644 --- a/Main.tscn +++ b/Main.tscn @@ -316,26 +316,26 @@ texture_normal = ExtResource( 9 ) [node name="CanvasAndTimeline" type="VSplitContainer" parent="MenuAndUI/UI"] margin_left = 48.0 -margin_right = 980.0 +margin_right = 950.0 margin_bottom = 692.0 size_flags_horizontal = 3 custom_constants/autohide = 0 [node name="HViewportContainer" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline"] -margin_right = 932.0 +margin_right = 902.0 margin_bottom = 480.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="ViewportAndRulers" type="VBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer"] -margin_right = 932.0 +margin_right = 902.0 margin_bottom = 480.0 size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/separation = 0 [node name="HorizontalRuler" type="Button" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers"] -margin_right = 932.0 +margin_right = 902.0 margin_bottom = 16.0 rect_min_size = Vector2( 0, 16 ) focus_mode = 0 @@ -349,13 +349,13 @@ script = ExtResource( 14 ) [node name="HSplitContainer" type="HSplitContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers"] margin_top = 16.0 -margin_right = 932.0 +margin_right = 902.0 margin_bottom = 480.0 size_flags_vertical = 3 custom_constants/autohide = 0 [node name="ViewportandVerticalRuler" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer"] -margin_right = 920.0 +margin_right = 890.0 margin_bottom = 464.0 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -379,7 +379,7 @@ script = ExtResource( 15 ) [node name="ViewportContainer" type="ViewportContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler"] margin_left = 16.0 -margin_right = 920.0 +margin_right = 890.0 margin_bottom = 464.0 focus_mode = 2 size_flags_horizontal = 3 @@ -387,7 +387,7 @@ size_flags_vertical = 3 stretch = true [node name="Viewport" type="Viewport" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer"] -size = Vector2( 904, 464 ) +size = Vector2( 874, 464 ) handle_input_locally = false usage = 0 render_target_update_mode = 3 @@ -416,8 +416,8 @@ polygon = PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0 ) script = ExtResource( 18 ) [node name="ViewportContainer2" type="ViewportContainer" parent="MenuAndUI/UI/CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer"] -margin_left = 932.0 -margin_right = 932.0 +margin_left = 902.0 +margin_right = 902.0 margin_bottom = 464.0 size_flags_vertical = 3 stretch = true @@ -435,14 +435,14 @@ script = ExtResource( 17 ) [node name="AnimationTimeline" parent="MenuAndUI/UI/CanvasAndTimeline" instance=ExtResource( 20 )] margin_top = 492.0 -margin_right = 932.0 +margin_right = 902.0 margin_bottom = 692.0 [node name="RightPanel" type="Panel" parent="MenuAndUI/UI"] -margin_left = 980.0 +margin_left = 950.0 margin_right = 1280.0 margin_bottom = 692.0 -rect_min_size = Vector2( 300, 0 ) +rect_min_size = Vector2( 330, 0 ) [node name="PreviewAndPalettes" type="VBoxContainer" parent="MenuAndUI/UI/RightPanel"] anchor_right = 1.0 @@ -453,12 +453,12 @@ __meta__ = { } [node name="CanvasPreview" type="ViewportContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes"] -margin_right = 300.0 +margin_right = 330.0 margin_bottom = 150.0 rect_min_size = Vector2( 0, 150 ) [node name="Viewport" type="Viewport" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/CanvasPreview"] -size = Vector2( 300, 150 ) +size = Vector2( 330, 150 ) transparent_bg = true handle_input_locally = false render_target_update_mode = 3 @@ -472,36 +472,36 @@ script = ExtResource( 17 ) [node name="HSeparator" type="HSeparator" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes"] margin_top = 154.0 -margin_right = 300.0 +margin_right = 330.0 margin_bottom = 158.0 [node name="ToolAndPaletteVSplit" type="VSplitContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes"] margin_top = 162.0 -margin_right = 300.0 +margin_right = 330.0 margin_bottom = 676.0 size_flags_vertical = 3 custom_constants/autohide = 0 [node name="ColorAndToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit"] -margin_right = 300.0 +margin_right = 330.0 margin_bottom = 251.0 size_flags_vertical = 3 custom_constants/separation = 8 [node name="ColorButtonsVertical" type="VBoxContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions"] -margin_right = 300.0 +margin_right = 330.0 margin_bottom = 51.0 custom_constants/separation = 2 [node name="ColorSwitchCenter" type="CenterContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ColorButtonsVertical"] -margin_right = 300.0 +margin_right = 330.0 margin_bottom = 7.0 [node name="ColorSwitch" type="TextureButton" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ColorButtonsVertical/ColorSwitchCenter" groups=[ "UIButtons", ]] -margin_left = 137.0 -margin_right = 162.0 +margin_left = 152.0 +margin_right = 177.0 margin_bottom = 7.0 mouse_default_cursor_shape = 2 shortcut_in_tooltip = false @@ -510,12 +510,12 @@ texture_normal = ExtResource( 10 ) [node name="ColorPickersCenter" type="CenterContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ColorButtonsVertical"] margin_top = 9.0 -margin_right = 300.0 +margin_right = 330.0 margin_bottom = 41.0 [node name="ColorPickersHorizontal" type="HBoxContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ColorButtonsVertical/ColorPickersCenter"] -margin_left = 79.0 -margin_right = 220.0 +margin_left = 94.0 +margin_right = 235.0 margin_bottom = 32.0 custom_constants/separation = 13 @@ -541,15 +541,15 @@ color = Color( 1, 1, 1, 1 ) [node name="ColorDefaultsCenter" type="CenterContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ColorButtonsVertical"] margin_top = 43.0 -margin_right = 300.0 +margin_right = 330.0 margin_bottom = 51.0 size_flags_horizontal = 3 [node name="ColorDefaults" type="TextureButton" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ColorButtonsVertical/ColorDefaultsCenter" groups=[ "UIButtons", ]] -margin_left = 137.0 -margin_right = 162.0 +margin_left = 152.0 +margin_right = 177.0 margin_bottom = 8.0 hint_tooltip = "Reset the colors to their default state (black for left, white for right)" mouse_default_cursor_shape = 2 @@ -557,36 +557,36 @@ texture_normal = ExtResource( 11 ) [node name="ScrollContainer" type="ScrollContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions"] margin_top = 59.0 -margin_right = 300.0 +margin_right = 330.0 margin_bottom = 251.0 size_flags_vertical = 3 [node name="ToolOptions" type="HBoxContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer"] -margin_right = 300.0 +margin_right = 330.0 margin_bottom = 192.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="LeftToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions"] -margin_right = 144.0 +margin_right = 159.0 margin_bottom = 192.0 size_flags_horizontal = 3 [node name="LeftLabel" type="Label" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions"] -margin_right = 144.0 +margin_right = 159.0 margin_bottom = 15.0 text = "Left tool options" align = 1 [node name="LeftBrushType" type="HBoxContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions"] margin_top = 19.0 -margin_right = 144.0 +margin_right = 159.0 margin_bottom = 51.0 alignment = 1 [node name="LeftBrushTypeButton" type="TextureButton" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftBrushType"] -margin_left = 25.0 -margin_right = 61.0 +margin_left = 32.0 +margin_right = 68.0 margin_bottom = 32.0 rect_min_size = Vector2( 36, 32 ) hint_tooltip = "Select a brush" @@ -605,8 +605,8 @@ __meta__ = { } [node name="LeftBrushSizeEdit" type="SpinBox" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftBrushType"] -margin_left = 65.0 -margin_right = 119.0 +margin_left = 72.0 +margin_right = 126.0 margin_bottom = 32.0 mouse_default_cursor_shape = 2 min_value = 1.0 @@ -615,9 +615,9 @@ align = 1 suffix = "px" [node name="LeftBrushSizeSlider" type="HSlider" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions"] -margin_left = 26.0 +margin_left = 33.0 margin_top = 55.0 -margin_right = 118.0 +margin_right = 125.0 margin_bottom = 71.0 rect_min_size = Vector2( 92, 0 ) mouse_default_cursor_shape = 2 @@ -823,13 +823,13 @@ text = "100% Zoom" [node name="EmptySpacer" type="Control" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions"] margin_top = 75.0 -margin_right = 144.0 +margin_right = 159.0 margin_bottom = 87.0 rect_min_size = Vector2( 0, 12 ) [node name="LeftMirrorButtons" type="HBoxContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions"] margin_top = 91.0 -margin_right = 144.0 +margin_right = 159.0 margin_bottom = 108.0 custom_constants/separation = 44 alignment = 1 @@ -837,8 +837,8 @@ alignment = 1 [node name="LeftHorizontalMirroring" type="TextureButton" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftMirrorButtons" groups=[ "UIButtons", ]] -margin_left = 34.0 -margin_right = 49.0 +margin_left = 41.0 +margin_right = 56.0 margin_bottom = 17.0 hint_tooltip = "Enable horizontal mirrored drawing" mouse_default_cursor_shape = 2 @@ -849,8 +849,8 @@ texture_pressed = ExtResource( 40 ) [node name="LeftVerticalMirroring" type="TextureButton" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/LeftToolOptions/LeftMirrorButtons" groups=[ "UIButtons", ]] -margin_left = 93.0 -margin_right = 110.0 +margin_left = 100.0 +margin_right = 117.0 margin_bottom = 17.0 hint_tooltip = "Enable vertical mirrored drawing" mouse_default_cursor_shape = 2 @@ -859,31 +859,31 @@ texture_normal = ExtResource( 42 ) texture_pressed = ExtResource( 41 ) [node name="VSeparator" type="VSeparator" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions"] -margin_left = 148.0 -margin_right = 152.0 +margin_left = 163.0 +margin_right = 167.0 margin_bottom = 192.0 [node name="RightToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions"] -margin_left = 156.0 -margin_right = 300.0 +margin_left = 171.0 +margin_right = 330.0 margin_bottom = 192.0 size_flags_horizontal = 3 [node name="RightLabel" type="Label" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions"] -margin_right = 144.0 +margin_right = 159.0 margin_bottom = 15.0 text = "Right tool options" align = 1 [node name="RightBrushType" type="HBoxContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions"] margin_top = 19.0 -margin_right = 144.0 +margin_right = 159.0 margin_bottom = 51.0 alignment = 1 [node name="RightBrushTypeButton" type="TextureButton" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightBrushType"] -margin_left = 25.0 -margin_right = 61.0 +margin_left = 32.0 +margin_right = 68.0 margin_bottom = 32.0 rect_min_size = Vector2( 36, 32 ) hint_tooltip = "Select a brush" @@ -902,8 +902,8 @@ __meta__ = { } [node name="RightBrushSizeEdit" type="SpinBox" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightBrushType"] -margin_left = 65.0 -margin_right = 119.0 +margin_left = 72.0 +margin_right = 126.0 margin_bottom = 32.0 mouse_default_cursor_shape = 2 min_value = 1.0 @@ -912,9 +912,9 @@ align = 1 suffix = "px" [node name="RightBrushSizeSlider" type="HSlider" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions"] -margin_left = 26.0 +margin_left = 33.0 margin_top = 55.0 -margin_right = 118.0 +margin_right = 125.0 margin_bottom = 71.0 rect_min_size = Vector2( 92, 0 ) mouse_default_cursor_shape = 2 @@ -1120,13 +1120,13 @@ text = "100% Zoom" [node name="EmptySpacer" type="Control" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions"] margin_top = 75.0 -margin_right = 144.0 +margin_right = 159.0 margin_bottom = 87.0 rect_min_size = Vector2( 0, 12 ) [node name="RightMirrorButtons" type="HBoxContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions"] margin_top = 91.0 -margin_right = 144.0 +margin_right = 159.0 margin_bottom = 108.0 custom_constants/separation = 44 alignment = 1 @@ -1134,8 +1134,8 @@ alignment = 1 [node name="RightHorizontalMirroring" type="TextureButton" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightMirrorButtons" groups=[ "UIButtons", ]] -margin_left = 34.0 -margin_right = 49.0 +margin_left = 41.0 +margin_right = 56.0 margin_bottom = 17.0 hint_tooltip = "Enable horizontal mirrored drawing" mouse_default_cursor_shape = 2 @@ -1146,8 +1146,8 @@ texture_pressed = ExtResource( 40 ) [node name="RightVerticalMirroring" type="TextureButton" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightMirrorButtons" groups=[ "UIButtons", ]] -margin_left = 93.0 -margin_right = 110.0 +margin_left = 100.0 +margin_right = 117.0 margin_bottom = 17.0 hint_tooltip = "Enable vertical mirrored drawing" mouse_default_cursor_shape = 2 @@ -1157,18 +1157,18 @@ texture_pressed = ExtResource( 41 ) [node name="PaletteVBoxContainer" type="VBoxContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit"] margin_top = 263.0 -margin_right = 300.0 +margin_right = 330.0 margin_bottom = 514.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="HSeparator2" type="HSeparator" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/PaletteVBoxContainer"] -margin_right = 300.0 +margin_right = 330.0 margin_bottom = 4.0 [node name="PalettesLabel" type="Label" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/PaletteVBoxContainer"] margin_top = 8.0 -margin_right = 300.0 +margin_right = 330.0 margin_bottom = 23.0 size_flags_horizontal = 3 size_flags_vertical = 0 @@ -1177,17 +1177,17 @@ align = 1 [node name="HSeparator3" type="HSeparator" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/PaletteVBoxContainer"] margin_top = 27.0 -margin_right = 300.0 +margin_right = 330.0 margin_bottom = 31.0 [node name="CenterContainer" type="CenterContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/PaletteVBoxContainer"] margin_top = 35.0 -margin_right = 300.0 +margin_right = 330.0 margin_bottom = 67.0 [node name="PaletteButtons" type="HBoxContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/PaletteVBoxContainer/CenterContainer"] -margin_left = 62.0 -margin_right = 237.0 +margin_left = 77.0 +margin_right = 252.0 margin_bottom = 32.0 [node name="AddPalette" type="TextureButton" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/PaletteVBoxContainer/CenterContainer/PaletteButtons" groups=[ @@ -1232,21 +1232,21 @@ clip_text = true [node name="ScrollPalette" type="ScrollContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/PaletteVBoxContainer"] margin_top = 71.0 -margin_right = 300.0 +margin_right = 330.0 margin_bottom = 251.0 rect_min_size = Vector2( 0, 100 ) size_flags_horizontal = 3 size_flags_vertical = 3 [node name="CenterPalette" type="CenterContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/PaletteVBoxContainer/ScrollPalette"] -margin_right = 300.0 +margin_right = 330.0 size_flags_horizontal = 3 [node name="PaletteContainer" type="GridContainer" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/PaletteVBoxContainer/ScrollPalette/CenterPalette"] -margin_left = 150.0 -margin_right = 150.0 +margin_left = 165.0 +margin_right = 165.0 size_flags_horizontal = 3 -columns = 7 +columns = 10 script = ExtResource( 25 ) [node name="BrushesPopup" type="Popup" parent="."] @@ -1317,7 +1317,6 @@ columns = 5 [node name="SplashDialog" parent="." instance=ExtResource( 27 )] [node name="CreateNewImage" parent="." instance=ExtResource( 28 )] -window_title = "Please Confirm..." [node name="OpenSprite" type="FileDialog" parent="."] margin_right = 515.0 @@ -1327,8 +1326,8 @@ resizable = true mode = 0 access = 2 filters = PoolStringArray( "*.pxo ; Pixelorama Project" ) -current_dir = "D:/Project/Pixelorama" -current_path = "D:/Project/Pixelorama/" +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="SaveSprite" type="FileDialog" parent="."] anchor_left = 0.5 @@ -1343,26 +1342,21 @@ window_title = "Save Sprite as .pxo" resizable = true access = 2 filters = PoolStringArray( "*.pxo ; Pixelorama Project" ) -current_dir = "D:/Project/Pixelorama" -current_path = "D:/Project/Pixelorama/" +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( 29 )] -current_dir = "D:/Project/Pixelorama" -current_path = "D:/Project/Pixelorama/" [node name="ExportDialog" parent="." instance=ExtResource( 39 )] [node name="ScaleImage" parent="." instance=ExtResource( 31 )] -window_title = "Please Confirm..." [node name="PreferencesDialog" parent="." instance=ExtResource( 32 )] [node name="RotateImage" parent="." instance=ExtResource( 38 )] -window_title = "Please Confirm..." [node name="OutlineDialog" parent="." instance=ExtResource( 33 )] visible = false -window_title = "Please Confirm..." [node name="AboutDialog" parent="." instance=ExtResource( 34 )] @@ -1370,12 +1364,11 @@ window_title = "Please Confirm..." margin_right = 200.0 margin_bottom = 70.0 window_title = "Unsaved Image" -dialog_text = "Are you sure want to proceed?" +dialog_text = "Changes has not been saved. Are you sure you want to create a new image?" [node name="QuitDialog" type="ConfirmationDialog" parent="."] margin_right = 200.0 margin_bottom = 70.0 -window_title = "Please Confirm..." resizable = true dialog_text = "Are you sure you want to exit Pixelorama?" @@ -1401,8 +1394,6 @@ dialog_text = "This is an error message!" [node name="PaletteImportFileDialog" parent="." instance=ExtResource( 37 )] filters = PoolStringArray( "*.json ; JavaScript Object Notation", "*.gpl ; Gimp Palette Library", "*.png; Portable Network Graphics" ) -current_dir = "D:/Project/Pixelorama" -current_path = "D:/Project/Pixelorama/" [node name="HSVDialog" parent="." instance=ExtResource( 44 )] @@ -1484,6 +1475,7 @@ visible = false [connection signal="confirmed" from="NewPaletteDialog" to="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/PaletteVBoxContainer/ScrollPalette/CenterPalette/PaletteContainer" method="on_new_palette_confirmed"] [connection signal="popup_hide" from="NewPaletteDialog" to="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/PaletteVBoxContainer/ScrollPalette/CenterPalette/PaletteContainer" method="_on_NewPaletteDialog_popup_hide"] [connection signal="file_selected" from="PaletteImportFileDialog" to="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/PaletteVBoxContainer/ScrollPalette/CenterPalette/PaletteContainer" method="on_palette_import_file_selected"] +[connection signal="popup_hide" from="PaletteImportFileDialog" to="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/PaletteVBoxContainer/ScrollPalette/CenterPalette/PaletteContainer" method="_on_NewPaletteDialog_popup_hide"] [connection signal="popup_hide" from="HSVDialog" to="." method="_can_draw_true"] [editable path="BrushesPopup/TabContainer/File/FileBrushContainer/CircleBrushButton"] diff --git a/Prefabs/Dialogs/CreateNewImage.tscn b/Prefabs/Dialogs/CreateNewImage.tscn index e38a17058..87f8e57d8 100644 --- a/Prefabs/Dialogs/CreateNewImage.tscn +++ b/Prefabs/Dialogs/CreateNewImage.tscn @@ -3,9 +3,9 @@ [ext_resource path="res://Scripts/Dialogs/CreateNewImage.gd" type="Script" id=1] [node name="CreateNewImage" type="ConfirmationDialog"] -margin_right = 205.0 +margin_right = 300.0 margin_bottom = 200.0 -rect_min_size = Vector2( 250, 200 ) +rect_min_size = Vector2( 375, 200 ) script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false @@ -14,25 +14,26 @@ __meta__ = { [node name="VBoxContainer" type="VBoxContainer" parent="."] margin_left = 8.0 margin_top = 8.0 -margin_right = 242.0 +margin_right = 367.0 margin_bottom = 164.0 +size_flags_horizontal = 0 __meta__ = { "_edit_use_anchors_": false } [node name="ImageSize" type="Label" parent="VBoxContainer"] -margin_right = 234.0 +margin_right = 359.0 margin_bottom = 14.0 text = "Image Size" [node name="HSeparator" type="HSeparator" parent="VBoxContainer"] margin_top = 18.0 -margin_right = 234.0 +margin_right = 359.0 margin_bottom = 22.0 [node name="OptionsContainer" type="GridContainer" parent="VBoxContainer"] margin_top = 26.0 -margin_right = 234.0 +margin_right = 359.0 margin_bottom = 154.0 custom_constants/vseparation = 4 custom_constants/hseparation = 2 diff --git a/Prefabs/Dialogs/ExportDialog.tscn b/Prefabs/Dialogs/ExportDialog.tscn index 604dc5256..828eee72c 100644 --- a/Prefabs/Dialogs/ExportDialog.tscn +++ b/Prefabs/Dialogs/ExportDialog.tscn @@ -154,14 +154,14 @@ rect_min_size = Vector2( 0, 24 ) [node name="BackgroundColorLabel" type="Label" parent="VBoxContainer/AnimationOptions/AnimatedOptions"] margin_top = 5.0 -margin_right = 82.0 +margin_right = 78.0 margin_bottom = 19.0 -text = "Background: " +text = "Background:" valign = 1 [node name="BackgroundColor" type="ColorPickerButton" parent="VBoxContainer/AnimationOptions/AnimatedOptions"] -margin_left = 86.0 -margin_right = 265.0 +margin_left = 82.0 +margin_right = 263.0 margin_bottom = 24.0 mouse_default_cursor_shape = 2 size_flags_horizontal = 7 @@ -169,14 +169,14 @@ color = Color( 1, 1, 1, 1 ) edit_alpha = false [node name="DirectionLabel" type="Label" parent="VBoxContainer/AnimationOptions/AnimatedOptions"] -margin_left = 269.0 +margin_left = 267.0 margin_top = 5.0 -margin_right = 332.0 +margin_right = 330.0 margin_bottom = 19.0 text = "Direction:" [node name="Direction" type="OptionButton" parent="VBoxContainer/AnimationOptions/AnimatedOptions"] -margin_left = 336.0 +margin_left = 334.0 margin_right = 516.0 margin_bottom = 24.0 rect_min_size = Vector2( 100, 0 ) diff --git a/Scripts/FrameButton.gd b/Scripts/FrameButton.gd index bece67fd0..08a17d852 100644 --- a/Scripts/FrameButton.gd +++ b/Scripts/FrameButton.gd @@ -33,9 +33,11 @@ func _on_FrameButton_pressed() -> void: popup_menu.set_item_disabled(3, false) popup_menu.popup(Rect2(get_global_mouse_position(), Vector2.ONE)) pressed = !pressed - else: # Middle mouse click + elif Input.is_action_just_released("middle_mouse"): # Middle mouse click pressed = !pressed Global.animation_timeline._on_DeleteFrame_pressed(frame) + else: # An example of this would be Space + pressed = !pressed func _on_PopupMenu_id_pressed(ID : int) -> void: diff --git a/Scripts/Palette/PaletteContainer.gd b/Scripts/Palette/PaletteContainer.gd index d3691e434..44b264fa7 100644 --- a/Scripts/Palette/PaletteContainer.gd +++ b/Scripts/Palette/PaletteContainer.gd @@ -34,9 +34,11 @@ func on_new_empty_palette() -> void: Global.new_palette_name_line_edit.text = "Custom_Palette" from_palette = null Global.new_palette_dialog.popup_centered() + Global.can_draw = false func on_import_palette() -> void: Global.palette_import_file_dialog.popup_centered() + Global.can_draw = false func on_palette_import_file_selected(path : String) -> void: var palette : Palette = null @@ -64,7 +66,6 @@ func on_palette_import_file_selected(path : String) -> void: Global.error_dialog.popup_centered() func _on_AddPalette_pressed() -> void: - Global.can_draw = false Global.add_palette_button.get_child(0).popup(Rect2(Global.add_palette_button.rect_global_position, Vector2.ONE)) func on_new_palette_confirmed() -> void: diff --git a/Translations/Translations.pot b/Translations/Translations.pot index 03675d6eb..1460a6533 100644 --- a/Translations/Translations.pot +++ b/Translations/Translations.pot @@ -173,6 +173,9 @@ msgstr "" msgid "Frame:" msgstr "" +msgid "Orientation:" +msgstr "" + msgid "Browse" msgstr "" @@ -422,6 +425,12 @@ msgstr "" msgid "Are you sure you want to exit Pixelorama?" msgstr "" +msgid "Unsaved Image" +msgstr "" + +msgid "Changes has not been saved. Are you sure you want to create a new image?" +msgstr "" + msgid "Save before exiting?" msgstr "" @@ -546,19 +555,19 @@ msgstr "" msgid "A color of the grid" msgstr "" -msgid "Checker size" +msgid "Checker size:" msgstr "" msgid "Size of the transparent checker background" msgstr "" -msgid "Checker color 1" +msgid "Checker color 1:" msgstr "" msgid "First color of the transparent checker background" msgstr "" -msgid "Checker color 2" +msgid "Checker color 2:" msgstr "" msgid "Second color of the transparent checker background"