From c7006898a65ebe37db9fc6b1db15daed2b42da23 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Wed, 14 Sep 2022 22:47:39 +0200 Subject: [PATCH] More icons as SVG --- src/icons/icons.qrc | 3 +- src/icons/images/checked_16px.png | Bin 0 -> 380 bytes src/icons/images/checked_16px@2x.png | Bin 0 -> 611 bytes src/icons/images/important.png | Bin 391 -> 0 bytes src/icons/images/important_16px.png | Bin 0 -> 813 bytes src/icons/images/important_16px@2x.png | Bin 0 -> 1880 bytes src/icons/images/unchecked_16px.png | Bin 0 -> 161 bytes src/icons/images/unchecked_16px@2x.png | Bin 0 -> 180 bytes src/icons/svg/checked_16px.svg | 89 +++++++++++++ src/icons/svg/important_16px.svg | 165 ++++++++++++++++++++++++ src/icons/svg/unchecked_16px.svg | 84 ++++++++++++ src/layui/layui/MarkerBrowserPage.ui | 2 +- src/layui/layui/layLayerControlPanel.cc | 2 +- src/layui/layui/rdbMarkerBrowserPage.cc | 2 +- 14 files changed, 343 insertions(+), 4 deletions(-) create mode 100644 src/icons/images/checked_16px.png create mode 100644 src/icons/images/checked_16px@2x.png delete mode 100644 src/icons/images/important.png create mode 100644 src/icons/images/important_16px.png create mode 100644 src/icons/images/important_16px@2x.png create mode 100644 src/icons/images/unchecked_16px.png create mode 100644 src/icons/images/unchecked_16px@2x.png create mode 100644 src/icons/svg/checked_16px.svg create mode 100644 src/icons/svg/important_16px.svg create mode 100644 src/icons/svg/unchecked_16px.svg diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc index d5dbdb137..86622eda1 100644 --- a/src/icons/icons.qrc +++ b/src/icons/icons.qrc @@ -91,7 +91,8 @@ images/home_24px.png images/home_24px@2x.png images/import.png - images/important.png + images/important_16px.png + images/important_16px@2x.png images/instance.png images/invert_16px.png images/invert_16px@2x.png diff --git a/src/icons/images/checked_16px.png b/src/icons/images/checked_16px.png new file mode 100644 index 0000000000000000000000000000000000000000..770b617a17ce7b8d72244c96e90ccd1b5eaf1cb2 GIT binary patch literal 380 zcmV-?0fYXDP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10SQS& zK~y-6rIImj!!Qg*AB(IKbcVcJY7GX%PWpbM}=Z6T^{6ixp4L4Hw> z6hQev2LRRgGDL*0-)4-F7~`sV&z}eQ(KJnJj8S8ZPSf~+`O{oZ?5q_ssV3x a&-w<>`|Kf`Gk1#s0000TtbYjg-=q94V!_Uaz&>q5P85Xy8#y2w{W}t)fHutp+}eg<)vIFl-bZ%6~L4s$4v@ zVGsly4hMt~%w{tz%L1S%3X&ut%QB>t#BmHj6h$bdTKT^3v)}Kl8f6<+bD$3_%VIX0 zkt7L9DWWI>s4dmcAdq08Te^*8o1qVtk-LlQrNbQ=Xs6XkB<+85GbWs zE|;Wf`aJ_fU&8Tt%zQpa2*KrYVYOOynt0DPeEA@1+68sO&^(I!?1DjEPw-Hl&G%YRd{&*P&(p;*#NzbU$%b6b4g#+G-F`n% zJ#y}ta|Mh3gN-iPuS244cDHX33H*I@{vpM{>l}({35f~c?9=|AVXE(tZV+(bYhYkI z>AZ4o8}|Z!hGh(#8z$RCB<#IoDHhEjEGRdZWx>{lJBznf`_4&yVlr{w_C^o&+0R=J z#^v0uX?>rc^=VE4?}^K{2Ta5ZFHdOOxN<4CLOgR@9=`!k(Y%uu*Y>=)ciEEBf^Vfr z<^K6hK8#cP_pbF~3}oq9Y^Jv}dfw~^k(Aq$rY$WkNLgfeY?s<pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10=h{= zK~y-6byMFV=t2BLfk&W!fb9p$=Iq!L%_u+6&5fKAW z2H;i}iUHW>IPT~={>4V#6I}xdFYQE!i zI;VMs;;2=tjV;#IWi}QUX?}d1R%d4DWp{T%&6wzNxh9FI=!&z`>73Rom5EucHoZ4I zOo@dBayuLZfL`?U(0)S$d5eqFMJiQdU|?V>=OrGGr-Nrqd}lVN<8yNq8XBUl`g(fa z)kOeker$|_W;2CNCi+xbnpQJ*w7k6B4gfMDVl6E#Pai52se5`o+v)E|CJ=zyX2YQ< zg5x+;Dipx!DIk@?Dwj(h6&5B(Mn<}cXhs5{?6cor-V~3k<7;a;+1&*Ia7rcOi3Ch~ zJ=B3fPUI(2srt+6YB>P21b`+SiD>R}9CwiHKM8=SwxA%obB6yfDbJ(1u@Ozx)ktS!o!5_Kl5~ZI z2LPfH0NXaZeSLxF|DF@%1_ORtt@yCAf~{Z>a*HKLU@DV|+iGgo0c-;Ryk75Po-y&Y zLXrNeQqix@PO7V_A^=pP)6s$3O+llP!X^`~7>%cD#zep0-*z4WwY9agj^5t4&!p1h zO(1g`iJ&6uT4}L>!eIcw_f#q^L?S1SzP>khyL~QqFhoTzmur$|Ol;NZV&B~EjCW#! zevgjQd!sSaVKBthjERGTgRic9AW2*Of{!4S%q%ai$Xd9uV{2nmAl(eL-S rT|Or61|bH(3_z2GqBuL}4r2*%*~Rh00000NkvXXu0mjf{z+(I literal 0 HcmV?d00001 diff --git a/src/icons/images/important_16px@2x.png b/src/icons/images/important_16px@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c4bfd85570615772b7191eddf873cb6ffcf7cc0d GIT binary patch literal 1880 zcmV-e2dDUnP)u+Z4)=uo&=|Vn$3^Fb73)aE5O5GTW3PA#)N?R)-6n-=l zf-Z^@!v7GVfGNw^6sDxX5v$ayv{Gpnk)({`Bxnk5o91gKgE+)rT!?+|efJ}_<%AG> z)1)5h{^hy&mPunB-2fDV8@WsU)e19$-7K7bjGSzKJv}{TV`F2^NF<^Qhr>nyFqupdqtO_zs;ZiZN z7)$26$+f_@NRrgh)YR0wapT4i0LtgHTCJhx=H?G1NopXX&HpR-?*9J%b55u8U+IPI zYIWkMMkDuCS5xHfT@w6$68wIO`u!C0`)Ts-UAlSWhMXSna=B&)1_sU%(d(%Y<^{|V z(ZSBn&Q7gX8wWreRjOoTVIhqejdZ`HgcjS|NnBW<_V?bS*7|yCJ#m6sPn@91Pd}xY z*GunPEL2=rm;gW;jYjC`==d`c9U!9IIY&f4_j-8c4QYaLn*XzAPM0<0AZ|U#v zKgaXD0Dz9D)$(ngr}3H^5AWWvch}Y zD=Hv8dD;v(eYCNc!x-7a5!Mz zyBBj8FJkcHBNsYS zA;|K;_VRK_!5}CeUw58IwVeFnaM%FAkWD}rjYf40zy_B4vSJ#|3J?5v^Ja+a#6R6$ zRw}`k3Fwh}Nz(*~rGP2tGRq-IdqBZ)*iu@GL>>gvYcs|&FlhpDgTW9Z0FNm*1;+Ck z4^)(tK&#Q@<$*a-1OYG_jWGbxYyvT}*&G9w6-7=0S;ugDWhEfX5GN;d&YMgwO9PY1 zlol`<0&`opZk+~z!5mTG^m=eSkCys+JoWo=v8f5ksVUI2XE_OcBnSim+qP|+1`y09 zaKEmuE&u?3XH0yNmf|!TINIB>1fculk8!ED7jyITP}=QKm6omxE(7?RAcz2P@ZiA! zfI!AbM4Ti^C#_a%2mm!Il{8pbNW&Tp{e$P}E1ix;^m+<5G|BN8s@=UCf4P1gBje+lzQsrcEgcSRz_EC{TTY~!gLkh55xvk`#bEi6cLOG`?(+dX^w^y%9G zzD(OQ1Q=sUj^jS*>gw|GJTKf#BoyZ*X~m(G9zVt=xBEGea*t=(9tu4N-nh6(A4a1J ztyU{sy?WKhaoi{CDrF+tn=Q#+D=0|bO6984Pr%x0m8R--;ZV zaXRT&217=YUA}zzPeiomg}_+^7!e)F7NwSyC>^ugDSZ7pEesFSA6r|g?bIonxN(D? z4iD4Zu3Z##I4D?DMDJTHRFo2>JkJXkE?l^hwanMprB-l zYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt+0BlY3Nje*FdOa+ z|2O6GQjSTc{0{SErZ|ePs&W%b-_*w{7V$v*u(kc0SXTK0n+F?!IvG4&{an^LB{Ts5 DEL<MC@5Lt z8c`CQpH@mmtT}V`<;yxP?4jji(^Pc>)Y!ac^MRVm=BsK z{h#W5l#5en{;9eC?}Qde>@khx+mOHFm8=ryhXYJZEF1y~4h;;9V1~kgTe~DWM4fBb7Bi literal 0 HcmV?d00001 diff --git a/src/icons/svg/checked_16px.svg b/src/icons/svg/checked_16px.svg new file mode 100644 index 000000000..6747255f8 --- /dev/null +++ b/src/icons/svg/checked_16px.svg @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/important_16px.svg b/src/icons/svg/important_16px.svg new file mode 100644 index 000000000..659aedf4a --- /dev/null +++ b/src/icons/svg/important_16px.svg @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/unchecked_16px.svg b/src/icons/svg/unchecked_16px.svg new file mode 100644 index 000000000..a99e11dc2 --- /dev/null +++ b/src/icons/svg/unchecked_16px.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/layui/layui/MarkerBrowserPage.ui b/src/layui/layui/MarkerBrowserPage.ui index b3e34f405..627ea3381 100644 --- a/src/layui/layui/MarkerBrowserPage.ui +++ b/src/layui/layui/MarkerBrowserPage.ui @@ -546,7 +546,7 @@ - :/important.png:/important.png + :/important_16px.png:/important_16px.png diff --git a/src/layui/layui/layLayerControlPanel.cc b/src/layui/layui/layLayerControlPanel.cc index f5efef48e..17ea16f53 100644 --- a/src/layui/layui/layLayerControlPanel.cc +++ b/src/layui/layui/layLayerControlPanel.cc @@ -373,7 +373,7 @@ LayerControlPanel::LayerControlPanel (lay::LayoutViewBase *view, db::Manager *ma m_no_stipples_label = new QLabel (tb); m_no_stipples_label->hide (); - m_no_stipples_label->setPixmap (QPixmap (QString::fromUtf8 (":/important.png"))); + m_no_stipples_label->setPixmap (QPixmap (QString::fromUtf8 (":/warn_16px.png"))); m_no_stipples_label->setToolTip (tr ("Stipples are disabled - unselect \"View/Show Layers Without Fill\" to re-enable them")); ltb->addWidget (m_no_stipples_label); diff --git a/src/layui/layui/rdbMarkerBrowserPage.cc b/src/layui/layui/rdbMarkerBrowserPage.cc index dfa3cb9c1..221a02cb9 100644 --- a/src/layui/layui/rdbMarkerBrowserPage.cc +++ b/src/layui/layui/rdbMarkerBrowserPage.cc @@ -1268,7 +1268,7 @@ public: const rdb::Item *i = item (index.row ()); if (i != 0 && i->has_tag (m_important_tag_id)) { - return QVariant (QIcon (QString::fromUtf8 (":important.png"))); + return QVariant (QIcon (QString::fromUtf8 (":important_16px.png"))); } } else if (index.column () == 2) {