Update to 6.4.0, Sharp Light Pro Font

gamecreature · Mar 28, 2023 · deeb5cb · deeb5cb
1 parent 61db41d
commit deeb5cb
Show file tree

Hide file tree

Showing 11 changed files with 89 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,7 @@
 # Changes
 
-- (2023-02-09) Update to 6.3.0, Aliases and Sharp Regular Pro fonts
+- (2023-03-28) Update to 6.4.0, Sharp Light Pro font
+- (2023-02-09) Update to 6.3.0, Aliases and Sharp Regular Pro font
   - Aliases are now included in the icon list names
   - Support for font style "Font Awesome Sharp Regular" (Pro)
   - Update generator to include all alias names

diff --git a/QtAwesome/QtAwesome.cpp b/QtAwesome/QtAwesome.cpp
@@ -215,6 +215,7 @@ const QString QtAwesome::FA_THIN_FONT_FILENAME = "pro/Font Awesome 6 Pro-Thin-10
 const QString QtAwesome::FA_SOLID_FONT_FILENAME = "pro/Font Awesome 6 Pro-Solid-900.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";
 #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";
@@ -256,6 +257,7 @@ QtAwesome::QtAwesome(QObject* parent)
     _fontDetails.insert(fa::fa_thin, QtAwesomeFontData(FA_THIN_FONT_FILENAME, FA_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));
 #endif
 }
 
@@ -319,6 +321,7 @@ bool QtAwesome::initFontAwesome()
     _namedCodepointsByStyle.insert(fa::fa_duotone, _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));
 #else
     addToNamedCodePoints(fa::fa_regular, faRegularFreeIconArray, sizeof(faRegularFreeIconArray)/sizeof(QtAwesomeNamedIcon));
 #endif
@@ -493,6 +496,7 @@ int QtAwesome::stringToStyleEnum(const QString style) const
     else if (style == "fa-duotone") return fa::fa_duotone;
     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;
 #endif
     return fa::fa_solid;
 }
@@ -509,6 +513,7 @@ const QString QtAwesome::styleEnumToString(int style) const
         case fa::fa_duotone: return "fa-duotone";
         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";
 #endif
     }
     return "fa_solid";

diff --git a/QtAwesome/QtAwesome.h b/QtAwesome/QtAwesome.h
@@ -34,6 +34,7 @@ enum fa_styles {
     fa_duotone = 5,
     fa_sharp_solid = 6,
     fa_sharp_regular = 7,
+    fa_sharp_light = 8,
 #endif
     fa_brands = 2
 };
@@ -89,12 +90,14 @@ Q_OBJECT
     static const QString FA_THIN_FONT_FILENAME; // 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 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_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;
 #endif
 
 public:

