Changes based on review

- Renamed AddFeaturePanel to TemplateLibraryPanel
- Changed how UI files are loaded and placed
- Commented out attribute_layer from FeatureTemplate

Author: nmaarnio

arho_feature_template/core/feature_template.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING, Sequence
 
 if TYPE_CHECKING:
-    from qgis.core import QgsMapLayer, QgsVectorLayer
+    from qgis.core import QgsVectorLayer
     from qgis.gui import QgsDoubleSpinBox, QgsSpinBox
     from qgis.PyQt.QtGui import QIcon
     from qgis.PyQt.QtWidgets import QLineEdit
@@ -15,7 +15,7 @@ class FeatureAttribute:
     name: str
     display_name: str
     feature_attribte_group: str
-    attribute_layer: QgsMapLayer  # Is this correct type?
+    # attribute_layer: QgsMapLayer  # Is this correct type?
     additional_information: str
     input_field_type: QLineEdit | QgsSpinBox | QgsDoubleSpinBox | None
     modifiable: bool = False

arho_feature_template/core/forms/feature_attribute_form.py

@@ -1,10 +1,14 @@
+from importlib import resources
+
+from qgis.PyQt import uic
 from qgis.PyQt.QtWidgets import QDialog
 
 from arho_feature_template.core.feature_template import FeatureTemplate
-from arho_feature_template.qgis_plugin_tools.tools.resources import load_ui
 
+ui_path = resources.files(__package__) / "feature_attribute_form.ui"
+FormClass, _ = uic.loadUiType(ui_path)
 
-class FeatureAttributeForm(QDialog, load_ui("feature_attribute_form.ui")):
+class FeatureAttributeForm(QDialog, FormClass):
     """Parent class for feature forms for adding and modifying feature attribute data."""
 
     def __init__(self, feature_template: FeatureTemplate):

arho_feature_template/resources/ui/feature_attribute_form.ui arho_feature_template/core/forms/feature_attribute_form.ui

@@ -1,10 +1,14 @@
+from importlib import resources
+
+from qgis.PyQt import uic
 from qgis.PyQt.QtWidgets import QWidget
 
 from arho_feature_template.core.feature_template_library import FeatureTemplateLibrary
-from arho_feature_template.qgis_plugin_tools.tools.resources import load_ui
 
+ui_path = resources.files(__package__) / "template_library_panel.ui"
+FormClass, _ = uic.loadUiType(ui_path)
 
-class AddFeaturePanel(QWidget, load_ui("add_feature_panel.ui")):
+class TemplateLibraryPanel(QWidget, FormClass):
     """Dock widget for selecting a feature template."""
 
     def __init__(self, feature_template_library: FeatureTemplateLibrary):

arho_feature_template/core/panels/add_feature_panel.py arho_feature_template/core/panels/template_library_panel.py

@@ -9,7 +9,7 @@
 from qgis.utils import iface
 
 from arho_feature_template.core.feature_template_library import FeatureTemplateLibrary
-from arho_feature_template.core.panels.add_feature_panel import AddFeaturePanel
+from arho_feature_template.core.panels.template_library_panel import TemplateLibraryPanel
 from arho_feature_template.qgis_plugin_tools.tools.custom_logging import setup_logger, teardown_logger
 from arho_feature_template.qgis_plugin_tools.tools.i18n import setup_translation
 from arho_feature_template.qgis_plugin_tools.tools.resources import plugin_name, resources_path
@@ -129,7 +129,7 @@ def unload(self) -> None:
 
     def run(self) -> None:
         self.feature_template_dock= QgsDockWidget()
-        self.add_feature_panel = AddFeaturePanel(self.active_library)
+        self.add_feature_panel = TemplateLibraryPanel(self.active_library)
         self.feature_template_dock.setWidget(self.add_feature_panel)
         self.feature_template_dock.setWindowTitle("ARHO")  # NOTE: Placeholder name