oqtopus 0.1.16__py3-none-any.whl → 0.1.18__py3-none-any.whl

oqtopus/core/module_asset.py

@@ -14,3 +14,5 @@ class ModuleAsset:
         self.download_url = download_url
         self.size = size
         self.type = type
+        self.package_zip = None
+        self.package_dir = None

oqtopus/core/module_package.py

@@ -25,6 +25,8 @@ class ModulePackage:
         branch=None,
     ):
         self.module = module
+        self.organisation = organisation
+        self.repository = repository
         self.type = type
         self.name = name
         self.branch = branch
@@ -50,12 +52,10 @@ class ModulePackage:
         if self.type == ModulePackage.Type.RELEASE:
             type = "tags"
 
-        self.download_url = (
-            f"https://github.com/{organisation}/{repository}/archive/refs/{type}/{self.branch}.zip"
-        )
+        self.download_url = f"https://github.com/{self.organisation}/{self.repository}/archive/refs/{type}/{self.branch}.zip"
 
-        self.zip_file = None
-        self.package_dir = None
+        self.source_package_zip = None
+        self.source_package_dir = None
 
     def display_name(self):
         if self.prerelease:

oqtopus/core/package_prepare_task.py

@@ -25,6 +25,8 @@ class PackagePrepareTask(QThread):
 
         self.module_package = None
 
+        self.__destination_directory = None
+
         self.__canceled = False
         self.lastError = None
 
@@ -53,6 +55,8 @@ class PackagePrepareTask(QThread):
             if self.module_package is None:
                 raise Exception(self.tr("No module version provided."))
 
+            self.__destination_directory = self.__prepareDestinationDirectory()
+
             self.__download_module_assets(self.module_package)
             self.lastError = None
 
@@ -61,13 +65,29 @@ class PackagePrepareTask(QThread):
             logger.critical(f"Package prepare task error: {e}")
             self.lastError = e
 
+    def __prepareDestinationDirectory(self):
+        """
+        Prepare the destination directory for the module package.
+        This method creates a temporary directory for the package.
+        """
+        temp_dir = PluginUtils.plugin_temp_path()
+        destination_directory = os.path.join(
+            temp_dir,
+            self.module_package.organisation,
+            self.module_package.repository,
+            self.module_package.name,
+        )
+        os.makedirs(destination_directory, exist_ok=True)
+
+        return destination_directory
+
     def __download_module_assets(self, module_package):
 
         # Download the source
         zip_file = self.__download_module_asset(module_package.download_url, "source.zip")
-        module_package.zip_file = zip_file
+        module_package.source_package_zip = zip_file
         package_dir = self.__extract_zip_file(zip_file)
-        module_package.package_dir = package_dir
+        module_package.source_package_dir = package_dir
 
         # Download the release assets
         self.__checkForCanceled()
@@ -77,6 +97,7 @@ class PackagePrepareTask(QThread):
                 module_package.asset_project.type.value + ".zip",
             )
             package_dir = self.__extract_zip_file(zip_file)
+            module_package.asset_project.package_zip = zip_file
             module_package.asset_project.package_dir = package_dir
 
         self.__checkForCanceled()
@@ -86,15 +107,12 @@ class PackagePrepareTask(QThread):
                 module_package.asset_plugin.type.value + ".zip",
             )
             package_dir = self.__extract_zip_file(zip_file)
+            module_package.asset_plugin.package_zip = zip_file
             module_package.asset_plugin.package_dir = package_dir
 
     def __download_module_asset(self, url: str, filename: str):
 
-        temp_dir = PluginUtils.plugin_temp_path()
-        destination_directory = os.path.join(temp_dir, "Downloads")
-        os.makedirs(destination_directory, exist_ok=True)
-
-        zip_file = os.path.join(destination_directory, filename)
+        zip_file = os.path.join(self.__destination_directory, filename)
 
         # Streaming, so we can iterate over the response.
         response = requests.get(url, allow_redirects=True, stream=True)
@@ -121,19 +139,17 @@ class PackagePrepareTask(QThread):
         return zip_file
 
     def __extract_zip_file(self, zip_file):
-        temp_dir = PluginUtils.plugin_temp_path()
-
         # Unzip the file to plugin temp dir
         try:
             with zipfile.ZipFile(zip_file, "r") as zip_ref:
                 # Find the top-level directory
                 zip_dirname = zip_ref.namelist()[0].split("/")[0]
-                package_dir = os.path.join(temp_dir, zip_dirname)
+                package_dir = os.path.join(self.__destination_directory, zip_dirname)
 
                 if os.path.exists(package_dir):
                     shutil.rmtree(package_dir)
 
-                zip_ref.extractall(temp_dir)
+                zip_ref.extractall(self.__destination_directory)
 
         except zipfile.BadZipFile:
             raise Exception(self.tr(f"The selected file '{zip_file}' is not a valid zip archive."))

oqtopus/gui/database_connection_widget.py

