diff --git a/src/Autoload/Global.gd b/src/Autoload/Global.gd index e6011f5ea..099673652 100644 --- a/src/Autoload/Global.gd +++ b/src/Autoload/Global.gd @@ -372,7 +372,7 @@ func _ready() -> void: frames_container = find_node_by_name(animation_timeline, "FramesContainer") animation_timer = find_node_by_name(animation_timeline, "AnimationTimer") frame_ids = find_node_by_name(animation_timeline, "FrameIDs") - current_frame_label = find_node_by_name(animation_timeline, "CurrentFrame") + current_frame_label = find_node_by_name(control, "CurrentFrame") onion_skinning_button = find_node_by_name(animation_timeline, "OnionSkinning") loop_animation_button = find_node_by_name(animation_timeline, "LoopAnim") play_forward = find_node_by_name(animation_timeline, "PlayForward") diff --git a/src/Main.tscn b/src/Main.tscn index 3be180afd..77da8c7d6 100644 --- a/src/Main.tscn +++ b/src/Main.tscn @@ -180,15 +180,18 @@ mouse_default_cursor_shape = 2 text = "Help" switch_on_hover = true -[node name="HBoxContainer" type="HBoxContainer" parent="MenuAndUI/TopMenuContainer"] +[node name="TopLabels" type="HBoxContainer" parent="MenuAndUI/TopMenuContainer"] anchor_left = 0.5 anchor_right = 0.5 anchor_bottom = 1.0 margin_left = -65.5 margin_right = 65.5 custom_constants/separation = 20 +__meta__ = { +"_edit_use_anchors_": false +} -[node name="ZoomLevel" type="Label" parent="MenuAndUI/TopMenuContainer/HBoxContainer"] +[node name="ZoomLevel" type="Label" parent="MenuAndUI/TopMenuContainer/TopLabels"] margin_top = 6.0 margin_right = 60.0 margin_bottom = 21.0 @@ -196,7 +199,7 @@ rect_min_size = Vector2( 60, 0 ) text = "781 %" align = 2 -[node name="CursorPosition" type="Label" parent="MenuAndUI/TopMenuContainer/HBoxContainer"] +[node name="CursorPosition" type="Label" parent="MenuAndUI/TopMenuContainer/TopLabels"] margin_left = 80.0 margin_top = 6.0 margin_right = 120.0 @@ -204,6 +207,32 @@ margin_bottom = 21.0 text = "[64×64]" align = 2 +[node name="HBoxContainer" type="HBoxContainer" parent="MenuAndUI/TopMenuContainer"] +anchor_left = 1.0 +anchor_top = 0.5 +anchor_right = 1.0 +anchor_bottom = 0.5 +margin_left = -330.0 +margin_top = -14.0 +margin_bottom = 14.0 +grow_horizontal = 2 +size_flags_vertical = 0 +alignment = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="CurrentFrame" type="Label" parent="MenuAndUI/TopMenuContainer/HBoxContainer"] +margin_left = 113.0 +margin_top = 6.0 +margin_right = 216.0 +margin_bottom = 21.0 +text = "Current Frame: 1/1" +valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} + [node name="UI" type="HBoxContainer" parent="MenuAndUI"] margin_top = 28.0 margin_right = 1280.0 @@ -476,7 +505,6 @@ script = ExtResource( 17 ) [node name="AnimationTimeline" parent="MenuAndUI/UI/CanvasAndTimeline" instance=ExtResource( 20 )] margin_top = 492.0 -margin_right = 902.0 margin_bottom = 692.0 [node name="RightPanel" type="Panel" parent="MenuAndUI/UI"] @@ -1653,8 +1681,8 @@ resizable = true mode = 0 access = 2 filters = PoolStringArray( "*.pxo ; Pixelorama Project" ) -current_dir = "/home/overloaded/Documents/Pixelorama" -current_path = "/home/overloaded/Documents/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 @@ -1669,12 +1697,10 @@ window_title = "Save Sprite as .pxo" resizable = true access = 2 filters = PoolStringArray( "*.pxo ; Pixelorama Project" ) -current_dir = "/home/overloaded/Documents/Pixelorama" -current_path = "/home/overloaded/Documents/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 = "/home/overloaded/Documents/Pixelorama" -current_path = "/home/overloaded/Documents/Pixelorama/" [node name="ExportDialog" parent="." instance=ExtResource( 39 )] @@ -1723,8 +1749,8 @@ 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 = "/home/overloaded/Documents/Pixelorama" -current_path = "/home/overloaded/Documents/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="HSVDialog" parent="." instance=ExtResource( 44 )] diff --git a/src/UI/Dialogs/AboutDialog.tscn b/src/UI/Dialogs/AboutDialog.tscn index b8b068a50..0a7b5c50f 100644 --- a/src/UI/Dialogs/AboutDialog.tscn +++ b/src/UI/Dialogs/AboutDialog.tscn @@ -6,13 +6,10 @@ [ext_resource path="res://assets/graphics/splash_screen/orama_64x64.png" type="Texture" id=4] [ext_resource path="res://assets/fonts/Roboto-Small.tres" type="DynamicFont" id=5] - - - [node name="AboutDialog" type="WindowDialog"] -margin_right = 512.0 -margin_bottom = 288.0 -rect_min_size = Vector2( 512, 288 ) +margin_right = 600.0 +margin_bottom = 400.0 +rect_min_size = Vector2( 600, 400 ) window_title = "About Pixelorama" resizable = true script = ExtResource( 1 ) @@ -27,7 +24,7 @@ margin_bottom = -8.0 alignment = 1 [node name="IconsButtons" type="HBoxContainer" parent="AboutUI"] -margin_right = 488.0 +margin_right = 576.0 margin_bottom = 64.0 [node name="PixeloramaLogo" type="TextureRect" parent="AboutUI/IconsButtons"] @@ -37,14 +34,14 @@ texture = ExtResource( 2 ) [node name="SloganAndLinks" type="CenterContainer" parent="AboutUI/IconsButtons"] margin_left = 68.0 -margin_right = 420.0 +margin_right = 508.0 margin_bottom = 64.0 size_flags_horizontal = 3 [node name="VBoxContainer" type="VBoxContainer" parent="AboutUI/IconsButtons/SloganAndLinks"] -margin_left = 64.0 +margin_left = 108.0 margin_top = 12.0 -margin_right = 288.0 +margin_right = 332.0 margin_bottom = 51.0 [node name="Pixelorama" type="Label" parent="AboutUI/IconsButtons/SloganAndLinks/VBoxContainer"] @@ -80,44 +77,44 @@ mouse_default_cursor_shape = 2 text = "Donate" [node name="OramaLogo" type="TextureRect" parent="AboutUI/IconsButtons"] -margin_left = 424.0 -margin_right = 488.0 +margin_left = 512.0 +margin_right = 576.0 margin_bottom = 64.0 texture = ExtResource( 4 ) [node name="HSeparator" type="HSeparator" parent="AboutUI"] margin_top = 68.0 -margin_right = 488.0 +margin_right = 576.0 margin_bottom = 72.0 [node name="Credits" type="HSplitContainer" parent="AboutUI"] margin_top = 76.0 -margin_right = 488.0 -margin_bottom = 233.0 +margin_right = 576.0 +margin_bottom = 345.0 size_flags_vertical = 3 [node name="Groups" type="Tree" parent="AboutUI/Credits"] margin_right = 120.0 -margin_bottom = 157.0 +margin_bottom = 269.0 rect_min_size = Vector2( 120, 120 ) custom_constants/item_margin = -2 hide_root = true [node name="Developers" type="VBoxContainer" parent="AboutUI/Credits"] margin_left = 132.0 -margin_right = 488.0 -margin_bottom = 157.0 +margin_right = 576.0 +margin_bottom = 269.0 size_flags_horizontal = 3 [node name="Label" type="Label" parent="AboutUI/Credits/Developers"] -margin_right = 356.0 +margin_right = 444.0 margin_bottom = 14.0 text = "Development Team" [node name="DeveloperTree" type="Tree" parent="AboutUI/Credits/Developers"] margin_top = 18.0 -margin_right = 356.0 -margin_bottom = 157.0 +margin_right = 444.0 +margin_bottom = 269.0 size_flags_vertical = 3 custom_constants/item_margin = -2 custom_constants/button_margin = 2 @@ -184,21 +181,21 @@ custom_constants/item_margin = -2 hide_root = true [node name="HSeparator2" type="HSeparator" parent="AboutUI"] -margin_top = 237.0 -margin_right = 488.0 -margin_bottom = 241.0 +margin_top = 349.0 +margin_right = 576.0 +margin_bottom = 353.0 [node name="MadeBy" type="Label" parent="AboutUI"] -margin_top = 245.0 -margin_right = 488.0 -margin_bottom = 259.0 +margin_top = 357.0 +margin_right = 576.0 +margin_bottom = 371.0 text = "Developed by Orama Interactive" align = 1 [node name="Copyright" type="Label" parent="AboutUI"] -margin_top = 263.0 -margin_right = 488.0 -margin_bottom = 276.0 +margin_top = 375.0 +margin_right = 576.0 +margin_bottom = 388.0 custom_fonts/font = ExtResource( 5 ) text = "Copyright 2019-2020 Orama Interactive" align = 1 diff --git a/src/UI/Timeline/AnimationTimeline.tscn b/src/UI/Timeline/AnimationTimeline.tscn index 4ba0e551e..371651078 100644 --- a/src/UI/Timeline/AnimationTimeline.tscn +++ b/src/UI/Timeline/AnimationTimeline.tscn @@ -23,8 +23,6 @@ [ext_resource path="res://assets/graphics/dark_themes/timeline/loop.png" type="Texture" id=31] [ext_resource path="res://src/UI/Dialogs/FrameTagDialog.tscn" type="PackedScene" id=42] - - [sub_resource type="InputEventKey" id=1] control = true command = true @@ -92,8 +90,8 @@ HScrollBar/styles/scroll_focus = SubResource( 17 ) [node name="AnimationTimeline" type="Panel"] margin_top = 438.0 -margin_right = 704.0 -margin_bottom = 620.0 +margin_right = 902.0 +margin_bottom = 638.0 rect_min_size = Vector2( 0, 200 ) size_flags_horizontal = 3 script = ExtResource( 1 ) @@ -108,25 +106,26 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ForLayerButtons" type="VBoxContainer" parent="AnimationContainer"] -margin_right = 68.0 +[node name="TimelineContainer" type="VBoxContainer" parent="AnimationContainer"] +margin_right = 894.0 margin_bottom = 200.0 +size_flags_horizontal = 3 -[node name="SpacerControl" type="Control" parent="AnimationContainer/ForLayerButtons"] -margin_right = 68.0 -margin_bottom = 30.0 -rect_min_size = Vector2( 0, 30 ) +[node name="SpacerControl" type="Control" parent="AnimationContainer/TimelineContainer"] +margin_right = 894.0 -[node name="LayerButtons" type="GridContainer" parent="AnimationContainer/ForLayerButtons"] -margin_top = 34.0 -margin_right = 68.0 -margin_bottom = 138.0 +[node name="TimelineButtons" type="HBoxContainer" parent="AnimationContainer/TimelineContainer"] +margin_top = 4.0 +margin_right = 894.0 +margin_bottom = 36.0 +size_flags_horizontal = 3 + +[node name="LayerButtons" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/TimelineButtons"] +margin_right = 212.0 +margin_bottom = 32.0 size_flags_vertical = 0 -custom_constants/vseparation = 4 -custom_constants/hseparation = 4 -columns = 2 -[node name="AddLayer" type="Button" parent="AnimationContainer/ForLayerButtons/LayerButtons" groups=[ +[node name="AddLayer" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtons" groups=[ "UIButtons", ]] margin_right = 32.0 @@ -136,7 +135,7 @@ hint_tooltip = "Create a new layer" focus_mode = 0 mouse_default_cursor_shape = 2 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/ForLayerButtons/LayerButtons/AddLayer"] +[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtons/AddLayer"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -152,7 +151,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="RemoveLayer" type="Button" parent="AnimationContainer/ForLayerButtons/LayerButtons" groups=[ +[node name="RemoveLayer" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtons" groups=[ "UIButtons", ]] margin_left = 36.0 @@ -164,7 +163,7 @@ focus_mode = 0 mouse_default_cursor_shape = 8 disabled = true -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/ForLayerButtons/LayerButtons/RemoveLayer"] +[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtons/RemoveLayer"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -180,19 +179,19 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="MoveUpLayer" type="Button" parent="AnimationContainer/ForLayerButtons/LayerButtons" groups=[ +[node name="MoveUpLayer" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtons" groups=[ "UIButtons", ]] -margin_top = 36.0 -margin_right = 32.0 -margin_bottom = 68.0 +margin_left = 72.0 +margin_right = 104.0 +margin_bottom = 32.0 rect_min_size = Vector2( 32, 32 ) hint_tooltip = "Move up the current layer" focus_mode = 0 mouse_default_cursor_shape = 8 disabled = true -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/ForLayerButtons/LayerButtons/MoveUpLayer"] +[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtons/MoveUpLayer"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -208,20 +207,19 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="MoveDownLayer" type="Button" parent="AnimationContainer/ForLayerButtons/LayerButtons" groups=[ +[node name="MoveDownLayer" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtons" groups=[ "UIButtons", ]] -margin_left = 36.0 -margin_top = 36.0 -margin_right = 68.0 -margin_bottom = 68.0 +margin_left = 108.0 +margin_right = 140.0 +margin_bottom = 32.0 rect_min_size = Vector2( 32, 32 ) hint_tooltip = "Move down the current layer" focus_mode = 0 mouse_default_cursor_shape = 8 disabled = true -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/ForLayerButtons/LayerButtons/MoveDownLayer"] +[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtons/MoveDownLayer"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -237,18 +235,18 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="CloneLayer" type="Button" parent="AnimationContainer/ForLayerButtons/LayerButtons" groups=[ +[node name="CloneLayer" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtons" groups=[ "UIButtons", ]] -margin_top = 72.0 -margin_right = 32.0 -margin_bottom = 104.0 +margin_left = 144.0 +margin_right = 176.0 +margin_bottom = 32.0 rect_min_size = Vector2( 32, 32 ) hint_tooltip = "Clone current layer" focus_mode = 0 mouse_default_cursor_shape = 2 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/ForLayerButtons/LayerButtons/CloneLayer"] +[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtons/CloneLayer"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -264,20 +262,19 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="MergeDownLayer" type="Button" parent="AnimationContainer/ForLayerButtons/LayerButtons" groups=[ +[node name="MergeDownLayer" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtons" groups=[ "UIButtons", ]] -margin_left = 36.0 -margin_top = 72.0 -margin_right = 68.0 -margin_bottom = 104.0 +margin_left = 180.0 +margin_right = 212.0 +margin_bottom = 32.0 rect_min_size = Vector2( 32, 32 ) hint_tooltip = "Merge current layer with the one below" focus_mode = 0 mouse_default_cursor_shape = 8 disabled = true -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/ForLayerButtons/LayerButtons/MergeDownLayer"] +[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtons/MergeDownLayer"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -293,48 +290,34 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="SpacerControl" type="Control" parent="AnimationContainer"] -margin_left = 72.0 -margin_right = 88.0 -margin_bottom = 200.0 -rect_min_size = Vector2( 16, 0 ) - -[node name="TimelineContainer" type="VBoxContainer" parent="AnimationContainer"] -margin_left = 92.0 -margin_right = 696.0 -margin_bottom = 200.0 -size_flags_horizontal = 3 - -[node name="SpacerControl" type="Control" parent="AnimationContainer/TimelineContainer"] -margin_right = 604.0 - -[node name="AnimationButtons" type="HBoxContainer" parent="AnimationContainer/TimelineContainer"] -margin_top = 4.0 -margin_right = 604.0 -margin_bottom = 28.0 +[node name="AnimationButtons" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/TimelineButtons"] +margin_left = 216.0 +margin_right = 894.0 +margin_bottom = 32.0 rect_min_size = Vector2( 0, 24 ) +size_flags_horizontal = 3 +custom_constants/separation = 40 +alignment = 2 -[node name="CurrentFrame" type="Label" parent="AnimationContainer/TimelineContainer/AnimationButtons"] -margin_top = 5.0 -margin_right = 150.0 -margin_bottom = 19.0 -rect_min_size = Vector2( 150, 0 ) -text = "Current frame: 1/1" +[node name="FrameButtons" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons"] +margin_left = 228.0 +margin_right = 320.0 +margin_bottom = 32.0 -[node name="AddFrame" type="Button" parent="AnimationContainer/TimelineContainer/AnimationButtons" groups=[ +[node name="AddFrame" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/FrameButtons" groups=[ "UIButtons", ]] -margin_left = 154.0 -margin_right = 174.0 -margin_bottom = 20.0 +margin_top = 6.0 +margin_right = 20.0 +margin_bottom = 26.0 rect_min_size = Vector2( 20, 0 ) hint_tooltip = "Add a new frame" focus_mode = 0 mouse_default_cursor_shape = 2 size_flags_horizontal = 0 -size_flags_vertical = 0 +size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/AnimationButtons/AddFrame"] +[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/FrameButtons/AddFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -348,20 +331,21 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="DeleteFrame" type="Button" parent="AnimationContainer/TimelineContainer/AnimationButtons" groups=[ +[node name="DeleteFrame" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/FrameButtons" groups=[ "UIButtons", ]] -margin_left = 178.0 -margin_right = 198.0 -margin_bottom = 20.0 +margin_left = 24.0 +margin_top = 6.0 +margin_right = 44.0 +margin_bottom = 26.0 rect_min_size = Vector2( 20, 0 ) hint_tooltip = "Remove Frame" focus_mode = 0 mouse_default_cursor_shape = 2 size_flags_horizontal = 0 -size_flags_vertical = 0 +size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/AnimationButtons/DeleteFrame"] +[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/FrameButtons/DeleteFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -377,20 +361,21 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="CopyFrame" type="Button" parent="AnimationContainer/TimelineContainer/AnimationButtons" groups=[ +[node name="CopyFrame" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/FrameButtons" groups=[ "UIButtons", ]] -margin_left = 202.0 -margin_right = 222.0 -margin_bottom = 20.0 +margin_left = 48.0 +margin_top = 6.0 +margin_right = 68.0 +margin_bottom = 26.0 rect_min_size = Vector2( 20, 0 ) hint_tooltip = "Clone Frame" focus_mode = 0 mouse_default_cursor_shape = 2 size_flags_horizontal = 0 -size_flags_vertical = 0 +size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/AnimationButtons/CopyFrame"] +[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/FrameButtons/CopyFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -404,20 +389,21 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="FrameTagButton" type="Button" parent="AnimationContainer/TimelineContainer/AnimationButtons" groups=[ +[node name="FrameTagButton" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/FrameButtons" groups=[ "UIButtons", ]] -margin_left = 226.0 -margin_right = 246.0 -margin_bottom = 20.0 +margin_left = 72.0 +margin_top = 6.0 +margin_right = 92.0 +margin_bottom = 26.0 rect_min_size = Vector2( 20, 0 ) hint_tooltip = "Manage frame tags" focus_mode = 0 mouse_default_cursor_shape = 2 size_flags_horizontal = 0 -size_flags_vertical = 0 +size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/AnimationButtons/FrameTagButton"] +[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/FrameButtons/FrameTagButton"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -431,26 +417,26 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="PlaybackButtons" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/AnimationButtons"] -margin_left = 286.0 -margin_right = 426.0 -margin_bottom = 24.0 -size_flags_horizontal = 6 +[node name="PlaybackButtons" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons"] +margin_left = 360.0 +margin_right = 500.0 +margin_bottom = 32.0 -[node name="FirstFrame" type="Button" parent="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons" groups=[ +[node name="FirstFrame" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/PlaybackButtons" groups=[ "UIButtons", ]] +margin_top = 6.0 margin_right = 20.0 -margin_bottom = 20.0 +margin_bottom = 26.0 rect_min_size = Vector2( 20, 0 ) hint_tooltip = "FIRSTFRAME_HT" focus_mode = 0 mouse_default_cursor_shape = 2 -size_flags_vertical = 0 +size_flags_vertical = 4 shortcut_in_tooltip = false shortcut = SubResource( 2 ) -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/FirstFrame"] +[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/PlaybackButtons/FirstFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -464,21 +450,22 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="PreviousFrame" type="Button" parent="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons" groups=[ +[node name="PreviousFrame" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/PlaybackButtons" groups=[ "UIButtons", ]] margin_left = 24.0 +margin_top = 6.0 margin_right = 44.0 -margin_bottom = 20.0 +margin_bottom = 26.0 rect_min_size = Vector2( 20, 0 ) hint_tooltip = "PREVIOUSFRAME_HT" focus_mode = 0 mouse_default_cursor_shape = 2 -size_flags_vertical = 0 +size_flags_vertical = 4 shortcut_in_tooltip = false shortcut = SubResource( 4 ) -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/PreviousFrame"] +[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/PlaybackButtons/PreviousFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -492,22 +479,23 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="PlayBackwards" type="Button" parent="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons" groups=[ +[node name="PlayBackwards" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/PlaybackButtons" groups=[ "UIButtons", ]] margin_left = 48.0 +margin_top = 6.0 margin_right = 68.0 -margin_bottom = 20.0 +margin_bottom = 26.0 rect_min_size = Vector2( 20, 0 ) hint_tooltip = "PLAYBACKWARDS_HT" focus_mode = 0 mouse_default_cursor_shape = 2 -size_flags_vertical = 0 +size_flags_vertical = 4 toggle_mode = true shortcut_in_tooltip = false shortcut = SubResource( 6 ) -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/PlayBackwards"] +[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/PlaybackButtons/PlayBackwards"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -521,23 +509,24 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="PlayForward" type="Button" parent="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons" groups=[ +[node name="PlayForward" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/PlaybackButtons" groups=[ "UIButtons", ]] margin_left = 72.0 +margin_top = 6.0 margin_right = 92.0 -margin_bottom = 20.0 +margin_bottom = 26.0 rect_min_size = Vector2( 20, 0 ) hint_tooltip = "PLAYFORWARD_HT" focus_mode = 0 mouse_default_cursor_shape = 2 size_flags_horizontal = 0 -size_flags_vertical = 0 +size_flags_vertical = 4 toggle_mode = true shortcut_in_tooltip = false shortcut = SubResource( 8 ) -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/PlayForward"] +[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/PlaybackButtons/PlayForward"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -551,21 +540,22 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="NextFrame" type="Button" parent="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons" groups=[ +[node name="NextFrame" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/PlaybackButtons" groups=[ "UIButtons", ]] margin_left = 96.0 +margin_top = 6.0 margin_right = 116.0 -margin_bottom = 20.0 +margin_bottom = 26.0 rect_min_size = Vector2( 20, 0 ) hint_tooltip = "NEXTFRAME_HT" focus_mode = 0 mouse_default_cursor_shape = 2 -size_flags_vertical = 0 +size_flags_vertical = 4 shortcut_in_tooltip = false shortcut = SubResource( 10 ) -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/NextFrame"] +[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/PlaybackButtons/NextFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -579,21 +569,22 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="LastFrame" type="Button" parent="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons" groups=[ +[node name="LastFrame" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/PlaybackButtons" groups=[ "UIButtons", ]] margin_left = 120.0 +margin_top = 6.0 margin_right = 140.0 -margin_bottom = 20.0 +margin_bottom = 26.0 rect_min_size = Vector2( 20, 0 ) hint_tooltip = "LASTFRAME_HT" focus_mode = 0 mouse_default_cursor_shape = 2 -size_flags_vertical = 0 +size_flags_vertical = 4 shortcut_in_tooltip = false shortcut = SubResource( 12 ) -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/LastFrame"] +[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/PlaybackButtons/LastFrame"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -607,24 +598,24 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="LoopButtons" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/AnimationButtons"] -margin_left = 466.0 -margin_right = 604.0 -margin_bottom = 24.0 -size_flags_horizontal = 0 +[node name="LoopButtons" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons"] +margin_left = 540.0 +margin_right = 678.0 +margin_bottom = 32.0 -[node name="OnionSkinningSettings" type="Button" parent="AnimationContainer/TimelineContainer/AnimationButtons/LoopButtons" groups=[ +[node name="OnionSkinningSettings" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/LoopButtons" groups=[ "UIButtons", ]] +margin_top = 6.0 margin_right = 12.0 -margin_bottom = 20.0 +margin_bottom = 26.0 hint_tooltip = "Onion Skinning settings" focus_mode = 0 mouse_default_cursor_shape = 2 size_flags_horizontal = 0 -size_flags_vertical = 0 +size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/AnimationButtons/LoopButtons/OnionSkinningSettings"] +[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/LoopButtons/OnionSkinningSettings"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -640,19 +631,20 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="OnionSkinning" type="Button" parent="AnimationContainer/TimelineContainer/AnimationButtons/LoopButtons" groups=[ +[node name="OnionSkinning" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/LoopButtons" groups=[ "UIButtons", ]] margin_left = 16.0 +margin_top = 6.0 margin_right = 36.0 -margin_bottom = 20.0 +margin_bottom = 26.0 rect_min_size = Vector2( 20, 0 ) hint_tooltip = "Enable/disable Onion Skinning" focus_mode = 0 mouse_default_cursor_shape = 2 -size_flags_vertical = 0 +size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/AnimationButtons/LoopButtons/OnionSkinning"] +[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/LoopButtons/OnionSkinning"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -668,19 +660,20 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="LoopAnim" type="Button" parent="AnimationContainer/TimelineContainer/AnimationButtons/LoopButtons" groups=[ +[node name="LoopAnim" type="Button" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/LoopButtons" groups=[ "UIButtons", ]] margin_left = 40.0 +margin_top = 6.0 margin_right = 60.0 -margin_bottom = 20.0 +margin_bottom = 26.0 rect_min_size = Vector2( 20, 0 ) hint_tooltip = "Cycle loop" focus_mode = 0 mouse_default_cursor_shape = 2 -size_flags_vertical = 0 +size_flags_vertical = 4 -[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/AnimationButtons/LoopButtons/LoopAnim"] +[node name="TextureRect" type="TextureRect" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/LoopButtons/LoopAnim"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -694,10 +687,10 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="FPSValue" type="SpinBox" parent="AnimationContainer/TimelineContainer/AnimationButtons/LoopButtons"] +[node name="FPSValue" type="SpinBox" parent="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/LoopButtons"] margin_left = 64.0 margin_right = 138.0 -margin_bottom = 24.0 +margin_bottom = 32.0 hint_tooltip = "How many frames per second should the animation preview be? The more FPS, the faster the animation plays." mouse_default_cursor_shape = 2 @@ -708,14 +701,14 @@ align = 1 suffix = "FPS" [node name="HSeparator" type="HSeparator" parent="AnimationContainer/TimelineContainer"] -margin_top = 32.0 -margin_right = 604.0 -margin_bottom = 36.0 +margin_top = 40.0 +margin_right = 894.0 +margin_bottom = 44.0 [node name="OpacityAndTagContainer" type="HBoxContainer" parent="AnimationContainer/TimelineContainer"] -margin_top = 40.0 -margin_right = 604.0 -margin_bottom = 72.0 +margin_top = 48.0 +margin_right = 894.0 +margin_bottom = 80.0 custom_constants/separation = 2 [node name="OpacityContainer" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/OpacityAndTagContainer"] @@ -754,7 +747,7 @@ align = 1 [node name="TagScroll" type="ScrollContainer" parent="AnimationContainer/TimelineContainer/OpacityAndTagContainer"] margin_left = 216.0 -margin_right = 604.0 +margin_right = 894.0 margin_bottom = 32.0 rect_min_size = Vector2( 0, 32 ) size_flags_horizontal = 3 @@ -764,19 +757,19 @@ scroll_vertical_enabled = false [node name="TagContainer" type="Control" parent="AnimationContainer/TimelineContainer/OpacityAndTagContainer/TagScroll"] [node name="TimelineScroll" type="ScrollContainer" parent="AnimationContainer/TimelineContainer"] -margin_top = 76.0 -margin_right = 604.0 +margin_top = 84.0 +margin_right = 894.0 margin_bottom = 200.0 size_flags_vertical = 3 [node name="LayersAndFrames" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/TimelineScroll"] margin_right = 252.0 -margin_bottom = 124.0 +margin_bottom = 116.0 size_flags_vertical = 3 [node name="LayerVBoxCont" type="VBoxContainer" parent="AnimationContainer/TimelineContainer/TimelineScroll/LayersAndFrames"] margin_right = 212.0 -margin_bottom = 124.0 +margin_bottom = 116.0 [node name="LayerLabel" type="Label" parent="AnimationContainer/TimelineContainer/TimelineScroll/LayersAndFrames/LayerVBoxCont"] margin_right = 212.0 @@ -797,7 +790,7 @@ margin_right = 212.0 [node name="FrameButtonsAndIds" type="VBoxContainer" parent="AnimationContainer/TimelineContainer/TimelineScroll/LayersAndFrames"] margin_left = 216.0 margin_right = 252.0 -margin_bottom = 124.0 +margin_bottom = 116.0 [node name="FrameIDs" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/TimelineScroll/LayersAndFrames/FrameButtonsAndIds"] margin_right = 36.0 @@ -818,8 +811,8 @@ margin_right = 36.0 margin_bottom = 20.0 [node name="VSeparator" type="VSeparator" parent="AnimationContainer"] -margin_left = 700.0 -margin_right = 704.0 +margin_left = 898.0 +margin_right = 902.0 margin_bottom = 200.0 [node name="AnimationTimer" type="Timer" parent="."] @@ -879,26 +872,26 @@ mouse_default_cursor_shape = 2 text = "Blue-Red Mode" [node name="FrameTagDialog" parent="." instance=ExtResource( 42 )] -[connection signal="pressed" from="AnimationContainer/ForLayerButtons/LayerButtons/AddLayer" to="." method="add_layer" binds= [ true ]] -[connection signal="pressed" from="AnimationContainer/ForLayerButtons/LayerButtons/RemoveLayer" to="." method="_on_RemoveLayer_pressed"] -[connection signal="pressed" from="AnimationContainer/ForLayerButtons/LayerButtons/MoveUpLayer" to="." method="change_layer_order" binds= [ 1 ]] -[connection signal="pressed" from="AnimationContainer/ForLayerButtons/LayerButtons/MoveDownLayer" to="." method="change_layer_order" binds= [ -1 ]] -[connection signal="pressed" from="AnimationContainer/ForLayerButtons/LayerButtons/CloneLayer" to="." method="add_layer" binds= [ false ]] -[connection signal="pressed" from="AnimationContainer/ForLayerButtons/LayerButtons/MergeDownLayer" to="." method="_on_MergeDownLayer_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/AddFrame" to="." method="add_frame"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/DeleteFrame" to="." method="_on_DeleteFrame_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/CopyFrame" to="." method="_on_CopyFrame_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/FrameTagButton" to="." method="_on_FrameTagButton_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/FirstFrame" to="." method="_on_FirstFrame_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/PreviousFrame" to="." method="_on_PreviousFrame_pressed"] -[connection signal="toggled" from="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/PlayBackwards" to="." method="_on_PlayBackwards_toggled"] -[connection signal="toggled" from="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/PlayForward" to="." method="_on_PlayForward_toggled"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/NextFrame" to="." method="_on_NextFrame_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/LastFrame" to="." method="_on_LastFrame_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/LoopButtons/OnionSkinningSettings" to="." method="_on_OnionSkinningSettings_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/LoopButtons/OnionSkinning" to="." method="_on_OnionSkinning_pressed"] -[connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/LoopButtons/LoopAnim" to="." method="_on_LoopAnim_pressed"] -[connection signal="value_changed" from="AnimationContainer/TimelineContainer/AnimationButtons/LoopButtons/FPSValue" to="." method="_on_FPSValue_value_changed"] +[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtons/AddLayer" to="." method="add_layer" binds= [ true ]] +[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtons/RemoveLayer" to="." method="_on_RemoveLayer_pressed"] +[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtons/MoveUpLayer" to="." method="change_layer_order" binds= [ 1 ]] +[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtons/MoveDownLayer" to="." method="change_layer_order" binds= [ -1 ]] +[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtons/CloneLayer" to="." method="add_layer" binds= [ false ]] +[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/LayerButtons/MergeDownLayer" to="." method="_on_MergeDownLayer_pressed"] +[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/FrameButtons/AddFrame" to="." method="add_frame"] +[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/FrameButtons/DeleteFrame" to="." method="_on_DeleteFrame_pressed"] +[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/FrameButtons/CopyFrame" to="." method="_on_CopyFrame_pressed"] +[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/FrameButtons/FrameTagButton" to="." method="_on_FrameTagButton_pressed"] +[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/PlaybackButtons/FirstFrame" to="." method="_on_FirstFrame_pressed"] +[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/PlaybackButtons/PreviousFrame" to="." method="_on_PreviousFrame_pressed"] +[connection signal="toggled" from="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/PlaybackButtons/PlayBackwards" to="." method="_on_PlayBackwards_toggled"] +[connection signal="toggled" from="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/PlaybackButtons/PlayForward" to="." method="_on_PlayForward_toggled"] +[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/PlaybackButtons/NextFrame" to="." method="_on_NextFrame_pressed"] +[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/PlaybackButtons/LastFrame" to="." method="_on_LastFrame_pressed"] +[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/LoopButtons/OnionSkinningSettings" to="." method="_on_OnionSkinningSettings_pressed"] +[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/LoopButtons/OnionSkinning" to="." method="_on_OnionSkinning_pressed"] +[connection signal="pressed" from="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/LoopButtons/LoopAnim" to="." method="_on_LoopAnim_pressed"] +[connection signal="value_changed" from="AnimationContainer/TimelineContainer/TimelineButtons/AnimationButtons/LoopButtons/FPSValue" to="." method="_on_FPSValue_value_changed"] [connection signal="value_changed" from="AnimationContainer/TimelineContainer/OpacityAndTagContainer/OpacityContainer/OpacitySlider" to="." method="_on_OpacitySlider_value_changed"] [connection signal="value_changed" from="AnimationContainer/TimelineContainer/OpacityAndTagContainer/OpacityContainer/OpacitySpinBox" to="." method="_on_OpacitySlider_value_changed"] [connection signal="timeout" from="AnimationTimer" to="." method="_on_AnimationTimer_timeout"]