colored join in characters

Author: coppolaemilio

addons/dialogic/Editor/EditorView.tscn

@@ -82,21 +82,23 @@ icon = ExtResource( 7 )
 flat = true
 
 [node name="ButtonSave" type="Button" parent="HBoxContainer"]
+visible = false
 margin_left = 68.0
 margin_right = 109.0
 margin_bottom = 28.0
 text = "Save"
 align = 0
 
 [node name="ReloadResource" type="Button" parent="HBoxContainer"]
-margin_left = 109.0
-margin_right = 164.0
+visible = false
+margin_left = 68.0
+margin_right = 123.0
 margin_bottom = 28.0
 text = "Reload"
 align = 0
 
 [node name="Control" type="Control" parent="HBoxContainer"]
-margin_left = 164.0
+margin_left = 68.0
 margin_right = 885.0
 margin_bottom = 28.0
 size_flags_horizontal = 3
@@ -135,6 +137,7 @@ margin_right = 180.0
 margin_bottom = 270.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
+allow_rmb_select = true
 
 [node name="VBoxContainer" type="VBoxContainer" parent="Editor/EventTools"]
 margin_top = 274.0
@@ -426,10 +429,41 @@ dialog_text = "Are you sure you want to remove this character?
 __meta__ = {
 "_edit_use_anchors_": false
 }