diff --git a/QtAwesome/QtAwesomeEnumGenerated.h b/QtAwesome/QtAwesomeEnumGenerated.h
@@ -2521,6 +2521,7 @@ enum fa_pro_icons : uint16_t {
             fa_arrow_left_long_to_line = 0xe3d4,
             fa_arrow_left_to_line = 0xf33e,
             fa_arrow_to_left = 0xf33e,
+            fa_arrow_progress = 0xe5df,
             fa_arrow_right_from_arc = 0xe4b1,
             fa_arrow_right_from_line = 0xf343,
             fa_arrow_from_left = 0xf343,
@@ -2582,6 +2583,7 @@ enum fa_pro_icons : uint16_t {
             fa_badge_sheriff = 0xf8a2,
             fa_badger_honey = 0xf6b4,
             fa_badminton = 0xe33a,
+            fa_bag_seedling = 0xe5f2,
             fa_bagel = 0xe3d7,
             fa_bags_shopping = 0xf847,
             fa_baguette = 0xe3d8,
@@ -2624,6 +2626,9 @@ enum fa_pro_icons : uint16_t {
             fa_bells = 0xf77f,
             fa_bench_tree = 0xe2e7,
             fa_billboard = 0xe5cd,
+            fa_bin_bottles = 0xe5f5,
+            fa_bin_bottles_recycle = 0xe5f6,
+            fa_bin_recycle = 0xe5f7,
             fa_binary = 0xe33b,
             fa_binary_circle_check = 0xe33c,
             fa_binary_lock = 0xe33d,
@@ -2775,6 +2780,7 @@ enum fa_pro_icons : uint16_t {
             fa_calendar_edit = 0xf333,
             fa_calendar_range = 0xe0d6,
             fa_calendar_star = 0xf736,
+            fa_calendar_users = 0xe5e2,
             fa_calendars = 0xe0d7,
             fa_camcorder = 0xf8a8,
             fa_video_handheld = 0xf8a8,
@@ -2848,11 +2854,16 @@ enum fa_pro_icons : uint16_t {
             fa_chart_candlestick = 0xe0e2,
             fa_chart_line_down = 0xf64d,
             fa_chart_line_up = 0xe0e5,
+            fa_chart_line_up_down = 0xe5d7,
             fa_chart_mixed = 0xf643,
             fa_analytics = 0xf643,
+            fa_chart_mixed_up_circle_currency = 0xe5d8,
+            fa_chart_mixed_up_circle_dollar = 0xe5d9,
             fa_chart_network = 0xf78a,
             fa_chart_pie_simple = 0xf64e,
             fa_chart_pie_alt = 0xf64e,
+            fa_chart_pie_simple_circle_currency = 0xe604,
+            fa_chart_pie_simple_circle_dollar = 0xe605,
             fa_chart_pyramid = 0xe0e6,
             fa_chart_radar = 0xe0e7,
             fa_chart_scatter = 0xf7ee,
@@ -2889,6 +2900,7 @@ enum fa_pro_icons : uint16_t {
             fa_chevron_double_right = 0xf324,
             fa_chevrons_up = 0xf325,
             fa_chevron_double_up = 0xf325,
+            fa_chf_sign = 0xe602,
             fa_chimney = 0xf78b,
             fa_chopsticks = 0xe3f7,
             fa_circle_0 = 0xe0ed,
@@ -3002,6 +3014,7 @@ enum fa_pro_icons : uint16_t {
             fa_circle_y = 0xe12f,
             fa_circle_yen = 0xe5d0,
             fa_circle_z = 0xe130,
+            fa_circles_overlap = 0xe600,
             fa_citrus = 0xe2f4,
             fa_citrus_slice = 0xe2f5,
             fa_clapperboard_play = 0xe132,
@@ -3036,6 +3049,7 @@ enum fa_pro_icons : uint16_t {
             fa_clock_two_thirty = 0xe35b,
             fa_closed_captioning_slash = 0xe135,
             fa_clothes_hanger = 0xe136,
+            fa_cloud_binary = 0xe601,
             fa_cloud_bolt_moon = 0xf76d,
             fa_thunderstorm_moon = 0xf76d,
             fa_cloud_bolt_sun = 0xf76e,
@@ -3113,6 +3127,7 @@ enum fa_pro_icons : uint16_t {
             fa_computer_speaker = 0xf8b2,
             fa_container_storage = 0xf4b7,
             fa_conveyor_belt = 0xf46e,
+            fa_conveyor_belt_arm = 0xe5f8,
             fa_conveyor_belt_boxes = 0xf46f,
             fa_conveyor_belt_alt = 0xf46f,
             fa_conveyor_belt_empty = 0xe150,
@@ -3172,10 +3187,14 @@ enum fa_pro_icons : uint16_t {
             fa_dice_d12 = 0xf6ce,
             fa_dice_d4 = 0xf6d0,
             fa_dice_d8 = 0xf6d2,
+            fa_dinosaur = 0xe5fe,
             fa_diploma = 0xf5ea,
             fa_scroll_ribbon = 0xf5ea,
             fa_disc_drive = 0xf8b5,
             fa_display_arrow_down = 0xe164,
+            fa_display_chart_up = 0xe5e3,
+            fa_display_chart_up_circle_currency = 0xe5e5,
+            fa_display_chart_up_circle_dollar = 0xe5e6,
             fa_display_code = 0xe165,
             fa_desktop_code = 0xe165,
             fa_display_medical = 0xe166,
@@ -3341,6 +3360,7 @@ enum fa_pro_icons : uint16_t {
             fa_file_circle_info = 0xe493,
             fa_file_dashed_line = 0xf877,
             fa_page_break = 0xf877,
+            fa_file_doc = 0xe5ed,
             fa_file_exclamation = 0xf31a,
             fa_file_heart = 0xe176,
             fa_file_lock = 0xe3a6,
@@ -3355,6 +3375,7 @@ enum fa_pro_icons : uint16_t {
             fa_file_user = 0xf65c,
             fa_file_xmark = 0xf317,
             fa_file_times = 0xf317,
+            fa_file_zip = 0xe5ee,
             fa_files = 0xe178,
             fa_files_medical = 0xf7fd,
             fa_film_canister = 0xf8b7,
@@ -3379,6 +3400,7 @@ enum fa_pro_icons : uint16_t {
             fa_flag_swallowtail = 0xf74c,
             fa_flag_alt = 0xf74c,
             fa_flashlight = 0xf8b8,
+            fa_flask_gear = 0xe5f1,
             fa_flask_round_poison = 0xf6e0,
             fa_flask_poison = 0xf6e0,
             fa_flask_round_potion = 0xf6e1,
@@ -3458,6 +3480,9 @@ enum fa_pro_icons : uint16_t {
             fa_tachometer_fastest = 0xf62b,
             fa_gauge_simple_min = 0xf62d,
             fa_tachometer_slowest = 0xf62d,
+            fa_gear_code = 0xe5e8,
+            fa_gear_complex = 0xe5e9,
+            fa_gear_complex_code = 0xe5eb,
             fa_gif = 0xe190,
             fa_gift_card = 0xf663,
             fa_gingerbread_man = 0xf79d,
@@ -3486,6 +3511,11 @@ enum fa_pro_icons : uint16_t {
             fa_grid_5 = 0xe199,
             fa_grid_dividers = 0xe3ad,
             fa_grid_horizontal = 0xe307,
+            fa_grid_round = 0xe5da,
+            fa_grid_round_2 = 0xe5db,
+            fa_grid_round_2_plus = 0xe5dc,
+            fa_grid_round_4 = 0xe5dd,
+            fa_grid_round_5 = 0xe5de,
             fa_grill = 0xe5a3,
             fa_grill_fire = 0xe5a4,
             fa_grill_hot = 0xe5a5,
@@ -3525,6 +3555,7 @@ enum fa_pro_icons : uint16_t {
             fa_hands_holding_heart = 0xf4c3,
             fa_hands_heart = 0xf4c3,
             fa_hashtag_lock = 0xe415,
+            fa_hat_beach = 0xe606,
             fa_hat_chef = 0xf86b,
             fa_hat_santa = 0xf7a7,
             fa_hat_winter = 0xf7a8,
@@ -3620,6 +3651,7 @@ enum fa_pro_icons : uint16_t {
             fa_jack_o_lantern = 0xf30e,
             fa_joystick = 0xf8c5,
             fa_jug = 0xf8c6,
+            fa_jug_bottle = 0xe5fb,
             fa_kazoo = 0xf8c7,
             fa_kerning = 0xf86f,
             fa_key_skeleton = 0xf6f3,
@@ -3643,6 +3675,7 @@ enum fa_pro_icons : uint16_t {
             fa_lamp_floor = 0xe015,
             fa_lamp_street = 0xe1c5,
             fa_laptop_arrow_down = 0xe1c6,
+            fa_laptop_binary = 0xe5e7,
             fa_laptop_mobile = 0xf87a,
             fa_phone_laptop = 0xf87a,
             fa_laptop_slash = 0xe1c7,
@@ -3674,6 +3707,7 @@ enum fa_pro_icons : uint16_t {
             fa_lightbulb_dollar = 0xf670,
             fa_lightbulb_exclamation = 0xf671,
             fa_lightbulb_exclamation_on = 0xe1ca,
+            fa_lightbulb_gear = 0xe5fd,
             fa_lightbulb_on = 0xf672,
             fa_lightbulb_slash = 0xf673,
             fa_lights_holiday = 0xf7b2,
@@ -3961,6 +3995,7 @@ enum fa_pro_icons : uint16_t {
             fa_person_from_portal = 0xe023,
             fa_portal_exit = 0xe023,
             fa_person_pinball = 0xe21d,
+            fa_person_running_fast = 0xe5ff,
             fa_person_seat = 0xe21e,
             fa_person_seat_reclined = 0xe21f,
             fa_person_sign = 0xf757,
@@ -4080,6 +4115,7 @@ enum fa_pro_icons : uint16_t {
             fa_arrow_alt_right = 0xf356,
             fa_right_from_line = 0xf347,
             fa_arrow_alt_from_left = 0xf347,
+            fa_right_left_large = 0xe5e1,
             fa_right_long_to_line = 0xe444,
             fa_right_to_line = 0xf34c,
             fa_arrow_alt_to_right = 0xf34c,
@@ -4554,6 +4590,7 @@ enum fa_pro_icons : uint16_t {
             fa_user_md_chat = 0xf82e,
             fa_user_group_crown = 0xf6a5,
             fa_users_crown = 0xf6a5,
+            fa_user_group_simple = 0xe603,
             fa_user_hair = 0xe45a,
             fa_user_hair_buns = 0xe3d3,
             fa_user_hair_long = 0xe45b,

diff --git a/QtAwesome/QtAwesomePro.qrc b/QtAwesome/QtAwesomePro.qrc
@@ -8,5 +8,6 @@
         <file>fonts/pro/Font Awesome 6 Pro-Thin-100.otf</file>
         <file>fonts/pro/Font Awesome 6 Sharp-Solid-900.otf</file>
         <file>fonts/pro/Font Awesome 6 Sharp-Regular-400.otf</file>
+        <file>fonts/pro/Font Awesome 6 Sharp-Light-300.otf</file>
     </qresource>
 </RCC>