Renames/Reorganization (#1231)

* Rename Theme concept to Style

* Reorganize/Rename some files

* Rename Display nodes to DialogicNodes

The class names had already been changed, but the actual files still said "Display". 
Hopefully this makes them easier to identify.

* Fix Merge mistakes

* Removing HintLabelSettings in favor of script

There is a new script that can be added to Labels to setup a similar style. Hopefully this won't lead to such annoying changes all the time.

* Fix GeneralSettings

Co-authored-by: Emi <[email protected]>

Author: Jowan-Spooner

addons/dialogic/Editor/CharacterEditor/CharacterEditor.gd

@@ -283,7 +283,7 @@ func update_preview() -> void:
 
 		var scene = null
 		if current_portrait_data.get('scene', '').is_empty():
-			scene = load("res://addons/dialogic/Other/DefaultPortrait.tscn")
+			scene = load("res://addons/dialogic/Events/Character/DefaultPortrait.tscn")
 		else:
 			scene = load(current_portrait_data.get('scene'))
 

addons/dialogic/Other/DCSS.gd renamed to addons/dialogic/Editor/Common/DCSS.gd

@@ -3,7 +3,7 @@ extends Control
 func _ready() -> void:
 	$PauseIndictator.hide()
 	var dialog_scene_path :String= DialogicUtil.get_project_setting(
-		'dialogic/editor/test_dialog_scene', 'res://addons/dialogic/Example Assets/ExampleScenes/DefaultDialogNode.tscn')
+		'dialogic/editor/test_dialog_scene', "res://addons/dialogic/Example Assets/example-scenes/DialogicDefaultScene.tscn")
 	var scene = load(dialog_scene_path).instantiate()
 	add_child(scene)
 	if scene is CanvasLayer:

addons/dialogic/Editor/Common/HintLabelSettings.tres

@@ -1,6 +1,6 @@
-[gd_scene load_steps=2 format=3 uid="uid://c01ibbjc4ijvh"]
+[gd_scene load_steps=2 format=3]
 
-[ext_resource type="Script" path="res://addons/dialogic/Other/TestTimelineScene.gd" id="1"]
+[ext_resource type="Script" path="res://addons/dialogic/Editor/Common/TestTimelineScene.gd" id="1"]
 
 [node name="TestTimelineScene" type="Control"]
 anchor_right = 1.0

addons/dialogic/Other/TestTimelineScene.gd renamed to addons/dialogic/Editor/Common/TestTimelineScene.gd

@@ -249,7 +249,7 @@ func _on_play_timeline():
 		ProjectSettings.set_setting('dialogic/editor/current_timeline_path', _get_timeline_editor().current_timeline.resource_path)
 		ProjectSettings.save()
 
-		DialogicUtil.get_dialogic_plugin().editor_interface.play_custom_scene("res://addons/dialogic/Other/TestTimelineScene.tscn")
+		DialogicUtil.get_dialogic_plugin().editor_interface.play_custom_scene("res://addons/dialogic/Editor/Common/TestTimelineScene.tscn")
 
 
 #########################################################

addons/dialogic/Other/TestTimelineScene.tscn renamed to addons/dialogic/Editor/Common/TestTimelineScene.tscn

@@ -0,0 +1,9 @@
+@tool
+extends Label
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	label_settings = LabelSettings.new()
+	label_settings.font = get_theme_font("doc_italic", "EditorFonts")
+	label_settings.font_size = get_theme_font_size('font_size', 'Label')
+	label_settings.font_color = get_theme_color("accent_color", "Editor")

addons/dialogic/Editor/EditorView.gd

@@ -2,11 +2,6 @@
 extends PanelContainer
 
 func _ready():
-	var info_font_settings :LabelSettings = load("res://addons/dialogic/Editor/Common/HintLabelSettings.tres")
-	info_font_settings.font = get_theme_font("doc_italic", "EditorFonts")
-	info_font_settings.font_size = get_theme_font_size('font_size', 'Label')
-	info_font_settings.font_color = get_theme_color("accent_color", "Editor")
-	
 	hide()
 	visibility_changed.connect(_on_visibility_changed)
 

addons/dialogic/Editor/Settings/HintLabelStylingScript.gd

@@ -23,7 +23,7 @@ func refresh():
 	%CustomEventsFolderLabel.text = DialogicUtil.get_project_setting('dialogic/custom_events_folder', 'res://addons/dialogic_additions/Events')
 	%CustomEventsFolderButton.icon = get_theme_icon("Folder", "EditorIcons")
 	%TestingSceneButton.icon = get_theme_icon("Folder", "EditorIcons")
