Get imports working

Author: jonnydgreen

.gitignore

@@ -9,6 +9,7 @@ export_presets.cfg
 
 # Imported translations (automatically generated from CSV files)
 *.translation
+exports
 
 # Mono-specific ignores
 .mono/

addons/parley/assets/Import.svg

@@ -0,0 +1,38 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bl5h6uohpmt6t"
+path="res://.godot/imported/Import.svg-03e08cc35f6e411246290f9e4e846fc2.ctex"
+metadata={
+"has_editor_variant": true,
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/parley/assets/Import.svg"
+dest_files=["res://.godot/imported/Import.svg-03e08cc35f6e411246290f9e4e846fc2.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=true
+editor/convert_colors_with_editor_theme=true

addons/parley/assets/Import.svg.import

@@ -22,4 +22,4 @@ func _ready() -> void:
 func _render() -> void:
 	if dialogue_text_label:
 		var character: ParleyCharacter = dialogue_node.resolve_character()
-		dialogue_text_label.text = "[b]%s[/b] – %s" % [tr(character.name if character.name != '' else 'Unknown'), dialogue_node.text]
+		dialogue_text_label.text = "[b]%s[/b] – %s" % [tr(character.name if character.name != '' else 'Unknown', 'DIALOGUE'), dialogue_node.text]

addons/parley/components/dialogue/dialogue_container.gd

@@ -5,11 +5,13 @@ class_name ParleyMainPanel extends VBoxContainer
 
 
 const ParleyExport = preload("./parley_export.gd")
+const ParleyImport = preload("./parley_import.gd")
 
 
 const new_file_icon: CompressedTexture2D = preload("./assets/New.svg")
 const load_file_icon: CompressedTexture2D = preload("./assets/Load.svg")
 const export_icon: CompressedTexture2D = preload("./assets/Export.svg")
+const import_icon: CompressedTexture2D = preload("./assets/Import.svg")
 const insert_after_icon: CompressedTexture2D = preload("./assets/InsertAfter.svg")
 const dialogue_icon: CompressedTexture2D = preload("./assets/Dialogue.svg")
 const dialogue_option_icon: CompressedTexture2D = preload("./assets/DialogueOption.svg")
@@ -46,6 +48,7 @@ var parley_manager: ParleyManager
 @onready var new_dialogue_sequence_modal: ParleyNewDialogueSequenceModal = %NewDialogueSequenceModal
 @onready var edit_dialogue_sequence_modal: ParleyEditDialogueSequenceModal = %EditDialogueSequenceModal
 @onready var export_modal: ParleyExportModal = %ExportModal
+@onready var import_modal: ParleyImportModal = %ImportModal
 @onready var select_locale_modal: Window = %SelectLocaleModal
 @onready var editor: HSplitContainer = %EditorView
 @onready var sidebar: ParleySidebar = %Sidebar
@@ -269,7 +272,7 @@ func _render_translations_menu() -> void:
 	popup.add_icon_item(export_icon, "Export Characters to CSV...", 1)
 	popup.set_item_tooltip(1, "Export Character Translations to CSV")
 
-	popup.add_icon_item(export_icon, "Import Dialogue from CSV...", 2)
+	popup.add_icon_item(import_icon, "Import Dialogue from CSV...", 2)
 	popup.set_item_tooltip(2, "Import Dialogue Text Translations from CSV")
 
 	ParleyUtils.signals.safe_connect(popup.id_pressed, _on_translations_menu_id_pressed)
@@ -346,14 +349,17 @@ func _on_translations_menu_id_pressed(id: int) -> void:
 			export_modal.render(ParleyExportModal.ExportType.DialogueTextTranslation, ParleyExportModal.FileType.Csv, dialogue_ast)
 		1:
 			export_modal.render(ParleyExportModal.ExportType.CharacterNameTranslation, ParleyExportModal.FileType.Csv, dialogue_ast)
-		1:
-			# IMPORT
-			return
+		2:
+			import_modal.render(ParleyImportModal.ImportType.DialogueTextTranslation, ParleyImportModal.FileType.Csv, dialogue_ast)
 		_:
 			print_rich(ParleyUtils.log.info_msg("Unknown option ID pressed: {id}".format({'id': id})))
 
 
 func _on_save_pressed() -> void:
+	await _save_and_refresh_dialogue()
+
+
+func _save_and_refresh_dialogue() -> void:
 	var result: int = _save_dialogue()
 	if result != OK:
 		return
@@ -737,14 +743,46 @@ func _on_export_requested(export_type: ParleyExportModal.ExportType, file_type:
 	var export_type_name: String = ParleyUtils.string.get_enum_key_name(ParleyExportModal.ExportType, export_type)
 	match export_type:
 		ParleyExportModal.ExportType.Node:
-			ParleyExport.export_node(file_type, dialogue_sequence_ast, path)
+			var result: Array = ParleyExport.export_node(file_type, dialogue_sequence_ast, path)
+			var code: int = result[0]
+			if code != OK:
+				parley_manager.push_toast("Unable to export Nodes from current Dialogue Sequence (code:%s): %s" % [error_string(code), result[1]], EditorToaster.SEVERITY_ERROR)
+				return
+			parley_manager.push_toast(&"Successfully exported Nodes from current Dialogue Sequence")
 		ParleyExportModal.ExportType.DialogueTextTranslation:
-			ParleyExport.export_dialogue_text_translation(file_type, dialogue_sequence_ast, path)
+			var result: Array = ParleyExport.export_dialogue_text_translation(file_type, dialogue_sequence_ast, path)
+			var code: int = result[0]
+			if code != OK:
+				parley_manager.push_toast("Unable to export Text Translations from current Dialogue Sequence (code:%s): %s" % [error_string(code), result[1]], EditorToaster.SEVERITY_ERROR)
+				return
+			parley_manager.push_toast(&"Successfully exported Text Translations from current Dialogue Sequence")
 		ParleyExportModal.ExportType.CharacterNameTranslation:
-			ParleyExport.export_character_name_translation(file_type, dialogue_sequence_ast, path)
+			var result: Array = ParleyExport.export_character_name_translation(file_type, dialogue_sequence_ast, path)
+			var code: int = result[0]
+			if code != OK:
+				parley_manager.push_toast("Unable to export Character Names from current Dialogue Sequence (code:%s): %s" % [error_string(code), result[1]], EditorToaster.SEVERITY_ERROR)
+				return
+			parley_manager.push_toast(&"Successfully exported Character Names from current Dialogue Sequence")
 		_:
 			push_error(ParleyUtils.log.error_msg("Unable to export data: unknown export type (file_type:%s, export_type:%s)" % [file_type_name, export_type_name]))
 			return
+
+
+func _on_import_modal_import_requested(import_type: ParleyImportModal.ImportType, file_type: ParleyImportModal.FileType, dialogue_sequence_ast: ParleyDialogueSequenceAst, path: String) -> void:
+	var file_type_name: String = ParleyUtils.string.get_enum_key_name(ParleyImportModal.FileType, file_type)
+	var import_type_name: String = ParleyUtils.string.get_enum_key_name(ParleyImportModal.ImportType, import_type)
+	match import_type:
+		ParleyImportModal.ImportType.DialogueTextTranslation:
+			var result: Array = ParleyImport.import_dialogue_text_translation(file_type, dialogue_sequence_ast, path)
+			var code: int = result[0]
+			if code != OK:
+				parley_manager.push_toast("Unable to import Text Translations into current Dialogue Sequence (code:%s): %s" % [error_string(code), result[1]], EditorToaster.SEVERITY_ERROR)
+				return
+			await _save_and_refresh_dialogue()
+			parley_manager.push_toast(&"Successfully imported Text Translations into current Dialogue Sequence", EditorToaster.SEVERITY_INFO)
+		_:
+			push_error(ParleyUtils.log.error_msg("Unable to import data: unknown import type (file_type:%s, import_type:%s)" % [file_type_name, import_type_name]))
+			return
 #endregion
 
 

addons/parley/main_panel.gd

@@ -1,4 +1,4 @@
-[gd_scene load_steps=41 format=3 uid="uid://ckubjbp3e7yy3"]
+[gd_scene load_steps=42 format=3 uid="uid://ckubjbp3e7yy3"]
 
 [ext_resource type="Script" uid="uid://ctp441gxhvg80" path="res://addons/parley/main_panel.gd" id="1_06n3w"]
 [ext_resource type="Texture2D" uid="uid://ct6iywe1qjuh3" path="res://addons/parley/assets/New.svg" id="3_4ui00"]
@@ -34,6 +34,7 @@
 [ext_resource type="Script" uid="uid://3nqtsewsmim0" path="res://addons/parley/models/node_ast.gd" id="31_tp54n"]
 [ext_resource type="Script" uid="uid://btn7s5anok7p4" path="res://addons/parley/models/dialogue_sequence_ast.gd" id="32_pogw7"]
 [ext_resource type="PackedScene" uid="uid://d3d5w0atvk7y1" path="res://addons/parley/modals/select_locale_modal.tscn" id="33_s5oy3"]
+[ext_resource type="PackedScene" uid="uid://dm8p6rjl3h1km" path="res://addons/parley/modals/import_modal.tscn" id="35_8yxrj"]
 
 [sub_resource type="Resource" id="Resource_s5oy3"]
 script = ExtResource("26_anq7l")
@@ -50,7 +51,7 @@ script = ExtResource("28_anq7l")
 characters = Array[ExtResource("11_7jaih")]([])
 id = ""
 
-[sub_resource type="Image" id="Image_owjo5"]
+[sub_resource type="Image" id="Image_8yxrj"]
 data = {
 "data": PackedByteArray(255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 92, 92, 0, 255, 92, 92, 0, 255, 92, 92, 0, 255, 92, 92, 0, 255, 92, 92, 0, 255, 92, 92, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 0, 255, 92, 92, 127, 255, 92, 92, 0, 255, 92, 92, 0, 255, 92, 92, 0, 255, 92, 92, 0, 255, 92, 92, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 0, 255, 93, 93, 255, 255, 92, 92, 127, 255, 92, 92, 0, 255, 92, 92, 0, 255, 92, 92, 0, 255, 92, 92, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 92, 92, 127, 255, 92, 92, 0, 255, 92, 92, 0, 255, 92, 92, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 92, 92, 127, 255, 92, 92, 0, 255, 92, 92, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 92, 92, 0, 255, 92, 92, 0, 255, 92, 92, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 231, 255, 90, 90, 54, 255, 94, 94, 57, 255, 93, 93, 233, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 231, 255, 90, 90, 54, 255, 94, 94, 57, 255, 93, 93, 233, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 0, 255, 93, 93, 0, 255, 91, 91, 0, 255, 91, 91, 0, 255, 91, 91, 42, 255, 90, 90, 0, 255, 94, 94, 0, 255, 91, 91, 42, 255, 93, 93, 233, 255, 92, 92, 232, 255, 93, 93, 41, 255, 90, 90, 0, 255, 94, 94, 0, 255, 91, 91, 42, 255, 93, 93, 233, 255, 92, 92, 232, 255, 92, 92, 0, 255, 92, 92, 0, 255, 91, 91, 0, 255, 91, 91, 0, 255, 91, 91, 0, 255, 91, 91, 45, 255, 93, 93, 44, 255, 91, 91, 0, 255, 91, 91, 42, 255, 91, 91, 42, 255, 93, 93, 0, 255, 91, 91, 45, 255, 93, 93, 44, 255, 91, 91, 0, 255, 91, 91, 42, 255, 91, 91, 42, 255, 91, 91, 0, 255, 91, 91, 0, 255, 91, 91, 0, 255, 91, 91, 0, 255, 91, 91, 45, 255, 92, 92, 235, 255, 92, 92, 234, 255, 89, 89, 43, 255, 91, 91, 0, 255, 91, 91, 0, 255, 91, 91, 45, 255, 92, 92, 235, 255, 92, 92, 234, 255, 89, 89, 43, 255, 91, 91, 0, 255, 91, 91, 0, 255, 91, 91, 0, 255, 91, 91, 0, 255, 92, 92, 0, 255, 92, 92, 0, 255, 92, 92, 235, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 233, 255, 91, 91, 59, 255, 92, 92, 61, 255, 92, 92, 235, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 233, 255, 91, 91, 59, 255, 92, 92, 61, 255, 92, 92, 0, 255, 92, 92, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0, 255, 93, 93, 0),
 "format": "RGBA8",
@@ -59,8 +60,8 @@ data = {
 "width": 16
 }
 
-[sub_resource type="ImageTexture" id="ImageTexture_8yxrj"]
-image = SubResource("Image_owjo5")
+[sub_resource type="ImageTexture" id="ImageTexture_h2jtb"]
+image = SubResource("Image_8yxrj")
 
 [sub_resource type="Resource" id="Resource_7hjis"]
 script = ExtResource("32_pogw7")
@@ -272,7 +273,7 @@ unique_name_in_owner = true
 layout_mode = 2
 tooltip_text = "Navigate to the Parley Documentation."
 text = "Docs"
-icon = SubResource("ImageTexture_8yxrj")
+icon = SubResource("ImageTexture_h2jtb")
 flat = true
 
 [node name="EditorView" type="HSplitContainer" parent="MarginContainer/MainContainer/HSplitContainer/MainViewPanel/MainViewContainer"]
@@ -324,6 +325,10 @@ visible = false
 unique_name_in_owner = true
 visible = false
 
+[node name="ImportModal" parent="." instance=ExtResource("35_8yxrj")]
+unique_name_in_owner = true
+visible = false
+
 [connection signal="pressed" from="MarginContainer/MainContainer/HSplitContainer/MainViewPanel/MainViewContainer/Toolbar/EditorActions/SaveButton" to="." method="_on_save_pressed"]
 [connection signal="pressed" from="MarginContainer/MainContainer/HSplitContainer/MainViewPanel/MainViewContainer/Toolbar/EditorActions/ArrangeNodesButton" to="." method="_on_arrange_nodes_button_pressed"]
 [connection signal="pressed" from="MarginContainer/MainContainer/HSplitContainer/MainViewPanel/MainViewContainer/Toolbar/EditorActions/RefreshButton" to="." method="_on_refresh_button_pressed"]
@@ -346,3 +351,4 @@ visible = false
 [connection signal="export_requested" from="ExportModal" to="." method="_on_export_requested"]
 [connection signal="dialogue_ast_edited" from="EditDialogueSequenceModal" to="." method="_on_edit_dialogue_sequence_modal_dialogue_ast_edited"]
 [connection signal="locale_changed" from="SelectLocaleModal" to="." method="_on_select_locale_modal_locale_changed"]
+[connection signal="import_requested" from="ImportModal" to="." method="_on_import_modal_import_requested"]

addons/parley/main_panel.tscn

@@ -37,6 +37,13 @@ signal export_requested(export_type: ExportType, file_type: FileType, dialogue_s
 #endregion
 
 
+#region LIFECYCLE
+func _ready() -> void:
+	_render_title()
+	_render_status()
+#endregion
+
+
 #region SETTERS
 func _set_export_type(new_export_type: ExportType) -> void:
 	export_type = new_export_type
@@ -51,7 +58,7 @@ func _set_file_type(new_file_type: FileType) -> void:
 #endregion
 
 
-#region LIFECYCLE
+#region RENDERERS
 # TODO: check where this is called
 func render(p_export_type: ExportType, p_file_type: FileType, p_dialogue_sequence_ast: ParleyDialogueSequenceAst) -> void:
 	file_type = p_file_type

addons/parley/modals/export_modal.gd

@@ -5,7 +5,7 @@
 
 [node name="ExportModal" type="Window"]
 auto_translate_mode = 1
-title = "Export to CSV"
+title = "Export Dialogue Text Translations to CSV"
 initial_position = 2
 size = Vector2i(1400, 800)
 min_size = Vector2i(1400, 800)
@@ -39,7 +39,6 @@ unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
 text = "res://export/export.csv"
-expand_to_text_length = true
 
 [node name="ChoosePathButton" type="Button" parent="ExportMarginContainer/ExportContainer/PathContainer"]
 layout_mode = 2
@@ -53,7 +52,7 @@ size_flags_vertical = 3
 bbcode_enabled = true
 text = "[color=#19e34f]
 [ul]CSV path name is valid[/ul][/color][color=#19e34f]
-[ul]Will export the current Dialogue Sequence to CSV[/ul][/color]
+[ul]Will export the Dialogue Text Translations to CSV[/ul][/color]
 "
 fit_content = true