huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-02-20 12:33:14 +00:00
Code Issues Wiki Activity

Small canvas preview UI changes and translation string additions

Browse source
This commit is contained in:
Emmanouil Papadeas 2023-04-15 13:46:42 +03:00
parent db29ec9f0f
commit 23198a84aa
3 changed files with 93 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Translations/Translations.pot
View file

@ -378,6 +378,9 @@ msgstr ""
msgid "Start frame:"
msgstr ""
msgid "End frame:"
msgstr ""
msgid "At frame:"
msgstr ""
@ -646,7 +649,7 @@ msgstr ""
msgid "System Language"
msgstr ""
msgid "Display Scale"
msgid "Display scale:"
msgstr ""
msgid "Dim interface on dialog popup"
@ -1587,6 +1590,12 @@ msgstr ""
msgid "Current frame:"
msgstr ""
msgid "Animation mode:"
msgstr ""
msgid "Current frame as spritesheet"
msgstr ""
msgid "Jump to the first frame\n"
"(%s)"
msgstr ""

32
src/UI/CanvasPreviewContainer/CanvasPreviewContainer.gd
View file

@ -4,10 +4,8 @@ onready var canvas_preview: Node2D = $"%CanvasPreview"
onready var camera: Camera2D = $"%CameraPreview"
onready var play_button: Button = $"%PlayButton"
onready var h_frames: SpinBox = $"%HFrames"
onready var v_frames: SpinBox = $"%VFrames"
onready var start: SpinBox = $"%Start"
onready var end: SpinBox = $"%End"
onready var start_frame := $"%StartFrame" as ValueSlider
onready var end_frame := $"%EndFrame" as ValueSlider
func _on_PreviewZoomSlider_value_changed(value: float) -> void:
@ -23,7 +21,7 @@ func _on_PlayButton_toggled(button_pressed: bool) -> void:
play_button.pressed = false
return
else:
if start.value == end.value:
if start_frame.value == end_frame.value:
play_button.pressed = false
return
canvas_preview.animation_timer.start()
@ -42,31 +40,31 @@ func _on_OptionButton_item_selected(index: int) -> void:
func _on_HFrames_value_changed(value: float) -> void:
canvas_preview.h_frames = value
var frames = canvas_preview.h_frames * canvas_preview.v_frames
start.max_value = frames
end.max_value = frames
var frames: int = canvas_preview.h_frames * canvas_preview.v_frames
start_frame.max_value = frames
end_frame.max_value = frames
canvas_preview.update()
func _on_VFrames_value_changed(value: float) -> void:
canvas_preview.v_frames = value
var frames = canvas_preview.h_frames * canvas_preview.v_frames
start.max_value = frames
end.max_value = frames
var frames: int = canvas_preview.h_frames * canvas_preview.v_frames
start_frame.max_value = frames
end_frame.max_value = frames
canvas_preview.update()
func _on_Start_value_changed(value: float) -> void:
func _on_StartFrame_value_changed(value: float) -> void:
canvas_preview.frame = value - 1
canvas_preview.start_sprite_sheet_frame = value
if end.value < value:
end.value = value
if end_frame.value < value:
end_frame.value = value
canvas_preview.update()
func _on_End_value_changed(value: float) -> void:
func _on_EndFrame_value_changed(value: float) -> void:
canvas_preview.end_sprite_sheet_frame = value
if start.value > value:
start.value = value
if start_frame.value > value:
start_frame.value = value
canvas_preview.frame = value - 1
canvas_preview.update()

