diff --git a/ACKNOWLEDGEMENTS.md b/ACKNOWLEDGEMENTS.md
index 78706a70..4b5474f2 100644
--- a/ACKNOWLEDGEMENTS.md
+++ b/ACKNOWLEDGEMENTS.md
@@ -67,6 +67,7 @@ Supercell Wx uses assets from the following sources:
| [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 |
+| [Roboto Flex](https://fonts.google.com/specimen/Roboto+Flex) | SIL Open Font License |
| [Supercell thunderstorm with dramatic clouds](https://www.shutterstock.com/image-photo/supercell-thunderstorm-dramatic-clouds-1354353521) | Shutterstock Standard License | Photo by John Sirlin
Services
diff --git a/scwx-qt/res/fonts/RobotoFlex-Regular.ttf b/scwx-qt/res/fonts/RobotoFlex-Regular.ttf
new file mode 100644
index 00000000..6cf3b2a4
Binary files /dev/null and b/scwx-qt/res/fonts/RobotoFlex-Regular.ttf differ
diff --git a/scwx-qt/scwx-qt.qrc b/scwx-qt/scwx-qt.qrc
index 91d6ab02..4bc8a324 100644
--- a/scwx-qt/scwx-qt.qrc
+++ b/scwx-qt/scwx-qt.qrc
@@ -18,6 +18,7 @@
res/fonts/din1451alt.ttf
res/fonts/din1451alt_g.ttf
res/fonts/Inconsolata-Regular.ttf
+ res/fonts/RobotoFlex-Regular.ttf
res/icons/scwx-64.png
res/icons/scwx-256.ico
res/icons/scwx-256.png
diff --git a/scwx-qt/source/scwx/qt/manager/resource_manager.cpp b/scwx-qt/source/scwx/qt/manager/resource_manager.cpp
index c9c40b6b..443d771b 100644
--- a/scwx-qt/source/scwx/qt/manager/resource_manager.cpp
+++ b/scwx-qt/source/scwx/qt/manager/resource_manager.cpp
@@ -28,7 +28,8 @@ static void LoadTextures();
static const std::vector> fontNames_ {
{types::Font::din1451alt, ":/res/fonts/din1451alt.ttf"},
{types::Font::din1451alt_g, ":/res/fonts/din1451alt_g.ttf"},
- {types::Font::Inconsolata_Regular, ":/res/fonts/Inconsolata-Regular.ttf"}};
+ {types::Font::Inconsolata_Regular, ":/res/fonts/Inconsolata-Regular.ttf"},
+ {types::Font::RobotoFlex_Regular, ":/res/fonts/RobotoFlex-Regular.ttf"}};
void Initialize()
{
diff --git a/scwx-qt/source/scwx/qt/settings/text_settings.cpp b/scwx-qt/source/scwx/qt/settings/text_settings.cpp
index d8181df9..49b97c59 100644
--- a/scwx-qt/source/scwx/qt/settings/text_settings.cpp
+++ b/scwx-qt/source/scwx/qt/settings/text_settings.cpp
@@ -15,19 +15,23 @@ static const std::string logPrefix_ = "scwx::qt::settings::text_settings";
static const std::string kAlteDIN1451Mittelscrhift_ {
"Alte DIN 1451 Mittelschrift"};
static const std::string kInconsolata_ {"Inconsolata"};
+static const std::string kRobotoFlex_ {"Roboto Flex"};
static const std::string kRegular_ {"Regular"};
static const std::unordered_map
kDefaultFontFamily_ {
{types::FontCategory::Default, kAlteDIN1451Mittelscrhift_},
- {types::FontCategory::Tooltip, kInconsolata_}};
+ {types::FontCategory::Tooltip, kInconsolata_},
+ {types::FontCategory::Attribution, kRobotoFlex_}};
static const std::unordered_map
kDefaultFontStyle_ {{types::FontCategory::Default, kRegular_},
- {types::FontCategory::Tooltip, kRegular_}};
+ {types::FontCategory::Tooltip, kRegular_},
+ {types::FontCategory::Attribution, kRegular_}};
static const std::unordered_map
kDefaultFontPointSize_ {{types::FontCategory::Default, 12.0},
- {types::FontCategory::Tooltip, 10.5}};
+ {types::FontCategory::Tooltip, 10.5},
+ {types::FontCategory::Attribution, 9.0}};
class TextSettings::Impl
{
diff --git a/scwx-qt/source/scwx/qt/types/font_types.hpp b/scwx-qt/source/scwx/qt/types/font_types.hpp
index 6fc8c506..1f2805f9 100644
--- a/scwx-qt/source/scwx/qt/types/font_types.hpp
+++ b/scwx-qt/source/scwx/qt/types/font_types.hpp
@@ -37,7 +37,8 @@ enum class Font
{
din1451alt,
din1451alt_g,
- Inconsolata_Regular
+ Inconsolata_Regular,
+ RobotoFlex_Regular
};
} // namespace types
diff --git a/scwx-qt/source/scwx/qt/types/text_types.cpp b/scwx-qt/source/scwx/qt/types/text_types.cpp
index f994dab9..14595686 100644
--- a/scwx-qt/source/scwx/qt/types/text_types.cpp
+++ b/scwx-qt/source/scwx/qt/types/text_types.cpp
@@ -14,6 +14,7 @@ namespace types
static const std::unordered_map fontCategoryName_ {
{FontCategory::Default, "Default"},
{FontCategory::Tooltip, "Tooltip"},
+ {FontCategory::Attribution, "Attribution"},
{FontCategory::Unknown, "?"}};
static const std::unordered_map tooltipMethodName_ {
diff --git a/scwx-qt/source/scwx/qt/types/text_types.hpp b/scwx-qt/source/scwx/qt/types/text_types.hpp
index 07c1ea00..6e09c4ac 100644
--- a/scwx-qt/source/scwx/qt/types/text_types.hpp
+++ b/scwx-qt/source/scwx/qt/types/text_types.hpp
@@ -15,10 +15,11 @@ enum class FontCategory
{
Default,
Tooltip,
+ Attribution,
Unknown
};
typedef scwx::util::
- Iterator
+ Iterator
FontCategoryIterator;
enum class TooltipMethod