@@ -60,6 +60,15 @@ class DatabaseConnectionWidget(QWidget, DIALOG_UI):
         """
         return self.__database_connection
 
+    def getService(self):
+        """
+        Returns the current service name.
+        If no service is selected, returns None.
+        """
+        if self.db_services_comboBox.currentText() == "":
+            return None
+        return self.db_services_comboBox.currentText()
+
     def __loadDatabaseInformations(self):
         pg_service_conf_path = pgserviceparser_conf_path()
         self.db_servicesConfigFilePath_label.setText(

oqtopus/gui/database_create_dialog.py

@@ -35,6 +35,11 @@ from ..utils.qt_utils import OverrideCursor
 DIALOG_UI = PluginUtils.get_ui_class("database_create_dialog.ui")
 
 
+DEFAULT_PG_PORT = "5432"
+DEFAULT_PG_DB = "postgres"
+DEFAULT_PG_HOST = "localhost"
+
+
 class DatabaseCreateDialog(QDialog, DIALOG_UI):
     def __init__(self, selected_service=None, parent=None):
         QDialog.__init__(self, parent)
@@ -62,6 +67,11 @@ class DatabaseCreateDialog(QDialog, DIALOG_UI):
         self.parameters_ssl_comboBox.addItem("require", "require")
         self.parameters_ssl_comboBox.addItem("verify-ca", "verify-ca")
         self.parameters_ssl_comboBox.addItem("verify-full", "verify-full")
+        self.parameters_ssl_comboBox.setCurrentIndex(2)  # Default to 'prefer'
+
+        self.parameters_host_lineEdit.setPlaceholderText(DEFAULT_PG_HOST)
+        self.parameters_port_lineEdit.setPlaceholderText(DEFAULT_PG_PORT)
+        self.parameters_database_lineEdit.setPlaceholderText(DEFAULT_PG_DB)
 
         self.database_lineEdit.textChanged.connect(self._databaseTextChanged)
 
@@ -91,8 +101,7 @@ class DatabaseCreateDialog(QDialog, DIALOG_UI):
         self.parameters_ssl_comboBox.setCurrentIndex(parameter_ssl_index)
         self.parameters_user_lineEdit.setText(service_user)
         self.parameters_password_lineEdit.setText(service_password)
-
-        self.database_lineEdit.setText(service_dbname)
+        self.parameters_database_lineEdit.setText(service_dbname)
 
     def _enterManuallyToggled(self, checked):
         self.parameters_frame.setEnabled(checked)
@@ -195,16 +204,16 @@ class DatabaseCreateDialog(QDialog, DIALOG_UI):
 
         # Collect parameters from manual input fields
         if self.parameters_host_lineEdit.text():
-            parameters["host"] = self.parameters_host_lineEdit.text()
+            parameters["host"] = self.parameters_host_lineEdit.text() or DEFAULT_PG_HOST
         if self.parameters_port_lineEdit.text():
-            parameters["port"] = self.parameters_port_lineEdit.text()
+            parameters["port"] = self.parameters_port_lineEdit.text() or DEFAULT_PG_PORT
         if self.parameters_ssl_comboBox.currentData():
             parameters["sslmode"] = self.parameters_ssl_comboBox.currentData()
         if self.parameters_user_lineEdit.text():
             parameters["user"] = self.parameters_user_lineEdit.text()
         if self.parameters_password_lineEdit.text():
             parameters["password"] = self.parameters_password_lineEdit.text()
-        if self.database_lineEdit.text():
-            parameters["dbname"] = self.database_lineEdit.text()
+        if self.parameters_database_lineEdit.text():
+            parameters["dbname"] = self.parameters_database_lineEdit.text() or DEFAULT_PG_DB
 
         return parameters

oqtopus/gui/main_dialog.py

@@ -45,6 +45,7 @@ from .database_connection_widget import DatabaseConnectionWidget  # noqa: E402
 from .logs_widget import LogsWidget  # noqa: E402
 from .module_selection_widget import ModuleSelectionWidget  # noqa: E402
 from .module_widget import ModuleWidget  # noqa: E402
+from .plugin_widget import PluginWidget  # noqa: E402
 from .project_widget import ProjectWidget  # noqa: E402
 
 DIALOG_UI = PluginUtils.get_ui_class("main_dialog.ui")
@@ -52,7 +53,7 @@ DIALOG_UI = PluginUtils.get_ui_class("main_dialog.ui")
 
 class MainDialog(QDialog, DIALOG_UI):
 
-    def __init__(self, modules_config, parent=None):
+    def __init__(self, modules_config_path, parent=None):
         QDialog.__init__(self, parent)
         self.setupUi(self)
 
@@ -60,7 +61,7 @@ class MainDialog(QDialog, DIALOG_UI):
         self.buttonBox.helpRequested.connect(self.__helpRequested)
 
         # Init GUI Modules
-        self.__moduleSelectionWidget = ModuleSelectionWidget(modules_config, self)
+        self.__moduleSelectionWidget = ModuleSelectionWidget(modules_config_path, self)
         self.moduleSelection_groupBox.layout().addWidget(self.__moduleSelectionWidget)
 
         # Init GUI Database
@@ -75,6 +76,10 @@ class MainDialog(QDialog, DIALOG_UI):
         self.__projectWidget = ProjectWidget(self)
         self.project_tab.layout().addWidget(self.__projectWidget)
 
+        # Init GUI Plugin
+        self.__pluginWidget = PluginWidget(self)
+        self.plugin_tab.layout().addWidget(self.__pluginWidget)
+
         # Init GUI Logs
         self.__logsWidget = LogsWidget(self)
         self.logs_groupBox.layout().addWidget(self.__logsWidget)
@@ -108,6 +113,7 @@ class MainDialog(QDialog, DIALOG_UI):
         self.__databaseConnectionWidget.signal_connectionChanged.connect(
             self.__databaseConnectionWidget_connectionChanged
         )
+        self.__databaseConnectionWidget_connectionChanged()
 
         self.module_tab.setEnabled(False)
         self.plugin_tab.setEnabled(False)
@@ -164,5 +170,11 @@ class MainDialog(QDialog, DIALOG_UI):
             self.__moduleSelectionWidget.getSelectedModulePackage()
         )
 
+        self.__pluginWidget.setModulePackage(
+            self.__moduleSelectionWidget.getSelectedModulePackage()
+        )
+
     def __databaseConnectionWidget_connectionChanged(self):
         self.__moduleWidget.setDatabaseConnection(self.__databaseConnectionWidget.getConnection())
+
+        self.__projectWidget.setService(self.__databaseConnectionWidget.getService())

oqtopus/gui/module_selection_widget.py

@@ -1,9 +1,11 @@
+import yaml
 from qgis.PyQt.QtCore import Qt, QUrl, pyqtSignal
 from qgis.PyQt.QtGui import QDesktopServices
 from qgis.PyQt.QtWidgets import QApplication, QFileDialog, QMessageBox, QWidget
 
 from ..core.module import Module
 from ..core.module_package import ModulePackage
+from ..core.modules_config import ModulesConfig
 from ..core.package_prepare_task import PackagePrepareTask, PackagePrepareTaskCanceled
 from ..utils.plugin_utils import PluginUtils, logger
 from ..utils.qt_utils import CriticalMessageBox, OverrideCursor, QtUtils
@@ -18,28 +20,44 @@ class ModuleSelectionWidget(QWidget, DIALOG_UI):
     signal_loadingStarted = pyqtSignal()
     signal_loadingFinished = pyqtSignal()
 
-    def __init__(self, modules_config, parent=None):
+    def __init__(self, modules_config_path, parent=None):
         QWidget.__init__(self, parent)
         self.setupUi(self)
 
         self.__current_module = None
         self.__current_module_package = None
-        self.__modules_config = modules_config
+        self.__modules_config = None
+
+        try:
+            with modules_config_path.open() as f:
+                data = yaml.safe_load(f)
+                self.__modules_config = ModulesConfig(**data)
+        except Exception as e:
+            logger.error(f"Error loading modules config from {modules_config_path}: {e}")
+            QMessageBox.critical(
+                self,
+                self.tr("Error"),
+                self.tr(f"Can't load modules configuration from '{modules_config_path}': {e}"),
+            )
+            self.__modules_config = None
 
         self.module_progressBar.setVisible(False)
 
         self.module_module_comboBox.clear()
         self.module_module_comboBox.addItem(self.tr("Please select a module"), None)
-        for config_module in self.__modules_config.modules:
-            module = Module(
-                name=config_module.name,
-                organisation=config_module.organisation,
-                repository=config_module.repository,
-                parent=self,
-            )
-            self.module_module_comboBox.addItem(module.name, module)
-            module.signal_versionsLoaded.connect(self.__loadVersionsFinished)
-            module.signal_developmentVersionsLoaded.connect(self.__loadDevelopmentVersionsFinished)
+        if self.__modules_config is not None:
+            for config_module in self.__modules_config.modules:
+                module = Module(
+                    name=config_module.name,
+                    organisation=config_module.organisation,
+                    repository=config_module.repository,
+                    parent=self,
+                )
+                self.module_module_comboBox.addItem(module.name, module)
+                module.signal_versionsLoaded.connect(self.__loadVersionsFinished)
+                module.signal_developmentVersionsLoaded.connect(
+                    self.__loadDevelopmentVersionsFinished
+                )
 
         self.module_latestVersion_label.setText("")
         QtUtils.setForegroundColor(self.module_latestVersion_label, PluginUtils.COLOR_GREEN)
@@ -190,20 +208,26 @@ class ModuleSelectionWidget(QWidget, DIALOG_UI):
             QtUtils.setForegroundColor(self.module_information_label, PluginUtils.COLOR_WARNING)
             return
 
-        package_dir = self.module_package_comboBox.currentData().package_dir
+        package_dir = self.module_package_comboBox.currentData().source_package_dir
         logger.info(f"Package loaded into '{package_dir}'")
-        self.module_information_label.setText(package_dir)
         QtUtils.resetForegroundColor(self.module_information_label)
+        self.module_information_label.setText(
+            f"<a href='file://{package_dir}'>{package_dir}</a>",
+        )
 
         asset_project = self.module_package_comboBox.currentData().asset_project
         if asset_project:
-            self.module_informationProject_label.setText(asset_project.package_dir)
+            self.module_informationProject_label.setText(
+                f"<a href='file://{asset_project.package_dir}'>{asset_project.package_dir}</a>",
+            )
         else:
             self.module_informationProject_label.setText("No asset available")
 
         asset_plugin = self.module_package_comboBox.currentData().asset_plugin
         if asset_plugin:
-            self.module_informationPlugin_label.setText(asset_plugin.package_dir)
+            self.module_informationPlugin_label.setText(
+                f"<a href='file://{asset_plugin.package_dir}'>{asset_plugin.package_dir}</a>",
+            )
         else:
             self.module_informationPlugin_label.setText("No asset available")
 

oqtopus/gui/module_widget.py

@@ -42,13 +42,13 @@ class ModuleWidget(QWidget, DIALOG_UI):
         self.__updateModuleInfo()
 
     def __packagePrepareGetPUMConfig(self):
-        package_dir = self.__current_module_package.package_dir
+        package_dir = self.__current_module_package.source_package_dir
 
         if package_dir is None:
             CriticalMessageBox(
                 self.tr("Error"),
                 self.tr(
-                    f"The selected file '{self.__current_module_package.zip_file}' does not contain a valid package directory."
+                    f"The selected file '{self.__current_module_package.source_package_zip}' does not contain a valid package directory."
                 ),
                 None,
                 self,
@@ -61,7 +61,7 @@ class ModuleWidget(QWidget, DIALOG_UI):
             CriticalMessageBox(
                 self.tr("Error"),
                 self.tr(
-                    f"The selected file '{self.__current_module_package.zip_file}' does not contain a valid .pum.yaml file."
+                    f"The selected file '{self.__current_module_package.source_package_zip}' does not contain a valid .pum.yaml file."
                 ),
                 None,
                 self,

oqtopus/gui/plugin_widget.py

@@ -0,0 +1,155 @@
+import os
+import shutil
+
+from qgis.PyQt.QtCore import QUrl
+from qgis.PyQt.QtGui import QDesktopServices
+from qgis.PyQt.QtWidgets import QFileDialog, QMessageBox, QWidget
+
+from ..core.module_package import ModulePackage
+from ..utils.plugin_utils import PluginUtils, logger
+from ..utils.qt_utils import QtUtils
+
+DIALOG_UI = PluginUtils.get_ui_class("plugin_widget.ui")
+
+
+class PluginWidget(QWidget, DIALOG_UI):
+
+    def __init__(self, parent=None):
+        QWidget.__init__(self, parent)
+        self.setupUi(self)
+
+        self.install_pushButton.clicked.connect(self.__installClicked)
+        self.seeChangelog_pushButton.clicked.connect(self.__seeChangelogClicked)
+        self.copyZipToDirectory_pushButton.clicked.connect(self.__copyZipToDirectoryClicked)
+
+        self.__current_module_package = None
+
+    def setModulePackage(self, module_package: ModulePackage):
+        self.__current_module_package = module_package
+        self.__packagePrepareGetPluginFilename()
+
+    def __packagePrepareGetPluginFilename(self):
+        asset_plugin = self.__current_module_package.asset_plugin
+        if asset_plugin is None:
+            self.info_label.setText(self.tr("No plugin asset available for this module version."))
+            QtUtils.setForegroundColor(self.info_label, PluginUtils.COLOR_WARNING)
+            QtUtils.setFontItalic(self.info_label, True)
+            return
+
+        # Check if the package exists
+        if not os.path.exists(asset_plugin.package_zip):
+            self.info_label.setText(
+                self.tr(f"Plugin zip file '{asset_plugin.package_zip}' does not exist.")
+            )
+            QtUtils.setForegroundColor(self.info_label, PluginUtils.COLOR_WARNING)
+            QtUtils.setFontItalic(self.info_label, True)
+            return
+
+        QtUtils.resetForegroundColor(self.info_label)
+        QtUtils.setFontItalic(self.info_label, False)
+        self.info_label.setText(
+            f"<a href='file://{asset_plugin.package_zip}'>{asset_plugin.package_zip}</a>",
+        )
+
+    def __installClicked(self):
+        if self.__current_module_package is None:
+            QMessageBox.warning(
+                self,
+                self.tr("Error"),
+                self.tr("Please select a module and version first."),
+            )
+            return
+
+        # Check if the package exists
+        asset_plugin = self.__current_module_package.asset_plugin
+        if not os.path.exists(asset_plugin.package_zip):
+            self.info_label.setText(
+                self.tr(f"Plugin zip file '{asset_plugin.package_zip}' does not exist.")
+            )
+            QtUtils.setForegroundColor(self.info_label, PluginUtils.COLOR_WARNING)
+            QtUtils.setFontItalic(self.info_label, True)
+            return
+
+        QMessageBox.warning(
+            self,
+            self.tr("Not implemented"),
+            self.tr("Installation is not implemented yet."),
+        )
+        return
+
+    def __seeChangelogClicked(self):
+        if self.__current_module_package is None:
+            QMessageBox.warning(
+                self,
+                self.tr("Can't open changelog"),
+                self.tr("Please select a module and version first."),
+            )
+            return
+
+        if self.__current_module_package.type == ModulePackage.Type.FROM_ZIP:
+            QMessageBox.warning(
+                self,
+                self.tr("Can't open changelog"),
+                self.tr("Changelog is not available for Zip packages."),
+            )
+            return
+
+        if self.__current_module_package.html_url is None:
+            QMessageBox.warning(
+                self,
+                self.tr("Can't open changelog"),
+                self.tr(
+                    f"Changelog not available for version '{self.__current_module_package.display_name()}'."
+                ),
+            )
+            return
+
+        changelog_url = self.__current_module_package.html_url
+        logger.info(f"Opening changelog URL: {changelog_url}")
+        QDesktopServices.openUrl(QUrl(changelog_url))
+
+    def __copyZipToDirectoryClicked(self):
+        if self.__current_module_package is None:
+            QMessageBox.warning(
+                self,
+                self.tr("Error"),
+                self.tr("Please select a module and version first."),
+            )
+            return
+
+        # Check if the package exists
+        asset_plugin = self.__current_module_package.asset_plugin
+        if not os.path.exists(asset_plugin.package_zip):
+            self.info_label.setText(
+                self.tr(f"Plugin zip file '{asset_plugin.package_zip}' does not exist.")
+            )
+            QtUtils.setForegroundColor(self.info_label, PluginUtils.COLOR_WARNING)
+            QtUtils.setFontItalic(self.info_label, True)
+            return
+
+        install_destination = QFileDialog.getExistingDirectory(
+            self,
+            self.tr("Select installation directory"),
+            "",
+            QFileDialog.Option.ShowDirsOnly,
+        )
+
+        if not install_destination:
+            return
+
+        # Copy the plugin package to the selected directory
+        try:
+            shutil.copy2(asset_plugin.package_zip, install_destination)
+
+            QMessageBox.information(
+                self,
+                self.tr("Plugin copied"),
+                self.tr(f"Plugin package has been copied to '{install_destination}'."),
+            )
+        except Exception as e:
+            QMessageBox.critical(
+                self,
+                self.tr("Error"),
+                self.tr(f"Failed to copy plugin package: {e}"),
+            )
+            return

oqtopus/gui/project_widget.py

@@ -1,4 +1,5 @@
 import os
+import re
 import shutil
 
 from qgis.PyQt.QtCore import QUrl
@@ -22,11 +23,15 @@ class ProjectWidget(QWidget, DIALOG_UI):
         self.project_seeChangelog_pushButton.clicked.connect(self.__projectSeeChangelogClicked)
 
         self.__current_module_package = None
+        self.__current_service = None
 
     def setModulePackage(self, module_package: ModulePackage):
         self.__current_module_package = module_package
         self.__packagePrepareGetProjectFilename()
 
+    def setService(self, service):
+        self.__current_service = service
+
     def __packagePrepareGetProjectFilename(self):
         asset_project = self.__current_module_package.asset_project
         if asset_project is None:
@@ -110,6 +115,24 @@ class ProjectWidget(QWidget, DIALOG_UI):
 
                 if os.path.isdir(source_path):
                     shutil.copytree(source_path, destination_path, dirs_exist_ok=True)
+
+                elif item.endswith(".qgs"):
+                    with open(source_path) as original_project:
+                        contents = original_project.read()
+
+                    if self.__current_service is not None:
+                        contents = re.sub(
+                            r"service='[^']+'", f"service='{self.__current_service}'", contents
+                        )
+                    else:
+                        logger.warning(
+                            "No service set, skipping service replacement in project file."
+                        )
+
+                    installed_path = os.path.join(install_destination, item)
+                    with open(installed_path, "w") as output_file:
+                        output_file.write(contents)
+
                 else:
                     shutil.copy2(source_path, destination_path)
 

oqtopus/oqtopus.py

@@ -2,8 +2,6 @@ import sys
 import types
 from pathlib import Path
 
-import yaml
-
 # Create fake qgis.PyQt modules that point to PyQt5 modules
 try:
     pyqt_core = __import__("PyQt6.QtCore", fromlist=[""])
@@ -38,7 +36,6 @@ sys.modules["qgis.PyQt.uic"] = pyqt_uic
 
 from qgis.PyQt.QtGui import QIcon  # noqa: E402
 
-from .core.modules_config import ModulesConfig  # noqa: E402
 from .gui.main_dialog import MainDialog  # noqa: E402
 from .utils.plugin_utils import PluginUtils  # noqa: E402
 
@@ -52,11 +49,7 @@ def main():
 
     conf_path = Path(__file__).parent / "default_config.yaml"
 
-    with conf_path.open() as f:
-        data = yaml.safe_load(f)
-        modules_config = ModulesConfig(**data)
-
-    dialog = MainDialog(modules_config)
+    dialog = MainDialog(modules_config_path=conf_path)
     dialog.setWindowIcon(icon)
     dialog.show()
 

oqtopus/oqtopus_plugin.py

@@ -1,11 +1,8 @@
 from pathlib import Path
 
-import yaml
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import QAction, QApplication
 
-from oqtopus.core.modules_config import ModulesConfig
-
 from .gui.about_dialog import AboutDialog
 from .gui.main_dialog import MainDialog
 from .utils.plugin_utils import PluginUtils, logger
@@ -35,12 +32,6 @@ class OqtopusPlugin:
         self.actions = []
         self.main_menu_name = self.tr(f"&{PluginUtils.PLUGIN_NAME}")
 
-        conf_path = Path(__file__).parent / "default_config.yaml"
-
-        with conf_path.open() as f:
-            data = yaml.safe_load(f)
-            self.modules_config = ModulesConfig(**data)
-
     # noinspection PyMethodMayBeStatic
     def tr(self, source_text):
         """
