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

Fix 

https://github.com/2dust/v2rayN/pull/5829
pull/5834/head
2dust 2024-10-14 19:29:15 +08:00
parent 9540669f56
commit 24afe8bde4
9 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
v2rayN/ServiceLib/Models/ConfigItems.cs
View File

@ -103,8 +103,6 @@
public int trayMenuServersLimit { get; set; } = 20;
public bool enableHWA { get; set; } = false;
public string geoSourceUrl { get; set; }
}
[Serializable]
@ -142,6 +140,7 @@
{
public string defIEProxyExceptions { get; set; }
public string subConvertUrl { get; set; } = string.Empty;
public string? geoSourceUrl { get; set; }
}
[Serializable]

8
v2rayN/ServiceLib/Resx/ResUI.Designer.cs generated
View File

@ -3005,12 +3005,10 @@ namespace ServiceLib.Resx {
}
/// <summary>
/// Get Geo files source.
/// 查找类似 Geo files source (optional) 的本地化字符串。
/// </summary>
public static string TbSettingsGeoFilesSource
{
get
{
public static string TbSettingsGeoFilesSource {
get {
return ResourceManager.GetString("TbSettingsGeoFilesSource", resourceCulture);
}
}

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

@ -1328,6 +1328,6 @@
<value>Save Interface Layout</value>
</data>
<data name="TbSettingsGeoFilesSource" xml:space="preserve">
<value>Geo files source</value>
<value>Geo files source (optional)</value>
</data>
</root>

3
v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
View File

@ -1324,4 +1324,7 @@
<data name="menuStorageUI" xml:space="preserve">
<value>保存界面布局</value>
</data>
<data name="TbSettingsGeoFilesSource" xml:space="preserve">
<value>Geo文件来源(可选)</value>
</data>
</root>

3
v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
View File

@ -1204,4 +1204,7 @@
<data name="menuStorageUI" xml:space="preserve">
<value>儲存介面佈局</value>
</data>
<data name="TbSettingsGeoFilesSource" xml:space="preserve">
<value>Geo文件來源(可選)</value>
</data>
</root>

4
v2rayN/ServiceLib/Services/UpdateService.cs
View File

@ -451,7 +451,9 @@ namespace ServiceLib.Services
_config = config;
_updateFunc = updateFunc;
var geoUrl = !String.IsNullOrEmpty(config?.guiItem.geoSourceUrl) ? config.guiItem.geoSourceUrl : Global.GeoUrl;
var geoUrl = string.IsNullOrEmpty(config?.constItem.geoSourceUrl)
? Global.GeoUrl
: config.constItem.geoSourceUrl;
var url = string.Format(Global.GeoUrl, geoName);
var fileName = Utils.GetTempPath(Utils.GetGuid());

4
v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs
View File

@ -165,7 +165,7 @@ namespace ServiceLib.ViewModels
EnableHWA = _config.guiItem.enableHWA;
SubConvertUrl = _config.constItem.subConvertUrl;
MainGirdOrientation = (int)_config.uiItem.mainGirdOrientation;
GeoFileSourceUrl = _config.guiItem.geoSourceUrl;
GeoFileSourceUrl = _config.constItem.geoSourceUrl;
#endregion UI
@ -318,7 +318,7 @@ namespace ServiceLib.ViewModels
_config.guiItem.enableHWA = EnableHWA;
_config.constItem.subConvertUrl = SubConvertUrl;
_config.uiItem.mainGirdOrientation = (EGirdOrientation)MainGirdOrientation;
_config.guiItem.geoSourceUrl = GeoFileSourceUrl;
_config.constItem.geoSourceUrl = GeoFileSourceUrl;
//systemProxy
_config.systemProxyItem.systemProxyExceptions = systemProxyExceptions;

2
v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
View File

@ -32,7 +32,7 @@
Cursor="Hand" />
</StackPanel>
<TabControl HorizontalContentAlignment="Left">
<TabControl HorizontalContentAlignment="Stretch">
<TabItem Header="{x:Static resx:ResUI.TbSettingsCore}">
<ScrollViewer VerticalScrollBarVisibility="Visible">
<Grid Classes="Margin8">

5
v2rayN/v2rayN/Views/OptionSettingWindow.xaml
View File

@ -847,11 +847,10 @@
Margin="{StaticResource Margin8}"
Style="{StaticResource DefComboBox}" />
<TextBlock
Grid.Row="22"
Grid.Column="0"
Margin="{StaticResource SettingItemMargin}"
Margin="{StaticResource Margin8}"
VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.TbSettingsGeoFilesSource}" />
@ -860,7 +859,7 @@
Grid.Row="22"
Grid.Column="1"
Width="300"
Margin="{StaticResource SettingItemMargin}"
Margin="{StaticResource Margin8}"
IsEditable="True"
Style="{StaticResource DefComboBox}" />
</Grid>