diff --git a/SunnyUI/Font/UFontAwesomeV6.cs b/SunnyUI/Font/UFontAwesomeV6.cs
index 3fa93639..0813c842 100644
--- a/SunnyUI/Font/UFontAwesomeV6.cs
+++ b/SunnyUI/Font/UFontAwesomeV6.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+ /******************************************************************************
* SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
* CopyRight (C) 2012-2024 ShenYongHua(沈永华).
* QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
@@ -19,6 +19,7 @@
* 2023-04-23: V3.3.5 增加文件说明
* 2024-06-26: V3.6.7 更新为Font Awesome version: 6.5.2
* 2024-06-27: V3.6.7 减小文件大小
+ * 2024-07-21: V3.6.8 更新为Font Awesome version: 6.6.0
******************************************************************************/
/******************************************************************************
@@ -26,7 +27,7 @@
* https://fontawesome.com/license/free
* https://github.com/FortAwesome/Font-Awesome/blob/6.x/LICENSE.txt
******************************************************************************
-
+
UPDATED: JULY 12, 2018
Font Awesome Free License
@@ -60,7 +61,7 @@ learn about Font Awesome.
namespace Sunny.UI;
///
-///Font Awesome version: 6.5.2
+///Font Awesome version: 6.6.0
///fa-regular-400.ttf
///Symbol count: 163
///
@@ -232,9 +233,9 @@ public static class FontAweSomeV6Regular
}
///
-///Font Awesome version: 6.5.2
+///Font Awesome version: 6.6.0
///fa-brands-400.ttf
-///Symbol count: 490
+///Symbol count: 492
///
public static class FontAweSomeV6Brands
{
@@ -340,6 +341,7 @@ public static class FontAweSomeV6Brands
public const int fa_d_and_d_beyond = 0xf6ca;
public const int fa_d_and_d = 0xf38d;
public const int fa_dailymotion = 0xe052;
+ public const int fa_dart_lang = 0xe693;
public const int fa_dashcube = 0xf210;
public const int fa_debian = 0xe60b;
public const int fa_deezer = 0xe077;
@@ -389,6 +391,7 @@ public static class FontAweSomeV6Brands
public const int fa_firstdraft = 0xf3a1;
public const int fa_flickr = 0xf16e;
public const int fa_flipboard = 0xf44d;
+ public const int fa_flutter = 0xe694;
public const int fa_fly = 0xf417;
public const int fa_font_awesome = 0xf2b4;
public const int fa_fonticons_fi = 0xf3a2;
@@ -731,9 +734,9 @@ public static class FontAweSomeV6Brands
}
///
-///Font Awesome version: 6.5.2
+///Font Awesome version: 6.6.0
///fa-solid-900.ttf
-///Symbol count: 1392
+///Symbol count: 1395
///
public static class FontAweSomeV6Solid
{
@@ -1924,6 +1927,7 @@ public static class FontAweSomeV6Solid
public const int fa_table_cells_column_lock = 0xe678;
public const int fa_table_cells_large = 0xf009;
public const int fa_table_cells_row_lock = 0xe67a;
+ public const int fa_table_cells_row_unlock = 0xe691;
public const int fa_table_cells = 0xf00a;
public const int fa_table_columns = 0xf0db;
public const int fa_table_list = 0xf00b;
@@ -1965,6 +1969,7 @@ public static class FontAweSomeV6Solid
public const int fa_thermometer = 0xf491;
public const int fa_thumbs_down = 0xf165;
public const int fa_thumbs_up = 0xf164;
+ public const int fa_thumbtack_slash = 0xe68f;
public const int fa_thumbtack = 0xf08d;
public const int fa_ticket_simple = 0xf3ff;
public const int fa_ticket = 0xf145;
@@ -2103,6 +2108,7 @@ public static class FontAweSomeV6Solid
public const int fa_water_ladder = 0xf5c5;
public const int fa_water = 0xf773;
public const int fa_wave_square = 0xf83e;
+ public const int fa_web_awesome = 0xe682;
public const int fa_weight_hanging = 0xf5cd;
public const int fa_weight_scale = 0xf496;
public const int fa_wheat_awn_circle_exclamation = 0xe598;
diff --git a/SunnyUI/Font/UFontImages.cs b/SunnyUI/Font/UFontImages.cs
index c8dc5650..1690ff9e 100644
--- a/SunnyUI/Font/UFontImages.cs
+++ b/SunnyUI/Font/UFontImages.cs
@@ -185,17 +185,82 @@ namespace Sunny.UI
}
}
- internal static class FontAweSomeV6ItemBuilder
+ public static class FontAweSomeV6ItemBuilder
{
public static void Build()
{
string path = @"D:\Temp\Font-Awesome-6.x\";
string scss = path + @"scss\_variables.scss";
- string version = "Font Awesome version: 6.5.2";
+ string version = "Font Awesome version: 6.6.0";
string[] lines = File.ReadAllLines(scss);
+ string header = """
+ /******************************************************************************
+ * SunnyUI 开源控件库、工具类库、扩展类库、多页面开发框架。
+ * CopyRight (C) 2012-2024 ShenYongHua(沈永华).
+ * QQ群：56829229 QQ：17612584 EMail：SunnyUI@QQ.Com
+ *
+ * Blog: https://www.cnblogs.com/yhuse
+ * Gitee: https://gitee.com/yhuse/SunnyUI
+ * GitHub: https://github.com/yhuse/SunnyUI
+ *
+ * SunnyUI.dll can be used for free under the GPL-3.0 license.
+ * If you use this code, please keep this note.
+ * 如果您使用此代码，请保留此说明。
+ ******************************************************************************
+ * 文件名称: UFontAwesomeV6.cs
+ * 文件说明: 字体图片定义类：FontAweSome，V6.4.0
+ * 当前版本: V3.1
+ * 创建日期: 2023-04-23
+ *
+ * 2023-04-23: V3.3.5 增加文件说明
+ * 2024-06-26: V3.6.7 更新为Font Awesome version: 6.5.2
+ * 2024-06-27: V3.6.7 减小文件大小
+ * 2024-07-21: V3.6.8 更新为Font Awesome version: 6.6.0
+ ******************************************************************************/
+
+ /******************************************************************************
+ * https://fontawesome.com/search?o=r&m=free
+ * https://fontawesome.com/license/free
+ * https://github.com/FortAwesome/Font-Awesome/blob/6.x/LICENSE.txt
+ ******************************************************************************
+
+ UPDATED: JULY 12, 2018
+
+ Font Awesome Free License
+
+ Font Awesome Free is free, open source, and GPL friendly. You can use it for
+ commercial projects, open source projects, or really almost whatever you want.
+
+ Icons - CC BY 4.0 License
+ In the Font Awesome Free download, the CC BY 4.0 license applies to all icons
+ packaged as .svg and .js files types.
+
+ Fonts - SIL OFL 1.1 License
+ In the Font Awesome Free download, the SIL OFL license applies to all icons
+ packaged as web and desktop font files.
+
+ Code - MIT License
+ In the Font Awesome Free download, the MIT license applies to all non-font and
+ non-icon files.
+
+ Attribution
+ Attribution is required by MIT, SIL OFL, and CC BY licenses. Downloaded Font
+ Awesome Free files already contain embedded comments with sufficient
+ attribution, so you shouldn't need to do anything additional when using
+ these files normally.
+
+ We've kept attribution comments terse, so we ask that you do not actively work
+ to remove them from files, especially code. They're a great way for folks to
+ learn about Font Awesome.
+ ******************************************************************************/
+
+ """;
+
StringBuilder sb = new StringBuilder();
+ sb.AppendLine(header);
+
int startLine = 0;
for (startLine = 0; startLine < lines.Length; startLine++)
{
@@ -284,7 +349,7 @@ namespace Sunny.UI
}
sb.AppendLine("}");
- File.WriteAllText("D:\\UFontAwesomeV6.cs", sb.ToString());
+ File.WriteAllText("D:\\UFontAwesomeV6.cs", sb.ToString(), Encoding.UTF8);
}
}
}
diff --git a/SunnyUI/Font/fa-brands-400.ttf b/SunnyUI/Font/fa-brands-400.ttf
index 8c8a4023..38f72c3b 100644
Binary files a/SunnyUI/Font/fa-brands-400.ttf and b/SunnyUI/Font/fa-brands-400.ttf differ
diff --git a/SunnyUI/Font/fa-regular-400.ttf b/SunnyUI/Font/fa-regular-400.ttf
index 3d041f4d..5ebf3794 100644
Binary files a/SunnyUI/Font/fa-regular-400.ttf and b/SunnyUI/Font/fa-regular-400.ttf differ
diff --git a/SunnyUI/Font/fa-solid-900.ttf b/SunnyUI/Font/fa-solid-900.ttf
index 19a4d2bb..cee3c5bb 100644
Binary files a/SunnyUI/Font/fa-solid-900.ttf and b/SunnyUI/Font/fa-solid-900.ttf differ