Use inherited Dialogs using plugintools' load_ui

Author: LKajan

nlsgpkgloader/nls_geopackage_loader.py

@@ -21,34 +21,44 @@
 
 import io
 import os
-import sqlite3
 import xml.etree.ElementTree
 import zipfile
 from zipfile import BadZipFile
 
-import processing
 import requests
 from osgeo import ogr
-from qgis.PyQt import uic
-from qgis.PyQt.QtCore import QCoreApplication, QSettings, QTimer, QTranslator, qVersion
-from qgis.PyQt.QtGui import QIcon
-from qgis.PyQt.QtWidgets import QAction, QListWidgetItem, QMessageBox
 from qgis.core import (
-    QgsCoordinateReferenceSystem,
-    QgsFeature,
-    QgsFeatureRequest,
+    QgsApplication,
     QgsLayerTreeGroup,
     QgsMessageLog,
-    QgsProcessingFeedback,
     QgsProject,
-    QgsVectorFileWriter,
     QgsVectorLayer,
 )
-from qgis.gui import QgsBusyIndicatorDialog, QgsFileWidget
+from qgis.gui import QgsFileWidget
+from qgis.PyQt.QtCore import QCoreApplication, QSettings, QTimer, QTranslator, qVersion
+from qgis.PyQt.QtGui import QIcon
+from qgis.PyQt.QtWidgets import QAction, QListWidgetItem, QMessageBox
 
-NLS_USER_KEY_DIALOG_FILE = "nls_geopackage_loader_dialog_NLS_user_key.ui"
-MUNICIPALITIES_DIALOG_FILE = "nls_geopackage_loader_dialog_municipality_selection.ui"
-NLS_PROGRESS_DIALOG_FILE = "nls_geopackage_loader_dialog_progress.ui"
+from nlsgpkgloader.nls_geopackage_loader_mtk_productdata import (
+    MTK_ALL_PRODUCTS_TITLE,
+    MTK_ALL_PRODUCTS_URL,
+    MTK_LAYERS_KEY_PREFIX,
+    MTK_PRESELECTED_PRODUCTS,
+    MTK_PRODUCT_NAMES,
+    MTK_STYLED_LAYERS,
+)
+from nlsgpkgloader.nls_geopackage_loader_tasks import (
+    CleanUpTask,
+    ClipLayersTask,
+    CreateGeoPackageTask,
+    DissolveFeaturesTask,
+)
+from nlsgpkgloader.qgis_plugin_tools.tools.resources import resources_path
+from nlsgpkgloader.ui import (
+    NLSGeoPackageLoaderMunicipalitySelectionDialog,
+    NLSGeoPackageLoaderProgressDialog,
+    NLSGeoPackageLoaderUserKeyDialog,
+)
 
 
 class NLSGeoPackageLoader:
@@ -90,9 +100,8 @@ def __init__(self, iface):
         self.path = os.path.dirname(__file__)
         self.data_download_dir = self.path
 
-        self.nls_user_key_dialog = uic.loadUi(
-            os.path.join(self.path, NLS_USER_KEY_DIALOG_FILE)
-        )
+        self.nls_user_key_dialog = NLSGeoPackageLoaderUserKeyDialog()
+
         self.first_run = QSettings().value("/NLSgpkgloader/first_run", True, type=bool)
         if self.first_run:
             QSettings().setValue("/NLSgpkgloader/first_run", False)
@@ -240,9 +249,8 @@ def run(self):
 
         self.product_types = self.downloadNLSProductTypes()
 
-        self.municipalities_dialog = uic.loadUi(
-            os.path.join(self.path, MUNICIPALITIES_DIALOG_FILE)
-        )
+        self.municipalities_dialog = NLSGeoPackageLoaderMunicipalitySelectionDialog()
+
         self.municipalities_dialog.settingsPushButton.clicked.connect(
             self.showSettingsDialog
         )
@@ -298,9 +306,7 @@ def run(self):
                 else:
                     return
 
-            self.progress_dialog = uic.loadUi(
-                os.path.join(self.path, NLS_PROGRESS_DIALOG_FILE)
-            )
+            self.progress_dialog = NLSGeoPackageLoaderProgressDialog()
             self.progress_dialog.progressBar.hide()
             self.progress_dialog.label.setText("Initializing...")
             self.progress_dialog.show()

nlsgpkgloader/nls_geopackage_loader_dialog_NLS_user_key.ui renamed to nlsgpkgloader/resources/ui/nls_geopackage_loader_dialog_NLS_user_key.ui

