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

oqtopus/gui/module_selection_widget.py

@@ -213,19 +213,19 @@ class ModuleSelectionWidget(QWidget, DIALOG_UI):
         self.module_information_label.setText(loading_text)
 
     def __seeChangeLogClicked(self):
-        if self.__current_module_package.type == ModulePackage.Type.FROM_ZIP:
+        if self.__current_module_package is None:
             QMessageBox.warning(
                 self,
                 self.tr("Can't open changelog"),
-                self.tr("Changelog is not available for Zip packages."),
+                self.tr("Please select a module and version first."),
             )
             return
 
-        if self.__current_module_package is None:
+        if self.__current_module_package.type == ModulePackage.Type.FROM_ZIP:
             QMessageBox.warning(
                 self,
                 self.tr("Can't open changelog"),
-                self.tr("Please select a module and version first."),
+                self.tr("Changelog is not available for Zip packages."),
             )
             return
 

oqtopus/gui/project_widget.py

@@ -1,11 +1,13 @@
 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
-from ..utils.qt_utils import CriticalMessageBox, QtUtils
+from ..utils.plugin_utils import PluginUtils, logger
+from ..utils.qt_utils import QtUtils
 
 DIALOG_UI = PluginUtils.get_ui_class("project_widget.ui")
 
@@ -35,41 +37,40 @@ class ProjectWidget(QWidget, DIALOG_UI):
             QtUtils.setFontItalic(self.project_info_label, True)
             return
 
-        # Search for QGIS project file in self.__package_dir
-        project_file_dir = os.path.join(asset_project.package_dir, "project")
-
         # Check if the directory exists
-        if not os.path.exists(project_file_dir):
+        if not os.path.exists(asset_project.package_dir):
             self.project_info_label.setText(
-                self.tr(f"Project directory '{project_file_dir}' does not exist.")
+                self.tr(f"Project directory '{asset_project.package_dir}' does not exist.")
             )
             QtUtils.setForegroundColor(self.project_info_label, PluginUtils.COLOR_WARNING)
             QtUtils.setFontItalic(self.project_info_label, True)
             return
 
-        self.__project_file = None
-        for root, dirs, files in os.walk(project_file_dir):
+        project_file = None
+        for root, dirs, files in os.walk(asset_project.package_dir):
             for file in files:
                 if file.endswith(".qgz") or file.endswith(".qgs"):
-                    self.__project_file = os.path.join(root, file)
+                    project_file = os.path.join(root, file)
                     break
 
-            if self.__project_file:
+            if project_file:
                 break
 
-        if self.__project_file is None:
+        if project_file is None:
             self.project_info_label.setText(
-                self.tr(f"No QGIS project file (.qgz or .qgs) found into {project_file_dir}."),
+                self.tr(
+                    f"No QGIS project file (.qgz or .qgs) found into {asset_project.package_dir}."
+                ),
             )
             QtUtils.setForegroundColor(self.project_info_label, PluginUtils.COLOR_WARNING)
-            QtUtils.setFontItalic(self.db_database_label, True)
+            QtUtils.setFontItalic(self.project_info_label, True)
             return
 
+        QtUtils.resetForegroundColor(self.project_info_label)
+        QtUtils.setFontItalic(self.project_info_label, False)
         self.project_info_label.setText(
-            self.tr(self.__project_file),
+            f"<a href='file://{asset_project.package_dir}'>{asset_project.package_dir}</a>",
         )
-        QtUtils.setForegroundColor(self.project_info_label, PluginUtils.COLOR_GREEN)
-        QtUtils.setFontItalic(self.db_database_label, False)
 
     def __projectInstallClicked(self):
 
@@ -81,15 +82,7 @@ class ProjectWidget(QWidget, DIALOG_UI):
             )
             return
 
-        if self.module_package_comboBox.currentData() is None:
-            QMessageBox.warning(
-                self,
-                self.tr("Error"),
-                self.tr("Please select a module version first."),
-            )
-            return
-
-        asset_project = self.module_package_comboBox.currentData().asset_project
+        asset_project = self.__current_module_package.asset_project
         if asset_project is None:
             QMessageBox.warning(
                 self,
@@ -98,46 +91,6 @@ class ProjectWidget(QWidget, DIALOG_UI):
             )
             return
 
