Merge pull request #5009 from opengisch/lock_icon

Use vector icon for the locked layer badge to fix visual glitch.
opengisch · Feb 7, 2024 · 4f72239 · 4f72239 · qfield-fairy · Feb 7, 2024
2 parents e282d88 + ff4b409
commit 4f72239
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 7 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -486,11 +486,6 @@
         <file>themes/qfield/xhdpi/more_horiz.png</file>
         <file>themes/qfield/xxhdpi/more_horiz.png</file>
         <file>themes/qfield/xxxhdpi/more_horiz.png</file>
-        <file>themes/qfield/hdpi/ic_lock_black_24dp.png</file>
-        <file>themes/qfield/mdpi/ic_lock_black_24dp.png</file>
-        <file>themes/qfield/xhdpi/ic_lock_black_24dp.png</file>
-        <file>themes/qfield/xxhdpi/ic_lock_black_24dp.png</file>
-        <file>themes/qfield/xxxhdpi/ic_lock_black_24dp.png</file>
         <file>themes/qfield/mdpi/ic_navigation_flag_red_24dp.png</file>
         <file>themes/qfield/hdpi/ic_navigation_flag_red_24dp.png</file>
         <file>themes/qfield/xhdpi/ic_navigation_flag_red_24dp.png</file>

diff --git a/images/themes/qfield/hdpi/ic_lock_black_24dp.png b/images/themes/qfield/hdpi/ic_lock_black_24dp.png
diff --git a/images/themes/qfield/mdpi/ic_lock_black_24dp.png b/images/themes/qfield/mdpi/ic_lock_black_24dp.png
diff --git a/images/themes/qfield/xhdpi/ic_lock_black_24dp.png b/images/themes/qfield/xhdpi/ic_lock_black_24dp.png
diff --git a/images/themes/qfield/xxhdpi/ic_lock_black_24dp.png b/images/themes/qfield/xxhdpi/ic_lock_black_24dp.png
diff --git a/images/themes/qfield/xxxhdpi/ic_lock_black_24dp.png b/images/themes/qfield/xxxhdpi/ic_lock_black_24dp.png
diff --git a/src/core/identifytool.cpp b/src/core/identifytool.cpp
@@ -118,7 +118,11 @@ QList<IdentifyTool::IdentifyResult> IdentifyTool::identifyVectorLayer( QgsVector
     if ( !temporalFilter.isEmpty() )
       req.setFilterExpression( temporalFilter );
     req.setLimit( QSettings().value( "/QField/identify/limit", 200 ).toInt() );
+#if _QGIS_VERSION_INT >= 33500
+    req.setFlags( Qgis::FeatureRequestFlag::ExactIntersect );
+#else
     req.setFlags( QgsFeatureRequest::ExactIntersect );
+#endif
 
     QgsAttributeTableConfig config = layer->attributeTableConfig();
     if ( !config.sortExpression().isEmpty() )

diff --git a/src/core/locator/activelayerfeatureslocatorfilter.cpp b/src/core/locator/activelayerfeatureslocatorfilter.cpp
@@ -86,7 +86,11 @@ QStringList ActiveLayerFeaturesLocatorFilter::prepare( const QString &string, co
     req.setSubsetOfAttributes( qgis::setToList( mDispExpression.referencedAttributeIndexes( layer->fields() ) ) );
     if ( !mDispExpression.needsGeometry() )
     {
+#if _QGIS_VERSION_INT >= 33500
+      req.setFlags( Qgis::FeatureRequestFlag::NoGeometry );
+#else
       req.setFlags( QgsFeatureRequest::NoGeometry );
+#endif
     }
     QString enhancedSearch = searchString;
     enhancedSearch.replace( ' ', '%' );
@@ -159,7 +163,11 @@ QStringList ActiveLayerFeaturesLocatorFilter::prepare( const QString &string, co
   QgsFeatureRequest req;
   if ( !mDispExpression.needsGeometry() )
   {
+#if _QGIS_VERSION_INT >= 33500
+    req.setFlags( Qgis::FeatureRequestFlag::NoGeometry );
+#else
     req.setFlags( QgsFeatureRequest::NoGeometry );
+#endif
   }
   req.setFilterExpression( expression );
   if ( isRestricting )

diff --git a/src/core/locator/featureslocatorfilter.cpp b/src/core/locator/featureslocatorfilter.cpp
@@ -64,7 +64,11 @@ QStringList FeaturesLocatorFilter::prepare( const QString &string, const QgsLoca
     QgsFeatureRequest req;
     req.setSubsetOfAttributes( expression.referencedAttributeIndexes( layer->fields() ).values() );
     if ( !expression.needsGeometry() )
+#if _QGIS_VERSION_INT >= 33500
+      req.setFlags( Qgis::FeatureRequestFlag::NoGeometry );
+#else
       req.setFlags( QgsFeatureRequest::NoGeometry );
+#endif
     QString enhancedSearch = string;
     enhancedSearch.replace( " ", "%" );
     req.setFilterExpression( QStringLiteral( "%1 ILIKE '%%2%'" )

diff --git a/src/core/utils/layerutils.cpp b/src/core/utils/layerutils.cpp
@@ -122,7 +122,11 @@ QgsAbstractVectorLayerLabeling *LayerUtils::defaultLabeling( QgsVectorLayer *lay
     case Qgis::GeometryType::Polygon:
     {
       settings.placement = Qgis::LabelPlacement::AroundPoint;
+#if _QGIS_VERSION_INT >= 33500
+      settings.obstacleSettings().setType( QgsLabelObstacleSettings::ObstacleType::PolygonBoundary );
+#else
       settings.obstacleSettings().setType( QgsLabelObstacleSettings::PolygonBoundary );
+#endif
       break;
     }
 

diff --git a/src/qml/LayerTreeItemProperties.qml b/src/qml/LayerTreeItemProperties.qml
@@ -333,7 +333,7 @@ Popup {
         Text {
           id: lockText
 
-          property var padlockIcon: Theme.getThemeIcon('ic_lock_black_24dp')
+          property var padlockIcon: Theme.getThemeVectorIcon('ic_lock_black_24dp')
           property var padlockSize: fontMetrics.height - 5
 
           property bool isReadOnly: index !== undefined && layerTree.data(index, FlatLayerTreeModel.ReadOnly)

diff --git a/src/qml/Legend.qml b/src/qml/Legend.qml
@@ -242,7 +242,7 @@ ListView {
         bgcolor: 'transparent'
         opacity: 0.5
 
-        icon.source: Theme.getThemeIcon( 'ic_lock_black_24dp' )
+        icon.source: Theme.getThemeVectorIcon( 'ic_lock_black_24dp' )
         icon.color: Theme.mainTextColor
 
         onClicked: {