diff --git a/addons/resources_speadsheet_view/editor_icon_button.gd b/addons/resources_speadsheet_view/editor_icon_button.gd index 9d8a46f..9119e69 100644 --- a/addons/resources_speadsheet_view/editor_icon_button.gd +++ b/addons/resources_speadsheet_view/editor_icon_button.gd @@ -11,4 +11,4 @@ func _ready(): func _set_icon_name(v): icon_name = v - icon = get_icon(v, "EditorIcons") + icon = get_theme_icon(v, "EditorIcons") diff --git a/addons/resources_speadsheet_view/editor_stylebox_overrider.gd b/addons/resources_speadsheet_view/editor_stylebox_overrider.gd index ea155b4..be0bc56 100644 --- a/addons/resources_speadsheet_view/editor_stylebox_overrider.gd +++ b/addons/resources_speadsheet_view/editor_stylebox_overrider.gd @@ -13,9 +13,9 @@ func _ready(): func _set_box_name(v): box_name = v - add_stylebox_override(box_name, get_stylebox(box_name, box_class)) + add_theme_stylebox_override(box_name, get_theme_stylebox(box_name, box_class)) func _set_box_class(v): box_class = v - add_stylebox_override(box_name, get_stylebox(box_name, box_class)) + add_theme_stylebox_override(box_name, get_theme_stylebox(box_name, box_class)) diff --git a/addons/resources_speadsheet_view/editor_view.gd b/addons/resources_speadsheet_view/editor_view.gd index a7b3d66..d3ca9fa 100644 --- a/addons/resources_speadsheet_view/editor_view.gd +++ b/addons/resources_speadsheet_view/editor_view.gd @@ -76,7 +76,9 @@ func _ready(): all_cell_editors[all_cell_editors.size() - 1].hint_strings_array = column_hint_strings get_node(path_recent_paths).selected = 0 - display_folder(recent_paths[0], "resource_name", false, true) + + if recent_paths.size() > 0: + display_folder(recent_paths[0], "resource_name", false, true) func _on_filesystem_changed(): diff --git a/addons/resources_speadsheet_view/editor_view.tscn b/addons/resources_speadsheet_view/editor_view.tscn index 17a5065..7da038b 100644 --- a/addons/resources_speadsheet_view/editor_view.tscn +++ b/addons/resources_speadsheet_view/editor_view.tscn @@ -47,9 +47,9 @@ focus_previous = NodePath(".") focus_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 -custom_constants/margin_right = 3 -custom_constants/margin_top = 0 custom_constants/margin_left = 3 +custom_constants/margin_top = 0 +custom_constants/margin_right = 3 custom_constants/margin_bottom = 3 script = ExtResource( 1 ) __meta__ = { @@ -349,8 +349,8 @@ __meta__ = { [node name="MarginContainer" type="MarginContainer" parent="HeaderContentSplit/MarginContainer/FooterContentSplit/Panel/Scroll"] margin_right = 5.65 -custom_constants/margin_right = 0 custom_constants/margin_top = 0 +custom_constants/margin_right = 0 __meta__ = { "_edit_lock_": true } @@ -358,8 +358,8 @@ __meta__ = { [node name="TableGrid" type="GridContainer" parent="HeaderContentSplit/MarginContainer/FooterContentSplit/Panel/Scroll/MarginContainer"] margin_right = 5.65 rect_min_size = Vector2( 5.65, 0 ) -custom_constants/vseparation = 0 custom_constants/hseparation = 0 +custom_constants/vseparation = 0 __meta__ = { "_edit_lock_": true } diff --git a/addons/resources_speadsheet_view/import_export/import_export_dialog.gd b/addons/resources_speadsheet_view/import_export/import_export_dialog.gd index 2005566..bbf65f1 100644 --- a/addons/resources_speadsheet_view/import_export/import_export_dialog.gd +++ b/addons/resources_speadsheet_view/import_export/import_export_dialog.gd @@ -26,7 +26,7 @@ func _ready(): ) create_file_button.text = "Create File" create_file_button.visible = true - create_file_button.icon = get_icon("New", "EditorIcons") + create_file_button.icon = get_theme_icon("New", "EditorIcons") func _on_create_file_pressed(): diff --git a/addons/resources_speadsheet_view/plugin.gd b/addons/resources_speadsheet_view/plugin.gd index 6dca931..f532838 100644 --- a/addons/resources_speadsheet_view/plugin.gd +++ b/addons/resources_speadsheet_view/plugin.gd @@ -36,4 +36,4 @@ func has_main_screen(): func get_plugin_icon(): # Until I add an actual icon, this'll do. - return get_editor_interface().get_base_control().get_icon("VisualScriptComment", "EditorIcons") + return get_editor_interface().get_base_control().get_theme_icon("VisualScriptComment", "EditorIcons") diff --git a/addons/resources_speadsheet_view/selection_actions.gd b/addons/resources_speadsheet_view/selection_actions.gd index fdb97d7..7b3bb04 100644 --- a/addons/resources_speadsheet_view/selection_actions.gd +++ b/addons/resources_speadsheet_view/selection_actions.gd @@ -18,9 +18,9 @@ var editbox_action : int func _ready(): - editbox_input.get_node("../..").add_stylebox_override( + editbox_input.get_node("../..").add_theme_stylebox_override( "panel", - get_stylebox("Content", "EditorStyles") + get_theme_stylebox("Content", "EditorStyles") ) diff --git a/addons/resources_speadsheet_view/typed_editors/dock_base.gd b/addons/resources_speadsheet_view/typed_editors/dock_base.gd index 378a528..3f771c7 100644 --- a/addons/resources_speadsheet_view/typed_editors/dock_base.gd +++ b/addons/resources_speadsheet_view/typed_editors/dock_base.gd @@ -14,7 +14,7 @@ func _ready(): parent = parent.get_parent() sheet = parent - get_node(path_property_name).add_font_override("bold", get_font("bold", "EditorFonts")) + get_node(path_property_name).add_theme_font_override("bold", get_theme_font("bold", "EditorFonts")) # Override to define when to show the dock and, if it can edit the value, how to handle it. func try_edit_value(value, type, property_hint) -> bool: diff --git a/example/Random Upgrades/upgrades_csv/upgrades.csv.import b/example/Random Upgrades/upgrades_csv/upgrades.csv.import index 1ac2098..8dd0c09 100644 --- a/example/Random Upgrades/upgrades_csv/upgrades.csv.import +++ b/example/Random Upgrades/upgrades_csv/upgrades.csv.import @@ -1,13 +1,3 @@ [remap] -importer="csv_translation" -type="Translation" -valid=false - -[deps] - -source_file="res://example/Random Upgrades/upgrades_csv/upgrades.csv" -[params] - -compress=true -delimiter=0 +importer="keep"