improved tooltip and warning box

opengisch · Oct 30, 2024 · d69c8da · d69c8da
1 parent c4f75d6
commit d69c8da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/QgisModelBaker/gui/ili2db_options.py b/QgisModelBaker/gui/ili2db_options.py
@@ -147,7 +147,7 @@ def __init__(self, parent=None, remove_create_tid_group=True):
             self.create_gpkg_multigeom_checkbox.setToolTip(
                 """<html><head/><body>
             <p>If the INTERLIS model has classes that contain <span style=" font-weight:600;">multiple geometries</span>, tables with multiple geometry columns can be created in <span style=" font-weight:600;">GeoPackage</span>.</p>
-            <p>This function is not standardized and such tables with multiple geometries require <span style=" font-weight:600;">GDAL version &gt;= 3.8</span> to run in QGIS (your current QGIS version is <span style=" font-weight:600;">{qgis_version}</span> with GDAL <span style=" font-weight:600;">{gdal_version}</span>, but note that others with lower 3.8 versions <span style=" font-weight:600;">will not be able </span>to read such tables in the created QGIS project.</p>
+            <p>This function is not standardized and such tables with multiple geometries require <span style=" font-weight:600;">GDAL version &gt;= 3.8</span> to run in QGIS (yours is <span style=" font-weight:600;">{gdal_version}</span>, but note that others with lower 3.8 versions <span style=" font-weight:600;">will not be able </span>to read such tables in the created QGIS project.)</p>
             </body></html>""".format(
                     qgis_version=Qgis.QGIS_VERSION,
                     gdal_version=gdal.VersionInfo("RELEASE_NAME"),

diff --git a/QgisModelBaker/gui/workflow_wizard/project_creation_page.py b/QgisModelBaker/gui/workflow_wizard/project_creation_page.py
@@ -730,7 +730,7 @@ def _multigeom_gpkg(self):
                 """
                 <html><head/><body style="background-color:powderblue;">
                      <p><b>This GeoPackage contains at least one table with multiple geometries</b></p>
-                    <p>These tables require <span style=" font-weight:600;">GDAL version &gt;= 3.8</span> to run in QGIS.<br/>Your current QGIS version is <span style=" font-weight:600;">{qgis_version}</span> with GDAL <span style=" font-weight:600;">{gdal_version}</span>.</p>
+                    <p>These tables require <span style=" font-weight:600;">GDAL version &gt;= 3.8</span> to run in QGIS, yours is <span style=" font-weight:600;">{gdal_version}</span>.</p>
                     <p>Means this won't work.</p>
                 </body></html>
                 """.format(
@@ -744,8 +744,8 @@ def _multigeom_gpkg(self):
                 """
                 <html><head/><body style="background-color:powderblue;">
                     <p><b>This GeoPackage contains at least one table with multiple geometries</b></p>
-                    <p>These tables require <span style=" font-weight:600;">GDAL version &gt;= 3.8</span> to run in QGIS.<br/>Your current QGIS version is <span style=" font-weight:600;">{qgis_version}</span> with GDAL <span style=" font-weight:600;">{gdal_version}</span>.</p>
-                    <p>But note that others with lower 3.8 version <span style=" font-weight:600;">will not be able </span>to read such tables in the created QGIS project.</p>
+                    <p>These tables require <span style=" font-weight:600;">GDAL version &gt;= 3.8</span> to run in QGIS, yours is <span style=" font-weight:600;">{gdal_version}</span>.</p>
+                    <p>But note that others with lower 3.8 version <span style=" font-weight:600;">will not be able</span> to read such tables in the created QGIS project.</p>
                 </body></html>
                 """.format(
                     qgis_version=Qgis.QGIS_VERSION,
@@ -754,12 +754,6 @@ def _multigeom_gpkg(self):
             )
         return True
 
-    def _multiple_geometry_gpkg_table(self):
-        if self.db_connector.multiple_geometry_tables() > 0:
-            return True
-
-        return false
-
     def help_text(self):
         logline = self.tr(
             "Most of the time you won't need to change anything here.<br />Just press Generate :-)"