diff --git a/.gitignore b/.gitignore index 1c5a57c..cfcacbf 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ *.pro.user *.pro.user* CMakeLists.txt.user -/*build* +*/build # never include pro files QtAwesome/fonts/pro/ diff --git a/CHANGES.md b/CHANGES.md index 86c0fae..0b6ecfc 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # Changes +- (2024-11-21) Update to 6.7.1, Extra Duotone styles + - Expand Duotone to support Solid, Regular, Light and Thin + - Add Sharp Duotone styles + - Deprecated Duotone (without style) - (2024-04-23) Support for dark/light colorSchema mode, (contribution by @hanjianqiao(Lanchitour)) - (2023-12-07) Update to 6.5.1, Sharp Thin Pro font - (2023-08-16) Update to 6.4.2, Fix issue missing pro icons in namedCodePoints diff --git a/QtAwesome/QtAwesome.cpp b/QtAwesome/QtAwesome.cpp index 7a19bd1..dd666d2 100644 --- a/QtAwesome/QtAwesome.cpp +++ b/QtAwesome/QtAwesome.cpp @@ -213,15 +213,26 @@ private: const QString QtAwesome::FA_BRANDS_FONT_FILENAME = "Font Awesome 6 Brands-Regular-400.otf"; #ifdef FONT_AWESOME_PRO -const QString QtAwesome::FA_DUOTONE_FONT_FILENAME = "pro/Font Awesome 6 Duotone-Solid-900.otf"; -const QString QtAwesome::FA_LIGHT_FONT_FILENAME = "pro/Font Awesome 6 Pro-Light-300.otf"; -const QString QtAwesome::FA_REGULAR_FONT_FILENAME = "pro/Font Awesome 6 Pro-Regular-400.otf"; -const QString QtAwesome::FA_THIN_FONT_FILENAME = "pro/Font Awesome 6 Pro-Thin-100.otf"; +const QString QtAwesome::FA_DUOTONE_FONT_FILENAME = "pro/Font Awesome 6 Duotone-Solid-900.otf"; // DEPRECATED, use FA_DUOTONE_SOLID_FONT_FILENAME +const QString QtAwesome::FA_DUOTONE_SOLID_FONT_FILENAME = "pro/Font Awesome 6 Duotone-Solid-900.otf"; +const QString QtAwesome::FA_DUOTONE_REGULAR_FONT_FILENAME = "pro/Font Awesome 6 Duotone-Regular-400.otf"; +const QString QtAwesome::FA_DUOTONE_LIGHT_FONT_FILENAME = "pro/Font Awesome 6 Duotone-Light-300.otf"; +const QString QtAwesome::FA_DUOTONE_THIN_FONT_FILENAME = "pro/Font Awesome 6 Duotone-Thin-100.otf"; + const QString QtAwesome::FA_SOLID_FONT_FILENAME = "pro/Font Awesome 6 Pro-Solid-900.otf"; +const QString QtAwesome::FA_REGULAR_FONT_FILENAME = "pro/Font Awesome 6 Pro-Regular-400.otf"; +const QString QtAwesome::FA_LIGHT_FONT_FILENAME = "pro/Font Awesome 6 Pro-Light-300.otf"; +const QString QtAwesome::FA_THIN_FONT_FILENAME = "pro/Font Awesome 6 Pro-Thin-100.otf"; + const QString QtAwesome::FA_SHARP_SOLID_FONT_FILENAME = "pro/Font Awesome 6 Sharp-Solid-900.otf"; const QString QtAwesome::FA_SHARP_REGULAR_FONT_FILENAME = "pro/Font Awesome 6 Sharp-Regular-400.otf"; const QString QtAwesome::FA_SHARP_LIGHT_FONT_FILENAME = "pro/Font Awesome 6 Sharp-Light-300.otf"; const QString QtAwesome::FA_SHARP_THIN_FONT_FILENAME = "pro/Font Awesome 6 Sharp-Thin-100.otf"; + +const QString QtAwesome::FA_SHARP_DUOTONE_SOLID_FONT_FILENAME = "pro/Font Awesome 6 Sharp Duotone-Solid-900.otf"; +const QString QtAwesome::FA_SHARP_DUOTONE_REGULAR_FONT_FILENAME = "pro/Font Awesome 6 Sharp Duotone-Regular-400.otf"; +const QString QtAwesome::FA_SHARP_DUOTONE_LIGHT_FONT_FILENAME = "pro/Font Awesome 6 Sharp Duotone-Light-300.otf"; +const QString QtAwesome::FA_SHARP_DUOTONE_THIN_FONT_FILENAME = "pro/Font Awesome 6 Sharp Duotone-Thin-100.otf"; #else const QString QtAwesome::FA_REGULAR_FONT_FILENAME = "Font Awesome 6 Free-Regular-400.otf"; const QString QtAwesome::FA_SOLID_FONT_FILENAME = "Font Awesome 6 Free-Solid-900.otf"; @@ -238,17 +249,25 @@ QtAwesome::QtAwesome(QObject* parent) _fontIconPainter = new QtAwesomeCharIconPainter(); + _fontDetails.insert(fa::fa_brands, QtAwesomeFontData(FA_BRANDS_FONT_FILENAME, FA_BRANDS_FONT_WEIGHT)); _fontDetails.insert(fa::fa_solid, QtAwesomeFontData(FA_SOLID_FONT_FILENAME, FA_SOLID_FONT_WEIGHT)); _fontDetails.insert(fa::fa_regular, QtAwesomeFontData(FA_REGULAR_FONT_FILENAME, FA_REGULAR_FONT_WEIGHT)); - _fontDetails.insert(fa::fa_brands, QtAwesomeFontData(FA_BRANDS_FONT_FILENAME, FA_BRANDS_FONT_WEIGHT)); #ifdef FONT_AWESOME_PRO _fontDetails.insert(fa::fa_light, QtAwesomeFontData(FA_LIGHT_FONT_FILENAME, FA_LIGHT_FONT_WEIGHT)); - _fontDetails.insert(fa::fa_duotone, QtAwesomeFontData(FA_DUOTONE_FONT_FILENAME, FA_DUOTONE_FONT_WEIGHT)); _fontDetails.insert(fa::fa_thin, QtAwesomeFontData(FA_THIN_FONT_FILENAME, FA_THIN_FONT_WEIGHT)); + _fontDetails.insert(fa::fa_duotone, QtAwesomeFontData(FA_DUOTONE_FONT_FILENAME, FA_DUOTONE_FONT_WEIGHT)); // DEPRECATED + _fontDetails.insert(fa::fa_duotone_solid, QtAwesomeFontData(FA_DUOTONE_SOLID_FONT_FILENAME, FA_DUOTONE_SOLID_FONT_WEIGHT)); + _fontDetails.insert(fa::fa_duotone_regular, QtAwesomeFontData(FA_DUOTONE_REGULAR_FONT_FILENAME, FA_DUOTONE_REGULAR_FONT_WEIGHT)); + _fontDetails.insert(fa::fa_duotone_light, QtAwesomeFontData(FA_DUOTONE_LIGHT_FONT_FILENAME, FA_DUOTONE_LIGHT_FONT_WEIGHT)); + _fontDetails.insert(fa::fa_duotone_thin, QtAwesomeFontData(FA_DUOTONE_THIN_FONT_FILENAME, FA_DUOTONE_THIN_FONT_WEIGHT)); _fontDetails.insert(fa::fa_sharp_solid, QtAwesomeFontData(FA_SHARP_SOLID_FONT_FILENAME, FA_SHARP_SOLID_FONT_WEIGHT)); _fontDetails.insert(fa::fa_sharp_regular, QtAwesomeFontData(FA_SHARP_REGULAR_FONT_FILENAME, FA_SHARP_REGULAR_FONT_WEIGHT)); _fontDetails.insert(fa::fa_sharp_light, QtAwesomeFontData(FA_SHARP_LIGHT_FONT_FILENAME, FA_SHARP_LIGHT_FONT_WEIGHT)); _fontDetails.insert(fa::fa_sharp_thin, QtAwesomeFontData(FA_SHARP_THIN_FONT_FILENAME, FA_SHARP_THIN_FONT_WEIGHT)); + _fontDetails.insert(fa::fa_sharp_duotone_solid, QtAwesomeFontData(FA_SHARP_DUOTONE_SOLID_FONT_FILENAME, FA_SHARP_DUOTONE_SOLID_FONT_WEIGHT)); + _fontDetails.insert(fa::fa_sharp_duotone_regular, QtAwesomeFontData(FA_SHARP_DUOTONE_REGULAR_FONT_FILENAME, FA_SHARP_DUOTONE_REGULAR_FONT_WEIGHT)); + _fontDetails.insert(fa::fa_sharp_duotone_light, QtAwesomeFontData(FA_SHARP_DUOTONE_LIGHT_FONT_FILENAME, FA_SHARP_DUOTONE_LIGHT_FONT_WEIGHT)); + _fontDetails.insert(fa::fa_sharp_duotone_thin, QtAwesomeFontData(FA_SHARP_DUOTONE_THIN_FONT_FILENAME, FA_SHARP_DUOTONE_THIN_FONT_WEIGHT)); #endif #ifdef USE_COLOR_SCHEME @@ -343,11 +362,19 @@ bool QtAwesome::initFontAwesome() _namedCodepointsByStyle.insert(fa::fa_regular, _namedCodepointsByStyle.value(fa::fa_solid)); _namedCodepointsByStyle.insert(fa::fa_light, _namedCodepointsByStyle.value(fa::fa_solid)); _namedCodepointsByStyle.insert(fa::fa_thin, _namedCodepointsByStyle.value(fa::fa_solid)); - _namedCodepointsByStyle.insert(fa::fa_duotone, _namedCodepointsByStyle.value(fa::fa_solid)); + _namedCodepointsByStyle.insert(fa::fa_duotone, _namedCodepointsByStyle.value(fa::fa_solid)); // DEPRECATED + _namedCodepointsByStyle.insert(fa::fa_duotone_solid, _namedCodepointsByStyle.value(fa::fa_solid)); + _namedCodepointsByStyle.insert(fa::fa_duotone_regular, _namedCodepointsByStyle.value(fa::fa_solid)); + _namedCodepointsByStyle.insert(fa::fa_duotone_light, _namedCodepointsByStyle.value(fa::fa_solid)); + _namedCodepointsByStyle.insert(fa::fa_duotone_thin, _namedCodepointsByStyle.value(fa::fa_solid)); _namedCodepointsByStyle.insert(fa::fa_sharp_solid, _namedCodepointsByStyle.value(fa::fa_solid)); _namedCodepointsByStyle.insert(fa::fa_sharp_regular, _namedCodepointsByStyle.value(fa::fa_solid)); _namedCodepointsByStyle.insert(fa::fa_sharp_light, _namedCodepointsByStyle.value(fa::fa_solid)); _namedCodepointsByStyle.insert(fa::fa_sharp_thin, _namedCodepointsByStyle.value(fa::fa_solid)); + _namedCodepointsByStyle.insert(fa::fa_sharp_duotone_solid, _namedCodepointsByStyle.value(fa::fa_solid)); + _namedCodepointsByStyle.insert(fa::fa_sharp_duotone_regular, _namedCodepointsByStyle.value(fa::fa_solid)); + _namedCodepointsByStyle.insert(fa::fa_sharp_duotone_light, _namedCodepointsByStyle.value(fa::fa_solid)); + _namedCodepointsByStyle.insert(fa::fa_sharp_duotone_thin, _namedCodepointsByStyle.value(fa::fa_solid)); #else addToNamedCodePoints(fa::fa_regular, faRegularFreeIconArray, sizeof(faRegularFreeIconArray)/sizeof(QtAwesomeNamedIcon)); #endif @@ -519,11 +546,19 @@ int QtAwesome::stringToStyleEnum(const QString style) const #ifdef FONT_AWESOME_PRO else if (style == "fa-light") return fa::fa_light; else if (style == "fa-thin") return fa::fa_thin; - else if (style == "fa-duotone") return fa::fa_duotone; + else if (style == "fa-duotone") return fa::fa_duotone; // DEPRECATED + else if (style == "fa-duotone-solid") return fa::fa_duotone_solid; + else if (style == "fa-duotone-regular") return fa::fa_duotone_regular; + else if (style == "fa-duotone-light") return fa::fa_duotone_light; + else if (style == "fa-duotone-thin") return fa::fa_duotone_thin; else if (style == "fa-sharp-solid") return fa::fa_sharp_solid; else if (style == "fa-sharp-regular") return fa::fa_sharp_regular; else if (style == "fa-sharp-light") return fa::fa_sharp_light; else if (style == "fa-sharp-thin") return fa::fa_sharp_thin; + else if (style == "fa-sharp-duotone-solid") return fa::fa_sharp_duotone_solid; + else if (style == "fa-sharp-duotone-regular") return fa::fa_sharp_duotone_regular; + else if (style == "fa-sharp-duotone-light") return fa::fa_sharp_duotone_light; + else if (style == "fa-sharp-duotone-thin") return fa::fa_sharp_duotone_thin; #endif return fa::fa_solid; } @@ -536,15 +571,23 @@ const QString QtAwesome::styleEnumToString(int style) const case fa::fa_brands: return "fa-brands"; #ifdef FONT_AWESOME_PRO case fa::fa_light: return "fa-light"; - case fa::fa_thin: return "fa=thin"; - case fa::fa_duotone: return "fa-duotone"; + case fa::fa_thin: return "fa-thin"; + // case fa::fa_duotone: return "fa-duotone"; // DEPRECATED + case fa::fa_duotone_solid: return "fa-duotone-solid"; + case fa::fa_duotone_regular: return "fa-duotone-regular"; + case fa::fa_duotone_light: return "fa-duotone-light"; + case fa::fa_duotone_thin: return "fa-duotone-thin"; case fa::fa_sharp_solid: return "fa-sharp-solid"; case fa::fa_sharp_regular: return "fa-sharp-regular"; case fa::fa_sharp_light: return "fa-sharp-light"; case fa::fa_sharp_thin: return "fa-sharp-thin"; + case fa::fa_sharp_duotone_solid: return "fa-sharp-duotone-solid"; + case fa::fa_sharp_duotone_regular: return "fa-sharp-duotone-regular"; + case fa::fa_sharp_duotone_light: return "fa-sharp-duotone-light"; + case fa::fa_sharp_duotone_thin: return "fa-sharp-duotone-thin"; #endif } - return "fa_solid"; + return "fa-solid"; } //--------------------------------------------------------------------------------------- diff --git a/QtAwesome/QtAwesome.h b/QtAwesome/QtAwesome.h index c1ec3c8..b6f4637 100644 --- a/QtAwesome/QtAwesome.h +++ b/QtAwesome/QtAwesome.h @@ -31,11 +31,22 @@ enum fa_styles { #ifdef FONT_AWESOME_PRO fa_light = 3, fa_thin = 4, - fa_duotone = 5, - fa_sharp_solid = 6, - fa_sharp_regular = 7, - fa_sharp_light = 8, - fa_sharp_thin = 9, + + fa_duotone = 5, // DEPRECATED, use fa_duotone_solid + fa_duotone_solid = 5, + fa_duotone_regular = 6, + fa_duotone_light = 7, + fa_duotone_thin = 8, + + fa_sharp_solid = 9, + fa_sharp_regular = 10, + fa_sharp_light = 11, + fa_sharp_thin = 12, + + fa_sharp_duotone_solid = 13, + fa_sharp_duotone_regular = 14, + fa_sharp_duotone_light = 15, + fa_sharp_duotone_thin = 16, #endif fa_brands = 2 }; @@ -87,20 +98,43 @@ public: #ifdef FONT_AWESOME_PRO static const QString FA_LIGHT_FONT_FILENAME; // fa-light - static const QString FA_DUOTONE_FONT_FILENAME; // fa-duotone static const QString FA_THIN_FONT_FILENAME; // fa-thin + + static const QString FA_DUOTONE_FONT_FILENAME; // fa-duotone / DEPRECATED + static const QString FA_DUOTONE_SOLID_FONT_FILENAME; // fa-duotone fa-solid + static const QString FA_DUOTONE_REGULAR_FONT_FILENAME; // fa-duotone fa-regular + static const QString FA_DUOTONE_LIGHT_FONT_FILENAME; // fa-duotone fa-light + static const QString FA_DUOTONE_THIN_FONT_FILENAME; // fa-duotone fa-thin + static const QString FA_SHARP_SOLID_FONT_FILENAME; // fa-sharp fa-solid static const QString FA_SHARP_REGULAR_FONT_FILENAME; // fa-sharp fa-regular static const QString FA_SHARP_LIGHT_FONT_FILENAME; // fa-sharp fa-light static const QString FA_SHARP_THIN_FONT_FILENAME; // fa-sharp fa-thin + + static const QString FA_SHARP_DUOTONE_SOLID_FONT_FILENAME; // fa-sharp-duotone fa-solid + static const QString FA_SHARP_DUOTONE_REGULAR_FONT_FILENAME; // fa-sharp-duotone fa-regular + static const QString FA_SHARP_DUOTONE_LIGHT_FONT_FILENAME; // fa-sharp-duotone fa-light + static const QString FA_SHARP_DUOTONE_THIN_FONT_FILENAME; // fa-sharp-duotone fa-thin + static const int DUOTONE_HEX_ICON_VALUE = 0x100000; static const QFont::Weight FA_LIGHT_FONT_WEIGHT = QFont::Light; static const QFont::Weight FA_THIN_FONT_WEIGHT = QFont::ExtraLight; - static const QFont::Weight FA_DUOTONE_FONT_WEIGHT = QFont::Black; + + static const QFont::Weight FA_DUOTONE_FONT_WEIGHT = QFont::Black; // DEPRECATED: use FA_DUOTONE_FONT_SOLID_WEIGHT + static const QFont::Weight FA_DUOTONE_SOLID_FONT_WEIGHT = QFont::Black; + static const QFont::Weight FA_DUOTONE_REGULAR_FONT_WEIGHT = QFont::Normal; + static const QFont::Weight FA_DUOTONE_LIGHT_FONT_WEIGHT = QFont::Light; + static const QFont::Weight FA_DUOTONE_THIN_FONT_WEIGHT = QFont::ExtraLight; + static const QFont::Weight FA_SHARP_SOLID_FONT_WEIGHT = QFont::Black; static const QFont::Weight FA_SHARP_REGULAR_FONT_WEIGHT = QFont::Normal; static const QFont::Weight FA_SHARP_LIGHT_FONT_WEIGHT = QFont::Light; static const QFont::Weight FA_SHARP_THIN_FONT_WEIGHT = QFont::ExtraLight; + + static const QFont::Weight FA_SHARP_DUOTONE_SOLID_FONT_WEIGHT = QFont::Black; + static const QFont::Weight FA_SHARP_DUOTONE_REGULAR_FONT_WEIGHT = QFont::Normal; + static const QFont::Weight FA_SHARP_DUOTONE_LIGHT_FONT_WEIGHT = QFont::Light; + static const QFont::Weight FA_SHARP_DUOTONE_THIN_FONT_WEIGHT = QFont::ExtraLight; #endif public: diff --git a/QtAwesome/QtAwesomeEnumGenerated.h b/QtAwesome/QtAwesomeEnumGenerated.h index 691340a..3215e1e 100644 --- a/QtAwesome/QtAwesomeEnumGenerated.h +++ b/QtAwesome/QtAwesomeEnumGenerated.h @@ -371,6 +371,7 @@ enum fa_common_icons : uint16_t { fa_chart_bar = 0xf080, fa_bar_chart = 0xf080, fa_chart_column = 0xe0e3, + fa_chart_diagram = 0xe695, fa_chart_gantt = 0xe0e4, fa_chart_line = 0xf201, fa_line_chart = 0xf201, @@ -506,6 +507,7 @@ enum fa_common_icons : uint16_t { fa_comment_dots = 0xf4ad, fa_commenting = 0xf4ad, fa_comment_medical = 0xf7f5, + fa_comment_nodes = 0xe696, fa_comment_slash = 0xf4b3, fa_comment_sms = 0xf7cd, fa_sms = 0xf7cd, @@ -743,6 +745,8 @@ enum fa_common_icons : uint16_t { fa_file_excel = 0xf1c3, fa_file_export = 0xf56e, fa_arrow_right_from_file = 0xf56e, + fa_file_fragment = 0xe697, + fa_file_half_dashed = 0xe698, fa_file_image = 0xf1c5, fa_file_import = 0xf56f, fa_arrow_right_to_file = 0xf56f, @@ -946,6 +950,8 @@ enum fa_common_icons : uint16_t { fa_hard_hat = 0xf807, fa_hat_hard = 0xf807, fa_helmet_un = 0xe503, + fa_hexagon_nodes = 0xe699, + fa_hexagon_nodes_bolt = 0xe69a, fa_highlighter = 0xf591, fa_hill_avalanche = 0xe507, fa_hill_rockslide = 0xe508, @@ -1568,6 +1574,7 @@ enum fa_common_icons : uint16_t { fa_square = 0xf0c8, fa_square_arrow_up_right = 0xf14c, fa_external_link_square = 0xf14c, + fa_square_binary = 0xe69b, fa_square_caret_down = 0xf150, fa_caret_square_down = 0xf150, fa_square_caret_left = 0xf191, @@ -1655,8 +1662,11 @@ enum fa_common_icons : uint16_t { fa_table = 0xf0ce, fa_table_cells = 0xf00a, fa_th = 0xf00a, + fa_table_cells_column_lock = 0xe678, fa_table_cells_large = 0xf009, fa_th_large = 0xf009, + fa_table_cells_row_lock = 0xe67a, + fa_table_cells_row_unlock = 0xe691, fa_table_columns = 0xf0db, fa_columns = 0xf0db, fa_table_list = 0xf00b, @@ -1725,6 +1735,8 @@ enum fa_common_icons : uint16_t { fa_thumbs_up = 0xf164, fa_thumbtack = 0xf08d, fa_thumb_tack = 0xf08d, + fa_thumbtack_slash = 0xe68f, + fa_thumb_tack_slash = 0xe68f, fa_ticket = 0xf145, fa_ticket_simple = 0xf3ff, fa_ticket_alt = 0xf3ff, @@ -1998,6 +2010,7 @@ enum fa_brand_icons : uint16_t { fa_blackberry = 0xf37b, fa_blogger = 0xf37c, fa_blogger_b = 0xf37d, + fa_bluesky = 0xe671, fa_bluetooth = 0xf293, fa_bluetooth_b = 0xf294, fa_bootstrap = 0xf836, @@ -2051,12 +2064,14 @@ enum fa_brand_icons : uint16_t { fa_creative_commons_share = 0xf4f2, fa_creative_commons_zero = 0xf4f3, fa_critical_role = 0xf6c9, + fa_css = 0xe6a2, fa_css3 = 0xf13c, fa_css3_alt = 0xf38b, fa_cuttlefish = 0xf38c, fa_d_and_d = 0xf38d, fa_d_and_d_beyond = 0xf6ca, fa_dailymotion = 0xe052, + fa_dart_lang = 0xe693, fa_dashcube = 0xf210, fa_debian = 0xe60b, fa_deezer = 0xe077, @@ -2099,6 +2114,7 @@ enum fa_brand_icons : uint16_t { fa_fedex = 0xf797, fa_fedora = 0xf798, fa_figma = 0xf799, + fa_files_pinwheel = 0xe69f, fa_firefox = 0xf269, fa_firefox_browser = 0xe007, fa_first_order = 0xf2b0, @@ -2106,6 +2122,7 @@ enum fa_brand_icons : uint16_t { fa_firstdraft = 0xf3a1, fa_flickr = 0xf16e, fa_flipboard = 0xf44d, + fa_flutter = 0xe694, fa_fly = 0xf417, fa_font_awesome = 0xf2b4, fa_font_awesome_flag = 0xf2b4, @@ -2182,10 +2199,12 @@ enum fa_brand_icons : uint16_t { fa_joomla = 0xf1aa, fa_js = 0xf3b8, fa_jsfiddle = 0xf1cc, + fa_jxl = 0xe67b, fa_kaggle = 0xf5fa, fa_keybase = 0xf4f5, fa_keycdn = 0xf3ba, fa_kickstarter = 0xf3bb, + fa_square_kickstarter = 0xf3bb, fa_kickstarter_k = 0xf3bc, fa_korvue = 0xf42f, fa_laravel = 0xf3bd, @@ -2325,6 +2344,7 @@ enum fa_brand_icons : uint16_t { fa_spotify = 0xf1bc, fa_square_behance = 0xf1b5, fa_behance_square = 0xf1b5, + fa_square_bluesky = 0xe6a3, fa_square_dribbble = 0xf397, fa_dribbble_square = 0xf397, fa_square_facebook = 0xf082, @@ -2366,10 +2386,13 @@ enum fa_brand_icons : uint16_t { fa_tumblr_square = 0xf174, fa_square_twitter = 0xf081, fa_twitter_square = 0xf081, + fa_square_upwork = 0xe67c, fa_square_viadeo = 0xf2aa, fa_viadeo_square = 0xf2aa, fa_square_vimeo = 0xf194, fa_vimeo_square = 0xf194, + fa_square_web_awesome = 0xe683, + fa_square_web_awesome_stroke = 0xe684, fa_square_whatsapp = 0xf40c, fa_whatsapp_square = 0xf40c, fa_square_x_twitter = 0xe61a, @@ -2439,6 +2462,7 @@ enum fa_brand_icons : uint16_t { fa_vuejs = 0xf41f, fa_watchman_monitoring = 0xe087, fa_waze = 0xf83f, + fa_web_awesome = 0xe682, fa_webflow = 0xe65c, fa_weebly = 0xf5cc, fa_weibo = 0xf18a, @@ -2507,6 +2531,7 @@ enum fa_pro_icons : uint16_t { fa_angle = 0xe08c, fa_angle_90 = 0xe08d, fa_angles_up_down = 0xe60d, + fa_ant = 0xe680, fa_apartment = 0xe468, fa_aperture = 0xe2df, fa_apostrophe = 0x27, @@ -2516,6 +2541,7 @@ enum fa_pro_icons : uint16_t { fa_arrow_down_big_small = 0xf88c, fa_sort_size_down = 0xf88c, fa_arrow_down_from_arc = 0xe614, + fa_arrow_down_from_bracket = 0xe667, fa_arrow_down_from_dotted_line = 0xe090, fa_arrow_down_from_line = 0xf345, fa_arrow_from_top = 0xf345, @@ -2535,10 +2561,12 @@ enum fa_pro_icons : uint16_t { fa_arrow_down_triangle_square = 0xf888, fa_sort_shapes_down = 0xf888, fa_arrow_left_from_arc = 0xe615, + fa_arrow_left_from_bracket = 0xe668, fa_arrow_left_from_line = 0xf344, fa_arrow_from_right = 0xf344, fa_arrow_left_long_to_line = 0xe3d4, fa_arrow_left_to_arc = 0xe616, + fa_arrow_left_to_bracket = 0xe669, fa_arrow_left_to_line = 0xf33e, fa_arrow_to_left = 0xf33e, fa_arrow_progress = 0xe5df, @@ -2573,6 +2601,7 @@ enum fa_pro_icons : uint16_t { fa_arrow_up_square_triangle = 0xf88b, fa_sort_shapes_up_alt = 0xf88b, fa_arrow_up_to_arc = 0xe617, + fa_arrow_up_to_bracket = 0xe66a, fa_arrow_up_to_dotted_line = 0xe0a1, fa_arrow_up_to_line = 0xf341, fa_arrow_to_top = 0xf341, @@ -2714,6 +2743,7 @@ enum fa_pro_icons : uint16_t { fa_border_outer = 0xf851, fa_border_right = 0xf852, fa_border_top = 0xf855, + fa_bottle_baby = 0xe673, fa_bow_arrow = 0xf6b9, fa_bowl_chopsticks = 0xe2e9, fa_bowl_chopsticks_noodles = 0xe2ea, @@ -2790,6 +2820,7 @@ enum fa_pro_icons : uint16_t { fa_cabin = 0xe46d, fa_cabinet_filing = 0xf64b, fa_cactus = 0xf8a7, + fa_caduceus = 0xe681, fa_cake_slice = 0xe3e5, fa_shortcake = 0xe3e5, fa_calculator_simple = 0xf64c, @@ -2859,6 +2890,8 @@ enum fa_pro_icons : uint16_t { fa_card_spade = 0xe3ec, fa_cards = 0xe3ed, fa_cards_blank = 0xe4df, + fa_carpool = 0xe69c, + fa_car_people = 0xe69c, fa_cars = 0xf85b, fa_cart_arrow_up = 0xe3ee, fa_cart_circle_arrow_down = 0xe3ef, @@ -2887,6 +2920,7 @@ enum fa_pro_icons : uint16_t { fa_glass_champagne = 0xf79e, fa_chart_bullet = 0xe0e1, fa_chart_candlestick = 0xe0e2, + fa_chart_fft = 0xe69e, fa_chart_kanban = 0xe64f, fa_chart_line_down = 0xf64d, fa_chart_line_up = 0xe0e5, @@ -2906,6 +2940,7 @@ enum fa_pro_icons : uint16_t { fa_chart_scatter_3d = 0xe0e8, fa_chart_scatter_bubble = 0xe0e9, fa_chart_simple_horizontal = 0xe474, + fa_chart_sine = 0xe69d, fa_chart_tree_map = 0xe0ea, fa_chart_user = 0xf6a3, fa_user_chart = 0xf6a3, @@ -2991,6 +3026,7 @@ enum fa_pro_icons : uint16_t { fa_circle_exclamation_check = 0xe10d, fa_circle_f = 0xe10e, fa_circle_g = 0xe10f, + fa_circle_gf = 0xe67f, fa_circle_half = 0xe110, fa_circle_heart = 0xf4c7, fa_heart_circle = 0xf4c7, @@ -3046,11 +3082,16 @@ enum fa_pro_icons : uint16_t { fa_circle_w = 0xe12c, fa_circle_waveform_lines = 0xe12d, fa_waveform_circle = 0xe12d, + fa_circle_wifi = 0xe67d, + fa_circle_wifi_circle_wifi = 0xe67e, + fa_circle_wifi_group = 0xe67e, fa_circle_x = 0xe12e, fa_circle_y = 0xe12f, fa_circle_yen = 0xe5d0, fa_circle_z = 0xe130, fa_circles_overlap = 0xe600, + fa_circles_overlap_3 = 0xe6a1, + fa_pronoun = 0xe6a1, fa_citrus = 0xe2f4, fa_citrus_slice = 0xe2f5, fa_clapperboard_play = 0xe132, @@ -3220,6 +3261,7 @@ enum fa_pro_icons : uint16_t { fa_diamond_exclamation = 0xe405, fa_diamond_half = 0xe5b7, fa_diamond_half_stroke = 0xe5b8, + fa_diamonds_4 = 0xe68b, fa_dice_d10 = 0xf6cd, fa_dice_d12 = 0xf6ce, fa_dice_d4 = 0xf6d0, @@ -3249,6 +3291,7 @@ enum fa_pro_icons : uint16_t { fa_doughnut = 0xe406, fa_down = 0xf354, fa_arrow_alt_down = 0xf354, + fa_down_from_bracket = 0xe66b, fa_down_from_dotted_line = 0xe407, fa_down_from_line = 0xf349, fa_arrow_alt_from_top = 0xf349, @@ -3389,6 +3432,7 @@ enum fa_pro_icons : uint16_t { fa_field_hockey_stick_ball = 0xf44c, fa_field_hockey = 0xf44c, fa_file_binary = 0xe175, + fa_file_cad = 0xe672, fa_file_certificate = 0xf5f3, fa_file_award = 0xf5f3, fa_file_chart_column = 0xf659, @@ -3548,6 +3592,7 @@ enum fa_pro_icons : uint16_t { fa_globe_pointer = 0xe60e, fa_globe_snow = 0xf7a3, fa_globe_stand = 0xf5f6, + fa_globe_wifi = 0xe685, fa_goal_net = 0xe3ab, fa_golf_club = 0xf451, fa_golf_flag_hole = 0xe3ac, @@ -3677,6 +3722,7 @@ enum fa_pro_icons : uint16_t { fa_house_window = 0xe3b3, fa_hundred_points = 0xe41c, fa_100 = 0xe41c, + fa_hydra = 0xe686, fa_hyphen = 0x2d, fa_ice_skate = 0xf7ac, fa_image_landscape = 0xe1b5, @@ -3747,9 +3793,11 @@ enum fa_pro_icons : uint16_t { fa_leafy_green = 0xe41d, fa_left = 0xf355, fa_arrow_alt_left = 0xf355, + fa_left_from_bracket = 0xe66c, fa_left_from_line = 0xf348, fa_arrow_alt_from_right = 0xf348, fa_left_long_to_line = 0xe41e, + fa_left_to_bracket = 0xe66d, fa_left_to_line = 0xf34b, fa_arrow_alt_to_left = 0xf34b, fa_light_ceiling = 0xe016, @@ -3764,6 +3812,7 @@ enum fa_pro_icons : uint16_t { fa_lightbulb_exclamation = 0xf671, fa_lightbulb_exclamation_on = 0xe1ca, fa_lightbulb_gear = 0xe5fd, + fa_lightbulb_message = 0xe687, fa_lightbulb_on = 0xf672, fa_lightbulb_slash = 0xf673, fa_lighthouse = 0xe612, @@ -3978,6 +4027,7 @@ enum fa_pro_icons : uint16_t { fa_octagon_xmark = 0xf2f0, fa_times_octagon = 0xf2f0, fa_xmark_octagon = 0xf2f0, + fa_octopus = 0xe688, fa_oil_can_drip = 0xe205, fa_oil_temperature = 0xf614, fa_oil_temp = 0xf614, @@ -4171,6 +4221,7 @@ enum fa_pro_icons : uint16_t { fa_rectangle_wide = 0xf2fc, fa_rectangles_mixed = 0xe323, fa_reel = 0xe238, + fa_reflect_both = 0xe66f, fa_reflect_horizontal = 0xe664, fa_reflect_vertical = 0xe665, fa_refrigerator = 0xe026, @@ -4502,6 +4553,9 @@ enum fa_pro_icons : uint16_t { fa_symbols = 0xf86e, fa_icons_alt = 0xf86e, fa_t_rex = 0xe629, + fa_table_cells_column_unlock = 0xe690, + fa_table_cells_lock = 0xe679, + fa_table_cells_unlock = 0xe692, fa_table_layout = 0xe290, fa_table_picnic = 0xe32d, fa_table_pivot = 0xe291, @@ -4669,11 +4723,13 @@ enum fa_pro_icons : uint16_t { fa_arrow_alt_from_bottom = 0xf346, fa_up_left = 0xe2bd, fa_up_right = 0xe2be, + fa_up_to_bracket = 0xe66e, fa_up_to_dotted_line = 0xe457, fa_up_to_line = 0xf34d, fa_arrow_alt_to_top = 0xf34d, fa_usb_drive = 0xf8e9, fa_user_alien = 0xe04a, + fa_user_beard_bolt = 0xe689, fa_user_bounty_hunter = 0xe2bf, fa_user_chef = 0xe3d2, fa_user_cowboy = 0xf8ea, @@ -4696,6 +4752,7 @@ enum fa_pro_icons : uint16_t { fa_user_helmet_safety = 0xf82c, fa_user_construction = 0xf82c, fa_user_hard_hat = 0xf82c, + fa_user_hoodie = 0xe68a, fa_user_magnifying_glass = 0xe5c5, fa_user_music = 0xf8eb, fa_user_nurse_hair = 0xe45d, diff --git a/QtAwesome/QtAwesomePro.qrc b/QtAwesome/QtAwesomePro.qrc index 5c21e32..55ba8f5 100644 --- a/QtAwesome/QtAwesomePro.qrc +++ b/QtAwesome/QtAwesomePro.qrc @@ -2,13 +2,20 @@ fonts/Font Awesome 6 Brands-Regular-400.otf fonts/pro/Font Awesome 6 Duotone-Solid-900.otf - fonts/pro/Font Awesome 6 Pro-Light-300.otf - fonts/pro/Font Awesome 6 Pro-Regular-400.otf + fonts/pro/Font Awesome 6 Duotone-Regular-400.otf + fonts/pro/Font Awesome 6 Duotone-Light-300.otf + fonts/pro/Font Awesome 6 Duotone-Thin-100.otf fonts/pro/Font Awesome 6 Pro-Solid-900.otf + fonts/pro/Font Awesome 6 Pro-Regular-400.otf + fonts/pro/Font Awesome 6 Pro-Light-300.otf fonts/pro/Font Awesome 6 Pro-Thin-100.otf fonts/pro/Font Awesome 6 Sharp-Solid-900.otf fonts/pro/Font Awesome 6 Sharp-Regular-400.otf fonts/pro/Font Awesome 6 Sharp-Light-300.otf fonts/pro/Font Awesome 6 Sharp-Thin-100.otf + fonts/pro/Font Awesome 6 Sharp Duotone-Solid-900.otf + fonts/pro/Font Awesome 6 Sharp Duotone-Regular-400.otf + fonts/pro/Font Awesome 6 Sharp Duotone-Light-300.otf + fonts/pro/Font Awesome 6 Sharp Duotone-Thin-100.otf diff --git a/QtAwesome/QtAwesomeStringGenerated.h b/QtAwesome/QtAwesomeStringGenerated.h index 80e9631..a11be64 100644 --- a/QtAwesome/QtAwesomeStringGenerated.h +++ b/QtAwesome/QtAwesomeStringGenerated.h @@ -370,6 +370,7 @@ static const fa::QtAwesomeNamedIcon faCommonIconArray[] = { { "chart-bar", fa::fa_chart_bar } , { "bar-chart", fa::fa_bar_chart } , { "chart-column", fa::fa_chart_column } , + { "chart-diagram", fa::fa_chart_diagram } , { "chart-gantt", fa::fa_chart_gantt } , { "chart-line", fa::fa_chart_line } , { "line-chart", fa::fa_line_chart } , @@ -505,6 +506,7 @@ static const fa::QtAwesomeNamedIcon faCommonIconArray[] = { { "comment-dots", fa::fa_comment_dots } , { "commenting", fa::fa_commenting } , { "comment-medical", fa::fa_comment_medical } , + { "comment-nodes", fa::fa_comment_nodes } , { "comment-slash", fa::fa_comment_slash } , { "comment-sms", fa::fa_comment_sms } , { "sms", fa::fa_sms } , @@ -742,6 +744,8 @@ static const fa::QtAwesomeNamedIcon faCommonIconArray[] = { { "file-excel", fa::fa_file_excel } , { "file-export", fa::fa_file_export } , { "arrow-right-from-file", fa::fa_arrow_right_from_file } , + { "file-fragment", fa::fa_file_fragment } , + { "file-half-dashed", fa::fa_file_half_dashed } , { "file-image", fa::fa_file_image } , { "file-import", fa::fa_file_import } , { "arrow-right-to-file", fa::fa_arrow_right_to_file } , @@ -945,6 +949,8 @@ static const fa::QtAwesomeNamedIcon faCommonIconArray[] = { { "hard-hat", fa::fa_hard_hat } , { "hat-hard", fa::fa_hat_hard } , { "helmet-un", fa::fa_helmet_un } , + { "hexagon-nodes", fa::fa_hexagon_nodes } , + { "hexagon-nodes-bolt", fa::fa_hexagon_nodes_bolt } , { "highlighter", fa::fa_highlighter } , { "hill-avalanche", fa::fa_hill_avalanche } , { "hill-rockslide", fa::fa_hill_rockslide } , @@ -1567,6 +1573,7 @@ static const fa::QtAwesomeNamedIcon faCommonIconArray[] = { { "square", fa::fa_square } , { "square-arrow-up-right", fa::fa_square_arrow_up_right } , { "external-link-square", fa::fa_external_link_square } , + { "square-binary", fa::fa_square_binary } , { "square-caret-down", fa::fa_square_caret_down } , { "caret-square-down", fa::fa_caret_square_down } , { "square-caret-left", fa::fa_square_caret_left } , @@ -1654,8 +1661,11 @@ static const fa::QtAwesomeNamedIcon faCommonIconArray[] = { { "table", fa::fa_table } , { "table-cells", fa::fa_table_cells } , { "th", fa::fa_th } , + { "table-cells-column-lock", fa::fa_table_cells_column_lock } , { "table-cells-large", fa::fa_table_cells_large } , { "th-large", fa::fa_th_large } , + { "table-cells-row-lock", fa::fa_table_cells_row_lock } , + { "table-cells-row-unlock", fa::fa_table_cells_row_unlock } , { "table-columns", fa::fa_table_columns } , { "columns", fa::fa_columns } , { "table-list", fa::fa_table_list } , @@ -1724,6 +1734,8 @@ static const fa::QtAwesomeNamedIcon faCommonIconArray[] = { { "thumbs-up", fa::fa_thumbs_up } , { "thumbtack", fa::fa_thumbtack } , { "thumb-tack", fa::fa_thumb_tack } , + { "thumbtack-slash", fa::fa_thumbtack_slash } , + { "thumb-tack-slash", fa::fa_thumb_tack_slash } , { "ticket", fa::fa_ticket } , { "ticket-simple", fa::fa_ticket_simple } , { "ticket-alt", fa::fa_ticket_alt } , @@ -1996,6 +2008,7 @@ static const fa::QtAwesomeNamedIcon faBrandsIconArray[] = { { "blackberry", fa::fa_blackberry } , { "blogger", fa::fa_blogger } , { "blogger-b", fa::fa_blogger_b } , + { "bluesky", fa::fa_bluesky } , { "bluetooth", fa::fa_bluetooth } , { "bluetooth-b", fa::fa_bluetooth_b } , { "bootstrap", fa::fa_bootstrap } , @@ -2049,12 +2062,14 @@ static const fa::QtAwesomeNamedIcon faBrandsIconArray[] = { { "creative-commons-share", fa::fa_creative_commons_share } , { "creative-commons-zero", fa::fa_creative_commons_zero } , { "critical-role", fa::fa_critical_role } , + { "css", fa::fa_css } , { "css3", fa::fa_css3 } , { "css3-alt", fa::fa_css3_alt } , { "cuttlefish", fa::fa_cuttlefish } , { "d-and-d", fa::fa_d_and_d } , { "d-and-d-beyond", fa::fa_d_and_d_beyond } , { "dailymotion", fa::fa_dailymotion } , + { "dart-lang", fa::fa_dart_lang } , { "dashcube", fa::fa_dashcube } , { "debian", fa::fa_debian } , { "deezer", fa::fa_deezer } , @@ -2097,6 +2112,7 @@ static const fa::QtAwesomeNamedIcon faBrandsIconArray[] = { { "fedex", fa::fa_fedex } , { "fedora", fa::fa_fedora } , { "figma", fa::fa_figma } , + { "files-pinwheel", fa::fa_files_pinwheel } , { "firefox", fa::fa_firefox } , { "firefox-browser", fa::fa_firefox_browser } , { "first-order", fa::fa_first_order } , @@ -2104,6 +2120,7 @@ static const fa::QtAwesomeNamedIcon faBrandsIconArray[] = { { "firstdraft", fa::fa_firstdraft } , { "flickr", fa::fa_flickr } , { "flipboard", fa::fa_flipboard } , + { "flutter", fa::fa_flutter } , { "fly", fa::fa_fly } , { "font-awesome", fa::fa_font_awesome } , { "font-awesome-flag", fa::fa_font_awesome_flag } , @@ -2180,10 +2197,12 @@ static const fa::QtAwesomeNamedIcon faBrandsIconArray[] = { { "joomla", fa::fa_joomla } , { "js", fa::fa_js } , { "jsfiddle", fa::fa_jsfiddle } , + { "jxl", fa::fa_jxl } , { "kaggle", fa::fa_kaggle } , { "keybase", fa::fa_keybase } , { "keycdn", fa::fa_keycdn } , { "kickstarter", fa::fa_kickstarter } , + { "square-kickstarter", fa::fa_square_kickstarter } , { "kickstarter-k", fa::fa_kickstarter_k } , { "korvue", fa::fa_korvue } , { "laravel", fa::fa_laravel } , @@ -2323,6 +2342,7 @@ static const fa::QtAwesomeNamedIcon faBrandsIconArray[] = { { "spotify", fa::fa_spotify } , { "square-behance", fa::fa_square_behance } , { "behance-square", fa::fa_behance_square } , + { "square-bluesky", fa::fa_square_bluesky } , { "square-dribbble", fa::fa_square_dribbble } , { "dribbble-square", fa::fa_dribbble_square } , { "square-facebook", fa::fa_square_facebook } , @@ -2364,10 +2384,13 @@ static const fa::QtAwesomeNamedIcon faBrandsIconArray[] = { { "tumblr-square", fa::fa_tumblr_square } , { "square-twitter", fa::fa_square_twitter } , { "twitter-square", fa::fa_twitter_square } , + { "square-upwork", fa::fa_square_upwork } , { "square-viadeo", fa::fa_square_viadeo } , { "viadeo-square", fa::fa_viadeo_square } , { "square-vimeo", fa::fa_square_vimeo } , { "vimeo-square", fa::fa_vimeo_square } , + { "square-web-awesome", fa::fa_square_web_awesome } , + { "square-web-awesome-stroke", fa::fa_square_web_awesome_stroke } , { "square-whatsapp", fa::fa_square_whatsapp } , { "whatsapp-square", fa::fa_whatsapp_square } , { "square-x-twitter", fa::fa_square_x_twitter } , @@ -2437,6 +2460,7 @@ static const fa::QtAwesomeNamedIcon faBrandsIconArray[] = { { "vuejs", fa::fa_vuejs } , { "watchman-monitoring", fa::fa_watchman_monitoring } , { "waze", fa::fa_waze } , + { "web-awesome", fa::fa_web_awesome } , { "webflow", fa::fa_webflow } , { "weebly", fa::fa_weebly } , { "weibo", fa::fa_weibo } , @@ -2505,6 +2529,7 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "angle", fa::fa_angle } , { "angle-90", fa::fa_angle_90 } , { "angles-up-down", fa::fa_angles_up_down } , + { "ant", fa::fa_ant } , { "apartment", fa::fa_apartment } , { "aperture", fa::fa_aperture } , { "apostrophe", fa::fa_apostrophe } , @@ -2514,6 +2539,7 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "arrow-down-big-small", fa::fa_arrow_down_big_small } , { "sort-size-down", fa::fa_sort_size_down } , { "arrow-down-from-arc", fa::fa_arrow_down_from_arc } , + { "arrow-down-from-bracket", fa::fa_arrow_down_from_bracket } , { "arrow-down-from-dotted-line", fa::fa_arrow_down_from_dotted_line } , { "arrow-down-from-line", fa::fa_arrow_down_from_line } , { "arrow-from-top", fa::fa_arrow_from_top } , @@ -2533,10 +2559,12 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "arrow-down-triangle-square", fa::fa_arrow_down_triangle_square } , { "sort-shapes-down", fa::fa_sort_shapes_down } , { "arrow-left-from-arc", fa::fa_arrow_left_from_arc } , + { "arrow-left-from-bracket", fa::fa_arrow_left_from_bracket } , { "arrow-left-from-line", fa::fa_arrow_left_from_line } , { "arrow-from-right", fa::fa_arrow_from_right } , { "arrow-left-long-to-line", fa::fa_arrow_left_long_to_line } , { "arrow-left-to-arc", fa::fa_arrow_left_to_arc } , + { "arrow-left-to-bracket", fa::fa_arrow_left_to_bracket } , { "arrow-left-to-line", fa::fa_arrow_left_to_line } , { "arrow-to-left", fa::fa_arrow_to_left } , { "arrow-progress", fa::fa_arrow_progress } , @@ -2571,6 +2599,7 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "arrow-up-square-triangle", fa::fa_arrow_up_square_triangle } , { "sort-shapes-up-alt", fa::fa_sort_shapes_up_alt } , { "arrow-up-to-arc", fa::fa_arrow_up_to_arc } , + { "arrow-up-to-bracket", fa::fa_arrow_up_to_bracket } , { "arrow-up-to-dotted-line", fa::fa_arrow_up_to_dotted_line } , { "arrow-up-to-line", fa::fa_arrow_up_to_line } , { "arrow-to-top", fa::fa_arrow_to_top } , @@ -2712,6 +2741,7 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "border-outer", fa::fa_border_outer } , { "border-right", fa::fa_border_right } , { "border-top", fa::fa_border_top } , + { "bottle-baby", fa::fa_bottle_baby } , { "bow-arrow", fa::fa_bow_arrow } , { "bowl-chopsticks", fa::fa_bowl_chopsticks } , { "bowl-chopsticks-noodles", fa::fa_bowl_chopsticks_noodles } , @@ -2788,6 +2818,7 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "cabin", fa::fa_cabin } , { "cabinet-filing", fa::fa_cabinet_filing } , { "cactus", fa::fa_cactus } , + { "caduceus", fa::fa_caduceus } , { "cake-slice", fa::fa_cake_slice } , { "shortcake", fa::fa_shortcake } , { "calculator-simple", fa::fa_calculator_simple } , @@ -2857,6 +2888,8 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "card-spade", fa::fa_card_spade } , { "cards", fa::fa_cards } , { "cards-blank", fa::fa_cards_blank } , + { "carpool", fa::fa_carpool } , + { "car-people", fa::fa_car_people } , { "cars", fa::fa_cars } , { "cart-arrow-up", fa::fa_cart_arrow_up } , { "cart-circle-arrow-down", fa::fa_cart_circle_arrow_down } , @@ -2885,6 +2918,7 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "glass-champagne", fa::fa_glass_champagne } , { "chart-bullet", fa::fa_chart_bullet } , { "chart-candlestick", fa::fa_chart_candlestick } , + { "chart-fft", fa::fa_chart_fft } , { "chart-kanban", fa::fa_chart_kanban } , { "chart-line-down", fa::fa_chart_line_down } , { "chart-line-up", fa::fa_chart_line_up } , @@ -2904,6 +2938,7 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "chart-scatter-3d", fa::fa_chart_scatter_3d } , { "chart-scatter-bubble", fa::fa_chart_scatter_bubble } , { "chart-simple-horizontal", fa::fa_chart_simple_horizontal } , + { "chart-sine", fa::fa_chart_sine } , { "chart-tree-map", fa::fa_chart_tree_map } , { "chart-user", fa::fa_chart_user } , { "user-chart", fa::fa_user_chart } , @@ -2989,6 +3024,7 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "circle-exclamation-check", fa::fa_circle_exclamation_check } , { "circle-f", fa::fa_circle_f } , { "circle-g", fa::fa_circle_g } , + { "circle-gf", fa::fa_circle_gf } , { "circle-half", fa::fa_circle_half } , { "circle-heart", fa::fa_circle_heart } , { "heart-circle", fa::fa_heart_circle } , @@ -3044,11 +3080,16 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "circle-w", fa::fa_circle_w } , { "circle-waveform-lines", fa::fa_circle_waveform_lines } , { "waveform-circle", fa::fa_waveform_circle } , + { "circle-wifi", fa::fa_circle_wifi } , + { "circle-wifi-circle-wifi", fa::fa_circle_wifi_circle_wifi } , + { "circle-wifi-group", fa::fa_circle_wifi_group } , { "circle-x", fa::fa_circle_x } , { "circle-y", fa::fa_circle_y } , { "circle-yen", fa::fa_circle_yen } , { "circle-z", fa::fa_circle_z } , { "circles-overlap", fa::fa_circles_overlap } , + { "circles-overlap-3", fa::fa_circles_overlap_3 } , + { "pronoun", fa::fa_pronoun } , { "citrus", fa::fa_citrus } , { "citrus-slice", fa::fa_citrus_slice } , { "clapperboard-play", fa::fa_clapperboard_play } , @@ -3218,6 +3259,7 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "diamond-exclamation", fa::fa_diamond_exclamation } , { "diamond-half", fa::fa_diamond_half } , { "diamond-half-stroke", fa::fa_diamond_half_stroke } , + { "diamonds-4", fa::fa_diamonds_4 } , { "dice-d10", fa::fa_dice_d10 } , { "dice-d12", fa::fa_dice_d12 } , { "dice-d4", fa::fa_dice_d4 } , @@ -3247,6 +3289,7 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "doughnut", fa::fa_doughnut } , { "down", fa::fa_down } , { "arrow-alt-down", fa::fa_arrow_alt_down } , + { "down-from-bracket", fa::fa_down_from_bracket } , { "down-from-dotted-line", fa::fa_down_from_dotted_line } , { "down-from-line", fa::fa_down_from_line } , { "arrow-alt-from-top", fa::fa_arrow_alt_from_top } , @@ -3387,6 +3430,7 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "field-hockey-stick-ball", fa::fa_field_hockey_stick_ball } , { "field-hockey", fa::fa_field_hockey } , { "file-binary", fa::fa_file_binary } , + { "file-cad", fa::fa_file_cad } , { "file-certificate", fa::fa_file_certificate } , { "file-award", fa::fa_file_award } , { "file-chart-column", fa::fa_file_chart_column } , @@ -3546,6 +3590,7 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "globe-pointer", fa::fa_globe_pointer } , { "globe-snow", fa::fa_globe_snow } , { "globe-stand", fa::fa_globe_stand } , + { "globe-wifi", fa::fa_globe_wifi } , { "goal-net", fa::fa_goal_net } , { "golf-club", fa::fa_golf_club } , { "golf-flag-hole", fa::fa_golf_flag_hole } , @@ -3675,6 +3720,7 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "house-window", fa::fa_house_window } , { "hundred-points", fa::fa_hundred_points } , { "100", fa::fa_100 } , + { "hydra", fa::fa_hydra } , { "hyphen", fa::fa_hyphen } , { "ice-skate", fa::fa_ice_skate } , { "image-landscape", fa::fa_image_landscape } , @@ -3745,9 +3791,11 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "leafy-green", fa::fa_leafy_green } , { "left", fa::fa_left } , { "arrow-alt-left", fa::fa_arrow_alt_left } , + { "left-from-bracket", fa::fa_left_from_bracket } , { "left-from-line", fa::fa_left_from_line } , { "arrow-alt-from-right", fa::fa_arrow_alt_from_right } , { "left-long-to-line", fa::fa_left_long_to_line } , + { "left-to-bracket", fa::fa_left_to_bracket } , { "left-to-line", fa::fa_left_to_line } , { "arrow-alt-to-left", fa::fa_arrow_alt_to_left } , { "light-ceiling", fa::fa_light_ceiling } , @@ -3762,6 +3810,7 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "lightbulb-exclamation", fa::fa_lightbulb_exclamation } , { "lightbulb-exclamation-on", fa::fa_lightbulb_exclamation_on } , { "lightbulb-gear", fa::fa_lightbulb_gear } , + { "lightbulb-message", fa::fa_lightbulb_message } , { "lightbulb-on", fa::fa_lightbulb_on } , { "lightbulb-slash", fa::fa_lightbulb_slash } , { "lighthouse", fa::fa_lighthouse } , @@ -3976,6 +4025,7 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "octagon-xmark", fa::fa_octagon_xmark } , { "times-octagon", fa::fa_times_octagon } , { "xmark-octagon", fa::fa_xmark_octagon } , + { "octopus", fa::fa_octopus } , { "oil-can-drip", fa::fa_oil_can_drip } , { "oil-temperature", fa::fa_oil_temperature } , { "oil-temp", fa::fa_oil_temp } , @@ -4169,6 +4219,7 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "rectangle-wide", fa::fa_rectangle_wide } , { "rectangles-mixed", fa::fa_rectangles_mixed } , { "reel", fa::fa_reel } , + { "reflect-both", fa::fa_reflect_both } , { "reflect-horizontal", fa::fa_reflect_horizontal } , { "reflect-vertical", fa::fa_reflect_vertical } , { "refrigerator", fa::fa_refrigerator } , @@ -4500,6 +4551,9 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "symbols", fa::fa_symbols } , { "icons-alt", fa::fa_icons_alt } , { "t-rex", fa::fa_t_rex } , + { "table-cells-column-unlock", fa::fa_table_cells_column_unlock } , + { "table-cells-lock", fa::fa_table_cells_lock } , + { "table-cells-unlock", fa::fa_table_cells_unlock } , { "table-layout", fa::fa_table_layout } , { "table-picnic", fa::fa_table_picnic } , { "table-pivot", fa::fa_table_pivot } , @@ -4667,11 +4721,13 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "arrow-alt-from-bottom", fa::fa_arrow_alt_from_bottom } , { "up-left", fa::fa_up_left } , { "up-right", fa::fa_up_right } , + { "up-to-bracket", fa::fa_up_to_bracket } , { "up-to-dotted-line", fa::fa_up_to_dotted_line } , { "up-to-line", fa::fa_up_to_line } , { "arrow-alt-to-top", fa::fa_arrow_alt_to_top } , { "usb-drive", fa::fa_usb_drive } , { "user-alien", fa::fa_user_alien } , + { "user-beard-bolt", fa::fa_user_beard_bolt } , { "user-bounty-hunter", fa::fa_user_bounty_hunter } , { "user-chef", fa::fa_user_chef } , { "user-cowboy", fa::fa_user_cowboy } , @@ -4694,6 +4750,7 @@ static const fa::QtAwesomeNamedIcon faProIconArray[] = { { "user-helmet-safety", fa::fa_user_helmet_safety } , { "user-construction", fa::fa_user_construction } , { "user-hard-hat", fa::fa_user_hard_hat } , + { "user-hoodie", fa::fa_user_hoodie } , { "user-magnifying-glass", fa::fa_user_magnifying_glass } , { "user-music", fa::fa_user_music } , { "user-nurse-hair", fa::fa_user_nurse_hair } , diff --git a/QtAwesome/fonts/Font Awesome 6 Brands-Regular-400.otf b/QtAwesome/fonts/Font Awesome 6 Brands-Regular-400.otf index 80ff0b6..e2dde2a 100644 Binary files a/QtAwesome/fonts/Font Awesome 6 Brands-Regular-400.otf and b/QtAwesome/fonts/Font Awesome 6 Brands-Regular-400.otf differ diff --git a/QtAwesome/fonts/Font Awesome 6 Free-Regular-400.otf b/QtAwesome/fonts/Font Awesome 6 Free-Regular-400.otf index 2edf2b2..325973f 100644 Binary files a/QtAwesome/fonts/Font Awesome 6 Free-Regular-400.otf and b/QtAwesome/fonts/Font Awesome 6 Free-Regular-400.otf differ diff --git a/QtAwesome/fonts/Font Awesome 6 Free-Solid-900.otf b/QtAwesome/fonts/Font Awesome 6 Free-Solid-900.otf index 6bd19b1..70d2846 100644 Binary files a/QtAwesome/fonts/Font Awesome 6 Free-Solid-900.otf and b/QtAwesome/fonts/Font Awesome 6 Free-Solid-900.otf differ diff --git a/QtAwesomeSample/mainwindow.cpp b/QtAwesomeSample/mainwindow.cpp index 549bb27..fa6f7f5 100644 --- a/QtAwesomeSample/mainwindow.cpp +++ b/QtAwesomeSample/mainwindow.cpp @@ -19,11 +19,19 @@ MainWindow::MainWindow(QWidget *parent) : #ifdef FONT_AWESOME_PRO ui->comboBox->addItem("Light", fa::fa_light); ui->comboBox->addItem("Thin", fa::fa_thin); - ui->comboBox->addItem("Duotone", fa::fa_duotone); + // ui->comboBox->addItem("Duotone", fa::fa_duotone); // DEPRECATED + ui->comboBox->addItem("Duotone Solid", fa::fa_duotone); + ui->comboBox->addItem("Duotone Regular", fa::fa_duotone_regular); + ui->comboBox->addItem("Duotone Light", fa::fa_duotone_light); + ui->comboBox->addItem("Duotone Thin", fa::fa_duotone_thin); ui->comboBox->addItem("Sharp Solid", fa::fa_sharp_solid); ui->comboBox->addItem("Sharp Regular", fa::fa_sharp_regular); ui->comboBox->addItem("Sharp Light", fa::fa_sharp_light); ui->comboBox->addItem("Sharp Thin", fa::fa_sharp_thin); + ui->comboBox->addItem("Sharp Duotone Solid", fa::fa_sharp_duotone_solid); + ui->comboBox->addItem("Sharp Duotone Regular", fa::fa_sharp_duotone_regular); + ui->comboBox->addItem("Sharp Duotone Light", fa::fa_sharp_duotone_light); + ui->comboBox->addItem("Sharp Duotone Thin", fa::fa_sharp_duotone_thin); #endif // a simple beer button diff --git a/README.md b/README.md index 4d1a6c0..e4918c5 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,13 @@ icons to your [Qt application](http://qt-project.org/). - [Contact](#contact) - [License](#license) -## Latest Release 6.5.1 +## Latest Release 6.7.1 -Pro Sharp Thin font support. +Extra Duotone styles + +- Expand Duotone to support Solid, Regular, Light and Thin +- Add Sharp Duoto styles +- Deprecated Duotone (without style) [View changelog](CHANGES.md)