-	%TestingSceneLabel.text = DialogicUtil.get_project_setting('dialogic/editor/test_dialog_scene', 'res://addons/dialogic/Other/DefaultDialogNode.tscn')
+	%TestingSceneLabel.text = DialogicUtil.get_project_setting('dialogic/editor/test_dialog_scene', "res://addons/dialogic/Example Assets/example-scenes/DialogicDefaultScene.tscn")
 	%PhysicsTimerButton.button_pressed = DialogicUtil.is_physics_timer()
 
 	# Color Palett

addons/dialogic/Editor/Settings/SettingsEditor.gd

@@ -1,17 +1,17 @@
 [gd_scene load_steps=8 format=3 uid="uid://dm4kxvcn7d7ug"]
 
 [ext_resource type="Script" path="res://addons/dialogic/Editor/Settings/Settings_General.gd" id="2"]
-[ext_resource type="LabelSettings" uid="uid://bqlmi2bwcj0s6" path="res://addons/dialogic/Editor/Common/HintLabelSettings.tres" id="2_hs15a"]
 [ext_resource type="StyleBox" uid="uid://dmsjhgv22dns8" path="res://addons/dialogic/Editor/Common/TitleBgStylebox.tres" id="2_u584y"]
+[ext_resource type="Script" path="res://addons/dialogic/Editor/Settings/HintLabelStylingScript.gd" id="2_uxx4f"]
 
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_6mpk2"]
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ui276"]
 content_margin_left = 5.0
 content_margin_top = 5.0
 content_margin_right = 5.0
 content_margin_bottom = 5.0
 bg_color = Color(0.545098, 0.545098, 0.545098, 0.211765)
 
-[sub_resource type="Image" id="Image_iyfpw"]
+[sub_resource type="Image" id="Image_6ds5e"]
 data = {
 "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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",
@@ -21,7 +21,7 @@ data = {
 }
 
 [sub_resource type="ImageTexture" id="7"]
-image = SubResource("Image_iyfpw")
+image = SubResource("Image_6ds5e")
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_3mwvq"]
 content_margin_left = 5.0
@@ -48,7 +48,7 @@ size_flags_horizontal = 3
 layout_mode = 2
 offset_right = 958.0
 offset_bottom = 36.0
-theme_override_styles/normal = SubResource("StyleBoxFlat_6mpk2")
+theme_override_styles/normal = SubResource("StyleBoxFlat_ui276")
 text = "Extensions"
 
 [node name="HBoxContainer" type="HBoxContainer" parent="General"]
@@ -89,27 +89,21 @@ offset_top = 70.0
 offset_right = 958.0
 offset_bottom = 96.0
 text = "You should restart godot after changing this path!"
-label_settings = ExtResource("2_hs15a")
-
-[node name="HSeparator" type="HSeparator" parent="General"]
-layout_mode = 2
-offset_top = 100.0
-offset_right = 958.0
-offset_bottom = 104.0
+script = ExtResource("2_uxx4f")
 
 [node name="TitleLabel2" type="Label" parent="General"]
 layout_mode = 2
-offset_top = 108.0
+offset_top = 100.0
 offset_right = 958.0
-offset_bottom = 144.0
-theme_override_styles/normal = SubResource("StyleBoxFlat_6mpk2")
+offset_bottom = 136.0
+theme_override_styles/normal = SubResource("StyleBoxFlat_ui276")
 text = "Testing"
 
 [node name="HBoxContainer2" type="HBoxContainer" parent="General"]
 layout_mode = 2
-offset_top = 148.0
+offset_top = 140.0
 offset_right = 958.0
-offset_bottom = 174.0
+offset_bottom = 166.0
 
 [node name="Label" type="Label" parent="General/HBoxContainer2"]
 layout_mode = 2
@@ -139,23 +133,23 @@ icon = SubResource("7")
 
 [node name="HSeparator2" type="HSeparator" parent="General"]
 layout_mode = 2
-offset_top = 178.0
+offset_top = 170.0
 offset_right = 958.0
-offset_bottom = 182.0
+offset_bottom = 174.0
 
 [node name="TitleLabel3" type="Label" parent="General"]
 layout_mode = 2
-offset_top = 186.0
+offset_top = 178.0
 offset_right = 958.0
-offset_bottom = 222.0
+offset_bottom = 214.0
 theme_override_styles/normal = SubResource("StyleBoxFlat_3mwvq")
 text = "Timer"
 
 [node name="HBoxContainer3" type="HBoxContainer" parent="General"]
 layout_mode = 2
-offset_top = 226.0
+offset_top = 218.0
 offset_right = 958.0
-offset_bottom = 252.0
+offset_bottom = 244.0
 
 [node name="Label" type="Label" parent="General/HBoxContainer3"]
 layout_mode = 2