From 58d3c2684abc2e28f3dfa393bd346fddcb450053 Mon Sep 17 00:00:00 2001 From: Mathieu Pellerin Date: Mon, 30 Sep 2024 11:52:18 +0700 Subject: [PATCH] Make digitizing toolbar icons look splendy on all DPI screens --- images/images.qrc | 12 ++---------- .../qfield/hdpi/ic_add_vertex_white_24dp.png | Bin 592 -> 0 bytes .../qfield/hdpi/ic_remove_vertex_white_24dp.png | Bin 574 -> 0 bytes .../qfield/mdpi/ic_add_vertex_white_24dp.png | Bin 371 -> 0 bytes .../qfield/mdpi/ic_remove_vertex_white_24dp.png | Bin 365 -> 0 bytes .../qfield/nodpi/ic_add_vertex_white_24dp.svg | 2 ++ .../qfield/nodpi/ic_remove_vertex_white_24dp.svg | 2 ++ .../qfield/xhdpi/ic_add_vertex_white_24dp.png | Bin 747 -> 0 bytes .../qfield/xhdpi/ic_remove_vertex_white_24dp.png | Bin 728 -> 0 bytes .../qfield/xxhdpi/ic_add_vertex_white_24dp.png | Bin 1064 -> 0 bytes .../xxhdpi/ic_remove_vertex_white_24dp.png | Bin 1040 -> 0 bytes .../qfield/xxxhdpi/ic_add_vertex_white_24dp.png | Bin 1426 -> 0 bytes .../xxxhdpi/ic_remove_vertex_white_24dp.png | Bin 1394 -> 0 bytes src/qml/DigitizingToolbar.qml | 4 ++-- src/qml/OverlayFeatureFormDrawer.qml | 3 +-- 15 files changed, 9 insertions(+), 14 deletions(-) delete mode 100644 images/themes/qfield/hdpi/ic_add_vertex_white_24dp.png delete mode 100644 images/themes/qfield/hdpi/ic_remove_vertex_white_24dp.png delete mode 100644 images/themes/qfield/mdpi/ic_add_vertex_white_24dp.png delete mode 100644 images/themes/qfield/mdpi/ic_remove_vertex_white_24dp.png create mode 100644 images/themes/qfield/nodpi/ic_add_vertex_white_24dp.svg create mode 100644 images/themes/qfield/nodpi/ic_remove_vertex_white_24dp.svg delete mode 100644 images/themes/qfield/xhdpi/ic_add_vertex_white_24dp.png delete mode 100644 images/themes/qfield/xhdpi/ic_remove_vertex_white_24dp.png delete mode 100644 images/themes/qfield/xxhdpi/ic_add_vertex_white_24dp.png delete mode 100644 images/themes/qfield/xxhdpi/ic_remove_vertex_white_24dp.png delete mode 100644 images/themes/qfield/xxxhdpi/ic_add_vertex_white_24dp.png delete mode 100644 images/themes/qfield/xxxhdpi/ic_remove_vertex_white_24dp.png diff --git a/images/images.qrc b/images/images.qrc index b26b1c0ec2..531e4b5baa 100644 --- a/images/images.qrc +++ b/images/images.qrc @@ -60,16 +60,8 @@ themes/qfield/xxxhdpi/ic_create_white_24dp.png themes/qfield/nodpi/ic_clear_white_24dp.svg themes/qfield/nodpi/ic_add_white_24dp.svg - themes/qfield/hdpi/ic_add_vertex_white_24dp.png - themes/qfield/mdpi/ic_add_vertex_white_24dp.png - themes/qfield/xhdpi/ic_add_vertex_white_24dp.png - themes/qfield/xxhdpi/ic_add_vertex_white_24dp.png - themes/qfield/xxxhdpi/ic_add_vertex_white_24dp.png - themes/qfield/hdpi/ic_remove_vertex_white_24dp.png - themes/qfield/mdpi/ic_remove_vertex_white_24dp.png - themes/qfield/xhdpi/ic_remove_vertex_white_24dp.png - themes/qfield/xxhdpi/ic_remove_vertex_white_24dp.png - themes/qfield/xxxhdpi/ic_remove_vertex_white_24dp.png + themes/qfield/nodpi/ic_add_vertex_white_24dp.svg + themes/qfield/nodpi/ic_remove_vertex_white_24dp.svg themes/qfield/nodpi/ic_menu_white_24dp.svg themes/qfield/nodpi/ic_move_white_24dp.svg themes/qfield/nodpi/ic_location_white_24dp.svg diff --git a/images/themes/qfield/hdpi/ic_add_vertex_white_24dp.png b/images/themes/qfield/hdpi/ic_add_vertex_white_24dp.png deleted file mode 100644 index 2f958ff82eed3defbe7d9242b13841e7216e87e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 592 zcmV-W0ee&I;Pv{6HbjGDIPIQ-JIt}h?+y1nW`QV#`-?QVB-Q0;Es zC}!3Sdl#zKvbAZ&i`=#&eJWwVxpb#m3cQVDOergy>Ok#*Q`eKA)u2tsP|Bd381M`% zCuKYb3yB3%K~ZE0eDAQtWH7wYHK^bOjK|Z@!OIlwGC)ye8*Idr``}hjpc(Kfp8NuC z#GGn9ttIyV$^-|Eg2Ond0e>6|U1UY*P7yTXpkG%2jewtV&}VS7r_oBF76($rJ( diff --git a/images/themes/qfield/hdpi/ic_remove_vertex_white_24dp.png b/images/themes/qfield/hdpi/ic_remove_vertex_white_24dp.png deleted file mode 100644 index dcd5a504a9c91bc288b9c2b4beb5962c54459b22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 574 zcmV-E0>S->P)K!IhW0i&Qs{=9+-E>tjaY2_)3 zu51BQaiwM5kBeTLjGaz9EcMK4?m6?FbAIRCdo!8;&*V&d=Gci#muik}o03Zh8ME$( zIJ>ZBY*@@4XOisH;$TSDeWNeayQ$91XMSh zH}ZXB3f_gNjsDtn>_uYQ8Cg4_z=ilubrg7;j0vbiaOQfib3JI2AF8tj=U}y0#tX1C z^sKFb?|-$#bZB@k#pIuY$>{QP@G{l>?}4r8;wNw`6=)88j4plwH^SSDO2RV}qDtT- z3TnZhj;SQ>wMvM}gH{yu>k6PE_!$L#1~*fcRtB{wsCosl=i|iQ20N)h``}4*aSAk2 z4CF`{$cgwZvOF~CE@<{_acf~e7ly(VeFOJpF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10RTxv zK~y-)z0zN9L17RD@Co6Cb|GpNwSbC>JyfaaF0hM6bw5aGu!x42`}FHm!@d3_(!_b2 z^UcY3X68iP7>ZgZmUecQCR&P@+MjJ?vDP@9` R4JQBq002ovPDHLkV1gkhoGt(W diff --git a/images/themes/qfield/mdpi/ic_remove_vertex_white_24dp.png b/images/themes/qfield/mdpi/ic_remove_vertex_white_24dp.png deleted file mode 100644 index 8056bff611c85a957100a13eba2611061eb67ca1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 365 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1&H|4}AkB9egc*J!`b(2^F+}ZTB(haLi#V&RckrbZl-zIJo|Td(t^2i zUmN~iy~%cCMm8e9VjGhyFXIP`@JiW`oDr_&0P2nv*E50y=>)Nqd zuU^eMb}eC2^7{^s+}&p+%QWYwP3T&;vv=|0-ko__SL!e7-zoK0XAzQV2ZjQJr>mdK II;Vst0N44KegFUf diff --git a/images/themes/qfield/nodpi/ic_add_vertex_white_24dp.svg b/images/themes/qfield/nodpi/ic_add_vertex_white_24dp.svg new file mode 100644 index 0000000000..0b7c7d004c --- /dev/null +++ b/images/themes/qfield/nodpi/ic_add_vertex_white_24dp.svg @@ -0,0 +1,2 @@ + + diff --git a/images/themes/qfield/nodpi/ic_remove_vertex_white_24dp.svg b/images/themes/qfield/nodpi/ic_remove_vertex_white_24dp.svg new file mode 100644 index 0000000000..c654ce2e1c --- /dev/null +++ b/images/themes/qfield/nodpi/ic_remove_vertex_white_24dp.svg @@ -0,0 +1,2 @@ + + diff --git a/images/themes/qfield/xhdpi/ic_add_vertex_white_24dp.png b/images/themes/qfield/xhdpi/ic_add_vertex_white_24dp.png deleted file mode 100644 index 64deca078dd854bb1abe81da55493ad362576211..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 747 zcmV*w{GurVG zHMM3bjQl`R-(ee{S(+`i?tXA#9;oQ;j>;ms= z#x;xp0U?-_aFYRl!h$NyL?nTvI_x?Bk><>tN7@ty3J5`766$n$!C}?4smKC797{^p z3(iPrHK0~P1caa@DMc^zMnd^m0#796wHMmfZmtu7oTPm4LJbLB_Bsr+wuY1K<`r;y zz=|bs!Rdv+AmB_P`%k6lY!3OBq*T37MM8yG0%MX=_CnJVT8kx6);HSOj*5)mu-ld3 zXk>wcBz*N5c0w?(ZnI>hac%KM5@!7ggQ^!MA_+`|TsT7TQc_O1-tm=rQ(c+Q^)=9^ zCQ^-bN0)xTO3xm>LBtW&o?GS;^z&Y=yBkJcR@53pM(%H@=;4LQ({WSLPnZmT3}P{* zau4gl56#m@?S^ZT)yUJMX{&-Oc33xh{0boi2~|(O?U)i{8(R77ePDDU$IW dY3KIO*)Q)hF2#Wd`YQkc002ovPDHLkV1j2MOV0oR diff --git a/images/themes/qfield/xhdpi/ic_remove_vertex_white_24dp.png b/images/themes/qfield/xhdpi/ic_remove_vertex_white_24dp.png deleted file mode 100644 index 8a7e2f0ffd07da31337b57bea816bcb1ee1729e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 728 zcmV;}0w?{6P)9&yowH_o1oxlKZE^}pr6F-gpaJw-$KTN=Bt9nKyjT02fr zm7Enn@_nJc#nOIfNp>XfUiZd4lGR&*+9Js(m3i2uX<3uA9|_#nDZZ=hWpCHEZ8aIn znA0k|$&fo?Ng6X2sz6*`_JaFJYtNjAp@&OODb(n3f}`TvMCby2oGO)!6P#1fdZg)F zR4N50^jbl=NCh4%l~+z^*K>103S^badnZ&^&}G{*&FC zZp1OM=Z<~}26-oWcl^k!Lamb0lD{sihvzz1_qNa*On2`nOlIWlVN>gKfdpH&NmeCC zpNFmTwzb2iwnd3aKmCeRicF9tiHS*)EKewkYt`Wd{Mg|xhuS|N2iy*0oPL&R`ieJs z%BAqrafk(Kp5is;xf1r%RqD7qwB?_cnN7{M(bMX^5Nv}3kkfeM70000< KMNUMnLSTZk?nd_j diff --git a/images/themes/qfield/xxhdpi/ic_add_vertex_white_24dp.png b/images/themes/qfield/xxhdpi/ic_add_vertex_white_24dp.png deleted file mode 100644 index 3a4c0bfe40e6d8110dc5a819de419d2806016210..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1064 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 diff --git a/images/themes/qfield/xxxhdpi/ic_remove_vertex_white_24dp.png b/images/themes/qfield/xxxhdpi/ic_remove_vertex_white_24dp.png deleted file mode 100644 index 0b821adfc9c5b04b8886d1b6b00c7d341edcb2d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1394 zcmV-&1&#WNP)k8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11pi4y zK~#9!?VC+(R8yzM5{PaU*$l5({e4^z$n^r#;)$ z)bV9m*I&^~%EU$$Dc<1gvUa{8;RXEFd{^evzfGepYil{k4MTh1uu3=lMt(7Hc8$H% zIGUK`cX3PM?OAt4!@L6i)1Doa zZHf@CbB}X_=M;J8B~Q=#ZHk5TiBn@+6(6+M^IEG<;dPU9^n*WU3?{sl{BWM^MQG%732{(7a~9h1?%#0D}UWqvk4Of=Xwg0c;o0jGC)V2`bG7 z&uJC|FYAQICd~s7+n9zx14s&wO`8WGl6{Fl1E?1s``tW%qM#BDG=P}!*q{G{0G9j` zTJoDXyVTR@l0V2sD!P;~XR9l$m^&??*=4TMT2bZnRr}?1B{eh;IA~}h5hnd+q%HHa z7p^FV zwucTRUJ`QL?!;%#i+p<=jIxuWCph!zYlYNn-s$y1y;K;*{+yJ|BF{Vf&Zcc{vyw~HG5P!E2n)g z@Ro9P|FC<*F~*fNLPlRwrB-SkZ_8&!w3^+r>RYAx92+zpTY07ZDQzWW*|E!&E?Nx0Y#SkckuN--J5Kc!9u#-FAUjh{Yf!g=C_q8?W4#4 zys`1J?BIF&X)0gzQbiMcqzmj)`P{SiiI_5}mdaI5Ge{TfNRl8*lsb|;#C8TbCGkA+ zt~#tG^OOl7@!L-{^y{~0c z?=%>lw< 1 round: true bgcolor: Theme.darkGray @@ -162,7 +162,7 @@ QfVisibilityFadingRow { Theme.darkGray; } } - iconSource: Theme.getThemeIcon("ic_add_vertex_white_24dp") + iconSource: Theme.getThemeVectorIcon("ic_add_vertex_white_24dp") iconColor: enabled ? "white" : Theme.darkGraySemiOpaque property bool lastAdditionAveraged: false diff --git a/src/qml/OverlayFeatureFormDrawer.qml b/src/qml/OverlayFeatureFormDrawer.qml index cb16e7c7fa..b195f84504 100644 --- a/src/qml/OverlayFeatureFormDrawer.qml +++ b/src/qml/OverlayFeatureFormDrawer.qml @@ -69,8 +69,7 @@ Drawer { FeatureForm { id: overlayFeatureForm - height: parent.height - width: parent.width + anchors.fill: parent visible: true topMargin: overlayFeatureFormDrawer.y == 0 ? mainWindow.sceneTopMargin : 0.0