Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sidebar upgrade #1894 #2350

Merged
merged 18 commits into from
Sep 22, 2024
Merged

Sidebar upgrade #1894 #2350

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
be2ecd6
Better Character Suggestions!
firedfromlife Jun 19, 2024
2514487
Fixed shadowed variable in event_text.gd
firedfromlife Jun 19, 2024
79f3597
Small fixes
Jowan-Spooner Jun 19, 2024
0df8b4d
Clean up and improve
firedfromlife Jun 19, 2024
b46d102
Merge branch 'better-character-suggestions' of https://github.com/fir…
firedfromlife Jun 19, 2024
28b8f04
Cleanup suggestions code
Jowan-Spooner Jun 20, 2024
53b16f9
Work in progress
firedfromlife Jul 24, 2024
224d8e9
Siderbar-upgrade ready for testing.
firedfromlife Jul 24, 2024
5673960
Merge to fix conflicts
Jowan-Spooner Jul 26, 2024
0f40cfa
Small bug-fix after merge
Jowan-Spooner Jul 26, 2024
1a24c54
Some code cleanup + save sidebar collapsing
Jowan-Spooner Jul 26, 2024
a312db7
Allow single click to open resource from sidebar
firedfromlife Jul 30, 2024
be989fd
Added support for folder and none sorting.
firedfromlife Aug 1, 2024
fc6ab21
Some improvements
Jowan-Spooner Aug 4, 2024
131623c
Added Path sorting option.
firedfromlife Aug 18, 2024
6097aa8
Fixed enum typo
firedfromlife Aug 18, 2024
a718116
Fixed sider_bar.tscn merge error.
firedfromlife Aug 18, 2024
6a53b36
Added folder color, updated Default to Types.
firedfromlife Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 87 additions & 16 deletions addons/dialogic/Editor/Common/side_bar.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
[gd_scene load_steps=5 format=3 uid="uid://cwe3r2tbh2og1"]
[gd_scene load_steps=7 format=3 uid="uid://cwe3r2tbh2og1"]

[ext_resource type="Script" path="res://addons/dialogic/Editor/Common/sidebar.gd" id="1_jnq65"]
[ext_resource type="Texture2D" uid="uid://bff65e82555qr" path="res://addons/dialogic/Editor/Images/Pieces/close-icon.svg" id="2_54pks"]
[ext_resource type="Texture2D" uid="uid://dx3o2ild56i76" path="res://addons/dialogic/Editor/Images/Pieces/closed-icon.svg" id="2_ilyps"]

[sub_resource type="Theme" id="Theme_pn0f4"]
VBoxContainer/constants/separation = 4
Expand All @@ -20,24 +22,41 @@ theme = SubResource("Theme_pn0f4")
split_offset = 100
script = ExtResource("1_jnq65")

[node name="VBox" type="VBoxContainer" parent="."]
[node name="VBoxHidden" type="VBoxContainer" parent="."]
unique_name_in_owner = true
visible = false
layout_mode = 2

[node name="OpenButton" type="Button" parent="VBoxHidden"]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 0
size_flags_vertical = 3
tooltip_text = "Show Sidebar"
theme_override_constants/icon_max_width = 20
icon = ExtResource("2_ilyps")
flat = true
icon_alignment = 1

[node name="VBoxPrimary" type="VBoxContainer" parent="."]
unique_name_in_owner = true
layout_mode = 2
size_flags_vertical = 3

[node name="Margin" type="MarginContainer" parent="VBox"]
[node name="Margin" type="MarginContainer" parent="VBoxPrimary"]
layout_mode = 2
size_flags_vertical = 3
theme_override_constants/margin_left = 5
theme_override_constants/margin_bottom = 5

[node name="VSplitContainer" type="VSplitContainer" parent="VBox/Margin"]
[node name="VSplitContainer" type="VSplitContainer" parent="VBoxPrimary/Margin"]
layout_mode = 2

[node name="VBox" type="VBoxContainer" parent="VBox/Margin/VSplitContainer"]
[node name="VBox" type="VBoxContainer" parent="VBoxPrimary/Margin/VSplitContainer"]
layout_mode = 2
size_flags_vertical = 3

[node name="Logo" type="TextureRect" parent="VBox/Margin/VSplitContainer/VBox"]
[node name="Logo" type="TextureRect" parent="VBoxPrimary/Margin/VSplitContainer/VBox"]
unique_name_in_owner = true
modulate = Color(1, 1, 1, 0.623529)
texture_filter = 6
Expand All @@ -46,33 +65,84 @@ layout_mode = 2
expand_mode = 3
stretch_mode = 4

[node name="CurrentResource" type="LineEdit" parent="VBox/Margin/VSplitContainer/VBox"]
[node name="HBox" type="HBoxContainer" parent="VBoxPrimary/Margin/VSplitContainer/VBox"]
layout_mode = 2