@@ -159,7 +150,9 @@ class OqtopusPlugin:
             self.iface.removeToolBarIcon(action)
 
     def show_main_dialog(self):
-        main_dialog = MainDialog(self.modules_config, self.iface.mainWindow())
+        conf_path = Path(__file__).parent / "default_config.yaml"
+
+        main_dialog = MainDialog(modules_config_path=conf_path, parent=self.iface.mainWindow())
         main_dialog.exec()
 
     def show_logs_folder(self):

oqtopus/ui/database_create_dialog.ui

@@ -62,13 +62,23 @@
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QGridLayout" name="gridLayout_5">
-         <item row="2" column="0">
-          <widget class="QLabel" name="label_10">
+         <item row="5" column="1">
+          <widget class="QLineEdit" name="parameters_password_lineEdit">
+           <property name="clearButtonEnabled">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="0">
+          <widget class="QLabel" name="label_12">
            <property name="text">
-            <string>Port</string>
+            <string>Password</string>
            </property>
           </widget>
          </item>
+         <item row="3" column="1">
+          <widget class="QComboBox" name="parameters_ssl_comboBox"/>
+         </item>
          <item row="3" column="0">
           <widget class="QLabel" name="label_11">
            <property name="text">
@@ -76,38 +86,11 @@
            </property>
           </widget>
          </item>
