From 551fd5754bb60ada5990a4b6a40b2b09494c1edd Mon Sep 17 00:00:00 2001
From: Mathieu Pellerin <nirvn.asia@gmail.com>
Date: Sat, 4 Feb 2023 09:11:30 +0700
Subject: [PATCH 1/4] Fix UUID edit widget not creating UUIDs when in read-only
 mode

---
 src/qml/FeatureForm.qml                 | 2 ++
 src/qml/editorwidgets/UuidGenerator.qml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/qml/FeatureForm.qml b/src/qml/FeatureForm.qml
index ff491ad3c5..4d17def2b9 100644
--- 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/UuidGenerator.qml b/src/qml/editorwidgets/UuidGenerator.qml
index 9046684e6e..b21b340e04 100644
--- 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 {

From 9f0b11df0580897db3c106238f2e4313d0afa74a Mon Sep 17 00:00:00 2001
From: Mathieu Pellerin <nirvn.asia@gmail.com>
Date: Sat, 4 Feb 2023 08:55:14 +0700
Subject: [PATCH 2/4] Fix layer tree node extent breaks map canvas for 1-point
 vector layers (fixes #3871)

---
 src/core/layertreemodel.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/core/layertreemodel.cpp b/src/core/layertreemodel.cpp
index eae817b066..90823b9be6 100644
--- 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 );

From c1b354fd6fb92397c598eb71991dbc228d9c29a6 Mon Sep 17 00:00:00 2001
From: Mathieu Pellerin <nirvn.asia@gmail.com>
Date: Sat, 4 Feb 2023 10:08:07 +0700
Subject: [PATCH 3/4] Fix blurry show (parent) feature button, make it black to
 better sit alongside other widgets

---
 images/images.qrc                                |   6 +-----
 images/themes/qfield/hdpi/ic_view_green_48dp.png | Bin 1504 -> 0 bytes
 images/themes/qfield/mdpi/ic_view_green_48dp.png | Bin 1087 -> 0 bytes
 .../themes/qfield/nodpi/ic_view_black_24dp.svg   |   4 ++++
 .../themes/qfield/nodpi/ic_view_green_48dp.svg   |  13 -------------
 .../themes/qfield/xhdpi/ic_view_green_48dp.png   | Bin 2020 -> 0 bytes
 .../themes/qfield/xxhdpi/ic_view_green_48dp.png  | Bin 2992 -> 0 bytes
 .../themes/qfield/xxxhdpi/ic_view_green_48dp.png | Bin 4090 -> 0 bytes
 src/qml/editorwidgets/RelationReference.qml      |   2 +-
 9 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 images/themes/qfield/hdpi/ic_view_green_48dp.png
 delete mode 100644 images/themes/qfield/mdpi/ic_view_green_48dp.png
 create mode 100644 images/themes/qfield/nodpi/ic_view_black_24dp.svg
 delete mode 100644 images/themes/qfield/nodpi/ic_view_green_48dp.svg
 delete mode 100644 images/themes/qfield/xhdpi/ic_view_green_48dp.png
 delete mode 100644 images/themes/qfield/xxhdpi/ic_view_green_48dp.png
 delete mode 100644 images/themes/qfield/xxxhdpi/ic_view_green_48dp.png

diff --git a/images/images.qrc b/images/images.qrc
index 49074341ce..41a9f1db90 100644
--- 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
deleted file mode 100644
index ec5fdaaadb88aecc7063e2b7461b58cd4b301b51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1504
zcmV<61t0o}P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm000&x
z000&x0ZCFM@Bjb+8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11#L-0
zK~#9!?OIuE97Paa5NEhg0YVUhwcYK7fN;ba4sm^u5DxJL;gCpzxQ}rE(6dRLa7BVY
zzJQ=8fB->kkPsjF0ps22852Z;Nkj;V9YBCTgG~-oHPhk)wvU~j*<D-xq|#dJp4yt~
z?&??7RVsOSczAetczAetczAetczAfYV1;0(1|hkL3sU8Rz0U<51la{L2C`4enEY-~
zjtO{37VvuIlxgXdYFs`KUUDVKHz1P^vL75f1fRV;BD1HoQ}~9NhXo<MF9)Y+1e_Jo
zCHPxY%P|po3SQv1;vDlo`85!9>FZm&4()8`gyc3bc6$pQ^IzEpE9%zHbIiuGPX@z2
z$nZjcgABv7U%_V|$lFr-<afg$dz#k^fgNn>i~wAxSIQH|#`tk~@lS9&a8aJSdf@cK
zjm{T6GjJ?C`y>zPdib2M{H@Vy)O~qdodYlWu;mO3c)5pqYxD%?)hfy-LU4WrbVe4x
z3%0QbTJM?3(g9%PDhmVSAnv|Kr|QKo$x%VXZV5v6IIOPKD9PV~-OM*tj?_+2$gY#e
zzTS?Iu0Wex7jp!C&0y3B@RWsovUH$2pqDSi?FM82(&&Nzv5$F7<|y^RZ-Arj#4V+@
z2^`-l=kyw!(~sLg_58|j&pi&ttW8N@69h42@2nEDjxlV#PYt}OTC8&-dXIL$hm;#u
z%`8|En;nkvExbm{x~(4w@~AG52N7Ld%xM*p%QQcXr_+3`b7OK^6Q`Ya`(i$4;A0Ck
zwoX)IdP%-3XXyN6H3V=x5Nw|Ad1SaUDb0rvhIGKhnsLICiEFImC*5|<5_i_Bw-vj=
z;`wLuX3dz+m}v-`r=%efS(6XfNsdz0OtPm<&*MzN*gp$ME5<P3TX41KlukBK5F_3Y
zJqLrL9~8@cy$!dJq^_9U3&^J(XTy`Vp^oqI9UWFrQm$xpT<)-$JsAtWC@?ww+{%W5
z%JDFEXRfE346Hj9hTU#k`j81}Q4X50Epb51x<jGkXJG7yWGG#*yA%osZE5?m8ab=z
z636nGooSsOr4@ok0efK<Qdn<nRC%tojyk=xXa_aJX>hE9!HWz>JFB@mNE%dZkt|{t
z=is2PGpry;HX9eCYPMU957C*$R}m{`*jFG_lWrGN8w6>x!$qMC^b<t}Y1;s+3DVm$
z1?f~NT|DiN`H<b~N)(4(h@z}I7UG~FVh_3zMYfr5xay!hYR(O7H<0T*W0`9FQGkPf
z=Yw5GTdd&c)d8Mdol_l%tZ_<KA!o~d^$5Du!a11H?^Wn{Gq-GBu7Yh&<&KaJ<ae|K
z;WGqQh@UrV4u~IZR$r6%>j{S#cPyBV=20*+H8G^k5$fVzRdioe)HToDE+to)dTerV
z&UdK8qU5T{|Jb5}i}q}psc5ge|4OQpX-sRTXpb#1Z|Sy0QnZiQXZll*zR;?hjaQwo
zePS{P#(e~`Tcc+;tjZ5zQZCS4`^dyvzkNgYQfn^`BevY;;t&kGR;TLajkAxyBD>rg
zub|-HX^`!iVVJ1vE!%5?HeEfF`z^1YqqMT9zAtO$>N$0$#f>V)qKGbOZ)Zo^STJgx
zI|<r{1$S&LFs+b(n-^ksh2&CwP2_eXSZ?Wv4v*fr>m-O1?`1fZ_9T~qDM#v0f_ECg
z`{j3AGPS=%bRF7M>NF$`2S~!&*Fd!uV^^t@feaT6eFEf{7CL4Z92$>hE?cw%X)TB?
zvh3r@Dgw(D9p9U1k*uDBJv!1^`yCvzFKNaCiczh1S4z_nvY&B2vRdFj@5*32BAdte
zN*PPO!~ek;9E%BYM+ROG4-XFy4-XFy4-XFy4-b#2g?|7Sqaq74tBMQ&0000<MNUMn
GLSTZl3AauF

diff --git a/images/themes/qfield/mdpi/ic_view_green_48dp.png b/images/themes/qfield/mdpi/ic_view_green_48dp.png
deleted file mode 100644
index d4ae6602d311540c31d53f290bfa376293ed0e8b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1087
zcmV-F1i<@=P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000id
z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11I$T8
zK~!ko?N~`q6hRaojT$vBQIDb`VpsKy!~^0I4}u!wdUp8%E(awVz1K9T7!@yS<g6am
z#N|vPNSx{J0Wpf(K`;vLQNTbVjPG?%V7j_`rk5GOq+e3$PItYfs^0tFdliX<6jDeb
zg%naq|2eVd>KROzH^y~xhH2y;(`X8wJ@6bfhw%>I=v^466)m~}c_!WPx^{Ur7}o$s
zeS?wqIDRpeHYv$yY~l@92?4_&ff1uV4Ce>Rc*qh|D!So~Z6$MH*Uo~%;XFpciO4VE
z*=i2sJ>Mw}!Mr-uQ5-+lV#{II+Z~h-GF84A*X8~7DS3sH4EzW44&Yqi`Qsof#h#Xz
z6x4VnMK^)qK7q0?ag81ag$pc;eG!|bsAMzzKZFC{o3zTAmN~!^*GMhO5Xk+6fnFHn
z5iv|O$yP7|<05bPxddIpRB{DQ>Zjc(_@>iF))rgLF9iNy%E-*-=~t3cRj^>y%2$D)
z&$eAxrCkmS?R62fy-bzX+gwy9TLt`I5iooif1#DkhoE}L34C9dAS>-ICar~k10Im4
zU(slVc*BgGkv;b<xa2(VL95dnoS<&jPD^d`z~2oe-r@5#9~Xu^RVuSDf?V@td^{E1
z#$o)BlRrWr9`l<6;wn9oBkr=HdKC23xU)VTnFb8cEs6kX98XH6Z2^*4tK%k`2$ene
z8QPYA_jS6DW7JqWGF_Y-D(4E&!^`-~noDO3WrI%muUj`#-s2)+8QF833EU|UN(Cz=
zz~>zyJW01$=gTcF79h7+70BD2-3J3M*aAeTmgSz+TrfX&gFbsXCAyOf8MV;_x)5yU
zZnr_)$*ufEjs-vQzW`^K5Cn0Dt02xW*Kja8EXtmy%aNnL7ogL_E@5;8<H2L~DPQMK
zp-1Gen2g~6D<2E!a!zFQgVlBDRiCAVEyH$;Py@>XEDt;w|6A0FF+El;C?($bDka8S
zMq9ay#oZ1&<VjUn2D>o+BTJEWf?{r`Kvy3^b+B^UG;F|4IeosfViA154C9Bu@b6eQ
z<D6`s2CZyirkozNosv!~3)vI&iW?eIi$?HqflUz9ItOtW4H0(>fjn_lK8Yo>=#&EY
z0=9NAxn^1BYDDA~*dE?OV?`C~m`ef(WV*E5Ia*4+zC&7Cyrv!+Z?gf<>F4M|T}D}A
z=7}x`x8j<5q7<#Ew**{*N}%vTfv#0X04DDvU`)=%7WTRMcQ@@6)CiqZ;%YI2R;P^X
zLzSvV&KSE|#QXu@RC)*J7;~q>)nZ5?g%naqA%zr>{sB#S8DEvWJ2L<P002ovPDHLk
FV1h<m<oo~t

diff --git a/images/themes/qfield/nodpi/ic_view_black_24dp.svg b/images/themes/qfield/nodpi/ic_view_black_24dp.svg
new file mode 100644
index 0000000000..7f2e1fe6d9
--- /dev/null
+++ b/images/themes/qfield/nodpi/ic_view_black_24dp.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="M12 16q1.875 0 3.188-1.312Q16.5 13.375 16.5 11.5q0-1.875-1.312-3.188Q13.875 7 12 7q-1.875 0-3.188 1.312Q7.5 9.625 7.5 11.5q0 1.875 1.312 3.188Q10.125 16 12 16Zm0-1.8q-1.125 0-1.912-.788Q9.3 12.625 9.3 11.5t.788-1.913Q10.875 8.8 12 8.8t1.913.787q.787.788.787 1.913t-.787 1.912q-.788.788-1.913.788Zm0 4.8q-3.65 0-6.65-2.038-3-2.037-4.35-5.462 1.35-3.425 4.35-5.463Q8.35 4 12 4q3.65 0 6.65 2.037 3 2.038 4.35 5.463-1.35 3.425-4.35 5.462Q15.65 19 12 19Zm0-7.5Zm0 5.5q2.825 0 5.188-1.488Q19.55 14.025 20.8 11.5q-1.25-2.525-3.612-4.013Q14.825 6 12 6 9.175 6 6.812 7.487 4.45 8.975 3.2 11.5q1.25 2.525 3.612 4.012Q9.175 17 12 17Z"/>
+</svg>
diff --git a/images/themes/qfield/nodpi/ic_view_green_48dp.svg b/images/themes/qfield/nodpi/ic_view_green_48dp.svg
deleted file mode 100644
index 323979b7f4..0000000000
--- a/images/themes/qfield/nodpi/ic_view_green_48dp.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="48" height="48" version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <metadata>
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <path d="m24 13.733c6.8909 0 13.036 3.976 16.036 10.267-3 6.2907-9.1273 10.267-16.036 10.267s-13.036-3.976-16.036-10.267c3-6.2907 9.1455-10.267 16.036-10.267m0-3.7333c-9.0909 0-16.855 5.8053-20 14 3.1455 8.1947 10.909 14 20 14 9.0909 0 16.855-5.8053 20-14-3.1455-8.1947-10.909-14-20-14zm0 5.6c-4.5091 0-8.1818 3.7707-8.1818 8.4s3.6727 8.4 8.1818 8.4 8.1818-3.7707 8.1818-8.4-3.6727-8.4-8.1818-8.4z" fill="#80cc28" stroke-width="1.8422"/>
-</svg>
diff --git a/images/themes/qfield/xhdpi/ic_view_green_48dp.png b/images/themes/qfield/xhdpi/ic_view_green_48dp.png
deleted file mode 100644
index 6151863a940e8d5b5631c158a5c099d68cae13cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2020
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
CgV2@$

diff --git a/images/themes/qfield/xxhdpi/ic_view_green_48dp.png b/images/themes/qfield/xxhdpi/ic_view_green_48dp.png
deleted file mode 100644
index c2f0c44a55eb3f5ce199563eb9f0d9f0959bdb83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2992
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
I)O3vaAL`_|y8r+H

diff --git a/images/themes/qfield/xxxhdpi/ic_view_green_48dp.png b/images/themes/qfield/xxxhdpi/ic_view_green_48dp.png
deleted file mode 100644
index f51318cf5dfa47863485277f484ae1121115e340..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4090
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

diff --git a/src/qml/editorwidgets/RelationReference.qml b/src/qml/editorwidgets/RelationReference.qml
index 3bf6b0c923..ab23b1c291 100644
--- 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 !== '' ) {

From 214eee786452976d2c3b271d10c05dc51a985547 Mon Sep 17 00:00:00 2001
From: Mathieu Pellerin <nirvn.asia@gmail.com>
Date: Sat, 4 Feb 2023 09:33:16 +0700
Subject: [PATCH 4/4] Avoid hidding attribute linked to parent feature in
 relation, just disable

---
 src/core/attributeformmodelbase.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/core/attributeformmodelbase.cpp b/src/core/attributeformmodelbase.cpp
index 874ec9c8f5..868ad3c034 100644
--- 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" ) )
   {