Skip to content

Commit dc2db44

Browse files
Updating to Alpha 15 (#1210)
* Updating to Alpha 15 hint-tooltip -> tooltip_text something2something -> something_to_something plus_file -> path_join fixing small error when renaming * Alpha 16 change (get_editor_main_screen) * CONNECT_ONESHOT -> CONNECT_ONE_SHOT * Update EventNode.gd * rest of queue_redraw updates * fixing timeline editor background style * Final fixes before merge
1 parent b4706ee commit dc2db44

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+192
-279
lines changed

addons/dialogic/Editor/Events/BranchEnd.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func set_indent(indent: int):
3535
indent_node.custom_minimum_size = Vector2(indent_size * indent, 0)
3636
indent_node.visible = indent != 0
3737
current_indent_level = indent
38-
update()
38+
queue_redraw()
3939

4040
func parent_node_changed():
4141
if parent_node:

addons/dialogic/Editor/Events/EventNode/EventNode.gd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,19 @@ func load_data(data):
6868

6969
func set_warning(text):
7070
warning.show()
71-
warning.hint_tooltip = text
71+
warning.tooltip_text = text
7272

7373

7474
func remove_warning(text = ''):
75-
if warning.hint_tooltip == text or text == '':
75+
if warning.tooltip_text == text or text == '':
7676
warning.hide()
7777

7878

7979
func set_indent(indent: int):
8080
indent_node.custom_minimum_size = Vector2(indent_size * indent, 0)
8181
indent_node.visible = indent != 0
8282
current_indent_level = indent
83-
update()
83+
queue_redraw()
8484

8585

8686
## *****************************************************************************
@@ -374,7 +374,7 @@ func _on_ExpandButton_toggled(button_pressed):
374374
%ExpandButton.set_pressed_no_signal(button_pressed)
375375
expanded = button_pressed
376376
body_container.visible = button_pressed
377-
get_parent().get_parent().update()
377+
get_parent().get_parent().queue_redraw()
378378

379379

380380
func _on_EventNode_gui_input(event):

addons/dialogic/Editor/Events/Fields/ComplexPicker.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func set_value(value, text : String = '') -> void:
5050
elif file_extension != "" && file_extension != ".dch" && file_extension != ".dtl":
5151

5252
$Search.text = value.resource_path
53-
$Search.hint_tooltip = value.resource_path
53+
$Search.tooltip_text = value.resource_path
5454
elif value:
5555
$Search.text = value
5656
else:

addons/dialogic/Editor/Events/Fields/FilePicker.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func set_left_text(value:String):
4242

4343
func set_value(value):
4444
%Field.text = value.get_file()
45-
%Field.hint_tooltip = value
45+
%Field.tooltip_text = value
4646
%ClearButton.visible = !value.is_empty()
4747

4848
func _on_OpenButton_pressed() -> void:

addons/dialogic/Editor/Settings/Settings_Translations.gd

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ func erase_translations():
9999
if trans_path.ends_with('.csv'):
100100
for x_file in DialogicUtil.listdir(trans_path.get_base_dir()):
101101
if x_file.ends_with('.translation'):
102-
trans_files.erase(trans_path.get_base_dir().plus_file(x_file))
103-
dir.remove(trans_path.get_base_dir().plus_file(x_file))
102+
trans_files.erase(trans_path.get_base_dir().path_join(x_file))
103+
dir.remove(trans_path.get_base_dir().path_join(x_file))
104104
dir.remove(DialogicUtil.get_project_setting('dialogic/translation_path', ''))
105105

106106
ProjectSettings.set_setting('dialogic/translation_path', null)
@@ -110,8 +110,8 @@ func erase_translations():
110110
dir.remove(timeline_path.trim_suffix('.dtl')+'_translation.csv')
111111
for x_file in DialogicUtil.listdir(timeline_path.get_base_dir()):
112112
if x_file.ends_with('.translation'):
113-
trans_files.erase(timeline_path.get_base_dir().plus_file(x_file))
114-
dir.remove(timeline_path.get_base_dir().plus_file(x_file))
113+
trans_files.erase(timeline_path.get_base_dir().path_join(x_file))
114+
dir.remove(timeline_path.get_base_dir().path_join(x_file))
115115

116116
var tml:DialogicTimeline = load(timeline_path)
117117
for event in tml.get_events():
@@ -141,7 +141,7 @@ func _on_TransUpdate_pressed():
141141

142142
if !mode:
143143
for file in DialogicUtil.listdir(timeline_path.get_base_dir()):
144-
file = timeline_path.get_base_dir().plus_file(file)
144+
file = timeline_path.get_base_dir().path_join(file)
145145
if file.ends_with('.translation'):
146146
if not file in trans_files:
147147
trans_files.append(file)
@@ -150,7 +150,7 @@ func _on_TransUpdate_pressed():
150150
if mode:
151151
var trans_folder = DialogicUtil.get_project_setting('dialogic/translation_path', '').get_base_dir()
152152
for file in DialogicUtil.listdir(trans_folder):
153-
file = trans_folder.plus_file(file)
153+
file = trans_folder.path_join(file)
154154
if file.ends_with('.translation'):
155155
if not file in trans_files:
156156
trans_files.append(file)

addons/dialogic/Editor/VisualEditor/AddEventButton.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func _ready():
1818
self_modulate = Color(1,1,1)
1919
if visible_name != '':
2020
text = ' ' + visible_name
21-
#hint_tooltip = DTS.translate(hint_tooltip)
21+
#tooltip_text = DTS.translate(tooltip_text)
2222

2323
var _scale = DialogicUtil.get_editor_scale()
2424
custom_minimum_size = Vector2(30,30)* _scale
@@ -46,7 +46,7 @@ func set_color(color):
4646
func _get_drag_data(position):
4747
var preview_label = Label.new()
4848

49-
preview_label.text = 'Add Event %s' % [ hint_tooltip ]
49+
preview_label.text = 'Add Event %s' % [ tooltip_text ]
5050
if self.text != '':
5151
preview_label.text = text
5252

addons/dialogic/Editor/VisualEditor/TimelineArea.gd

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ func _ready():
1414
mouse_exited.connect(_on_mouse_exited)
1515
gui_input.connect(_on_gui_input)
1616

17-
set('theme_override_styles/bg', DCSS.inline({
18-
'background': get_theme_color('dark_color_1', 'Editor')
19-
}))
17+
18+
set('theme_override_styles/panel', get_theme_stylebox("Background", "EditorStyles"))
2019

2120

2221
func _can_drop_data(position, data):

addons/dialogic/Editor/VisualEditor/VisualEditor.gd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -868,14 +868,14 @@ func get_index_under_cursor():
868868
func move_block_up(block):
869869
if block.get_index() < 1: return false
870870
%Timeline.move_child(block, block.get_index() - 1)
871-
%TimelineArea.update()
871+
%TimelineArea.queue_redraw()
872872
something_changed()
873873
return true
874874

875875

876876
func move_block_down(block):
877877
%Timeline.move_child(block, block.get_index() + 1)
878-
%TimelineArea.update()
878+
%TimelineArea.queue_redraw()
879879
something_changed()
880880
return true
881881

@@ -946,7 +946,7 @@ func indent_events() -> void:
946946
event.set_indent(0)
947947
indent += delayed_indent
948948

949-
%TimelineArea.update()
949+
%TimelineArea.queue_redraw()
950950

951951

952952
func add_extra_scroll_area_to_timeline():

0 commit comments

Comments
 (0)