Merge pull request #3878 from opengisch/backport-3875-to-release-2_6

[Backport release-2_6] A few fixes
opengisch · Feb 4, 2023 · aaa9ed3 · aaa9ed3 · qfield-fairy · Feb 4, 2023
2 parents 77e4062 + 214eee7
commit aaa9ed3
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 22 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -477,11 +477,7 @@
         <file>themes/qfield/nodpi/ic_reshape_tool_white_24dp.svg</file>
         <file>themes/qfield/nodpi/ic_ring_tool_white_24dp.svg</file>
         <file>themes/qfield/nodpi/ic_vertex_tool_white_24dp.svg</file>
-        <file>themes/qfield/hdpi/ic_view_green_48dp.png</file>
-        <file>themes/qfield/mdpi/ic_view_green_48dp.png</file>
-        <file>themes/qfield/xhdpi/ic_view_green_48dp.png</file>
-        <file>themes/qfield/xxhdpi/ic_view_green_48dp.png</file>
-        <file>themes/qfield/xxxhdpi/ic_view_green_48dp.png</file>
+        <file>themes/qfield/nodpi/ic_view_black_24dp.svg</file>
         <file>themes/qfield/hdpi/content-cut.png</file>
         <file>themes/qfield/mdpi/content-cut.png</file>
         <file>themes/qfield/xhdpi/content-cut.png</file>

diff --git a/images/themes/qfield/hdpi/ic_view_green_48dp.png b/images/themes/qfield/hdpi/ic_view_green_48dp.png
diff --git a/images/themes/qfield/mdpi/ic_view_green_48dp.png b/images/themes/qfield/mdpi/ic_view_green_48dp.png
diff --git a/images/themes/qfield/nodpi/ic_view_black_24dp.svg b/images/themes/qfield/nodpi/ic_view_black_24dp.svg
diff --git a/images/themes/qfield/nodpi/ic_view_green_48dp.svg b/images/themes/qfield/nodpi/ic_view_green_48dp.svg
diff --git a/images/themes/qfield/xhdpi/ic_view_green_48dp.png b/images/themes/qfield/xhdpi/ic_view_green_48dp.png
diff --git a/images/themes/qfield/xxhdpi/ic_view_green_48dp.png b/images/themes/qfield/xxhdpi/ic_view_green_48dp.png
diff --git a/images/themes/qfield/xxxhdpi/ic_view_green_48dp.png b/images/themes/qfield/xxxhdpi/ic_view_green_48dp.png
diff --git a/src/core/attributeformmodelbase.cpp b/src/core/attributeformmodelbase.cpp
@@ -262,8 +262,11 @@ void AttributeFormModelBase::updateAttributeValue( QStandardItem *item )
     QVariant attributeValue = mFeatureModel->data( mFeatureModel->index( fieldIndex ), FeatureModel::AttributeValue );
     item->setData( attributeValue.isNull() ? QVariant() : attributeValue, AttributeFormModel::AttributeValue );
     item->setData( mFeatureModel->data( mFeatureModel->index( fieldIndex ), FeatureModel::AttributeAllowEdit ), AttributeFormModel::AttributeAllowEdit );
-    //set item visibility to false in case it's a linked attribute
-    item->setData( !mFeatureModel->data( mFeatureModel->index( fieldIndex ), FeatureModel::LinkedAttribute ).toBool(), AttributeFormModel::CurrentlyVisible );
+    // set item editable state to false in case it's a linked attribute
+    if ( mFeatureModel->data( mFeatureModel->index( fieldIndex ), FeatureModel::LinkedAttribute ).toBool() )
+    {
+      item->setData( false, AttributeFormModel::AttributeEditable );
+    }
   }
   else if ( item->data( AttributeFormModel::ElementType ) == QStringLiteral( "qml" ) || item->data( AttributeFormModel::ElementType ) == QStringLiteral( "html" ) )
   {

diff --git a/src/core/layertreemodel.cpp b/src/core/layertreemodel.cpp
@@ -1208,6 +1208,28 @@ QgsRectangle FlatLayerTreeModelBase::nodeExtent( const QModelIndex &index, QgsQu
     }
   }
 
+  if ( extent.width() == 0.0 || extent.height() == 0.0 )
+  {
+    // If all of the features are at the one point, buffer the
+    // rectangle a bit. If they are all at zero, do something a bit
+    // more crude.
+    if ( extent.xMinimum() == 0.0 && extent.xMaximum() == 0.0 && extent.yMinimum() == 0.0 && extent.yMaximum() == 0.0 )
+    {
+      extent.set( -1.0, -1.0, 1.0, 1.0 );
+    }
+    else
+    {
+      const double padFactor = 1e-8;
+      const double widthPad = extent.xMinimum() * padFactor;
+      const double heightPad = extent.yMinimum() * padFactor;
+      const double xmin = extent.xMinimum() - widthPad;
+      const double xmax = extent.xMaximum() + widthPad;
+      const double ymin = extent.yMinimum() - heightPad;
+      const double ymax = extent.yMaximum() + heightPad;
+      extent.set( xmin, ymin, xmax, ymax );
+    }
+  }
+
   if ( buffer )
   {
     extent = extent.buffered( extent.width() * buffer );

diff --git a/src/qml/FeatureForm.qml b/src/qml/FeatureForm.qml
@@ -511,6 +511,8 @@ Page {
                 // - not set to editable in the widget configuration
                 // - not in edit mode (ReadOnly)
                 // - a relation in multi edit mode
+                property bool isAdding: form.state === 'Add'
+                property bool isEditing: form.state === 'Edit'
                 property bool isEnabled: !!AttributeEditable
                                          && form.state !== 'ReadOnly'
                                          && !( Type === 'relation' && form.model.featureModel.modelMode == FeatureModel.MultiFeatureModel )

diff --git a/src/qml/editorwidgets/RelationReference.qml b/src/qml/editorwidgets/RelationReference.qml
@@ -57,7 +57,7 @@ EditorWidgetBase {
     height: 48
 
     bgcolor: "transparent"
-    iconSource: Theme.getThemeIcon("ic_view_green_48dp")
+    iconSource: Theme.getThemeVectorIcon("ic_view_black_24dp")
 
     onClicked: {
         if ( relationReference.currentKeyValue !== undefined && relationReference.currentKeyValue !== '' ) {

diff --git a/src/qml/editorwidgets/UuidGenerator.qml b/src/qml/editorwidgets/UuidGenerator.qml
@@ -28,12 +28,13 @@ EditorWidgetBase {
       color: 'gray'
       text: {
         var displayValue = value !== undefined ? value : ''
-        if (isLoaded && isEnabled && (value === undefined || value == '')) {
+        if (isLoaded && isAdding && (value == undefined || value === '')) {
             displayValue = StringUtils.createUuid();
             valueChangeRequested(displayValue ,false);
         }
         return displayValue;
       }
+      elide: Text.ElideMiddle
   }
 
   Rectangle {