oqtopus 0.1.20__py3-none-any.whl → 0.1.22__py3-none-any.whl

oqtopus/gui/main_dialog.py

@@ -53,10 +53,12 @@ DIALOG_UI = PluginUtils.get_ui_class("main_dialog.ui")
 
 class MainDialog(QDialog, DIALOG_UI):
 
-    def __init__(self, modules_config_path, parent=None):
+    def __init__(self, modules_config_path, about_dialog_cls=None, parent=None):
         QDialog.__init__(self, parent)
         self.setupUi(self)
 
+        self.__about_dialog_cls = about_dialog_cls or AboutDialog
+
         self.buttonBox.rejected.connect(self.__closeDialog)
         self.buttonBox.helpRequested.connect(self.__helpRequested)
 
@@ -136,7 +138,7 @@ class MainDialog(QDialog, DIALOG_UI):
         dlg.exec()
 
     def __show_about_dialog(self):
-        dialog = AboutDialog(self)
+        dialog = self.__about_dialog_cls(self)
         dialog.exec()
 
     def __moduleSelection_loadingStarted(self):

oqtopus/gui/project_widget.py

@@ -27,12 +27,20 @@ class ProjectWidget(QWidget, DIALOG_UI):
 
     def setModulePackage(self, module_package: ModulePackage):
         self.__current_module_package = module_package
-        self.__packagePrepareGetProjectFilename()
+        self.__updateProjectFilename()
 
     def setService(self, service):
         self.__current_service = service
+        self.__updateProjectFilename()
+
+    def __updateProjectFilename(self):
+
+        if self.__current_module_package is None:
+            self.project_info_label.setText(self.tr("No module package selected."))
+            QtUtils.setForegroundColor(self.project_info_label, PluginUtils.COLOR_WARNING)
+            QtUtils.setFontItalic(self.project_info_label, True)
+            return
 
-    def __packagePrepareGetProjectFilename(self):
         asset_project = self.__current_module_package.asset_project
         if asset_project is None:
             self.project_info_label.setText(
@@ -73,9 +81,14 @@ class ProjectWidget(QWidget, DIALOG_UI):
 
         QtUtils.resetForegroundColor(self.project_info_label)
         QtUtils.setFontItalic(self.project_info_label, False)
-        self.project_info_label.setText(
-            f"<a href='file://{asset_project.package_dir}'>{asset_project.package_dir}</a>",
-        )
+        if self.__current_service:
+            self.project_info_label.setText(
+                f"Project will use PG Service '{self.__current_service}' for database connection"
+            )
+        else:
+            self.project_info_label.setText(
+                "Project will use the default service. Please set a service in the database connection tab if you need a specific one."
+            )
 
     def __projectInstallClicked(self):
 

oqtopus/utils/plugin_utils.py

@@ -95,8 +95,11 @@ class PluginUtils:
         return ini_text.value("version")
 
     @staticmethod
-    def init_logger():
-        PluginUtils.logsDirectory = f"{PluginUtils.plugin_root_path()}/logs"
+    def init_logger(logs_directory=None):
+        if logs_directory is not None:
+            PluginUtils.logsDirectory = logs_directory
+        else:
+            PluginUtils.logsDirectory = f"{PluginUtils.plugin_root_path()}/logs"
 
         directory = QDir(PluginUtils.logsDirectory)
         if not directory.exists():

{oqtopus-0.1.20.dist-info → oqtopus-0.1.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oqtopus
-Version: 0.1.20
+Version: 0.1.22
 Summary: A QGIS module manager
 Author-email: Damiano Lombardi <damiano@opengis.ch>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -346,9 +346,9 @@ License:                     GNU GENERAL PUBLIC LICENSE
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pyyaml
-Requires-Dist: pgserviceparser<3.0.0,>=2.3.0
-Requires-Dist: pum<2.0.0,>=1.1.2
+Requires-Dist: pgserviceparser<3.0.0,>=2.4.0
+Requires-Dist: pum<2.0.0,>=1.1.13
+Requires-Dist: PyYAML
 Requires-Dist: pydantic>=2.0
 Requires-Dist: psycopg<4.0.0,>=3.1.0
 Requires-Dist: requests<3.0.0,>=2.31.0

{oqtopus-0.1.20.dist-info → oqtopus-0.1.22.dist-info}/RECORD

@@ -12,12 +12,12 @@ oqtopus/gui/database_connection_widget.py,sha256=_SM9K-2dUmXMgjJzqdWrfutRnU4I0WD
 oqtopus/gui/database_create_dialog.py,sha256=Z7XK47EVs3S1GKWEGOZDE5a4cEWUgW4NcPzAD0JqyEg,8880
 oqtopus/gui/database_duplicate_dialog.py,sha256=Scc1eo8hmniAIyDDK_Qks1RgZn6MsDbtIokg9woEldA,4944
 oqtopus/gui/logs_widget.py,sha256=lxP0rZYUF4ahR7RtM3SJCbk5nk70SVC9Ien6TvBsflY,6698
-oqtopus/gui/main_dialog.py,sha256=7nxn4vL5fIege0qBPP1mrOp5jP0YWXFJ_k_ywGeKD8M,6362
+oqtopus/gui/main_dialog.py,sha256=aI1VE_EIsiSVEYsFQnLB3uzEiRe61s9iD9t0wu5fCYM,6464
 oqtopus/gui/module_selection_widget.py,sha256=57M9sM_VhD5lAfxqOxEPWUHiB2Ty6EQQkRnvAZ0VSv8,16116
 oqtopus/gui/module_widget.py,sha256=WEE0paMIbRDfJ2KvIByZtHK4H1TULXLBFb1c4ydQttg,8443
 oqtopus/gui/parameters_groupbox.py,sha256=ZXoIbTDrpoe_SfxyYr7mNbQOi0vHAJSW8cPIXzGKdmE,2938
 oqtopus/gui/plugin_widget.py,sha256=8av8KI3p8gnXOlSssB5-dFVvq4vaLfqGjY9NVSNiBb0,5757
-oqtopus/gui/project_widget.py,sha256=T34MyHzHgKw1Dl6V67MKPneSd9DDgrWhuhj7mrcvjSg,6696
+oqtopus/gui/project_widget.py,sha256=FhWvMBtQ6kw7NJ4pdCzNs48wMrA5ihjvcbplE4RMWbE,7281
 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
@@ -32,14 +32,14 @@ oqtopus/ui/plugin_widget.ui,sha256=osJ_QwzmXahV5fEHk4WfUjBBQ7jdsrL4pixiMF2jURA,2
 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/plugin_utils.py,sha256=ufPRakGPYPYqwCEElBKYYGILvxfEvrn_pG9tYP1Y174,5833
 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.20.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+oqtopus-0.1.22.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.20.dist-info/METADATA,sha256=L0mPS1xldApE8aF-eS68a2ArcpzYiJfFDQP5NCL_1W4,21475
-oqtopus-0.1.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-oqtopus-0.1.20.dist-info/top_level.txt,sha256=i4DHi21kcGIzrF8DlgsKj-UCENHg_NebTRac7cwt32A,14
-oqtopus-0.1.20.dist-info/RECORD,,
+oqtopus-0.1.22.dist-info/METADATA,sha256=wuvwY6p8oeCgrVdWDPoPjcLo9lf8se7Ku1JivoIQTgE,21476
+oqtopus-0.1.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+oqtopus-0.1.22.dist-info/top_level.txt,sha256=i4DHi21kcGIzrF8DlgsKj-UCENHg_NebTRac7cwt32A,14
+oqtopus-0.1.22.dist-info/RECORD,,