Various UI fixes & Code cleanups

addons/dialogic/Core/DialogicResourceUtil.gd

@@ -106,7 +106,7 @@ static func resource_exists_from_identifier(identifier:String, extension:String)
 ## Editor Only
 static func change_unique_identifier(file_path:String, new_identifier:String) -> void:
 	var directory := get_directory(file_path.get_extension())
-	var key: String = directory.find_key(file_path)
+	var key: Variant = directory.find_key(file_path)
 	while key != null:
 		if key == new_identifier:
 			break
@@ -118,7 +118,7 @@ static func change_unique_identifier(file_path:String, new_identifier:String) ->
 
 static func change_resource_path(old_path:String, new_path:String) -> void:
 	var directory := get_directory(new_path.get_extension())
-	var key: String = directory.find_key(old_path)
+	var key: Variant = directory.find_key(old_path)
 	while key != null:
 		directory[key] = new_path
 		key = directory.find_key(old_path)
@@ -127,7 +127,7 @@ static func change_resource_path(old_path:String, new_path:String) -> void:
 
 static func remove_resource(file_path:String) -> void:
 	var directory := get_directory(file_path.get_extension())
-	var key: String = directory.find_key(file_path)
+	var key: Variant = directory.find_key(file_path)
 	while key != null:
 		directory.erase(key)
 		key = directory.find_key(file_path)

addons/dialogic/Editor/CharacterEditor/character_editor.gd

@@ -149,7 +149,7 @@ func _ready() -> void:
 	if DialogicUtil.get_dialogic_plugin().has_signal("scene_saved"):
 		DialogicUtil.get_dialogic_plugin().scene_saved.connect(_on_some_resource_saved)
 
-	$NoCharacterScreen.color = get_theme_color("dark_color_3", "Editor")
+	$NoCharacterScreen.add_theme_stylebox_override("panel", get_theme_stylebox("Background", "EditorStyles"))
 	$NoCharacterScreen.show()
 	setup_portrait_list_tab()
 

addons/dialogic/Editor/CharacterEditor/character_editor.tscn

@@ -1,10 +1,11 @@
-[gd_scene load_steps=8 format=3 uid="uid://dlskc36c5hrwv"]
+[gd_scene load_steps=9 format=3 uid="uid://dlskc36c5hrwv"]
 
 [ext_resource type="Script" uid="uid://cwhe7tpe75oh7" path="res://addons/dialogic/Editor/CharacterEditor/character_editor.gd" id="2"]
 [ext_resource type="PackedScene" uid="uid://dbpkta2tjsqim" path="res://addons/dialogic/Editor/Common/hint_tooltip_icon.tscn" id="2_uhhqs"]
 [ext_resource type="Script" uid="uid://deliic6d8vajo" path="res://addons/dialogic/Editor/CharacterEditor/character_editor_portrait_tree.gd" id="2_vad0i"]
 [ext_resource type="Texture2D" uid="uid://bff65e82555qr" path="res://addons/dialogic/Editor/Images/Pieces/close-icon.svg" id="3_2ogmx"]
 [ext_resource type="Texture2D" uid="uid://dx3o2ild56i76" path="res://addons/dialogic/Editor/Images/Pieces/closed-icon.svg" id="4_wg7ys"]
+[ext_resource type="Texture2D" uid="uid://my600mb32ydt" path="res://addons/dialogic/Editor/Images/Toolbar/add-character.svg" id="6_2ogmx"]
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_es2rd"]
 
@@ -409,24 +410,17 @@ visible = false
 custom_minimum_size = Vector2(0, 20)
 layout_mode = 2
 
-[node name="NoCharacterScreen" type="ColorRect" parent="." unique_id=2122222002]
-visible = false
+[node name="NoCharacterScreen" type="PanelContainer" parent="." unique_id=190821474]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 size_flags_horizontal = 3
-color = Color(0, 0, 0, 1)
 
 [node name="CenterContainer" type="CenterContainer" parent="NoCharacterScreen" unique_id=1885703718]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
+layout_mode = 2
 
 [node name="VBoxContainer" type="VBoxContainer" parent="NoCharacterScreen/CenterContainer" unique_id=135127017]
 custom_minimum_size = Vector2(250, 0)
@@ -441,7 +435,9 @@ autowrap_mode = 3
 
 [node name="CreateCharacterButton" type="Button" parent="NoCharacterScreen/CenterContainer/VBoxContainer" unique_id=1496778365]
 layout_mode = 2
+size_flags_horizontal = 4
 text = "Create New Character"
+icon = ExtResource("6_2ogmx")
 
 [connection signal="pressed" from="Scroll/VBox/MainHSplit/MainSettingsPanel/MainSettings/HBoxContainer/CloseButton" to="." method="hide_main_settings"]
 [connection signal="pressed" from="Scroll/VBox/MainHSplit/MainSettingsPanel/MainSettingsHidden/OpenButton" to="." method="show_main_settings"]

addons/dialogic/Editor/Common/side_bar.tscn

@@ -157,7 +157,7 @@ text = "Trim Folder Paths"
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_vertical = 3
-theme_type_variation = &"DialogicSidebarTree"
+theme_type_variation = &"TreeSecondary"
 allow_rmb_select = true
 hide_root = true
 scroll_horizontal_enabled = false
@@ -190,7 +190,7 @@ unique_name_in_owner = true
 layout_mode = 2
 size_flags_vertical = 3
 tooltip_text = "Label events in your timeline will appear here, allowing you to jump to them."
-theme_type_variation = &"DialogicSidebarList"
+theme_type_variation = &"ItemListSecondary"
 theme_override_styles/selected = SubResource("StyleBoxEmpty_gxwm6")
 theme_override_styles/selected_focus = SubResource("StyleBoxEmpty_n8rql")
 allow_reselect = true
@@ -199,6 +199,7 @@ same_column_width = true
 [node name="CurrentVersion" type="Button" parent="VBoxPrimary" unique_id=2110656799]
 unique_name_in_owner = true
 layout_mode = 2
+mouse_default_cursor_shape = 2
 text = "Some Version"
 flat = true
 clip_text = true

addons/dialogic/Editor/Common/sidebar.gd

@@ -86,6 +86,10 @@ func _ready() -> void:
 	%MainVSplit.split_offset = DialogicUtil.get_editor_setting("sidebar_v_split", 0)
 	group_mode = DialogicUtil.get_editor_setting("sidebar_group_mode", 0)
 	%GroupingOptions.select(%GroupingOptions.get_item_index(group_mode))
+	if %GroupingOptions.get_item_id(%GroupingOptions.selected) == GroupMode.NONE:
+		%ResourceTree.add_theme_constant_override("item_margin", 0)
+	else:
+		%ResourceTree.remove_theme_constant_override("item_margin")
 
 	%FolderColors.button_pressed = DialogicUtil.get_editor_setting("sidebar_use_folder_colors", true)
 	%TrimFolderPaths.button_pressed = DialogicUtil.get_editor_setting("sidebar_trim_folder_paths", true)