github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4385 from ShiinaRinne/font-ttc 

Add: 添加TTC格式字体支持
pull/4405/head
2dust 2023-11-10 15:09:34 +08:00 committed by GitHub
parent 2a22b65b2d be30064f9a
commit e3c8ccfafe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 362 additions and 358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

705
v2rayN/v2rayN/Resx/ResUI.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

2
v2rayN/v2rayN/Resx/ResUI.resx
View File

@ -1037,7 +1037,7 @@
<value>FontFamily(Require restart)</value> <value>FontFamily(Require restart)</value>
</data> </data>
<data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve"> <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
<value>Copy the font TTF file to the directory guiFonts, restart the settings</value> <value>Copy the font TTF/TTC file to the directory guiFonts, restart the settings</value>
</data> </data>
<data name="TbSettingsSocksPortTip" xml:space="preserve"> <data name="TbSettingsSocksPortTip" xml:space="preserve">
<value>http port=socks port+1</value> <value>http port=socks port+1</value>

2
v2rayN/v2rayN/Resx/ResUI.ru.resx
View File

@ -1043,7 +1043,7 @@
<value>Шрифт (требуется перезагрузка)</value> <value>Шрифт (требуется перезагрузка)</value>
</data> </data>
<data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve"> <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
<value>Скопируйте файл шрифта TTF в каталог guiFonts, перезапустите настройки</value> <value>Скопируйте файл шрифта TTF/TTC в каталог guiFonts, перезапустите настройки</value>
</data> </data>
<data name="TbSettingsSocksPortTip" xml:space="preserve"> <data name="TbSettingsSocksPortTip" xml:space="preserve">
<value>HTTP port=socks port+1</value> <value>HTTP port=socks port+1</value>

2
v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
View File

@ -1037,7 +1037,7 @@
<value>当前字体(需重启)</value> <value>当前字体(需重启)</value>
</data> </data>
<data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve"> <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
<value>拷贝字体TTF文件到目录guiFonts，重启设置</value> <value>拷贝字体TTF/TTC文件到目录guiFonts，重启设置</value>
</data> </data>
<data name="TbSettingsSocksPortTip" xml:space="preserve"> <data name="TbSettingsSocksPortTip" xml:space="preserve">
<value>http端口=socks端口+1</value> <value>http端口=socks端口+1</value>

2
v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
View File

@ -1037,7 +1037,7 @@
<value>目前字型(需重啟)</value> <value>目前字型(需重啟)</value>
</data> </data>
<data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve"> <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
<value>複製字型TTF文件到目錄guiFonts，重啟設定</value> <value>複製字型TTF/TTC文件到目錄guiFonts，重啟設定</value>
</data> </data>
<data name="TbSettingsSocksPortTip" xml:space="preserve"> <data name="TbSettingsSocksPortTip" xml:space="preserve">
<value>http埠=socks埠+1</value> <value>http埠=socks埠+1</value>

7
v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
View File

@ -89,7 +89,12 @@ namespace v2rayN.Views
//fill fonts //fill fonts
try try
{ {
var files = Directory.GetFiles(Utils.GetFontsPath(), "*.ttf"); string[] searchPatterns = { "*.ttf", "*.ttc" };
var files = new List<string>();
foreach (var pattern in searchPatterns)
{
files.AddRange(Directory.GetFiles(Utils.GetFontsPath(), pattern));
}
var culture = _config.uiItem.currentLanguage == Global.Languages[0] ? "zh-cn" : "en-us"; var culture = _config.uiItem.currentLanguage == Global.Languages[0] ? "zh-cn" : "en-us";
var culture2 = "en-us"; var culture2 = "en-us";
foreach (var ttf in files) foreach (var ttf in files)