From ff882f5c06df6b6ba02d5095c115d47c05ed54a2 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sat, 13 Jan 2024 01:02:15 -0600 Subject: [PATCH] Add cardinal point and compass icon --- ACKNOWLEDGEMENTS.md | 1 + scwx-qt/res/icons/flaticon/README.md | 7 +++++++ scwx-qt/res/icons/flaticon/cardinal-point-24.png | Bin 0 -> 623 bytes scwx-qt/res/icons/flaticon/compass-24.png | Bin 0 -> 1490 bytes scwx-qt/scwx-qt.qrc | 2 ++ scwx-qt/source/scwx/qt/types/texture_types.cpp | 4 ++++ scwx-qt/source/scwx/qt/types/texture_types.hpp | 4 +++- 7 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 scwx-qt/res/icons/flaticon/README.md create mode 100644 scwx-qt/res/icons/flaticon/cardinal-point-24.png create mode 100644 scwx-qt/res/icons/flaticon/compass-24.png diff --git a/ACKNOWLEDGEMENTS.md b/ACKNOWLEDGEMENTS.md index f8bdec5d..fff42e48 100644 --- a/ACKNOWLEDGEMENTS.md +++ b/ACKNOWLEDGEMENTS.md @@ -62,6 +62,7 @@ Supercell Wx uses assets from the following sources: | ------ | ------- | ----- | | Alte DIN 1451 Mittelschrift | SIL Open Font License | | [EAS Attention Signal](https://en.wikipedia.org/wiki/File:Emergency_Alert_System_Attention_Signal_20s.ogg) | Public Domain | +| [Flaticon](https://www.flaticon.com/) | [Flaticon License](https://www.freepikcompany.com/legal#nav-flaticon-agreement) | [Details](scwx-qt/res/icons/flaticon/README.md) | | [Font Awesome Free](https://fontawesome.com/) | CC BY 4.0 License | | [Inconsolata](https://fonts.google.com/specimen/Inconsolata) | SIL Open Font License | | [NOAA's Weather and Climate Toolkit](https://www.ncdc.noaa.gov/wct/) | Public Domain | Default Color Tables | diff --git a/scwx-qt/res/icons/flaticon/README.md b/scwx-qt/res/icons/flaticon/README.md new file mode 100644 index 00000000..1a25c821 --- /dev/null +++ b/scwx-qt/res/icons/flaticon/README.md @@ -0,0 +1,7 @@ +Flaticon Acknowledgements +========================= + +Supercell Wx uses the following Flaticon assets: + +- Compass icons created by Dimitry Miroliubov - Flaticon +- Compass icons created by Slidicon - Flaticon diff --git a/scwx-qt/res/icons/flaticon/cardinal-point-24.png b/scwx-qt/res/icons/flaticon/cardinal-point-24.png new file mode 100644 index 0000000000000000000000000000000000000000..82cd93eec2632dbeb787d85a4e53853486045599 GIT binary patch literal 623 zcmV-#0+9WQP)HL(0t0hHNyZb1fn@nNxS42IsNg$& zDa--}kC8A>$piq{2O7@%XTYG8B-{XiAKGvgI2WE16i`^e9)8$ZN2%L@1MehMk&lTp z=XX53@&{kH{lQ*E4-TyxuV2{4-WSn;Qf!US-K$Q_-#rdTNekazEDp2+_X*I+wjLgN zx6+jG#2>ktu$O_eK&l=11u0J~pp{zcJbTYlRBbmz7S+ctrL0bV22O{eX5uJFkM6$w z7CV?kz?$T>uI2y(ZPQwmaAg+tv83CwD8yQ{nVZXKtKReHopC68AzNMh7{!m>z*uhd zX&!RT^*Da4fG5HV!QT{V(Z*bUE}o4$R1Hi z1s!q=#e;0ET*}tUC68JLT4Anth~6IkQ5&DnImITh>$NN8Dywh0^OecsEZ#i;DYlH8p#x{yOiKAeqw>dzzy7D^N)-xWpd>HKSL~Zd;@e@XAjo4oE00M zZaEZ#Tyst;ykBzZv@f*mL%N!-H^bbr6@z&ZtZYlFIfc2_)Ks`k7NW7S>Am1Rm&?89 zo|osGrw@85<;CB}^E~JG`~BaZKjEBXF6`K`r$P|OW)Q4)ID}_y+scW@<0=U0qu`eb z;g@WiUuF2E8`-o{?qw1;#8Gh7Q9pU>N#r91H{pnW5|tg+j(71)7?6 zH^@%;8{4*=i9`b4tgMM873Ip}@^bNPPfrmzNA0?GV?%>sb7){NkV+==?*H1)ZMve+n4Z!3CyE@vAemO&+scCnE+v9Fmlo%G3FB#d`*jOS7g5Y<`a8NQ=iU9zT==kl{ zBdxKCXmlw6liPGfCKAFqM=%)l5}G}(X{z(-g=HgkuWv2$$|Bs7I4|)uQc3Vc+}D^Nj~t+ary)tAGaW#l|y&E z`;MOwr~oPjDbNA{j1=C>~d^Js6Az0@>LNd!wrSSQ(vQw)1$LK$!B>+}-b^Y`;6$G-`vKTzxtcilc!Xp11UO=PMLRa6C3!K}RDBd>$uq z&z(ljmES=q2Tw5ADIoFM8_1UbOD7?O`27CSxT54+oK#Ut9ZL*D$KvvGG2`N4_&iR8 zfA|?W*M0*i2cKl%aTCe4FT+(_1WFz>wV!Q1IM+Ss9LcMOP|W0K`M$OoG$0EX&ObG^BASzmjPgCFl;j0e&F(r zn2xB%5u4HxOK9+j6g5u}RMjqnN17RJ1~*4;c^ESRLaqyh@JpN%3=Iqh*cO}1a7+2i$6_eX%p44^CZCREkOV)Y-pa2jGg$!=f zZ2-)PXmshPAGCzE$-AR-4c=_d_wCsio|;Njrqd~ig1kKx3MGMu7EZ&~w}OP@FaVJd zsHiB$b-J9xH%D%H?sW^xPp6ZxEK3swdHbnT-*^0 zUtcc?QlJGKdjZU7c+)h%mres/icons/scwx-64.png res/icons/scwx-256.ico res/icons/scwx-256.png + res/icons/flaticon/cardinal-point-24.png + res/icons/flaticon/compass-24.png res/icons/font-awesome-6/angle-down-solid.svg res/icons/font-awesome-6/angle-left-solid.svg res/icons/font-awesome-6/angle-right-solid.svg diff --git a/scwx-qt/source/scwx/qt/types/texture_types.cpp b/scwx-qt/source/scwx/qt/types/texture_types.cpp index 5f2123ad..569e0f41 100644 --- a/scwx-qt/source/scwx/qt/types/texture_types.cpp +++ b/scwx-qt/source/scwx/qt/types/texture_types.cpp @@ -16,6 +16,10 @@ struct TextureInfo }; static const std::unordered_map imageTextureInfo_ { + {ImageTexture::CardinalPoint24, + {"images/cardinal-point-24", ":/res/icons/flaticon/cardinal-point-24.png"}}, + {ImageTexture::Compass24, + {"images/compass-24", ":/res/icons/flaticon/compass-24.png"}}, {ImageTexture::Crosshairs24, {"images/crosshairs-24", ":/res/textures/images/crosshairs-24.png"}}}; diff --git a/scwx-qt/source/scwx/qt/types/texture_types.hpp b/scwx-qt/source/scwx/qt/types/texture_types.hpp index d3ed8c16..ea94162a 100644 --- a/scwx-qt/source/scwx/qt/types/texture_types.hpp +++ b/scwx-qt/source/scwx/qt/types/texture_types.hpp @@ -13,10 +13,12 @@ namespace types enum class ImageTexture { + CardinalPoint24, + Compass24, Crosshairs24 }; typedef scwx::util::Iterator ImageTextureIterator;