Skip to content

Commit 68fd097

Browse files
Revamping the layout editor and UX. (#1507)
1 parent f8b4378 commit 68fd097

32 files changed

+1353
-450
lines changed

addons/dialogic/Editor/editor_main.tscn

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ content_margin_left = 4.0
1515
content_margin_top = 4.0
1616
content_margin_right = 6.0
1717
content_margin_bottom = 6.0
18-
bg_color = Color(0.081961, 0.0884312, 0.097059, 1)
18+
bg_color = Color(0, 0, 0, 1)
1919
border_width_left = 2
2020
border_width_top = 2
2121
border_width_right = 2
2222
border_width_bottom = 2
23-
border_color = Color(0.14902, 0.160784, 0.176471, 1)
23+
border_color = Color(0, 0, 0, 1)
2424
corner_radius_top_right = 5
2525
corner_radius_bottom_right = 5
2626
corner_radius_bottom_left = 5
2727
expand_margin_left = 2.0
2828
expand_margin_top = 2.0
2929

30-
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_jhojw"]
30+
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_n8d6a"]
3131
content_margin_left = 4.0
3232
content_margin_top = 4.0
3333
content_margin_right = 4.0
@@ -93,11 +93,11 @@ script = ExtResource("4_6cx8s")
9393
unique_name_in_owner = true
9494
layout_mode = 2
9595
size_flags_horizontal = 3
96-
text = "Jowan.dch"
96+
text = "Change the look of the dialog in your game"
9797

9898
[node name="Panel" type="PanelContainer" parent="Margin/EditorsManager/HSplit/VBox/Toolbar"]
9999
layout_mode = 2
100-
theme_override_styles/panel = SubResource("StyleBoxFlat_jhojw")
100+
theme_override_styles/panel = SubResource("StyleBoxFlat_n8d6a")
101101

102102
[node name="CustomButtons" type="HBoxContainer" parent="Margin/EditorsManager/HSplit/VBox/Toolbar/Panel"]
103103
unique_name_in_owner = true
@@ -112,14 +112,18 @@ theme_override_styles/tabbar_background = SubResource("StyleBoxEmpty_1qqdn")
112112
[node name="HomePage" parent="Margin/EditorsManager/HSplit/VBox/Editors" instance=ExtResource("4_vey4f")]
113113
visible = false
114114
layout_mode = 2
115+
theme_override_constants/separation = 60
115116
metadata/_tab_name = ""
116117

117118
[node name="Timeline Editor" parent="Margin/EditorsManager/HSplit/VBox/Editors" instance=ExtResource("5_e5v7u")]
118119
visible = false
119120
layout_mode = 2
121+
metadata/_tab_name = "Timeline"
120122

121123
[node name="Character Editor" parent="Margin/EditorsManager/HSplit/VBox/Editors" instance=ExtResource("6_y5x3e")]
124+
visible = false
122125
layout_mode = 2
126+
metadata/_tab_name = "Character"
123127

124128
[node name="Settings" parent="Margin/EditorsManager/HSplit/VBox/Editors" instance=ExtResource("7_lqfl7")]
125129
visible = false

addons/dialogic/Events/DefaultLayouts/index.gd

Lines changed: 0 additions & 23 deletions
This file was deleted.

addons/dialogic/Events/DefaultLayouts/Default/DialogicDefaultLayout.tscn renamed to addons/dialogic/Events/DefaultStyles/Default/DialogicDefaultLayout.tscn

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
[gd_scene load_steps=26 format=3 uid="uid://r8jg1cax6dui"]
1+
[gd_scene load_steps=26 format=3]
22

3-
[ext_resource type="Script" path="res://addons/dialogic/Events/DefaultLayouts/Default/DialogicDefaultLayout.gd" id="1"]
3+
[ext_resource type="Script" path="res://addons/dialogic/Events/DefaultStyles/Default/DialogicDefaultLayout.gd" id="1"]
44
[ext_resource type="Script" path="res://addons/dialogic/Events/Text/node_dialog_text.gd" id="2"]
55
[ext_resource type="Script" path="res://addons/dialogic/Events/Text/node_name_label.gd" id="3"]
66
[ext_resource type="Script" path="res://addons/dialogic/Events/Character/node_portrait_container.gd" id="3_dbhei"]
@@ -11,13 +11,13 @@
1111
[ext_resource type="Script" path="res://addons/dialogic/Events/Style/node_style.gd" id="12"]
1212
[ext_resource type="AudioStream" uid="uid://dwcre3fjf3cj8" path="res://addons/dialogic/Example Assets/sound-effects/typing5.wav" id="13"]
1313
[ext_resource type="AudioStream" uid="uid://b6c1p14bc20p1" path="res://addons/dialogic/Example Assets/sound-effects/typing1.wav" id="14"]
14-
[ext_resource type="Script" path="res://addons/dialogic/Events/DefaultLayouts/Default/autoadvance_indicator.gd" id="15_ptoy3"]
14+
[ext_resource type="Script" path="res://addons/dialogic/Events/DefaultStyles/Default/autoadvance_indicator.gd" id="15_ptoy3"]
1515
[ext_resource type="Script" path="res://addons/dialogic/Events/Choice/node_button_sound.gd" id="18"]
1616
[ext_resource type="Script" path="res://addons/dialogic/Events/Text/node_next_indicator.gd" id="20_ljcq2"]
17-
[ext_resource type="Script" path="res://addons/dialogic/Events/DefaultLayouts/Default/ExampleGlossaryPopup.gd" id="20_vmnp2"]
18-
[ext_resource type="PackedScene" uid="uid://b1xv3pg0ptobj" path="res://addons/dialogic/Events/DefaultLayouts/ExampleHistoryScene.tscn" id="22_854kg"]
17+
[ext_resource type="Script" path="res://addons/dialogic/Events/DefaultStyles/Default/ExampleGlossaryPopup.gd" id="20_vmnp2"]
18+
[ext_resource type="PackedScene" uid="uid://b1xv3pg0ptobj" path="res://addons/dialogic/Events/DefaultStyles/ExampleHistoryScene.tscn" id="22_854kg"]
1919
[ext_resource type="Script" path="res://addons/dialogic/Events/TextInput/node_text_input.gd" id="22_ltkcf"]
20-
[ext_resource type="Script" path="res://addons/dialogic/Events/DefaultLayouts/HideWithChild.gd" id="23"]
20+
[ext_resource type="Script" path="res://addons/dialogic/Events/DefaultStyles/HideWithChild.gd" id="23"]
2121
[ext_resource type="FontFile" uid="uid://vrrmdx83skor" path="res://addons/dialogic/Example Assets/Fonts/Roboto-Regular.ttf" id="23_gyqve"]
2222
[ext_resource type="FontFile" uid="uid://cc4xli25271fd" path="res://addons/dialogic/Example Assets/Fonts/Roboto-Bold.ttf" id="24_aa4pl"]
2323
[ext_resource type="FontFile" uid="uid://b5c0p00x6g6u5" path="res://addons/dialogic/Example Assets/Fonts/Roboto-Italic.ttf" id="25_wt3bc"]

addons/dialogic/Events/DefaultLayouts/ExampleHistoryItem.tscn renamed to addons/dialogic/Events/DefaultStyles/ExampleHistoryItem.tscn

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
[gd_scene load_steps=4 format=3 uid="uid://d2l4yc12tm3av"]
1+
[gd_scene load_steps=4 format=3]
22

3-
[ext_resource type="Script" path="res://addons/dialogic/Events/DefaultLayouts/ExampleHistoryItem.gd" id="1_dgoja"]
4-
[ext_resource type="Texture2D" uid="uid://bbqfq3s7qrduv" path="res://icon.svg" id="2_ywvym"]
3+
[ext_resource type="Script" path="res://addons/dialogic/Events/DefaultStyles/ExampleHistoryItem.gd" id="1_dgoja"]
4+
[ext_resource type="Texture2D" uid="uid://cgyp4v74falt4" path="res://icon.svg" id="2_ywvym"]
55

66
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_upgjp"]
77
content_margin_left = 5.0

addons/dialogic/Events/DefaultLayouts/ExampleHistoryScene.gd renamed to addons/dialogic/Events/DefaultStyles/ExampleHistoryScene.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func show_history() -> void:
4848
child.queue_free()
4949

5050
for info in Dialogic.History.get_simple_history():
51-
var history_item :Control= load('res://addons/dialogic/Events/DefaultLayouts/ExampleHistoryItem.tscn').instantiate()
51+
var history_item :Control= load('res://addons/dialogic/Events/DefaultStyles/ExampleHistoryItem.tscn').instantiate()
5252
history_item.prepare_textbox(self)
5353
match info.event_type:
5454
"Text":

addons/dialogic/Events/DefaultLayouts/ExampleHistoryScene.tscn renamed to addons/dialogic/Events/DefaultStyles/ExampleHistoryScene.tscn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
[gd_scene load_steps=3 format=3 uid="uid://b1xv3pg0ptobj"]
1+
[gd_scene load_steps=3 format=3]
22

3-
[ext_resource type="Script" path="res://addons/dialogic/Events/DefaultLayouts/ExampleHistoryScene.gd" id="1_o5tfq"]
3+
[ext_resource type="Script" path="res://addons/dialogic/Events/DefaultStyles/ExampleHistoryScene.gd" id="1_o5tfq"]
44

55
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_1hdvb"]
66
content_margin_left = 10.0

0 commit comments

Comments
 (0)