-         <item row="3" column="1">
-          <widget class="QComboBox" name="parameters_ssl_comboBox">
-           <item>
-            <property name="text">
-             <string>disabled</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>allow</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>prefer</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>require</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>verify-ca</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>verify-full</string>
-            </property>
-           </item>
+         <item row="1" column="1">
+          <widget class="QLineEdit" name="parameters_host_lineEdit">
+           <property name="clearButtonEnabled">
+            <bool>true</bool>
+           </property>
           </widget>
          </item>
          <item row="2" column="1">
@@ -117,45 +100,51 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="1">
-          <widget class="QLineEdit" name="parameters_host_lineEdit">
+         <item row="4" column="1">
+          <widget class="QLineEdit" name="parameters_user_lineEdit">
            <property name="clearButtonEnabled">
             <bool>true</bool>
            </property>
           </widget>
          </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="label_9">
+         <item row="4" column="0">
+          <widget class="QLabel" name="label_8">
            <property name="text">
-            <string>Host</string>
+            <string>User</string>
            </property>
           </widget>
          </item>
-         <item row="4" column="0">
-          <widget class="QLabel" name="label_8">
+         <item row="2" column="0">
+          <widget class="QLabel" name="label_10">
            <property name="text">
-            <string>User</string>
+            <string>Port</string>
            </property>
           </widget>
          </item>