-        package_dir = asset_project.package_dir
-        if package_dir is None:
-            CriticalMessageBox(
-                self.tr("Error"), self.tr("No valid package directory available."), None, self
-            ).exec()
-            return
-
-        # Search for QGIS project file in package_dir
-        project_file_dir = os.path.join(package_dir, "project")
-
-        # Check if the directory exists
-        if not os.path.exists(project_file_dir):
-            CriticalMessageBox(
-                self.tr("Error"),
-                self.tr(f"Project directory '{project_file_dir}' does not exist."),
-                None,
-                self,
-            ).exec()
-            return
-
-        self.__project_file = None
-        for root, dirs, files in os.walk(project_file_dir):
-            print(f"Searching for QGIS project file in {root}: {files}")
-            for file in files:
-                if file.endswith(".qgz") or file.endswith(".qgs"):
-                    self.__project_file = os.path.join(root, file)
-                    break
-
-            if self.__project_file:
-                break
-
-        if self.__project_file is None:
-            CriticalMessageBox(
-                self.tr("Error"),
-                self.tr(f"No QGIS project file (.qgz or .qgs) found into {project_file_dir}."),
-                None,
-                self,
-            ).exec()
-            return
-
         install_destination = QFileDialog.getExistingDirectory(
             self,
             self.tr("Select installation directory"),
@@ -148,15 +101,22 @@ class ProjectWidget(QWidget, DIALOG_UI):
         if not install_destination:
             return
 
-        # Copy the project file to the selected directory
+        # Copy the project files to the selected directory
         try:
-            shutil.copy(self.__project_file, install_destination)
+            # Copy all files from assset_project to install_destination
+            for item in os.listdir(asset_project.package_dir):
+                source_path = os.path.join(asset_project.package_dir, item)
+                destination_path = os.path.join(install_destination, item)
+
+                if os.path.isdir(source_path):
+                    shutil.copytree(source_path, destination_path, dirs_exist_ok=True)
+                else:
+                    shutil.copy2(source_path, destination_path)
+
             QMessageBox.information(
                 self,
                 self.tr("Project installed"),
-                self.tr(
-                    f"Project file '{self.__project_file}' has been copied to '{install_destination}'."
-                ),
+                self.tr(f"Project files have been copied to '{install_destination}'."),
             )
         except Exception as e:
             QMessageBox.critical(
@@ -167,4 +127,32 @@ class ProjectWidget(QWidget, DIALOG_UI):
             return
 
     def __projectSeeChangelogClicked(self):
-        self.__seeChangeLogClicked()
+        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))

oqtopus/ui/about_dialog.ui

@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AboutDialog</class>
+ <widget class="QDialog" name="AboutDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>634</width>
+    <height>426</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="1" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="QLabel" name="titleLabel">
+       <property name="font">
+        <font>
+         <family>Sans Serif</family>
+         <pointsize>16</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>TITLE</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="descriptionLabel">
+       <property name="font">
+        <font>
+         <pointsize>12</pointsize>
+        </font>
+       </property>
+       <property name="text">
+        <string>DESCRIPTION</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="aboutLabel">
+       <property name="font">
+        <font>
+         <italic>true</italic>
+        </font>
+       </property>
+       <property name="text">
+        <string>ABOUT</string>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="6" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;For any feedback, bugs or comments, please visit &lt;a href=&quot;https://github.com/Oqtopus/Oqtopus/issues&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;https://github.com/Oqtopus/Oqtopus/issues&lt;/span&gt;&lt;/a&gt;. &lt;/p&gt;&lt;p&gt;For the changelog: &lt;a href=&quot;https://github.com/Oqtopus/Oqtopus/releases&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;https://github.com/Oqtopus/Oqtopus/releases&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0">
+    <layout class="QGridLayout" name="gridLayout_2">
+     <item row="1" column="1">
+      <widget class="QLabel" name="label_8">
+       <property name="text">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/Oqtopus/Home/wiki/Oqtopus-open-source-Community#contributors&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Oqtopus open source contributors&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="openExternalLinks">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_11">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Python requirements:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Author:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QLabel" name="qgisMinimumVersionLabel">
+       <property name="text">
+        <string>QGIS MIN VERSION</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_6">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>QGIS minimum version:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>License:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_5">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Sponsor:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLabel" name="label_9">
+       <property name="text">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/Oqtopus/Home/wiki/Oqtopus-open-source-Community#sponsors&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Oqtopus open source sponsors&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="openExternalLinks">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLabel" name="label_7">
+       <property name="text">
+        <string>GNU GPL 2</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="0" column="1" rowspan="5">
+    <widget class="QLabel" name="iconLabel">
+     <property name="text">
+      <string>ICON</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

oqtopus/ui/database_connection_widget.ui

@@ -0,0 +1,148 @@
+<?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>413</width>
+    <height>183</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>Database</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QComboBox" name="db_services_comboBox">
+     <item>
+      <property name="text">
+       <string>Select PG service</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>tww_pully_admin</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>tww_pully_user</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>tdw_pully_admin</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>tdw_pully_user</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>jardins_admin</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_9">
+     <property name="text">
+      <string>PG Service config</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_11">
+     <property name="text">
+      <string>Status</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QLabel" name="db_servicesConfigFilePath_label">
+     <property name="font">
+      <font>
+       <italic>true</italic>
+      </font>
+     </property>
+     <property name="text">
+      <string>/Users/denisrouzaud/.pg_service.conf</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="1" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>PG Service</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QLabel" name="db_database_label">
+     <property name="font">
+      <font>
+       <italic>true</italic>
+      </font>
+     </property>
+     <property name="text">
+      <string>No database</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QLabel" name="db_moduleInfo_label">
+     <property name="font">
+      <font>
+       <italic>true</italic>
+      </font>
+     </property>
+     <property name="text">
+      <string>No module found</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2">
+    <widget class="QToolButton" name="db_operations_toolButton">
+     <property name="text">
+      <string>...</string>
+     </property>
+     <property name="popupMode">
+      <enum>QToolButton::InstantPopup</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>