+
+[node name="RenameDialog" type="AcceptDialog" parent="."]
+visible = true
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+margin_left = -250.0
+margin_top = -44.0
+margin_right = 250.0
+margin_bottom = 44.0
+rect_min_size = Vector2( 500, 0 )
+window_title = "Renaming Dialog"
+resizable = true
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="LineEdit" type="LineEdit" parent="RenameDialog"]
+anchor_left = -0.00237569
+anchor_top = -0.00809895
+anchor_right = -0.00237569
+anchor_bottom = -0.00809895
+margin_left = 9.18785
+margin_top = 8.71271
+margin_right = 493.188
+margin_bottom = 52.7127
+__meta__ = {
+"_edit_use_anchors_": false
+}
 [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"]
 [connection signal="pressed" from="HBoxContainer/ReloadResource" to="." method="_on_ReloadResource_pressed"]
+[connection signal="item_rmb_selected" from="Editor/EventTools/DialogItemList" to="." method="_on_DialogItemList_item_rmb_selected"]
 [connection signal="item_selected" from="Editor/EventTools/DialogItemList" to="." method="_on_DialogItemList_item_selected"]
 [connection signal="pressed" from="Editor/EventTools/VBoxContainer/ButtonText" to="." method="_on_ButtonText_pressed"]
 [connection signal="pressed" from="Editor/EventTools/VBoxContainer/ButtonBackground" to="." method="_on_ButtonBackground_pressed"]
@@ -443,3 +477,4 @@ __meta__ = {
 [connection signal="pressed" from="Editor/CharacterEditor/HBoxContainer/Container/Actions/SaveButton" to="." method="_on_character_SaveButton_pressed"]
 [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"]

addons/dialogic/Editor/Pieces/CharacterJoinBlock.gd

@@ -2,7 +2,9 @@ tool
 extends PanelContainer
 
 var editor_reference
-var available_positions = ['left', 'middle', 'right']
+
+var current_color = Color('#ffffff')
+var default_icon_color = Color("#65989898")
 
 # This is the information of this event and it will get parsed and saved to the JSON file.
 var event_data = {
@@ -24,12 +26,23 @@ func _on_MenuCharacter_about_to_show():
 	var index = 0
 	for c in editor_reference.get_character_list():
 		Dropdown.get_popup().add_item(c['name'])
-		Dropdown.get_popup().set_item_metadata(index, {'file': c['file'], 'color': Color('#ffffff')})
+		Dropdown.get_popup().set_item_metadata(index, {'file': c['file'], 'color': c['color']})
 		index += 1
 
 func _on_character_selected(index):
 	var text = $VBoxContainer/Header/CharacterDropdown.get_popup().get_item_text(index)
 	var metadata = $VBoxContainer/Header/CharacterDropdown.get_popup().get_item_metadata(index)
+	
+	# Updating icon Color
+	current_color = Color(metadata['color'])
+	var c_c_ind = 0
+	for p in $VBoxContainer/Header/PositionsContainer.get_children():
+		if event_data['position'][str(c_c_ind)]:
+			p.set('self_modulate', Color(metadata['color']))
+		else:
+			p.set('self_modulate', default_icon_color)
+		c_c_ind += 1
+		
 	$VBoxContainer/Header/CharacterDropdown.text = text
 	event_data['character'] = metadata['file']
 
@@ -38,6 +51,7 @@ func position_button_pressed(name):
 	var selected_index = name.split('-')[1]
 	var button = $VBoxContainer/Header/PositionsContainer.get_node('position-' + selected_index)
 	button.set('self_modulate', Color("#ffffff"))
+	button.set('self_modulate', current_color)
 	button.pressed = true
 	event_data['position'][selected_index] = true
 	print('here', selected_index)
@@ -46,19 +60,25 @@ func clear_all_positions():
 	for i in range(5):
 		event_data['position'][str(i)] = false
 	for p in $VBoxContainer/Header/PositionsContainer.get_children():
-		p.set('self_modulate', Color("#65989898"))
+		p.set('self_modulate', default_icon_color)
 		p.pressed = false
 
-func check_active_position():
+func check_active_position(active_color = Color("#ffffff")):
 	var index = 0
 	for p in $VBoxContainer/Header/PositionsContainer.get_children():
 		if event_data['position'][str(index)]:
-			p.set('self_modulate', Color("#ffffff"))
 			p.pressed = true
+			p.set('self_modulate', active_color)
 		index += 1
 
 func load_data(data):
-	if data['character'] != '':
-		$VBoxContainer/Header/CharacterDropdown.text = editor_reference.get_character_name(data['character'])
 	event_data = data
+	if data['character'] != '':
+		var character_data = editor_reference.get_character_data(data['character'])
+		if character_data.has('name'):
+			$VBoxContainer/Header/CharacterDropdown.text = character_data['name']
+		if character_data.has('color'):
+			current_color = Color('#' + character_data['color'])
+			check_active_position(current_color)
+			return
 	check_active_position()

addons/dialogic/Editor/Pieces/CharacterJoinBlock.tscn

@@ -32,7 +32,7 @@ __meta__ = {
 margin_left = 6.0
 margin_top = 6.0
 margin_right = 1792.0
-margin_bottom = 46.0
+margin_bottom = 36.0
 size_flags_horizontal = 3
 
 [node name="Header" type="HBoxContainer" parent="VBoxContainer"]

addons/dialogic/Editor/editor_view.gd

@@ -11,6 +11,9 @@ var WORKING_DIR = "res://dialogic"
 var DIALOG_DIR = WORKING_DIR + "/dialogs"
 var CHAR_DIR = WORKING_DIR + "/characters"
 var working_dialog_file = ''
+var timer_duration = 200
+var timer_interval = 30
+var autosaving_hash
 onready var Timeline = $Editor/EventEditor/TimeLine
 onready var DialogList = $Editor/EventTools/DialogItemList
 onready var CharacterList = $Editor/CharacterTools/CharacterItemList
@@ -42,6 +45,12 @@ func _ready():
 	# Making the dialog editor the default
 	hide_editors()
 	_on_EventButton_pressed()
+
+func _process(delta):
+	timer_interval -= 1
+	if timer_interval < 0 :
+		timer_interval = timer_duration
+		_on_AutoSaver_timeout()
 
 func _on_piece_connect(from, from_slot, to, to_slot):
 	$Editor/GraphEdit.connect_node(from, from_slot, to, to_slot)
@@ -128,8 +137,7 @@ func _on_ReloadResource_pressed():
 func _on_ButtonSave_pressed():
 	save_nodes(working_dialog_file)
 
-func save_nodes(path):
-	print('Saving resource --------')
+func generate_save_data():
 	var info_to_save = {
 		'metadata': {
 			'dialogic-version': '0.4'
@@ -138,13 +146,16 @@ func save_nodes(path):
 	}
 	for event in Timeline.get_children():
 		info_to_save['events'].append(event.event_data)
-	
+	return info_to_save
+
+func save_nodes(path):
+	print('Saving resource --------')
+	var info_to_save = generate_save_data()
 	var file = File.new()
 	file.open(path, File.WRITE)
 	file.store_line(to_json(info_to_save))
 	file.close()
-
-	print(info_to_save)
+	autosaving_hash = info_to_save.hash()
 
 func load_nodes(path):
 	working_dialog_file = path
@@ -176,6 +187,7 @@ func load_nodes(path):
 				create_character_leave_node(i['character'], i['action'])
 				print('character-leave-block: ', i)
 
+	autosaving_hash = generate_save_data().hash()
 	fold_all_nodes()
 
 # Conversation files
@@ -202,13 +214,30 @@ func refresh_dialog_list():
 		DialogList.set_item_metadata(index, {'file': c['file'], 'index': index})
 		index += 1
 
-
 func _on_DialogItemList_item_selected(index):
 	var selected = DialogList.get_item_text(index)
 	var file = DialogList.get_item_metadata(index)['file']
 	clear_timeline()
 	load_nodes(DIALOG_DIR + '/' + file)
 
+# Renaming dialogs
+
+func _on_DialogItemList_item_rmb_selected(index, at_position):
+	print(index)
+	$RenameDialog.register_text_enter($RenameDialog/LineEdit)
+	$RenameDialog/LineEdit.text = get_filename_from_path(working_dialog_file)
+	$RenameDialog.set_as_minsize()
+	$RenameDialog.popup_centered()
+
+func _on_RenameDialog_confirmed():
+	var new_name = $RenameDialog/LineEdit.text + '.json'
+	var dir = Directory.new()
+	var new_full_path = DIALOG_DIR + '/' + new_name
+	dir.rename(working_dialog_file, new_full_path)
+	working_dialog_file = new_full_path
+	$RenameDialog/LineEdit.text = ''
+	refresh_dialog_list()
+
 # Character Creation
 func _on_Button_pressed():
 	var file = create_character()
@@ -289,6 +318,18 @@ func _on_character_SaveButton_pressed():
 	file.close()
 	refresh_character_list()
 
+func get_character_data(file):
+	var data = load_json(CHAR_DIR + '/' + file)
+	return data
+
+func get_character_color(file):
+	var data = load_json(CHAR_DIR + '/' + file)
+	if is_instance_valid(data):
+		if data.has('color'):
+			return data['color']
+	else:
+		return "ffffff"
+
 func get_character_name(file):
 	var data = load_json(CHAR_DIR + '/' + file)
 	if data.has('name'):
@@ -311,7 +352,6 @@ func _on_RemoveConfirmation_confirmed():
 	clear_character_editor()
 	refresh_character_list()
 
-
 func _on_DeleteButton_pressed():
 	$RemoveConfirmation.popup_centered()
 
@@ -342,6 +382,11 @@ func load_json(path):
 		return
 	return data_parse.result
 
+func get_filename_from_path(path):
+	if OS.get_name() == "Windows":
+		return path.split('/')[-1].replace('.json', '')
+	else:
+		return path.split('\\')[-1].replace('.json', '')
 
 # Godot dialog
 func godot_dialog():
@@ -362,7 +407,6 @@ func fold_all_nodes():
 func unfold_all_nodes():
 	for event in Timeline.get_children():
 		event.get_node("VBoxContainer/Header/VisibleToggle").set_pressed(true)
-		print(event.get_node("VBoxContainer/Header/VisibleToggle"))
 
 func _on_ButtonFold_pressed():
 	fold_all_nodes()
@@ -387,3 +431,10 @@ func _on_CharactersButton_pressed():
 	$Editor/CharacterTools.visible = true
 	$Editor/CharacterEditor.visible = true
 	$HBoxContainer/CharactersButton.set('self_modulate', Color('#6a9dea'))
+
+# Auto saving
+
+func _on_AutoSaver_timeout():
+	if autosaving_hash != generate_save_data().hash():
+		save_nodes(working_dialog_file)
+		print('[!] Changes detected. Auto saving. ', autosaving_hash)