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.

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

Implement a search bar for portraits #781

Merged
merged 1 commit into from
Feb 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 18 additions & 4 deletions addons/dialogic/Editor/CharacterEditor/CharacterEditor.gd
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ onready var nodes = {
'offset_x': $Split/EditorScroll/Editor/HBoxContainer/OffsetX,
'offset_y': $Split/EditorScroll/Editor/HBoxContainer/OffsetY,

'portrait_search':$Split/EditorScroll/Editor/Portraits/Search,
'portrait_list': $Split/EditorScroll/Editor/PortraitPanel/VBoxContainer/ScrollContainer/VBoxContainer/PortraitList,
'new_portrait_button': $Split/EditorScroll/Editor/PortraitPanel/VBoxContainer/Labels/HBoxContainer/NewPortrait,
'import_from_folder_button': $Split/EditorScroll/Editor/PortraitPanel/VBoxContainer/Labels/HBoxContainer/ImportFromFolder,
Expand Down Expand Up @@ -57,6 +58,7 @@ func _ready():
nodes['display_name_checkbox'].connect('toggled', self, '_on_display_name_toggled')
nodes['nickname_checkbox'].connect('toggled', self, '_on_nickname_toggled')

nodes['portrait_search'].connect('text_changed', self, '_on_PortraitSearch_text_changed')
nodes['import_from_folder_button'].connect('pressed', self, '_on_Import_Portrait_Folder_Button_pressed')
nodes['new_portrait_button'].connect('pressed', self, '_on_New_Portrait_Button_pressed')

Expand Down Expand Up @@ -87,6 +89,7 @@ func clear_character_editor():
nodes['theme'].text = 'No custom theme'
selected_theme_file = ''

nodes['portrait_search'].text = ''
nodes['portraits'] = []
nodes['scale'].value = 100
nodes['mirror_portraits_checkbox'].pressed = false
Expand Down Expand Up @@ -178,23 +181,34 @@ func load_character(filename: String):
nodes['portrait_preview_real'].flip_h = data.get('mirror_portraits', false)
nodes['portrait_preview_real'].rect_scale = Vector2(
float(data.get('scale', 100))/100, float(data.get('scale', 100))/100)

# Portraits
var default_portrait = create_portrait_entry()
default_portrait.get_node('NameEdit').text = 'Default'
default_portrait.get_node('NameEdit').editable = false
if data.has('portraits'):
for p in data['portraits']:
if opened_character_data.has('portraits'):
for p in opened_character_data['portraits']:
var current_item
if p['name'] == 'Default':
default_portrait.get_node('PathEdit').text = p['path']
default_portrait.update_preview(p['path'])
current_item = default_portrait
else:
create_portrait_entry(p['name'], p['path'])

current_item = create_portrait_entry(p['name'], p['path'])

####################################################################################################
## UI FUNCTIONS
####################################################################################################


func _on_PortraitSearch_text_changed(text):
for portrait_item in nodes['portrait_list'].get_children():
if text.empty() or text.to_lower() in portrait_item.get_node("NameEdit").text.to_lower() or text.to_lower() in portrait_item.get_node("PathEdit").text.to_lower():
portrait_item.show()
else:
portrait_item.hide()

func refresh_themes_and_select(file):
selected_theme_file = file
var picker_menu = nodes['theme']
Expand Down
90 changes: 51 additions & 39 deletions addons/dialogic/Editor/CharacterEditor/CharacterEditor.tscn
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[gd_scene load_steps=14 format=2]
[gd_scene load_steps=15 format=2]

[ext_resource path="res://addons/dialogic/Editor/CharacterEditor/PortraitEntry.tscn" type="PackedScene" id=1]
[ext_resource path="res://addons/dialogic/Editor/CharacterEditor/CharacterEditor.gd" type="Script" id=2]
[ext_resource path="res://addons/dialogic/Editor/Common/TLabel.tscn" type="PackedScene" id=3]
[ext_resource path="res://addons/dialogic/Example Assets/portraits/df-3.png" type="Texture" id=4]
[ext_resource path="res://addons/dialogic/Editor/Events/styles/InputFieldsStyle.tres" type="Theme" id=5]

[sub_resource type="StyleBoxFlat" id=1]
bg_color = Color( 0.2, 0.23, 0.31, 1 )
Expand Down Expand Up @@ -69,6 +70,7 @@ size = Vector2( 16, 16 )
anchor_right = 1.0
anchor_bottom = 1.0
margin_right = -25.0
theme = ExtResource( 5 )
script = ExtResource( 2 )
__meta__ = {
"_edit_use_anchors_": false
Expand Down Expand Up @@ -110,7 +112,7 @@ margin_top = 5.0
margin_right = 130.0
margin_bottom = 19.0
rect_min_size = Vector2( 130, 0 )
text = "Name:"
text = "Name: "
text_key = "Name: "

[node name="ColorPickerButton" type="ColorPickerButton" parent="Split/EditorScroll/Editor/NameAndColor"]
Expand Down Expand Up @@ -151,7 +153,7 @@ margin_top = 5.0
margin_right = 130.0
margin_bottom = 19.0
rect_min_size = Vector2( 130, 0 )
text = "Anzeigename:"
text = "Display Name: "
text_key = "Display Name: "

[node name="CheckBox" type="CheckBox" parent="Split/EditorScroll/Editor/DisplayName"]
Expand Down Expand Up @@ -188,7 +190,7 @@ margin_top = 5.0
margin_right = 130.0
margin_bottom = 19.0
rect_min_size = Vector2( 130, 0 )
text = "Spitznamen:"
text = "Nicknames: "
text_key = "Nicknames: "

[node name="CheckBox" type="CheckBox" parent="Split/EditorScroll/Editor/DisplayNickname"]
Expand Down Expand Up @@ -222,7 +224,7 @@ margin_right = 130.0
margin_bottom = 14.0
rect_min_size = Vector2( 130, 0 )
size_flags_vertical = 0
text = "Beschreibung:"
text = "Description: "
text_key = "Description: "

[node name="TextEdit" type="TextEdit" parent="Split/EditorScroll/Editor/Description"]
Expand Down Expand Up @@ -266,36 +268,46 @@ custom_constants/separation = 18
[node name="Portraits" type="HBoxContainer" parent="Split/EditorScroll/Editor"]
margin_top = 184.0
margin_right = 581.0
margin_bottom = 198.0
margin_bottom = 208.0

[node name="Title" parent="Split/EditorScroll/Editor/Portraits" instance=ExtResource( 3 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_right = 581.0
margin_bottom = 14.0
margin_top = 5.0
margin_right = 457.0
margin_bottom = 19.0
size_flags_horizontal = 3
custom_fonts/font = SubResource( 4 )
text = "Portraits"
valign = 1
text_key = "Portraits"

[node name="Search" type="LineEdit" parent="Split/EditorScroll/Editor/Portraits"]
margin_left = 461.0
margin_right = 581.0
margin_bottom = 24.0
rect_min_size = Vector2( 120, 0 )
size_flags_vertical = 4
expand_to_text_length = true
placeholder_text = "Search"

[node name="HBoxContainer" type="HBoxContainer" parent="Split/EditorScroll/Editor"]
margin_top = 202.0
margin_top = 212.0
margin_right = 581.0
margin_bottom = 226.0
margin_bottom = 236.0

[node name="TLabel11" parent="Split/EditorScroll/Editor/HBoxContainer" instance=ExtResource( 3 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 5.0
margin_right = 39.0
margin_right = 33.0
margin_bottom = 19.0
text = "Größe"
text = "Scale"
text_key = "Scale"

[node name="Scale" type="SpinBox" parent="Split/EditorScroll/Editor/HBoxContainer"]
margin_left = 43.0
margin_right = 117.0
margin_left = 37.0
margin_right = 113.0
margin_bottom = 24.0
value = 100.0
allow_greater = true
Expand All @@ -305,50 +317,50 @@ suffix = "%"
[node name="TLabel12" parent="Split/EditorScroll/Editor/HBoxContainer" instance=ExtResource( 3 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 121.0
margin_left = 117.0
margin_top = 5.0
margin_right = 207.0
margin_right = 156.0
margin_bottom = 19.0
text = "Verschiebung"
text = "Offset"
text_key = "Offset"

[node name="OffsetX" type="SpinBox" parent="Split/EditorScroll/Editor/HBoxContainer"]
margin_left = 211.0
margin_right = 285.0
margin_left = 160.0
margin_right = 236.0
margin_bottom = 24.0
allow_greater = true
allow_lesser = true
suffix = "X"

[node name="OffsetY" type="SpinBox" parent="Split/EditorScroll/Editor/HBoxContainer"]
margin_left = 289.0
margin_right = 363.0
margin_left = 240.0
margin_right = 316.0
margin_bottom = 24.0
allow_greater = true
allow_lesser = true
suffix = "Y"

[node name="MirrorOption" type="HBoxContainer" parent="Split/EditorScroll/Editor/HBoxContainer"]
margin_left = 367.0
margin_right = 507.0
margin_left = 320.0
margin_right = 445.0
margin_bottom = 24.0

[node name="TLabel11" parent="Split/EditorScroll/Editor/HBoxContainer/MirrorOption" instance=ExtResource( 3 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 5.0
margin_right = 112.0
margin_right = 97.0
margin_bottom = 19.0
text = "Portraits spiegeln"
text = "Mirror portraits"
text_key = "Mirror portraits"

[node name="MirrorPortraitsCheckBox" type="CheckBox" parent="Split/EditorScroll/Editor/HBoxContainer/MirrorOption"]
margin_left = 116.0
margin_right = 140.0
margin_left = 101.0
margin_right = 125.0
margin_bottom = 24.0

[node name="PortraitPanel" type="PanelContainer" parent="Split/EditorScroll/Editor"]
margin_top = 230.0
margin_top = 240.0
margin_right = 581.0
margin_bottom = 600.0
size_flags_vertical = 3
Expand All @@ -358,7 +370,7 @@ custom_styles/panel = SubResource( 7 )
margin_left = 2.0
margin_top = 2.0
margin_right = 579.0
margin_bottom = 368.0
margin_bottom = 358.0

[node name="Labels" type="HBoxContainer" parent="Split/EditorScroll/Editor/PortraitPanel/VBoxContainer"]
margin_right = 577.0
Expand All @@ -379,40 +391,40 @@ anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 164.0
margin_top = 4.0
margin_right = 276.0
margin_right = 329.0
margin_bottom = 18.0
size_flags_horizontal = 3
text = "Path"
text_key = "Path"

[node name="HBoxContainer" type="HBoxContainer" parent="Split/EditorScroll/Editor/PortraitPanel/VBoxContainer/Labels"]
margin_left = 280.0
margin_left = 333.0
margin_right = 577.0
margin_bottom = 22.0

[node name="NewPortrait" type="Button" parent="Split/EditorScroll/Editor/PortraitPanel/VBoxContainer/Labels/HBoxContainer"]
margin_right = 130.0
margin_right = 117.0
margin_bottom = 22.0
text = " Neues Portrait"
text = " New portrait"
icon = SubResource( 9 )

[node name="ImportFromFolder" type="Button" parent="Split/EditorScroll/Editor/PortraitPanel/VBoxContainer/Labels/HBoxContainer"]
margin_left = 134.0
margin_right = 297.0
margin_left = 121.0
margin_right = 244.0
margin_bottom = 22.0
text = " Ordner importieren"
text = " Import folder"
icon = SubResource( 9 )

[node name="ScrollContainer" type="ScrollContainer" parent="Split/EditorScroll/Editor/PortraitPanel/VBoxContainer"]
margin_top = 26.0
margin_right = 577.0
margin_bottom = 366.0
margin_bottom = 356.0
size_flags_horizontal = 3
size_flags_vertical = 3

[node name="VBoxContainer" type="VBoxContainer" parent="Split/EditorScroll/Editor/PortraitPanel/VBoxContainer/ScrollContainer"]
margin_right = 577.0
margin_bottom = 340.0
margin_bottom = 330.0
size_flags_horizontal = 3
size_flags_vertical = 3

Expand All @@ -436,7 +448,7 @@ anchor_bottom = 0.0
margin_top = 5.0
margin_right = 27.0
margin_bottom = 19.0
text = "Datei"
text = "File:"
text_key = "File:"

[node name="LineEdit" type="LineEdit" parent="Split/EditorScroll/Editor/FileName"]
Expand Down
2 changes: 1 addition & 1 deletion addons/dialogic/Editor/Events/styles/InputFieldsStyle.tres
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ LineEdit/colors/cursor_color = Color( 1, 1, 1, 1 )
LineEdit/colors/font_color = Color( 1, 1, 1, 1 )
LineEdit/colors/font_color_selected = Color( 1, 1, 1, 1 )
LineEdit/colors/font_color_uneditable = Color( 1, 1, 1, 1 )
LineEdit/colors/selection_color = Color( 1, 1, 1, 1 )
LineEdit/colors/selection_color = Color( 1, 1, 1, 0.235294 )
LineEdit/constants/minimum_spaces = 10
LineEdit/fonts/font = null
LineEdit/icons/clear = null
Expand Down