Skip to content

Commit 0a49d8f

Browse files
arnaudvergnetarnaudvergnet
authored
make wait seconds use the new template (#242)
1 parent 3ed281f commit 0a49d8f

File tree

8 files changed

+120
-109
lines changed

8 files changed

+120
-109
lines changed

‎addons/dialogic/Editor/Events/ChangeBackground.gd‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ var preview_scene = preload("res://addons/dialogic/Editor/Events/Common/Images/I
66
var preview = "..."
77
var image_picker
88

9-
# This is the information of this event and it will get parsed and saved to the JSON file.
10-
var event_data = {
11-
'background': ''
12-
}
139

1410
func _ready():
1511
image_picker = get_header()
1612
# Needed to open the file dialog
1713
image_picker.editor_reference = editor_reference
1814
image_picker.connect("file_selected", self, "_on_file_selected")
1915
image_picker.connect("clear_pressed", self, "_on_clear_pressed")
16+
# Init the data
17+
event_data = {
18+
'background': ''
19+
}
2020

2121

2222
func load_data(data):
23-
event_data = data
23+
.load_data(data)
2424
load_image(event_data['background'])
2525

2626

‎addons/dialogic/Editor/Events/Common/SecondsSelector.gd‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
tool
2+
extends HBoxContainer
3+
4+
onready var spinbox := $SpinBox
5+
6+
signal value_changed(value)
7+
8+
func set_value(val: float):
9+
spinbox.value = val
10+
11+
12+
func _on_SpinBox_value_changed(value):
13+
emit_signal("value_changed", value)

‎addons/dialogic/Editor/Events/Common/SecondsSelector.tscn‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[gd_scene load_steps=3 format=2]
2+
3+
[ext_resource path="res://addons/dialogic/Editor/Events/Common/SpinBoxPreventDnD.gd" type="Script" id=1]
4+
[ext_resource path="res://addons/dialogic/Editor/Events/Common/SecondsSelector.gd" type="Script" id=2]
5+
6+
[node name="SecondsSelector" type="HBoxContainer"]
7+
margin_right = 139.0
8+
margin_bottom = 28.0
9+
script = ExtResource( 2 )
10+
__meta__ = {
11+
"_edit_use_anchors_": false
12+
}
13+
14+
[node name="SpinBox" type="SpinBox" parent="."]
15+
margin_right = 74.0
16+
margin_bottom = 28.0
17+
min_value = 0.1
18+
step = 0.1
19+
value = 1.0
20+
allow_greater = true
21+
align = 1
22+
script = ExtResource( 1 )
23+
24+
[node name="MarginContainer" type="MarginContainer" parent="."]
25+
margin_left = 78.0
26+
margin_right = 141.0
27+
margin_bottom = 28.0
28+
mouse_filter = 1
29+
custom_constants/margin_left = 10
30+
31+
[node name="Title" type="Label" parent="MarginContainer"]
32+
margin_left = 10.0
33+
margin_top = 7.0
34+
margin_right = 63.0
35+
margin_bottom = 21.0
36+
text = "Seconds"
37+
[connection signal="value_changed" from="SpinBox" to="." method="_on_SpinBox_value_changed"]

‎addons/dialogic/Editor/Events/Templates/EventTemplate.gd‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,17 @@ var indent_size = 25
3030
# Useful for making placeholder events in drag and drop
3131
var ignore_save = false
3232

33+
# This is the data that is going to be saved to json
34+
var event_data := {}
35+
3336
## *****************************************************************************
3437
## PUBLIC METHODS
3538
## *****************************************************************************
3639

40+
# Called when timeline editor loads
41+
func load_data(data):
42+
event_data = data
43+
3744

3845
func set_event_style(style: StyleBoxFlat):
3946
panel.set('custom_styles/panel', style)

‎addons/dialogic/Editor/Events/WaitSeconds.gd‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
tool
2-
extends Control
2+
extends "res://addons/dialogic/Editor/Events/Templates/EventTemplate.gd"
33

4-
var editor_reference
54

6-
# This is the information of this event and it will get parsed and saved to the JSON file.
7-
var event_data = {
8-
'wait_seconds': 0
9-
}
5+
func _ready():
6+
event_data = {
7+
'wait_seconds': 1
8+
}
9+
get_header().set_value(float(event_data['wait_seconds']))
10+
get_header().connect("value_changed", self, "_on_Selector_value_changed")
1011

1112

1213
func load_data(data):
13-
event_data = data
14-
$PanelContainer/VBoxContainer/Header/SpinBox.value = event_data['wait_seconds']
14+
.load_data(data)
15+
get_header().set_value(float(event_data['wait_seconds']))
1516

1617

17-
func _on_SpinBox_value_changed(value):
18+
func _on_Selector_value_changed(value):
1819
event_data['wait_seconds'] = value

‎addons/dialogic/Editor/Events/WaitSeconds.tscn‎

Lines changed: 34 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,50 @@
1-
[gd_scene load_steps=7 format=2]
1+
[gd_scene load_steps=6 format=2]
22

33
[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/wait-seconds.svg" type="Texture" id=1]
44
[ext_resource path="res://addons/dialogic/Editor/Events/WaitSeconds.gd" type="Script" id=2]
5-
[ext_resource path="res://addons/dialogic/Editor/Events/Common/Spacer.tscn" type="PackedScene" id=3]
6-
[ext_resource path="res://addons/dialogic/Editor/Events/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
7-
[ext_resource path="res://addons/dialogic/Editor/Events/Common/SpinBoxPreventDnD.gd" type="Script" id=6]
5+
[ext_resource path="res://addons/dialogic/Editor/Events/Common/SecondsSelector.tscn" type="PackedScene" id=3]
6+
[ext_resource path="res://addons/dialogic/Editor/Events/Templates/EventTemplate.tscn" type="PackedScene" id=4]
7+
[ext_resource path="res://addons/dialogic/Editor/Events/styles/WaitSeconds.tres" type="StyleBox" id=5]
88

9-
[sub_resource type="StyleBoxFlat" id=1]
10-
content_margin_left = 16.0
11-
content_margin_right = 6.0
12-
content_margin_top = 6.0
13-
content_margin_bottom = 6.0
14-
bg_color = Color( 0.435294, 0.301961, 0.603922, 0.192157 )
15-
border_width_left = 2
16-
border_width_top = 2
17-
border_width_right = 2
18-
border_width_bottom = 2
19-
border_color = Color( 0.12549, 0.12549, 0.12549, 1 )
20-
corner_radius_top_left = 6
21-
corner_radius_top_right = 6
22-
corner_radius_bottom_right = 6
23-
corner_radius_bottom_left = 6
24-
25-
[node name="WaitSeconds" type="HBoxContainer"]
26-
margin_right = 1004.0
27-
margin_bottom = 42.0
28-
size_flags_horizontal = 3
29-
size_flags_vertical = 9
9+
[node name="EventTemplate" instance=ExtResource( 4 )]
10+
margin_bottom = 46.0
3011
script = ExtResource( 2 )
31-
__meta__ = {
32-
"_edit_use_anchors_": false
33-
}
34-
35-
[node name="Indent" type="Control" parent="."]
36-
visible = false
37-
margin_bottom = 42.0
38-
39-
[node name="PanelContainer" type="PanelContainer" parent="."]
40-
margin_right = 1004.0
41-
margin_bottom = 42.0
42-
mouse_filter = 1
43-
size_flags_horizontal = 3
44-
size_flags_vertical = 3
45-
custom_styles/panel = SubResource( 1 )
46-
__meta__ = {
47-
"_edit_use_anchors_": false
48-
}
12+
event_style = ExtResource( 5 )
13+
event_icon = ExtResource( 1 )
14+
event_name = "Wait"
15+
header_scene = ExtResource( 3 )
4916

50-
[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer"]
51-
margin_left = 16.0
52-
margin_top = 6.0
53-
margin_right = 998.0
54-
margin_bottom = 36.0
55-
size_flags_horizontal = 3
17+
[node name="PanelContainer" parent="." index="1"]
18+
custom_styles/panel = ExtResource( 5 )
5619

57-
[node name="Header" type="HBoxContainer" parent="PanelContainer/VBoxContainer"]
58-
margin_right = 982.0
59-
margin_bottom = 28.0
20+
[node name="IconMarginContainer" parent="PanelContainer/MarginContainer/VBoxContainer/Header" index="0"]
21+
margin_right = 37.0
6022

61-
[node name="TextureRect" type="TextureRect" parent="PanelContainer/VBoxContainer/Header"]
62-
margin_right = 22.0
63-
margin_bottom = 28.0
23+
[node name="IconTexture" parent="PanelContainer/MarginContainer/VBoxContainer/Header/IconMarginContainer" index="0"]
24+
margin_right = 32.0
6425
texture = ExtResource( 1 )
65-
stretch_mode = 6
6626

67-
[node name="Title" type="Label" parent="PanelContainer/VBoxContainer/Header"]
68-
margin_left = 26.0
69-
margin_top = 7.0
70-
margin_right = 75.0
71-
margin_bottom = 21.0
72-
text = " Wait "
27+
[node name="TitleHBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer/Header" index="1"]
28+
margin_left = 41.0
29+
margin_right = 96.0
7330

74-
[node name="SpinBox" type="SpinBox" parent="PanelContainer/VBoxContainer/Header"]
75-
margin_left = 79.0
76-
margin_right = 153.0
77-
margin_bottom = 28.0
78-
min_value = 0.1
79-
step = 0.1
80-
value = 1.0
81-
allow_greater = true
82-
align = 1
83-
script = ExtResource( 6 )
31+
[node name="TitleMarginContainer" parent="PanelContainer/MarginContainer/VBoxContainer/Header/TitleHBoxContainer" index="1"]
32+
margin_right = 47.0
8433

85-
[node name="Title2" type="Label" parent="PanelContainer/VBoxContainer/Header"]
86-
margin_left = 157.0
87-
margin_top = 7.0
88-
margin_right = 218.0
89-
margin_bottom = 21.0
90-
text = " Seconds"
34+
[node name="TitleLabel" parent="PanelContainer/MarginContainer/VBoxContainer/Header/TitleHBoxContainer/TitleMarginContainer" index="0"]
35+
margin_right = 34.0
36+
text = "Wait"
9137

92-
[node name="Preview" type="Label" parent="PanelContainer/VBoxContainer/Header"]
93-
margin_left = 222.0
94-
margin_top = 7.0
95-
margin_right = 222.0
96-
margin_bottom = 21.0
97-
custom_colors/font_color = Color( 1, 1, 1, 0.513726 )
38+
[node name="VSeparator2" parent="PanelContainer/MarginContainer/VBoxContainer/Header/TitleHBoxContainer" index="2"]
39+
margin_left = 51.0
40+
margin_right = 55.0
9841

99-
[node name="Spacer" parent="PanelContainer/VBoxContainer/Header" instance=ExtResource( 3 )]
100-
margin_left = 226.0
101-
margin_right = 941.0
102-
margin_bottom = 28.0
42+
[node name="Content" parent="PanelContainer/MarginContainer/VBoxContainer/Header" index="2"]
43+
margin_left = 100.0
44+
margin_right = 249.0
10345

104-
[node name="OptionButton" parent="PanelContainer/VBoxContainer/Header" instance=ExtResource( 4 )]
105-
margin_left = 945.0
106-
margin_right = 982.0
107-
margin_bottom = 28.0
108-
items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", true, "Remove", null, 0, false, false, 3, 0, null, "", false ]
46+
[node name="Spacer" parent="PanelContainer/MarginContainer/VBoxContainer/Header" index="4"]
47+
margin_left = 253.0
10948

110-
[connection signal="value_changed" from="PanelContainer/VBoxContainer/Header/SpinBox" to="." method="_on_SpinBox_value_changed"]
49+
[node name="OptionsControl" parent="PanelContainer/MarginContainer/VBoxContainer/Header" index="6"]
50+
items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", false, "Remove", null, 0, false, false, 3, 0, null, "", false ]

‎addons/dialogic/Editor/Events/styles/WaitSeconds.tres‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[gd_resource type="StyleBoxFlat" format=2]
2+
3+
[resource]
4+
bg_color = Color( 0.435294, 0.301961, 0.603922, 0.192157 )
5+
border_width_left = 2
6+
border_width_top = 2
7+
border_width_right = 2
8+
border_width_bottom = 2
9+
border_color = Color( 0.12549, 0.12549, 0.12549, 1 )
10+
corner_radius_top_left = 6
11+
corner_radius_top_right = 6
12+
corner_radius_bottom_right = 6
13+
corner_radius_bottom_left = 6

‎addons/dialogic/Editor/TimelineEditor/TimelineEditor.gd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var moving_piece = null
2222
var piece_was_dragged = false
2323

2424
func _has_template(event):
25-
return event.event_data.has("background")
25+
return event.event_data.has("background") or event.event_data.has("wait_seconds")
2626

2727

2828
func _ready():

0 commit comments

Comments
 (0)