Improving Event Buttons (#554)

* Fixed Dependecies

I moved some scenes in the last minute. Stupid me. I hope it is fixed now.

* Revert "Fixed Dependecies"

This reverts commit 9e7bcd8.

* Auto stash before merge of "main" and "upstream/main"

* Update Changelog

To contain the changes I made during the last week.

* Revert "Auto stash before merge of "main" and "upstream/main""

This reverts commit 8e1699d.

* Add the new styles to the remaining pickers

TimelinePicker, ThemePicker, OperationPicker, GlossaryPicker. It also removes the [] around the items, except for the operation picker. I wasn't sure if it wouldn't make readability harder having three similar buttons next to each other, so I kept the [] there. 

And it adds a "Bus:" label to the AudioPicker, because I thought it would make it cleaner.

* Cleanup and Simplification of the MasterTree.gd

* Auto stash before merge of "main" and "upstream/main"

* Remove more Engine.get_singleton()'s

:(

* Make the DocsTreeHelper ignore the mouse

It was blocking a small part of the MasterTree. This should fix #414

* VoiceSupport Feature Fix: Make sure no default bus is needed

There was a little annyoing warning popping up a lot.

* Small Documentation fix

* Add event documentation

Adds a basic documentation of
- Leave Event
- Question Event
- Choice Event
- End Event
- Condition Event
- Set Value Event

* Add the new documentations to the events

You now have these little buttons on the right of the events that instantly lead to the documentation.

* Check for complete dialogic_state information in start_from_save

Apparently you can manage to save dialog_data that is empty. Maybe it has to do with the Autosave on timeline end? Need to investigate this. But this thing adds a check if the data is valid.

* Changing the start_from_save function once again

You now need to have "/" if you want to use the currently loaded state (mostly after importing). 
Lot's of more checks added.

* Try to improve the Event Buttons

* Fixing stupid merge mistake

* Making the icon resize as well

* Updating the icons style

Co-authored-by: Emilio Coppola <[email protected]>

Author: Jowan-Spooner

addons/dialogic/Editor/Events/SetGlossary.tscn

@@ -1,67 +1,51 @@
-[gd_scene load_steps=9 format=2]
+[gd_scene load_steps=6 format=2]
 
-[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/set-theme.svg" type="Texture" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Events/styles/SetGlossary.tres" type="StyleBox" id=2]
 [ext_resource path="res://addons/dialogic/Editor/Events/Templates/EventTemplate.tscn" type="PackedScene" id=3]
 [ext_resource path="res://addons/dialogic/Editor/Events/Parts/ResourcePickers/Definitions/SetGlossary.tscn" type="PackedScene" id=4]
 [ext_resource path="res://addons/dialogic/Editor/Events/Parts/ResourcePickers/Definitions/GlossaryPicker.tscn" type="PackedScene" id=5]
 [ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/set-glossary.svg" type="Texture" id=6]
 
-[sub_resource type="Image" id=3]
-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",
-"height": 16,
-"mipmaps": false,
-"width": 16
-}
-
-[sub_resource type="ImageTexture" id=2]
-flags = 4
-flags = 4
-image = SubResource( 3 )
-size = Vector2( 16, 16 )
-
 [node name="SetGlossary" instance=ExtResource( 3 )]
+event_name = "Set Glossary"
 event_data = {
 "event_id": "dialogic_025",
 "extra": "",
 "glossary_id": "",
 "text": "",
 "title": ""
 }
-event_style = ExtResource( 2 )
 event_icon = ExtResource( 6 )
-event_name = "Set Glossary"
+event_style = ExtResource( 2 )
 header_scene = ExtResource( 5 )
 body_scene = ExtResource( 4 )
 expand_on_default = false
 
 [node name="PanelContainer" parent="." index="1"]
 custom_styles/panel = ExtResource( 2 )
 
-[node name="Warning" parent="PanelContainer/MarginContainer/VBoxContainer/Header" index="0"]
-icon = SubResource( 2 )
+[node name="SelectedStyle" parent="PanelContainer" index="0"]
+modulate = Color( 0, 0, 0, 1 )
 
-[node name="IconTexture" parent="PanelContainer/MarginContainer/VBoxContainer/Header" index="0"]
+[node name="IconTexture" parent="PanelContainer/MarginContainer/VBoxContainer/Header" index="1"]
 margin_right = 32.0
-texture = ExtResource( 1 )
+texture = ExtResource( 6 )
 
-[node name="TitleLabel" parent="PanelContainer/MarginContainer/VBoxContainer/Header" index="0"]
-margin_right = 84.0
+[node name="TitleLabel" parent="PanelContainer/MarginContainer/VBoxContainer/Header" index="2"]
+margin_left = 42.0
+margin_right = 121.0
 text = "Set Glossary"
 
 [node name="Content" parent="PanelContainer/MarginContainer/VBoxContainer/Header" index="3"]
-margin_left = 150.0
-margin_right = 160.0
+margin_left = 131.0
+margin_right = 294.0
 
 [node name="ExpandControl" parent="PanelContainer/MarginContainer/VBoxContainer/Header" index="4"]
-visible = true
 margin_left = 164.0
 margin_right = 216.0
 
 [node name="Spacer" parent="PanelContainer/MarginContainer/VBoxContainer/Header" index="5"]
-margin_left = 220.0
+margin_left = 304.0
 
 [node name="OptionsControl" parent="PanelContainer/MarginContainer/VBoxContainer/Header" index="7"]
 items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", false, "Remove", null, 0, false, false, 3, 0, null, "", false ]

addons/dialogic/Editor/Events/styles/SetGlossary.tres

@@ -5,7 +5,7 @@ content_margin_left = 0.0
 content_margin_right = 0.0
 content_margin_top = 0.0
 content_margin_bottom = 0.0
-bg_color = Color( 0.101961, 0.360784, 0.431373, 0.403922 )
+bg_color = Color( 0.270588, 0.243137, 0.572549, 0.407843 )
 border_width_left = 2
 border_width_top = 2
 border_width_right = 2

addons/dialogic/Editor/TimelineEditor/SmallEventButton.gd

@@ -1,16 +1,26 @@
 tool
 extends Button
 
+export(String) var visible_name = ""
 export (String) var event_id = 'dialogic_099'
+export (Color) var event_color = Color('#48a2a2a2')
 export(Texture) var event_icon = null setget set_icon
 
 
 func _ready():
+	$Panel.self_modulate = event_color
+	self_modulate = Color(1,1,1)
+	if visible_name != '':
+		text = '  ' + visible_name
 	hint_tooltip = DTS.translate(hint_tooltip)
+	var _scale = get_constant("inspector_margin", "Editor")
+	_scale = _scale * 0.125
+	rect_min_size = Vector2(30,30)
+	rect_min_size = rect_min_size * _scale
 
 
 func set_icon(texture):
-	$TextureRect.texture = texture
+	icon = texture
 	event_icon = texture
 
 

addons/dialogic/Editor/TimelineEditor/SmallEventButton.tscn

@@ -2,58 +2,53 @@
 
 [ext_resource path="res://addons/dialogic/Editor/TimelineEditor/SmallEventButton.gd" type="Script" id=1]
 
-[sub_resource type="StyleBoxFlat" id=2]
-bg_color = Color( 0.941176, 0.941176, 0.941176, 1 )
-border_width_left = 1
-border_width_top = 1
-border_width_right = 1
-border_width_bottom = 1
-border_color = Color( 0.0901961, 0.0901961, 0.0901961, 1 )
+[sub_resource type="StyleBoxFlat" id=1]
+bg_color = Color( 1, 1, 1, 1 )
+border_color = Color( 0.14902, 0.14902, 0.14902, 1 )
 corner_radius_top_left = 4
 corner_radius_top_right = 4
 corner_radius_bottom_right = 4
 corner_radius_bottom_left = 4
-expand_margin_left = 2.0
-expand_margin_right = 2.0
-expand_margin_top = 2.0
-expand_margin_bottom = 2.0
 
-[sub_resource type="StyleBoxFlat" id=1]
-bg_color = Color( 1, 1, 1, 1 )
+[sub_resource type="StyleBoxFlat" id=2]
+draw_center = false
 border_width_left = 1
 border_width_top = 1
 border_width_right = 1
 border_width_bottom = 1
-border_color = Color( 0.121569, 0.121569, 0.121569, 1 )
+border_color = Color( 0.0980392, 0.0980392, 0.0980392, 0.784314 )
 corner_radius_top_left = 4
 corner_radius_top_right = 4
 corner_radius_bottom_right = 4
 corner_radius_bottom_left = 4
-expand_margin_left = 2.0
-expand_margin_right = 2.0
-expand_margin_top = 2.0
-expand_margin_bottom = 2.0
 
 [node name="SmallEventButton" type="Button"]
-margin_right = 12.0
-margin_bottom = 20.0
-rect_min_size = Vector2( 30, 30 )
-custom_styles/hover = SubResource( 2 )
-custom_styles/pressed = SubResource( 1 )
-custom_styles/normal = SubResource( 1 )
+margin_right = 30.0
+margin_bottom = 30.0
+flat = true
+align = 0
+expand_icon = true
 script = ExtResource( 1 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="TextureRect" type="TextureRect" parent="."]
+[node name="Panel" type="Panel" parent="."]
+self_modulate = Color( 0.635294, 0.635294, 0.635294, 0.282353 )
+show_behind_parent = true
+anchor_right = 1.0
+anchor_bottom = 1.0
+mouse_filter = 2
+custom_styles/panel = SubResource( 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Border" type="Panel" parent="."]
 anchor_right = 1.0
 anchor_bottom = 1.0
-margin_left = 2.0
-margin_top = 2.0
-margin_right = -2.0
-margin_bottom = -2.0
-stretch_mode = 6
+mouse_filter = 2
+custom_styles/panel = SubResource( 2 )
 __meta__ = {
 "_edit_use_anchors_": false
 }

addons/dialogic/Editor/TimelineEditor/TimelineEditor.gd

@@ -728,6 +728,7 @@ func update_custom_events() -> void:
 		var button = load('res://addons/dialogic/Editor/TimelineEditor/SmallEventButton.tscn').instance()
 		#button.set_script(preload("EventButton.gd"))
 		button.event_id = custom_event_id
+		button.visible_name = custom_events[custom_event_id]['event_name']
 		button.self_modulate = Color('#494d58')
 		button.hint_tooltip = custom_events[custom_event_id]['event_name']
 		if custom_events[custom_event_id]['event_icon']: