[licenses] Clean up licenses interface

addons/licenses/internal/components_tree.gd

@@ -71,6 +71,15 @@ func reload(scroll_to: Component = null) -> void:
             self.scroll_to_item(item)
             item.select(0)
 
+func select_component(comp: Component) -> void:
+    var tree_item: TreeItem = self.get_root().get_next_in_tree()
+    while tree_item != null:
+        if tree_item.has_meta("idx") && comp == self._li.get_at(tree_item.get_meta("idx")):
+            tree_item.select(0)
+            self.scroll_to_item(tree_item)
+            break
+        tree_item = tree_item.get_next_in_tree()
+
 func _create_item_menu() -> void:
     self._item_menu = PopupMenu.new()
     self._item_menu.name = "item_menu"

addons/licenses/internal/licenses.gd

@@ -45,22 +45,22 @@ func _ready() -> void:
     self._toolbar.add_component.connect(self._on_toolbar_add_component)
     self._toolbar.show_engine_components.connect(self._on_toolbar_show_engine_components)
 
-    self.reload()
+    self._update_set_license_filepath_button()
     self._li.components_changed.connect(self._on_components_changed)
 
 func reload() -> void:
     self._update_set_license_filepath_button()
-    var res: Licenses.LoadResult = Licenses.load(self._license_file_edit.text)
+    var res: Licenses.LoadResult = self._li.load_licenses(self._license_file_edit.text)
     if res.err_msg == "":
         self._license_file_edit.right_icon = null
         self._license_file_edit.tooltip_text = ""
     else:
         self._license_file_edit.right_icon = self.get_theme_icon(&"NodeWarning", &"EditorIcons")
         self._license_file_edit.tooltip_text = res.err_msg
-    
-    self._li.set_components(res.components)
-    self._li.sort_custom(Licenses.compare_components_ascending)
-    self._li.emit_components_changed()
+
+func show_component(comp: Component) -> void:
+    self._components_tree.select_component(comp)
+    self._component_detail_tree.set_component(comp)
 
 func _update_set_license_filepath_button() -> void:
     if Licenses.get_license_data_filepath() == self._license_file_edit.text:

addons/licenses/internal/licenses_dialog.gd

@@ -3,11 +3,8 @@ extends Window
 
 const LicensesContainer := preload("res://addons/licenses/internal/licenses.gd")
 
-@export var _licenses: LicensesContainer
+@export var licenses: LicensesContainer
 
 func _notification(what: int) -> void:
     if (what == NOTIFICATION_WM_CLOSE_REQUEST):
         self.hide()
-
-func _on_about_to_popup() -> void:
-    self._licenses.reload()

addons/licenses/internal/licenses_dialog.tscn

@@ -3,15 +3,15 @@
 [ext_resource type="Script" path="res://addons/licenses/internal/licenses_dialog.gd" id="1_0s46i"]
 [ext_resource type="PackedScene" uid="uid://dfj2mhwrs1oss" path="res://addons/licenses/internal/licenses.tscn" id="1_f3ql8"]
 
-[node name="license_dialog" type="Window" node_paths=PackedStringArray("_licenses")]
+[node name="license_dialog" type="Window" node_paths=PackedStringArray("licenses")]
 disable_3d = true
 title = "Licenses"
 size = Vector2i(1920, 1080)
 visible = false
 wrap_controls = true
 transient = true
 script = ExtResource("1_0s46i")
-_licenses = NodePath("licenses")
+licenses = NodePath("licenses")
 
 [node name="panel" type="Panel" parent="."]
 anchors_preset = 15

addons/licenses/internal/plugin/licenses_interface.gd

@@ -1,13 +1,36 @@
 extends Node
 
+const LicensesDialogScene: PackedScene = preload("res://addons/licenses/internal/licenses_dialog.tscn")
 const Licenses := preload("res://addons/licenses/licenses.gd")
 const Component := preload("res://addons/licenses/component.gd")
+const LicensesDialog := preload("res://addons/licenses/internal/licenses_dialog.gd")
 
 signal components_changed()
 signal cfg_path_changed(new_path: String)
 
+var _licenses_dialog: LicensesDialog
+
 var _components: Array[Component] = []
 