@@ -0,0 +1,13 @@
+from .nls_geopackage_loader_dialog import NLSGeoPackageLoaderDialog
+from .nls_geopackage_loader_municipality_dialog import (
+    NLSGeoPackageLoaderMunicipalitySelectionDialog,
+)
+from .nls_geopackage_loader_progress_dialog import NLSGeoPackageLoaderProgressDialog
+from .nls_geopackage_loader_user_key_dialog import NLSGeoPackageLoaderUserKeyDialog
+
+__all__ = [
+    "NLSGeoPackageLoaderUserKeyDialog",
+    "NLSGeoPackageLoaderDialog",
+    "NLSGeoPackageLoaderProgressDialog",
+    "NLSGeoPackageLoaderMunicipalitySelectionDialog",
+]

nlsgpkgloader/nls_geopackage_loader_dialog_base.ui renamed to nlsgpkgloader/resources/ui/nls_geopackage_loader_dialog_base.ui

@@ -20,21 +20,19 @@
 #  You should have received a copy of the GNU General Public License
 #  along with NLSgpkgloadert.  If not, see <https://www.gnu.org/licenses/>.
 
-import os
+from qgis.PyQt import QtWidgets
 
-from qgis.PyQt import QtWidgets, uic
+from nlsgpkgloader.qgis_plugin_tools.tools.resources import load_ui
 
 # This loads your .ui file so that PyQt can populate your plugin with the
 # elements from Qt Designer
-FORM_CLASS, _ = uic.loadUiType(
-    os.path.join(os.path.dirname(__file__), "nls_geopackage_loader_dialog_base.ui")
-)
+FORM_CLASS = load_ui("nls_geopackage_loader_dialog_base.ui")
 
 
 class NLSGeoPackageLoaderDialog(QtWidgets.QDialog, FORM_CLASS):
     def __init__(self, parent=None):
         """Constructor."""
-        super(NLSGeoPackageLoaderDialog, self).__init__(parent)
+        super().__init__(parent)
         # Set up the user interface from Designer through FORM_CLASS.
         # After self.setupUi() you can access any designer object by doing
         # self.<objectname>, and you can use autoconnect slots - see

nlsgpkgloader/nls_geopackage_loader_dialog_municipality_selection.ui renamed to nlsgpkgloader/resources/ui/nls_geopackage_loader_dialog_municipality_selection.ui

@@ -0,0 +1,11 @@
+from qgis.PyQt.QtWidgets import QDialog
+
+from nlsgpkgloader.qgis_plugin_tools.tools.resources import load_ui
+
+FORM_CLASS = load_ui("nls_geopackage_loader_dialog_municipality_selection.ui")
+
+
+class NLSGeoPackageLoaderMunicipalitySelectionDialog(QDialog, FORM_CLASS):
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.setupUi(self)

nlsgpkgloader/nls_geopackage_loader_dialog_progress.ui renamed to nlsgpkgloader/resources/ui/nls_geopackage_loader_dialog_progress.ui

@@ -0,0 +1,11 @@
+from qgis.PyQt.QtWidgets import QDialog
+
+from nlsgpkgloader.qgis_plugin_tools.tools.resources import load_ui
+
+FORM_CLASS = load_ui("nls_geopackage_loader_dialog_progress.ui")
+
+
+class NLSGeoPackageLoaderProgressDialog(QDialog, FORM_CLASS):
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.setupUi(self)

nlsgpkgloader/ui/__init__.py

@@ -0,0 +1,13 @@
+from qgis.PyQt.QtWidgets import QDialog
+
+from nlsgpkgloader.qgis_plugin_tools.tools.resources import load_ui
+
+FORM_CLASS = load_ui("nls_geopackage_loader_dialog_NLS_user_key.ui")
+
+
+class NLSGeoPackageLoaderUserKeyDialog(QDialog, FORM_CLASS):
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.setupUi(self)
+
+        print(dir(self))

nlsgpkgloader/nls_geopackage_loader_dialog.py renamed to nlsgpkgloader/ui/nls_geopackage_loader_dialog.py

@@ -16,7 +16,7 @@
 import pytest
 from qgis.PyQt.QtWidgets import QDialog, QDialogButtonBox
 
-from nlsgpkgloader.nls_geopackage_loader_dialog import NLSGeoPackageLoaderDialog
+from nlsgpkgloader.ui.nls_geopackage_loader_dialog import NLSGeoPackageLoaderDialog
 
 
 @pytest.fixture