[node name="CurrentResource" type="LineEdit" parent="VBoxPrimary/Margin/VSplitContainer/VBox/HBox"]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 3
text = "No resource"
alignment = 1
editable = false

[node name="Search" type="LineEdit" parent="VBox/Margin/VSplitContainer/VBox"]
[node name="CloseButton" type="Button" parent="VBoxPrimary/Margin/VSplitContainer/VBox/HBox"]
unique_name_in_owner = true
layout_mode = 2
tooltip_text = "Hide Sidebar"
text = " "
icon = ExtResource("2_54pks")
flat = true
icon_alignment = 1
expand_icon = true

[node name="HBoxSearchSort" type="HBoxContainer" parent="VBoxPrimary/Margin/VSplitContainer/VBox"]
layout_mode = 2

[node name="Search" type="LineEdit" parent="VBoxPrimary/Margin/VSplitContainer/VBox/HBoxSearchSort"]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 3
tooltip_text = "Filter Resources"
placeholder_text = "Filter Resources"
caret_blink = true
caret_blink_interval = 0.5

[node name="ResourcesList" type="ItemList" parent="VBox/Margin/VSplitContainer/VBox"]
[node name="SortOption" type="OptionButton" parent="VBoxPrimary/Margin/VSplitContainer/VBox/HBoxSearchSort"]
unique_name_in_owner = true
layout_mode = 2
tooltip_text = "Sort
- Default: Sort alphabetically split into Characters & Timeilnes.
- Folder: Sort alphabetically by parent directory.
- None: Sort alphabetically with no categories."
selected = 0
item_count = 3
popup/item_0/text = "Default"
popup/item_1/text = "Folder"
popup/item_1/id = 1
popup/item_2/text = "None"
popup/item_2/id = 2

[node name="ResourceTree" type="Tree" parent="VBoxPrimary/Margin/VSplitContainer/VBox"]
unique_name_in_owner = true
layout_mode = 2
size_flags_vertical = 3
same_column_width = true
allow_rmb_select = true
hide_root = true
scroll_horizontal_enabled = false

[node name="HBoxContainer" type="HBoxContainer" parent="VBoxPrimary/Margin/VSplitContainer/VBox"]
visible = false
layout_mode = 2

[node name="Label" type="Label" parent="VBoxPrimary/Margin/VSplitContainer/VBox/HBoxContainer"]
layout_mode = 2
size_flags_vertical = 1
text = "Sort Order"
vertical_alignment = 1

[node name="SortOption" type="OptionButton" parent="VBoxPrimary/Margin/VSplitContainer/VBox/HBoxContainer"]
layout_mode = 2
size_flags_horizontal = 3
item_count = 1
popup/item_0/text = "Alphabetical (All)"

[node name="ContentListSection" type="VBoxContainer" parent="VBox/Margin/VSplitContainer"]
[node name="ContentListSection" type="VBoxContainer" parent="VBoxPrimary/Margin/VSplitContainer"]
unique_name_in_owner = true
layout_mode = 2
size_flags_vertical = 3

[node name="ContentList" type="ItemList" parent="VBox/Margin/VSplitContainer/ContentListSection"]
[node name="ContentList" type="ItemList" parent="VBoxPrimary/Margin/VSplitContainer/ContentListSection"]
unique_name_in_owner = true
layout_mode = 2
size_flags_vertical = 3
Expand All @@ -82,7 +152,7 @@ theme_override_styles/selected_focus = SubResource("StyleBoxEmpty_n8rql")
allow_reselect = true
same_column_width = true

[node name="CurrentVersion" type="Button" parent="VBox"]
[node name="CurrentVersion" type="Button" parent="VBoxPrimary"]
unique_name_in_owner = true
layout_mode = 2
text = "Some Version"
Expand All @@ -93,7 +163,8 @@ clip_text = true
unique_name_in_owner = true
size = Vector2i(164, 100)

[connection signal="gui_input" from="VBox/Margin/VSplitContainer/VBox/Logo" to="." method="_on_logo_gui_input"]
[connection signal="text_changed" from="VBox/Margin/VSplitContainer/VBox/Search" to="." method="_on_search_text_changed"]
[connection signal="pressed" from="VBox/CurrentVersion" to="." method="_on_current_version_pressed"]
[connection signal="gui_input" from="VBoxPrimary/Margin/VSplitContainer/VBox/Logo" to="." method="_on_logo_gui_input"]
[connection signal="text_changed" from="VBoxPrimary/Margin/VSplitContainer/VBox/HBoxSearchSort/Search" to="." method="_on_search_text_changed"]
[connection signal="text_submitted" from="VBoxPrimary/Margin/VSplitContainer/VBox/HBoxSearchSort/Search" to="." method="_on_search_text_submitted"]
[connection signal="pressed" from="VBoxPrimary/CurrentVersion" to="." method="_on_current_version_pressed"]
[connection signal="id_pressed" from="RightClickMenu" to="." method="_on_right_click_menu_id_pressed"]
Loading
Loading