latest before video

Author: coppolaemilio

addons/dialogic/Editor/EditorView.tscn

@@ -488,7 +488,7 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="AudioPreview" type="AudioStreamPlayer2D" parent="."]
+[node name="AudioPreview" type="AudioStreamPlayer" parent="."]
 [connection signal="pressed" from="HBoxContainer/EventButton" to="." method="_on_EventButton_pressed"]
 [connection signal="pressed" from="HBoxContainer/CharactersButton" to="." method="_on_CharactersButton_pressed"]
 [connection signal="pressed" from="HBoxContainer/ButtonSave" to="." method="_on_ButtonSave_pressed"]
@@ -510,3 +510,4 @@ __meta__ = {
 [connection signal="pressed" from="Editor/CharacterEditor/HBoxContainer/Container/Actions/DeleteButton" to="." method="_on_DeleteButton_pressed"]
 [connection signal="confirmed" from="RemoveConfirmation" to="." method="_on_RemoveConfirmation_confirmed"]
 [connection signal="confirmed" from="RenameDialog" to="." method="_on_RenameDialog_confirmed"]
+[connection signal="finished" from="AudioPreview" to="." method="_on_AudioPreview_finished"]

addons/dialogic/Editor/Pieces/AudioBlock.gd

@@ -4,15 +4,16 @@ extends PanelContainer
 var editor_reference
 var editorPopup
 
-var play_button_state = 'stopped'
+var play_icon = load("res://addons/dialogic/Images/play.svg")
+var stop_icon = load("res://addons/dialogic/Images/stop.svg")
 
 # This is the information of this event and it will get parsed and saved to the JSON file.
 var event_data = {
 	'audio': 'play',
 	'file': ''
 }
 
-func _ready():
+func _ready():	
 	$VBoxContainer/Header/VisibleToggle.disabled()
 
 
@@ -22,31 +23,30 @@ func _on_ButtonAudio_pressed():
 	editor_reference.godot_dialog_connect(self, "_on_file_selected")
 
 func _on_file_selected(path, target):
-	print('load_audio', path, target)
+	print('[Dialogic] Loading audio block ', path, target)
 	target.load_audio(path)
 
 func load_audio(path):
-	$VBoxContainer/Header/Title.text = path
+	$VBoxContainer/Header/Name.text = path
 	$VBoxContainer/Header/ButtonPreviewPlay.disabled = false
 	event_data['file'] = path
-	print(path)
 
 
 func load_data(data):
 	event_data = data
 	if data['file'] != '':
 		load_audio(data['file'])
-
-func _on_ButtonPreviewPlay_pressed():
-	print(editor_reference.get_node("AudioPreview"))
 
-	# It seems like you can't play audio on the editor.
-	if play_button_state == 'playing':
-		editor_reference.get_node("AudioPreview").stop()
-		play_button_state == 'stopped'
+func _on_ButtonPreviewPlay_pressed():
+	print('[Dialogic] Playing audio ' + event_data['file'])
+	if $AudioPreview.is_playing():
+		$AudioPreview.stop()
 	else:
-		var audio_preview = editor_reference.get_node("AudioPreview")
-		var audio_file = load(event_data['file'])
-		audio_preview.stream = audio_file
-		editor_reference.get_node("AudioPreview").play()
-		play_button_state == 'playing'
+		$AudioPreview.stream = load(event_data['file'])
+		$AudioPreview.play()
+		$VBoxContainer/Header/ButtonPreviewPlay.icon = stop_icon
+		
+
+
+func _on_AudioPreview_finished():
+	$VBoxContainer/Header/ButtonPreviewPlay.icon = play_icon

addons/dialogic/Editor/Pieces/AudioBlock.tscn

@@ -56,15 +56,21 @@ margin_right = 117.0
 margin_bottom = 22.0
 text = "  Audio   "
 
-[node name="ButtonAudio" type="Button" parent="VBoxContainer/Header"]
+[node name="Name" type="Label" parent="VBoxContainer/Header"]
 margin_left = 121.0
-margin_right = 145.0
+margin_top = 8.0
+margin_right = 121.0
+margin_bottom = 22.0
+
+[node name="ButtonAudio" type="Button" parent="VBoxContainer/Header"]
+margin_left = 125.0
+margin_right = 149.0
 margin_bottom = 30.0
 text = "..."
 
 [node name="ButtonPreviewPlay" type="Button" parent="VBoxContainer/Header"]
-margin_left = 149.0
-margin_right = 183.0
+margin_left = 153.0
+margin_right = 187.0
 margin_bottom = 30.0
 disabled = true
 icon = ExtResource( 5 )
@@ -79,12 +85,15 @@ custom_colors/font_color = Color( 1, 1, 1, 0.513726 )
 text = "    ..."
 
 [node name="Spacer" type="Control" parent="VBoxContainer/Header"]
-margin_left = 187.0
+margin_left = 191.0
 margin_right = 1745.0
 margin_bottom = 30.0
 size_flags_horizontal = 3
 
 [node name="OptionButton" parent="VBoxContainer/Header" instance=ExtResource( 4 )]
 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 ]
+
+[node name="AudioPreview" type="AudioStreamPlayer" parent="."]
 [connection signal="pressed" from="VBoxContainer/Header/ButtonAudio" to="." method="_on_ButtonAudio_pressed"]
 [connection signal="pressed" from="VBoxContainer/Header/ButtonPreviewPlay" to="." method="_on_ButtonPreviewPlay_pressed"]
+[connection signal="finished" from="AudioPreview" to="." method="_on_AudioPreview_finished"]

addons/dialogic/Editor/Pieces/SceneBlock.tscn

@@ -50,9 +50,9 @@ stretch_mode = 6
 [node name="Title" type="Label" parent="VBoxContainer/Header"]
 margin_left = 60.0
 margin_top = 8.0
-margin_right = 145.0
+margin_right = 165.0
 margin_bottom = 22.0
-text = "  Scene Block"
+text = "  Scene settings "
 
 [node name="Preview" type="Label" parent="VBoxContainer/Header"]
 visible = false
@@ -64,7 +64,7 @@ custom_colors/font_color = Color( 1, 1, 1, 0.513726 )
 text = "    ..."
 
 [node name="Spacer" type="Control" parent="VBoxContainer/Header"]
-margin_left = 149.0
+margin_left = 169.0
 margin_right = 1745.0
 margin_bottom = 30.0
 mouse_filter = 1

addons/dialogic/Editor/editor_view.gd

@@ -199,15 +199,16 @@ func load_nodes(path):
 func get_dialog_list():
 	var dialogs = []
 	for file in listdir(DIALOG_DIR):
-		var color = Color("#ffffff")
-		dialogs.append({'name':file.split('.')[0], 'color': color, 'file': file })
-		#var data = load_json(DIALOG_DIR + '/' + file)
-		#if data.has('color'):
-		#	color = Color('#' + data['color'])
-		#if data.has('name'):
-		#	characters.append({'name':data['name'], 'color': color, 'file': file })
-		#else:
-		#	characters.append({'name':data['id'], 'color': color, 'file': file })
+		if '.json' in file:
+			var color = Color("#ffffff")
+			dialogs.append({'name':file.split('.')[0], 'color': color, 'file': file })
+			#var data = load_json(DIALOG_DIR + '/' + file)
+			#if data.has('color'):
+			#	color = Color('#' + data['color'])
+			#if data.has('name'):
+			#	characters.append({'name':data['name'], 'color': color, 'file': file })
+			#else:
+			#	characters.append({'name':data['id'], 'color': color, 'file': file })
 	return dialogs
 
 func refresh_dialog_list():