Move function to utils

MerginMaps · Nov 4, 2024 · b766621 · b766621
1 parent 8f8fdbe
commit b766621
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/Mergin/diff.py b/Mergin/diff.py
@@ -7,7 +7,7 @@
 
 from qgis.PyQt.QtCore import QVariant
 
-from qgis.PyQt.QtGui import QColor, QIcon
+from qgis.PyQt.QtGui import QColor
 
 from qgis.core import (
     QgsApplication,
@@ -530,17 +530,3 @@ def style_diff_layer(layer, schema_table):
         )
         r = QgsRuleBasedRenderer(root_rule)
         layer.setRenderer(r)
-
-
-def icon_for_layer(layer) -> QIcon:
-    geom_type = layer.geometryType()
-    if geom_type == QgsWkbTypes.PointGeometry:
-        return QgsApplication.getThemeIcon("/mIconPointLayer.svg")
-    elif geom_type == QgsWkbTypes.LineGeometry:
-        return QgsApplication.getThemeIcon("/mIconLineLayer.svg")
-    elif geom_type == QgsWkbTypes.PolygonGeometry:
-        return QgsApplication.getThemeIcon("/mIconPolygonLayer.svg")
-    elif geom_type == QgsWkbTypes.UnknownGeometry:
-        return QgsApplication.getThemeIcon("/mIconGeometryCollectionLayer.svg")
-    else:
-        return QgsApplication.getThemeIcon("/mIconTableLayer.svg")
diff --git a/Mergin/diff_dialog.py b/Mergin/diff_dialog.py
@@ -18,8 +18,8 @@
 from qgis.utils import iface, OverrideCursor
 
 from .mergin.merginproject import MerginProject
-from .diff import make_local_changes_layer, make_version_changes_layers, icon_for_layer
-from .utils import icon_path
+from .diff import make_local_changes_layer, make_version_changes_layers
+from .utils import icon_path, icon_for_layer
 
 ui_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), "ui", "ui_diff_viewer_dialog.ui")
 

diff --git a/Mergin/utils.py b/Mergin/utils.py
@@ -16,7 +16,7 @@
 
 from qgis.PyQt.QtCore import QSettings, QVariant
 from qgis.PyQt.QtWidgets import QMessageBox, QFileDialog
-from qgis.PyQt.QtGui import QPalette, QColor
+from qgis.PyQt.QtGui import QPalette, QColor, QIcon
 from qgis.core import (
     NULL,
     Qgis,
@@ -1573,3 +1573,18 @@ def parse_user_agent(user_agent: str) -> str:
         return "Mergin Maps Python Client"
     else:  # For uncommon user agent we display user agent as is
         return user_agent
+
+
+def icon_for_layer(layer) -> QIcon:
+    # Used in diff viewer and history viewer
+    geom_type = layer.geometryType()
+    if geom_type == QgsWkbTypes.PointGeometry:
+        return QgsApplication.getThemeIcon("/mIconPointLayer.svg")
+    elif geom_type == QgsWkbTypes.LineGeometry:
+        return QgsApplication.getThemeIcon("/mIconLineLayer.svg")
+    elif geom_type == QgsWkbTypes.PolygonGeometry:
+        return QgsApplication.getThemeIcon("/mIconPolygonLayer.svg")
+    elif geom_type == QgsWkbTypes.UnknownGeometry:
+        return QgsApplication.getThemeIcon("/mIconGeometryCollectionLayer.svg")
+    else:
+        return QgsApplication.getThemeIcon("/mIconTableLayer.svg")
diff --git a/Mergin/version_viewer_dialog.py b/Mergin/version_viewer_dialog.py
@@ -49,13 +49,14 @@
     icon_path,
     format_datetime,
     parse_user_agent,
+    icon_for_layer,
 )
 
 from .mergin.merginproject import MerginProject
 from .mergin.utils import bytes_to_human_size, int_version
 
 from .mergin import MerginClient
-from .diff import make_version_changes_layers, icon_for_layer
+from .diff import make_version_changes_layers
 
 
 ui_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), "ui", "ui_versions_viewer.ui")