-         <item row="4" column="1">
-          <widget class="QLineEdit" name="parameters_user_lineEdit">
-           <property name="clearButtonEnabled">
-            <bool>true</bool>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_9">
+           <property name="text">
+            <string>Host</string>
            </property>
           </widget>
          </item>
-         <item row="5" column="0">
-          <widget class="QLabel" name="label_12">
+         <item row="6" column="0">
+          <widget class="QLabel" name="label_3">
            <property name="text">
-            <string>Password</string>
+            <string>Database</string>
            </property>
           </widget>
          </item>
-         <item row="5" column="1">
-          <widget class="QLineEdit" name="parameters_password_lineEdit">
-           <property name="clearButtonEnabled">
-            <bool>true</bool>
+         <item row="6" column="1">
+          <widget class="QLineEdit" name="parameters_database_lineEdit">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the database used to connect to the cluster. It must already exist.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="placeholderText">
+            <string>postgres</string>
            </property>
           </widget>
          </item>

oqtopus/ui/main_dialog.ui

@@ -63,77 +63,7 @@
       <attribute name="title">
        <string>Plugin</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_6">
-       <item row="1" column="1">
-        <widget class="QLabel" name="label_8">
-         <property name="font">
-          <font>
-           <italic>true</italic>
-          </font>
-         </property>
-         <property name="text">
-          <string>no current version</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QPushButton" name="pushButton_5">
-         <property name="text">
-          <string>Install 1.6.3</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="label_6">
-         <property name="text">
-          <string>Current QGIS profile</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_5">
-         <property name="text">
-          <string>Current version</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0">
-        <widget class="QPushButton" name="pushButton_8">
-         <property name="text">
-          <string>Copy ZIP to directory</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <widget class="QPushButton" name="pushButton_11">
-         <property name="text">
-          <string>See changelog</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QLabel" name="label_7">
-         <property name="font">
-          <font>
-           <italic>true</italic>
-          </font>
-         </property>
-         <property name="text">
-          <string>tww_user_profile</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="0">
-        <spacer name="verticalSpacer_6">
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
+      <layout class="QGridLayout" name="gridLayout_6"/>
      </widget>
     </widget>
    </item>