+func _ready() -> void:
+    self._licenses_dialog = LicensesDialogScene.instantiate()
+    self.add_child(self._licenses_dialog)
+
+func show_popup(show_comp: Component = null) -> void:
+    if show_comp != null:
+        self._licenses_dialog.licenses.show_component(show_comp)
+    if self._licenses_dialog.visible:
+        self._licenses_dialog.grab_focus()
+    else:
+        self._licenses_dialog.popup_centered_ratio(0.4)
+
+func load_licenses(license_path: String) -> Licenses.LoadResult:
+    var res: Licenses.LoadResult = Licenses.load(license_path)
+    self._components = res.components
+    self.sort_custom(Licenses.compare_components_ascending)
+    self.emit_components_changed()
+    return res
+
 func emit_components_changed() -> void:
     self.components_changed.emit()
 
@@ -19,9 +42,6 @@ func add_component(component: Component) -> void:
     self._components.append(component)
     self._components.sort_custom(Licenses.compare_components_ascending)
 
-func set_components(components_: Array[Component]) -> void:
-    self._components = components_
-
 func components() -> Array[Component]:
     return self._components
 
@@ -43,6 +63,15 @@ func sort_custom(fn: Callable) -> void:
 func count() -> int:
     return len(self._components)
 
+func get_components_in_path(path: String) -> Array[Component]:
+    var res: Array[Component] = []
+    for comp: Component in self._components:
+        for idx: int in range(comp.paths.size()):
+            if comp.paths[idx].begins_with(path):
+                res.append(comp)
+                break
+    return res
+
 static func create_interface() -> void:
     var li: Node = new()
     li.name = "kenyoni_licenses_interface"

addons/licenses/plugin.gd

@@ -1,15 +1,12 @@
 @tool
 extends EditorPlugin
 
-const LicensesDialogScene: PackedScene = preload("res://addons/licenses/internal/licenses_dialog.tscn")
-const LicensesDialog := preload("res://addons/licenses/internal/licenses_dialog.gd")
 const Licenses := preload("res://addons/licenses/licenses.gd")
 const ExportPlugin := preload("res://addons/licenses/internal/plugin/export_plugin.gd")
 const LicensesInterface := preload("res://addons/licenses/internal/plugin/licenses_interface.gd")
 const FileSystemWatcher := preload("res://addons/licenses/internal/plugin/file_system_watcher.gd")
 
 var _export_plugin: ExportPlugin
-var _licenses_dialog: LicensesDialog
 var _file_watcher: FileSystemWatcher
 
 func _get_plugin_name() -> String:
@@ -18,27 +15,20 @@ func _get_plugin_name() -> String:
 func _enter_tree() -> void:
     set_project_setting(Licenses.DATA_FILE, "res://licenses.json", TYPE_STRING, PROPERTY_HINT_FILE)
     LicensesInterface.create_interface()
+    LicensesInterface.get_interface().load_licenses(Licenses.get_license_data_filepath())
     self._file_watcher = FileSystemWatcher.new()
 
     self._export_plugin = ExportPlugin.new()
     self.add_export_plugin(self._export_plugin)
 
-    self._licenses_dialog = LicensesDialogScene.instantiate()
-    EditorInterface.get_base_control().add_child(self._licenses_dialog)
-    self.add_tool_menu_item(self._get_plugin_name() + "...", self._show_popup)
+    self.add_tool_menu_item(self._get_plugin_name() + "...", LicensesInterface.get_interface().show_popup)
 
 func _exit_tree() -> void:
     self.remove_tool_menu_item(self._get_plugin_name() + "...")
-    self._licenses_dialog.queue_free()
     self.remove_export_plugin(self._export_plugin)
+    self._file_watcher = null
     LicensesInterface.remove_interface()
 
-func _show_popup() -> void:
-    if _licenses_dialog.visible:
-        self._licenses_dialog.grab_focus()
-    else:
-        self._licenses_dialog.popup_centered_ratio(0.4)
-
 static func set_project_setting(key: String, initial_value, type: int, type_hint: int) -> void:
     if not ProjectSettings.has_setting(key):
         ProjectSettings.set_setting(key, initial_value)