version 20230504

haitao127 · May 5, 2023 · 529ddcd · 529ddcd
1 parent 54c3eec
commit 529ddcd
Show file tree

Hide file tree

Showing 36 changed files with 721 additions and 303 deletions.
diff --git a/app/display/fonts/src/main/java/org/csstudio/display/fonts/CommonFonts.java b/app/display/fonts/src/main/java/org/csstudio/display/fonts/CommonFonts.java
@@ -26,18 +26,13 @@ public class CommonFonts
 {
     private final static String[] fonts = new String[]
     {
-        "LiberationMono-Regular.ttf",
-        "LiberationSerif-Bold.ttf",
-        "LiberationSans-Bold.ttf",
-        "LiberationSerif-BoldItalic.ttf",
-        "LiberationMono-Bold.ttf",
-        "LiberationSans-BoldItalic.ttf",
-        "LiberationSerif-Italic.ttf",
-        "LiberationMono-BoldItalic.ttf",
-        "LiberationSans-Italic.ttf",
-        "LiberationSerif-Regular.ttf",
-        "LiberationMono-Italic.ttf",
-        "LiberationSans-Regular.ttf"
+        "SourceHanSansCN-Bold.otf",
+        "SourceHanSansCN-ExtraLight.otf",
+        "SourceHanSansCN-Heavy.otf",
+        "SourceHanSansCN-Light.otf",
+        "SourceHanSansCN-Medium.otf",
+        "SourceHanSansCN-Normal.otf",
+        "SourceHanSansCN-Regular.otf"
     };
 
     /** Install common fonts */

diff --git a/app/display/fonts/src/main/resources/fonts/AUTHORS b/app/display/fonts/src/main/resources/fonts/AUTHORS
diff --git a/app/display/fonts/src/main/resources/fonts/LiberationMono-Bold.ttf b/app/display/fonts/src/main/resources/fonts/LiberationMono-Bold.ttf
diff --git a/app/display/fonts/src/main/resources/fonts/LiberationMono-BoldItalic.ttf b/app/display/fonts/src/main/resources/fonts/LiberationMono-BoldItalic.ttf
diff --git a/app/display/fonts/src/main/resources/fonts/LiberationMono-Italic.ttf b/app/display/fonts/src/main/resources/fonts/LiberationMono-Italic.ttf
diff --git a/app/display/fonts/src/main/resources/fonts/LiberationMono-Regular.ttf b/app/display/fonts/src/main/resources/fonts/LiberationMono-Regular.ttf
diff --git a/app/display/fonts/src/main/resources/fonts/LiberationSans-Bold.ttf b/app/display/fonts/src/main/resources/fonts/LiberationSans-Bold.ttf
diff --git a/app/display/fonts/src/main/resources/fonts/LiberationSans-BoldItalic.ttf b/app/display/fonts/src/main/resources/fonts/LiberationSans-BoldItalic.ttf
diff --git a/app/display/fonts/src/main/resources/fonts/LiberationSans-Italic.ttf b/app/display/fonts/src/main/resources/fonts/LiberationSans-Italic.ttf
diff --git a/app/display/fonts/src/main/resources/fonts/LiberationSans-Regular.ttf b/app/display/fonts/src/main/resources/fonts/LiberationSans-Regular.ttf
diff --git a/app/display/fonts/src/main/resources/fonts/LiberationSerif-Bold.ttf b/app/display/fonts/src/main/resources/fonts/LiberationSerif-Bold.ttf
diff --git a/app/display/fonts/src/main/resources/fonts/LiberationSerif-BoldItalic.ttf b/app/display/fonts/src/main/resources/fonts/LiberationSerif-BoldItalic.ttf
diff --git a/app/display/fonts/src/main/resources/fonts/LiberationSerif-Italic.ttf b/app/display/fonts/src/main/resources/fonts/LiberationSerif-Italic.ttf
diff --git a/app/display/fonts/src/main/resources/fonts/LiberationSerif-Regular.ttf b/app/display/fonts/src/main/resources/fonts/LiberationSerif-Regular.ttf
diff --git a/app/display/fonts/src/main/resources/fonts/SourceHanSansCN-Bold.otf b/app/display/fonts/src/main/resources/fonts/SourceHanSansCN-Bold.otf
diff --git a/app/display/fonts/src/main/resources/fonts/SourceHanSansCN-ExtraLight.otf b/app/display/fonts/src/main/resources/fonts/SourceHanSansCN-ExtraLight.otf
diff --git a/app/display/fonts/src/main/resources/fonts/SourceHanSansCN-Heavy.otf b/app/display/fonts/src/main/resources/fonts/SourceHanSansCN-Heavy.otf
diff --git a/app/display/fonts/src/main/resources/fonts/SourceHanSansCN-Light.otf b/app/display/fonts/src/main/resources/fonts/SourceHanSansCN-Light.otf
diff --git a/app/display/fonts/src/main/resources/fonts/SourceHanSansCN-Medium.otf b/app/display/fonts/src/main/resources/fonts/SourceHanSansCN-Medium.otf
diff --git a/app/display/fonts/src/main/resources/fonts/SourceHanSansCN-Normal.otf b/app/display/fonts/src/main/resources/fonts/SourceHanSansCN-Normal.otf
diff --git a/app/display/fonts/src/main/resources/fonts/SourceHanSansCN-Regular.otf b/app/display/fonts/src/main/resources/fonts/SourceHanSansCN-Regular.otf