oqtopus/ui/module_selection_widget.ui

@@ -26,6 +26,12 @@
      <property name="text">
       <string>-</string>
      </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+     </property>
     </widget>
    </item>
    <item row="0" column="0">
@@ -54,6 +60,12 @@
      <property name="text">
       <string>-</string>
      </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+     </property>
     </widget>
    </item>
    <item row="2" column="0" colspan="3">
@@ -111,8 +123,11 @@
      <property name="text">
       <string>-</string>
      </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
      <property name="textInteractionFlags">
-      <set>Qt::NoTextInteraction</set>
+      <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
      </property>
     </widget>
    </item>

oqtopus/ui/plugin_widget.ui

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="2" column="0">
+    <widget class="QPushButton" name="install_pushButton">
+     <property name="text">
+      <string>Install</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Current QGIS profile</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QLabel" name="qgisProfile_label">
+     <property name="text">
+      <string>-</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QLabel" name="currentVersion_label">
+     <property name="text">
+      <string>no current version</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QPushButton" name="seeChangelog_pushButton">
+     <property name="text">
+      <string>See changelog</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>133</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="0">
+    <widget class="QPushButton" name="copyZipToDirectory_pushButton">
+     <property name="text">
+      <string>Copy ZIP to directory</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Current version</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="QLabel" name="info_label">
+     <property name="text">
+      <string>-</string>
+     </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