134
src/UI/CanvasPreviewContainer/CanvasPreviewContainer.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=2]
[gd_scene load_steps=10 format=2]
[ext_resource path="res://src/UI/Nodes/TransparentChecker.tscn" type="PackedScene" id=1]
[ext_resource path="res://src/Shaders/TransparentChecker.shader" type="Shader" id=2]
@ -7,6 +7,7 @@
[ext_resource path="res://src/UI/Canvas/CanvasPreview.tscn" type="PackedScene" id=5]
[ext_resource path="res://assets/graphics/timeline/play.png" type="Texture" id=6]
[ext_resource path="res://src/UI/Nodes/CollapsibleContainer.tscn" type="PackedScene" id=7]
[ext_resource path="res://src/UI/Nodes/ValueSlider.gd" type="Script" id=8]
[sub_resource type="ShaderMaterial" id=1]
shader = ExtResource( 2 )
@ -119,9 +120,6 @@ margin_right = 3.5
margin_bottom = 6.0
mouse_default_cursor_shape = 2
texture = ExtResource( 6 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="VBoxContainer" type="VBoxContainer" parent="VBox/Animation"]
margin_left = 24.0
@ -135,19 +133,20 @@ margin_bottom = 20.0
[node name="Label" type="Label" parent="VBox/Animation/VBoxContainer/Mode"]
margin_top = 3.0
margin_right = 114.0
margin_right = 111.0
margin_bottom = 17.0
text = "Animation Mode: "
text = "Animation mode:"
[node name="OptionButton" type="OptionButton" parent="VBox/Animation/VBoxContainer/Mode"]
margin_left = 118.0
margin_left = 115.0
margin_right = 290.0
margin_bottom = 20.0
mouse_default_cursor_shape = 2
size_flags_horizontal = 3
text = "Timeline Frames"
text = "All frames"
clip_text = true
align = 1
items = [ "Timeline Frames", null, false, 0, null, "Current Frame (As Spritesheet)", null, false, 1, null ]
items = [ "All frames", null, false, 0, null, "Current frame as spritesheet", null, false, 1, null ]
selected = 0
[node name="Options" parent="VBox/Animation/VBoxContainer" instance=ExtResource( 7 )]
@ -155,89 +154,92 @@ visible = false
margin_top = 24.0
margin_right = 290.0
margin_bottom = 44.0
text = "Spritesheet Options"
text = "Spritesheet options"
[node name="GridContainer" type="GridContainer" parent="VBox/Animation/VBoxContainer/Options"]
visible = false
margin_right = 290.0
margin_bottom = 52.0
columns = 4
columns = 2
[node name="Label" type="Label" parent="VBox/Animation/VBoxContainer/Options/GridContainer"]
margin_top = 5.0
margin_right = 65.0
margin_bottom = 19.0
text = "HFrames: "
align = 2
[node name="HFrames" type="SpinBox" parent="VBox/Animation/VBoxContainer/Options/GridContainer"]
unique_name_in_owner = true
margin_left = 69.0
margin_right = 143.0
margin_bottom = 24.0
[node name="HFrames" type="TextureProgress" parent="VBox/Animation/VBoxContainer/Options/GridContainer"]
margin_right = 6.0
margin_bottom = 6.0
rect_min_size = Vector2( 0, 24 )
mouse_default_cursor_shape = 2
size_flags_horizontal = 3
theme_type_variation = "ValueSlider"
min_value = 1.0
value = 1.0
allow_greater = true
nine_patch_stretch = true
stretch_margin_left = 3
stretch_margin_top = 3
stretch_margin_right = 3
stretch_margin_bottom = 3
script = ExtResource( 8 )
prefix = "Horizontal frames:"
[node name="Label2" type="Label" parent="VBox/Animation/VBoxContainer/Options/GridContainer"]
margin_left = 147.0
margin_top = 5.0
margin_right = 210.0
margin_bottom = 19.0
text = "VFrames: "
align = 2
[node name="VFrames" type="SpinBox" parent="VBox/Animation/VBoxContainer/Options/GridContainer"]
unique_name_in_owner = true
margin_left = 214.0
margin_right = 288.0
margin_bottom = 24.0
[node name="VFrames" type="TextureProgress" parent="VBox/Animation/VBoxContainer/Options/GridContainer"]
margin_right = 6.0
margin_bottom = 6.0
rect_min_size = Vector2( 0, 24 )
mouse_default_cursor_shape = 2
size_flags_horizontal = 3
theme_type_variation = "ValueSlider"
min_value = 1.0
value = 1.0
allow_greater = true
__meta__ = {
"_editor_description_": ""
}
nine_patch_stretch = true
stretch_margin_left = 3
stretch_margin_top = 3
stretch_margin_right = 3
stretch_margin_bottom = 3
script = ExtResource( 8 )
prefix = "Vertical frames:"
[node name="Label3" type="Label" parent="VBox/Animation/VBoxContainer/Options/GridContainer"]
margin_top = 33.0
margin_right = 65.0
margin_bottom = 47.0
text = "Start: "
align = 2
[node name="Start" type="SpinBox" parent="VBox/Animation/VBoxContainer/Options/GridContainer"]
[node name="StartFrame" type="TextureProgress" parent="VBox/Animation/VBoxContainer/Options/GridContainer"]
unique_name_in_owner = true
margin_left = 69.0
margin_top = 28.0
margin_right = 143.0
margin_bottom = 52.0
margin_right = 6.0
margin_bottom = 6.0
rect_min_size = Vector2( 0, 24 )
mouse_default_cursor_shape = 2
size_flags_horizontal = 3
theme_type_variation = "ValueSlider"
min_value = 1.0
max_value = 1.0
value = 1.0
nine_patch_stretch = true
stretch_margin_left = 3
stretch_margin_top = 3
stretch_margin_right = 3
stretch_margin_bottom = 3
script = ExtResource( 8 )
prefix = "Start frame:"
[node name="Label4" type="Label" parent="VBox/Animation/VBoxContainer/Options/GridContainer"]
margin_left = 147.0
margin_top = 33.0
margin_right = 210.0
margin_bottom = 47.0
text = "End: "
align = 2
[node name="End" type="SpinBox" parent="VBox/Animation/VBoxContainer/Options/GridContainer"]
[node name="EndFrame" type="TextureProgress" parent="VBox/Animation/VBoxContainer/Options/GridContainer"]
unique_name_in_owner = true
margin_left = 214.0
margin_top = 28.0
margin_right = 288.0
margin_bottom = 52.0
margin_right = 6.0
margin_bottom = 6.0
rect_min_size = Vector2( 0, 24 )
mouse_default_cursor_shape = 2
size_flags_horizontal = 3
theme_type_variation = "ValueSlider"
min_value = 1.0
max_value = 1.0
value = 1.0
nine_patch_stretch = true
stretch_margin_left = 3
stretch_margin_top = 3
stretch_margin_right = 3
stretch_margin_bottom = 3
script = ExtResource( 8 )
prefix = "End frame:"
[connection signal="value_changed" from="VBox/HBox/VBoxContainer/PreviewZoomSlider" to="." method="_on_PreviewZoomSlider_value_changed"]
[connection signal="toggled" from="VBox/Animation/PlayButton" to="." method="_on_PlayButton_toggled"]
[connection signal="item_selected" from="VBox/Animation/VBoxContainer/Mode/OptionButton" to="." method="_on_OptionButton_item_selected"]
[connection signal="value_changed" from="VBox/Animation/VBoxContainer/Options/GridContainer/HFrames" to="." method="_on_HFrames_value_changed"]
[connection signal="value_changed" from="VBox/Animation/VBoxContainer/Options/GridContainer/VFrames" to="." method="_on_VFrames_value_changed"]
[connection signal="value_changed" from="VBox/Animation/VBoxContainer/Options/GridContainer/Start" to="." method="_on_Start_value_changed"]
[connection signal="value_changed" from="VBox/Animation/VBoxContainer/Options/GridContainer/End" to="." method="_on_End_value_changed"]
[connection signal="value_changed" from="VBox/Animation/VBoxContainer/Options/GridContainer/StartFrame" to="." method="_on_StartFrame_value_changed"]
[connection signal="value_changed" from="VBox/Animation/VBoxContainer/Options/GridContainer/EndFrame" to="." method="_on_EndFrame_value_changed"]