From 0124133d02a2fc0b41a77c4778e3f8aafb4bfde7 Mon Sep 17 00:00:00 2001 From: don-tnowe <67479453+don-tnowe@users.noreply.github.com> Date: Tue, 6 Jun 2023 13:34:27 +0300 Subject: [PATCH] Remove/rename more class names in plugin --- addons/resources_spreadsheet_view/editor_color_setter.gd | 1 - addons/resources_spreadsheet_view/editor_icon_button.gd | 1 - addons/resources_spreadsheet_view/editor_view.gd | 2 ++ .../main_screen/column_header_manager.gd | 2 ++ .../main_screen/selection_actions.gd | 2 ++ addons/resources_spreadsheet_view/settings_grid.gd | 1 - addons/resources_spreadsheet_view/typed_cells/cell_editor.gd | 2 +- .../typed_cells/cell_editor_array.gd | 4 ++-- .../typed_cells/cell_editor_bool.gd | 2 +- .../typed_cells/cell_editor_color.gd | 2 +- .../typed_cells/cell_editor_enum.gd | 2 +- .../typed_cells/cell_editor_enum_array.gd | 2 +- .../typed_cells/cell_editor_resource.gd | 4 +++- .../typed_cells/cell_editor_string.gd | 2 +- addons/resources_spreadsheet_view/typed_editors/dock_base.gd | 2 ++ 15 files changed, 19 insertions(+), 12 deletions(-) diff --git a/addons/resources_spreadsheet_view/editor_color_setter.gd b/addons/resources_spreadsheet_view/editor_color_setter.gd index 29b5687..5c35111 100644 --- a/addons/resources_spreadsheet_view/editor_color_setter.gd +++ b/addons/resources_spreadsheet_view/editor_color_setter.gd @@ -1,5 +1,4 @@ @tool -class_name ThemeColorSetter extends Control diff --git a/addons/resources_spreadsheet_view/editor_icon_button.gd b/addons/resources_spreadsheet_view/editor_icon_button.gd index 73c1cd4..0259cb0 100644 --- a/addons/resources_spreadsheet_view/editor_icon_button.gd +++ b/addons/resources_spreadsheet_view/editor_icon_button.gd @@ -1,5 +1,4 @@ @tool -class_name ThemeIconButton extends Button @export var icon_name := "Node" : diff --git a/addons/resources_spreadsheet_view/editor_view.gd b/addons/resources_spreadsheet_view/editor_view.gd index c65e36b..47fdff0 100644 --- a/addons/resources_spreadsheet_view/editor_view.gd +++ b/addons/resources_spreadsheet_view/editor_view.gd @@ -3,6 +3,8 @@ extends Control signal grid_updated() +const SettingsGrid := preload("res://addons/resources_spreadsheet_view/settings_grid.gd") + @export @onready var node_folder_path : LineEdit = $"HeaderContentSplit/VBoxContainer/HBoxContainer/HBoxContainer/Path" @export @onready var node_recent_paths : OptionButton = $"HeaderContentSplit/VBoxContainer/HBoxContainer/HBoxContainer2/RecentPaths" @export @onready var node_table_root : GridContainer = $"HeaderContentSplit/MarginContainer/FooterContentSplit/Panel/Scroll/MarginContainer/TableGrid" diff --git a/addons/resources_spreadsheet_view/main_screen/column_header_manager.gd b/addons/resources_spreadsheet_view/main_screen/column_header_manager.gd index e41b2f4..9c459ec 100644 --- a/addons/resources_spreadsheet_view/main_screen/column_header_manager.gd +++ b/addons/resources_spreadsheet_view/main_screen/column_header_manager.gd @@ -1,6 +1,8 @@ @tool extends Control +const SettingsGrid := preload("res://addons/resources_spreadsheet_view/settings_grid.gd") + @export var table_header_scene : PackedScene @export @onready var editor_view : Control = $"../../../.." diff --git a/addons/resources_spreadsheet_view/main_screen/selection_actions.gd b/addons/resources_spreadsheet_view/main_screen/selection_actions.gd index 0b62edd..c445bea 100644 --- a/addons/resources_spreadsheet_view/main_screen/selection_actions.gd +++ b/addons/resources_spreadsheet_view/main_screen/selection_actions.gd @@ -7,6 +7,8 @@ enum { EDITBOX_DELETE, } +const SettingsGrid := preload("res://addons/resources_spreadsheet_view/settings_grid.gd") + @export @onready var editor_view := $"../.." @export @onready var selection := $"../../SelectionManager" diff --git a/addons/resources_spreadsheet_view/settings_grid.gd b/addons/resources_spreadsheet_view/settings_grid.gd index a1f34ec..fc8a211 100644 --- a/addons/resources_spreadsheet_view/settings_grid.gd +++ b/addons/resources_spreadsheet_view/settings_grid.gd @@ -1,5 +1,4 @@ @tool -class_name SettingsGrid extends GridContainer const SETTING_PREFIX = "addons/resources_spreadsheet_view/" diff --git a/addons/resources_spreadsheet_view/typed_cells/cell_editor.gd b/addons/resources_spreadsheet_view/typed_cells/cell_editor.gd index 363e066..580e67b 100644 --- a/addons/resources_spreadsheet_view/typed_cells/cell_editor.gd +++ b/addons/resources_spreadsheet_view/typed_cells/cell_editor.gd @@ -1,4 +1,4 @@ -class_name CellEditor +class_name SheetsCellEditor extends RefCounted const CELL_SCENE_DIR = "res://addons/resources_spreadsheet_view/typed_cells/" diff --git a/addons/resources_spreadsheet_view/typed_cells/cell_editor_array.gd b/addons/resources_spreadsheet_view/typed_cells/cell_editor_array.gd index 0a01873..6b9f93c 100644 --- a/addons/resources_spreadsheet_view/typed_cells/cell_editor_array.gd +++ b/addons/resources_spreadsheet_view/typed_cells/cell_editor_array.gd @@ -1,6 +1,6 @@ -class_name CellEditorArray -extends CellEditor +extends SheetsCellEditor +const SettingsGrid := preload("res://addons/resources_spreadsheet_view/settings_grid.gd") func can_edit_value(value, type, property_hint, column_index) -> bool: return type == TYPE_PACKED_STRING_ARRAY or type == TYPE_ARRAY diff --git a/addons/resources_spreadsheet_view/typed_cells/cell_editor_bool.gd b/addons/resources_spreadsheet_view/typed_cells/cell_editor_bool.gd index 488248e..e1d2496 100644 --- a/addons/resources_spreadsheet_view/typed_cells/cell_editor_bool.gd +++ b/addons/resources_spreadsheet_view/typed_cells/cell_editor_bool.gd @@ -1,4 +1,4 @@ -extends CellEditor +extends SheetsCellEditor func can_edit_value(value, type, property_hint, column_index) -> bool: diff --git a/addons/resources_spreadsheet_view/typed_cells/cell_editor_color.gd b/addons/resources_spreadsheet_view/typed_cells/cell_editor_color.gd index ab861da..77cb749 100644 --- a/addons/resources_spreadsheet_view/typed_cells/cell_editor_color.gd +++ b/addons/resources_spreadsheet_view/typed_cells/cell_editor_color.gd @@ -1,4 +1,4 @@ -extends CellEditor +extends SheetsCellEditor var _cached_color := Color.WHITE diff --git a/addons/resources_spreadsheet_view/typed_cells/cell_editor_enum.gd b/addons/resources_spreadsheet_view/typed_cells/cell_editor_enum.gd index eca0d07..25ee39d 100644 --- a/addons/resources_spreadsheet_view/typed_cells/cell_editor_enum.gd +++ b/addons/resources_spreadsheet_view/typed_cells/cell_editor_enum.gd @@ -1,4 +1,4 @@ -extends CellEditor +extends SheetsCellEditor func can_edit_value(value, type, property_hint, column_index) -> bool: diff --git a/addons/resources_spreadsheet_view/typed_cells/cell_editor_enum_array.gd b/addons/resources_spreadsheet_view/typed_cells/cell_editor_enum_array.gd index b93e9a9..54f3702 100644 --- a/addons/resources_spreadsheet_view/typed_cells/cell_editor_enum_array.gd +++ b/addons/resources_spreadsheet_view/typed_cells/cell_editor_enum_array.gd @@ -1,4 +1,4 @@ -extends CellEditorArray +extends "res://addons/resources_spreadsheet_view/typed_cells/cell_editor_array.gd" func can_edit_value(value, type, property_hint, column_index) -> bool: diff --git a/addons/resources_spreadsheet_view/typed_cells/cell_editor_resource.gd b/addons/resources_spreadsheet_view/typed_cells/cell_editor_resource.gd index b372402..31e1c8a 100644 --- a/addons/resources_spreadsheet_view/typed_cells/cell_editor_resource.gd +++ b/addons/resources_spreadsheet_view/typed_cells/cell_editor_resource.gd @@ -1,4 +1,6 @@ -extends CellEditor +extends SheetsCellEditor + +const SettingsGrid := preload("res://addons/resources_spreadsheet_view/settings_grid.gd") var previewer : EditorResourcePreview diff --git a/addons/resources_spreadsheet_view/typed_cells/cell_editor_string.gd b/addons/resources_spreadsheet_view/typed_cells/cell_editor_string.gd index 78f5744..8fdc9f2 100644 --- a/addons/resources_spreadsheet_view/typed_cells/cell_editor_string.gd +++ b/addons/resources_spreadsheet_view/typed_cells/cell_editor_string.gd @@ -1,4 +1,4 @@ -extends CellEditor +extends SheetsCellEditor func set_color(node : Control, color : Color): diff --git a/addons/resources_spreadsheet_view/typed_editors/dock_base.gd b/addons/resources_spreadsheet_view/typed_editors/dock_base.gd index 420665d..a63eb74 100644 --- a/addons/resources_spreadsheet_view/typed_editors/dock_base.gd +++ b/addons/resources_spreadsheet_view/typed_editors/dock_base.gd @@ -2,6 +2,8 @@ class_name SheetsDockEditor extends Control +const SettingsGrid := preload("res://addons/resources_spreadsheet_view/settings_grid.gd") + @export var path_property_name := NodePath("Header/Label") var sheet : Control