oqtopus/ui/project_widget.ui

@@ -17,7 +17,7 @@
    <item row="0" column="0">
     <widget class="QPushButton" name="project_install_pushButton">
      <property name="text">
-      <string>Install demo project</string>
+      <string>Install template project</string>
      </property>
     </widget>
    </item>

{oqtopus-0.1.16.dist-info → oqtopus-0.1.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oqtopus
-Version: 0.1.16
+Version: 0.1.18
 Summary: A QGIS module manager
 Author-email: Damiano Lombardi <damiano@opengis.ch>
 License:                     GNU GENERAL PUBLIC LICENSE

{oqtopus-0.1.16.dist-info → oqtopus-0.1.18.dist-info}/RECORD

@@ -1,43 +1,45 @@
 oqtopus/__init__.py,sha256=PUl5ObSgoyF6tcNphBip9Rff8lul0t9VobiwsLKwgFA,104
-oqtopus/oqtopus.py,sha256=e70YIN0xAB33jHOmfoK8-zP0CeZc6jCV5dAf8rAIbB4,2032
-oqtopus/oqtopus_plugin.py,sha256=yzrM_sJyZQ-MVYhvG-bILdPF6jH415z9LK9xKEpT5Sg,5995
+oqtopus/oqtopus.py,sha256=BF_JSF2oOCzc8Qr7Z0B7FJdYrdAR3FR9L7oXh3QatL4,1860
+oqtopus/oqtopus_plugin.py,sha256=Mpyk6xIgZ1wehBzv70xc6OfddiHQYfXnU6-2E6dDihs,5815
 oqtopus/core/module.py,sha256=XOGI7R_2LyoscXAA-hCTKu7KjJ6ppAPgVFwrtSBiWTA,4631
-oqtopus/core/module_asset.py,sha256=gMHauU5AdAK9gKlsjN1cmbXIca_Xwzb0QcnLBBrJ6f4,403
-oqtopus/core/module_package.py,sha256=15kqjw0LOx8Iy9N3zMwKhNee4k5q_2g1atu19dC12wg,3645
+oqtopus/core/module_asset.py,sha256=qr_wwriJ_rZd86EuBo_Rx-MDCDJNYA6odhk6F-Z6YFA,467
+oqtopus/core/module_package.py,sha256=ilMWlArVmvULhoKHEXg7hNwiE6pLUsAMkLwtOes4j5A,3726
 oqtopus/core/modules_config.py,sha256=iEN_JYuFuGpF4dyfnmcJPfp_bIzrn_PNbq9G1DElyCg,186
-oqtopus/core/package_prepare_task.py,sha256=Eoq9i6tpaik8dpnMef8CKBlmEdXs16krogrQU6vobXI,4839
+oqtopus/core/package_prepare_task.py,sha256=YqIjUbCqDyCd5t0Un71ECgY0LW_uFFxuXyO701nXZ_M,5483
 oqtopus/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oqtopus/gui/about_dialog.py,sha256=dDNwHxKf_M82Z-TKmXW1fXmnI_WSV_7MShqz05trzRw,2345
-oqtopus/gui/database_connection_widget.py,sha256=Uyhwj_jUY5nM5UTv95zkXBoBwbTwX4HsNvVuUzkcY7o,6096
-oqtopus/gui/database_create_dialog.py,sha256=klegVkrK9_7-aWWX0Fzue-mOAPyB09Ao1DJeLXdoNF8,8580
+oqtopus/gui/database_connection_widget.py,sha256=7wFO1ysGwoNoXFFakNz6TktwOm28z3dRmbVxavIXX0E,6375
+oqtopus/gui/database_create_dialog.py,sha256=afltzI1s9B0QGnZl6mgsX-0EvwOUArMu1Vxar4RsYvs,9055
 oqtopus/gui/database_duplicate_dialog.py,sha256=Oz8pob6HxZHbV5Thcrhy4dPvGEI4_brSxw9KIcTc2ZE,4017
 oqtopus/gui/logs_widget.py,sha256=B9Kbwt6cD40CV5mfcyaHZ5foJIPvWRednbxIRdeRgpU,6593
-oqtopus/gui/main_dialog.py,sha256=6nW76FzOg1w0B4bQl6l21YW03xfEf40fOxYb1Jv5WQI,5886
-oqtopus/gui/module_selection_widget.py,sha256=cWQFKDCslXYQL1vbfPOQwFYMkeRxxdThajY-dbpZc-w,15169
-oqtopus/gui/module_widget.py,sha256=g86mgctjfgkkGr57ynEb98jWkQRNtbDbDLpXwARSgO8,7591
+oqtopus/gui/main_dialog.py,sha256=7nxn4vL5fIege0qBPP1mrOp5jP0YWXFJ_k_ywGeKD8M,6362
+oqtopus/gui/module_selection_widget.py,sha256=57M9sM_VhD5lAfxqOxEPWUHiB2Ty6EQQkRnvAZ0VSv8,16116
+oqtopus/gui/module_widget.py,sha256=ev8LoYVREg45mLLU9qu5bPhS4uDiayFAAy8e2zoLk-c,7618
 oqtopus/gui/parameters_groupbox.py,sha256=Lgwv76epIvZOZA0y9sxNcbuZ0Tun-ObUzvOa6eM3EzM,2842
-oqtopus/gui/project_widget.py,sha256=qAUF7pJ3B-mBv3AMC9lg3kdQvt6c4Z5xi4zl-cvpx2g,5796
+oqtopus/gui/plugin_widget.py,sha256=BDtheJ35yrk55Th0vHulHe99jsJUMY11lKBgrHHmkiE,5622
+oqtopus/gui/project_widget.py,sha256=T34MyHzHgKw1Dl6V67MKPneSd9DDgrWhuhj7mrcvjSg,6696
 oqtopus/gui/settings_dialog.py,sha256=wgwVCuAIBh9iLrs9y5HfE99LrTV0rEYbL3frMBlW0cQ,1547
 oqtopus/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oqtopus/ui/about_dialog.ui,sha256=2oa5u3LIvN3prHyELUG-bwDuEHlBn9-uuA4CwYsEARo,6236
 oqtopus/ui/database_connection_widget.ui,sha256=0hLBaOx0KcLTH6RlkziVj-tsczjHDUGC-3EXQYgcTuE,3729
-oqtopus/ui/database_create_dialog.ui,sha256=Zu_YVSIL6MMOkg-1gPx5DQU-h-I93mhE5lpuViCFP7E,8295
+oqtopus/ui/database_create_dialog.ui,sha256=wM_x54bfgdSaShdx6MwBgDx_R-O_ckeoynEhFjs-Sws,8261
 oqtopus/ui/database_duplicate_dialog.ui,sha256=EzMRYhlxsiP_sr9ixBJn4lnefM5R_p1oXx4RCyMAj9U,3826
 oqtopus/ui/logs_widget.ui,sha256=oAgEtRUBXB-DzLC0vmBP-PEA-Uu3d3ppFm0ahs1jHQI,2785
-oqtopus/ui/main_dialog.ui,sha256=idp-jcLKdxbI22JrmXHsZtgmfT9YvOXkngMKxqqOJF0,4682
-oqtopus/ui/module_selection_widget.ui,sha256=AqLPBtX1B8Q03s-JB75lDP__OkhGH04cFVjZnoFwurw,4849
+oqtopus/ui/main_dialog.ui,sha256=mB_VeJ-4wXJm3UTS5leGg_ZgFwgBJaS1QruBqnYMh6U,2650
+oqtopus/ui/module_selection_widget.ui,sha256=IWfoWT5vHoayQPoOPIHOJlg4JdNmVX8DHFQnTIv-Hdk,5646
 oqtopus/ui/module_widget.ui,sha256=2sm0J-qb4CRiKaGk5lyg6AMWlq0d2hE0IW5OSYmJQZo,5662
-oqtopus/ui/project_widget.ui,sha256=flrADzGgDL04l2VdcTltn1IyrmE42tEjYtWXAReKdvc,1596
+oqtopus/ui/plugin_widget.ui,sha256=osJ_QwzmXahV5fEHk4WfUjBBQ7jdsrL4pixiMF2jURA,2570
+oqtopus/ui/project_widget.ui,sha256=5YqSjHR8mQFmHzbSB2M6JnNfrpkqhlRC0N9MSlgcXY8,1600
 oqtopus/ui/settings_dialog.ui,sha256=3PqxTMo22Ola1zl6XkwhXCi6G-uum6g_1-nbjSXWilI,2216
 oqtopus/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oqtopus/utils/plugin_utils.py,sha256=v-Oxu2zs8tQWzEdHnwEl1mseapyvpPS-lHimJNK2zHY,5702
 oqtopus/utils/qt_utils.py,sha256=HPe9tOQQH9R9xZp4rGphVhSJO7220q368xmreDu5-6g,3243
 oqtopus/utils/tmmtlogging.py,sha256=BSAPrhQGCuH2boMG4bP8QFyLfoss1uR4pO_pXjTA1eQ,1733
 oqtopus/utils/translation.py,sha256=p1d5N6CYIf94fGYdPQnJamdum9MVBlPkJ24c557rqdg,2647
-oqtopus-0.1.16.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+oqtopus-0.1.18.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
 tests/__init__.py,sha256=z5CxS92efenLcDm64Sifx26EjZBCWPO4oVvaEEHJJ6w,444
 tests/test_plugin_load.py,sha256=HuVLdrsn2PSjKIrvcLj0EH7vNE8-0jBMmHZHihsqB3Q,517
-oqtopus-0.1.16.dist-info/METADATA,sha256=g0Vr6WBe9SvnbKZEckDwXQbqwv8dPjdR_0c0nH8WIsY,21475
-oqtopus-0.1.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-oqtopus-0.1.16.dist-info/top_level.txt,sha256=i4DHi21kcGIzrF8DlgsKj-UCENHg_NebTRac7cwt32A,14
-oqtopus-0.1.16.dist-info/RECORD,,
+oqtopus-0.1.18.dist-info/METADATA,sha256=qk2WDV_BKgW05EmceSuaW1IwRFs-ChcbsxX5Eof4QbY,21475
+oqtopus-0.1.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+oqtopus-0.1.18.dist-info/top_level.txt,sha256=i4DHi21kcGIzrF8DlgsKj-UCENHg_NebTRac7cwt32A,14
+oqtopus-0.1.18.dist-info/RECORD,,