Removing old default_speaker option

Author: coppolaemilio

addons/dialogic/Editor/CharacterEditor/CharacterEditor.gd

@@ -12,7 +12,6 @@ onready var nodes = {
 	'file': $HBoxContainer/Container/FileName/LineEdit,
 	'color': $HBoxContainer/Container/Color/ColorPickerButton,
 	'mirror_portraits_checkbox' : $HBoxContainer/VBoxContainer/HBoxContainer/MirrorOption/MirrorPortraitsCheckBox,
-	'default_speaker': $HBoxContainer/Container/Actions/DefaultSpeaker,
 	'display_name_checkbox': $HBoxContainer/Container/Name/CheckBox,
 	'display_name': $HBoxContainer/Container/DisplayName/LineEdit,
 	'nickname_checkbox': $HBoxContainer/Container/Name/CheckBox2,
@@ -72,7 +71,6 @@ func clear_character_editor():
 	nodes['description'].text = ''
 	nodes['color'].color = Color('#ffffff')
 	nodes['mirror_portraits_checkbox'].pressed = false
-	nodes['default_speaker'].pressed = false
 	nodes['display_name_checkbox'].pressed = false
 	nodes['nickname_checkbox'].pressed = false
 	nodes['display_name'].text = ''
@@ -94,7 +92,6 @@ func create_character():
 	var character = {
 		'color': '#ffffff',
 		'id': character_file,
-		'default_speaker': false,
 		'portraits': [],
 		'mirror_portraits' :false
 	}
@@ -105,7 +102,6 @@ func create_character():
 
 # Saving and Loading
 func generate_character_data_to_save():
-	var default_speaker: bool = nodes['default_speaker'].pressed
 	var portraits = []
 	for p in $HBoxContainer/Container/ScrollContainer/VBoxContainer/PortraitList.get_children():
 		var entry = {}
@@ -117,7 +113,6 @@ func generate_character_data_to_save():
 		'description': nodes['description'].text,
 		'color': '#' + nodes['color'].color.to_html(),
 		'mirror_portraits': nodes["mirror_portraits_checkbox"].pressed,
-		'default_speaker': default_speaker,
 		'portraits': portraits,
 		'display_name_bool': nodes['display_name_checkbox'].pressed,
 		'display_name': nodes['display_name'].text,
@@ -147,16 +142,12 @@ func load_character(filename: String):
 	var data = DialogicResources.get_character_json(filename)
 	opened_character_data = data
 	nodes['file'].text = data['id']
-	nodes['default_speaker'].pressed = false
 	if data.has('name'):
 		nodes['name'].text = data['name']
 	if data.has('description'):
 		nodes['description'].text = data['description']
 	if data.has('color'):
 		nodes['color'].color = Color(data['color'])
-	if data.has('default_speaker'):
-		if data['default_speaker']:
-			nodes['default_speaker'].pressed = true
 
 	if data.has('display_name_bool'):
 		nodes['display_name_checkbox'].pressed = data['display_name_bool']

addons/dialogic/Editor/CharacterEditor/CharacterEditor.tscn

@@ -8,9 +8,9 @@ content_margin_left = 5.0
 content_margin_right = 5.0
 content_margin_top = 5.0
 content_margin_bottom = 5.0
-bg_color = Color( 0.2, 0.23, 0.31, 1 )
+bg_color = Color( 0, 0, 0, 1 )
 
-[sub_resource type="Image" id=3]
+[sub_resource type="Image" id=4]
 data = {
 "data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ),
 "format": "LumAlpha8",
@@ -19,10 +19,10 @@ data = {
 "width": 16
 }
 
-[sub_resource type="ImageTexture" id=2]
+[sub_resource type="ImageTexture" id=3]
 flags = 4
 flags = 4
-image = SubResource( 3 )
+image = SubResource( 4 )
 size = Vector2( 16, 16 )
 
 [node name="CharacterEditor" type="ScrollContainer"]
@@ -208,13 +208,13 @@ text = "Path"
 [node name="ScrollContainer" type="ScrollContainer" parent="HBoxContainer/Container"]
 margin_top = 206.0
 margin_right = 600.0
-margin_bottom = 611.0
+margin_bottom = 639.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
 [node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer/Container/ScrollContainer"]
 margin_right = 600.0
-margin_bottom = 405.0
+margin_bottom = 433.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
@@ -235,14 +235,14 @@ margin_bottom = 50.0
 margin_right = 144.0
 margin_bottom = 22.0
 text = "  Add new portrait"
-icon = SubResource( 2 )
+icon = SubResource( 3 )
 
 [node name="ImportFromFolder" type="Button" parent="HBoxContainer/Container/ScrollContainer/VBoxContainer/HBoxContainer"]
 margin_left = 148.0
 margin_right = 355.0
 margin_bottom = 22.0
 text = "  Import images from folder"
-icon = SubResource( 2 )
+icon = SubResource( 3 )
 
 [node name="FileName" type="HBoxContainer" parent="HBoxContainer/Container"]
 visible = false
@@ -266,27 +266,6 @@ focus_mode = 0
 size_flags_horizontal = 3
 editable = false
 
-[node name="Actions" type="HBoxContainer" parent="HBoxContainer/Container"]
-margin_top = 615.0
-margin_right = 600.0
-margin_bottom = 639.0
-
-[node name="DefaultSpeaker" type="CheckBox" parent="HBoxContainer/Container/Actions"]
-margin_right = 128.0
-margin_bottom = 24.0
-hint_tooltip = "By selecting \"Default Speaker\" all the new
-Text Events created will automatically
-select this character by default.
-You can only have 1 Default Speaker
-per project."
-text = "Default Speaker"
-
-[node name="Control" type="Control" parent="HBoxContainer/Container/Actions"]
-margin_left = 132.0
-margin_right = 600.0
-margin_bottom = 24.0
-size_flags_horizontal = 3
-
 [node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer"]
 margin_left = 604.0
 margin_right = 1127.0

addons/dialogic/Other/DialogicUtil.gd

@@ -21,7 +21,6 @@ static func get_character_list() -> Array:
 			var data: Dictionary     = DialogicResources.get_character_json(file)
 			var color: Color         = Color("#ffffff")
 			var c_name: String       = data['id']
-			var default_speaker      = false
 			var portraits: Array     = []
 			var display_name: String = ''
 			var nickname: String = ''
@@ -30,8 +29,6 @@ static func get_character_list() -> Array:
 				color = Color(data['color'])
 			if data.has('name'):
 				c_name = data['name']
-			if data.has('default_speaker'):
-				default_speaker = data['default_speaker']
 			if data.has('portraits'):
 				portraits = data['portraits']
 			if data.has('display_name'):
@@ -47,7 +44,6 @@ static func get_character_list() -> Array:
 				'name': c_name,
 				'color': color,
 				'file': file,
-				'default_speaker' : default_speaker,
 				'portraits': portraits,
 				'display_name': display_name,
 				'nickname': nickname,