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 00000000..82cd93ee Binary files /dev/null and b/scwx-qt/res/icons/flaticon/cardinal-point-24.png differ diff --git a/scwx-qt/res/icons/flaticon/compass-24.png b/scwx-qt/res/icons/flaticon/compass-24.png new file mode 100644 index 00000000..3e411ccd Binary files /dev/null and b/scwx-qt/res/icons/flaticon/compass-24.png differ diff --git a/scwx-qt/scwx-qt.qrc b/scwx-qt/scwx-qt.qrc index eeed2a70..91d6ab02 100644 --- a/scwx-qt/scwx-qt.qrc +++ b/scwx-qt/scwx-qt.qrc @@ -21,6 +21,8 @@ res/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;