diff --git a/v2rayN/ServiceLib/Models/ConfigItems.cs b/v2rayN/ServiceLib/Models/ConfigItems.cs
index 06e6788a..e4bbe112 100644
--- a/v2rayN/ServiceLib/Models/ConfigItems.cs
+++ b/v2rayN/ServiceLib/Models/ConfigItems.cs
@@ -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]
diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
index 3dd9543d..598eb574 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -3003,18 +3003,16 @@ namespace ServiceLib.Resx {
return ResourceManager.GetString("TbSettingsFontSize", resourceCulture);
}
}
-
+
/// <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);
}
}
-
+
/// <summary>
/// 查找类似 HTTP Port 的本地化字符串。
/// </summary>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
index 65cb3cf1..725481df 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -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>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
index f1557ed9..e2355650 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1324,4 +1324,7 @@
<data name="menuStorageUI" xml:space="preserve">
<value>保存界面布局</value>
</data>
+ <data name="TbSettingsGeoFilesSource" xml:space="preserve">
+ <value>Geo文件来源(可选)</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
index 870dca42..b85c239d 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1204,4 +1204,7 @@
<data name="menuStorageUI" xml:space="preserve">
<value>儲存介面佈局</value>
</data>
+ <data name="TbSettingsGeoFilesSource" xml:space="preserve">
+ <value>Geo文件來源(可選)</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/Services/UpdateService.cs b/v2rayN/ServiceLib/Services/UpdateService.cs
index 21e1aa2b..d821d1db 100644
--- a/v2rayN/ServiceLib/Services/UpdateService.cs
+++ b/v2rayN/ServiceLib/Services/UpdateService.cs
@@ -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());
diff --git a/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs b/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs
index 0aea70b6..ef6f6735 100644
--- a/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs
@@ -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;
diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
index aa9ec15b..a183fdf5 100644
--- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
@@ -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">
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
index 692df521..e1754326 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
@@ -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>