Fix

2dust#5829
lowercase78 · Oct 14, 2024 · 24afe8b · 24afe8b
1 parent 9540669
commit 24afe8b
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 17 deletions.
diff --git a/v2rayN/ServiceLib/Models/ConfigItems.cs b/v2rayN/ServiceLib/Models/ConfigItems.cs
@@ -103,8 +103,6 @@ public class GUIItem
         public int trayMenuServersLimit { get; set; } = 20;
 
         public bool enableHWA { get; set; } = false;
-
-        public string geoSourceUrl { get; set; }
     }
 
     [Serializable]
@@ -142,6 +140,7 @@ public class ConstItem
     {
         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
diff --git 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>
diff --git 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>
diff --git 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>
diff --git a/v2rayN/ServiceLib/Services/UpdateService.cs b/v2rayN/ServiceLib/Services/UpdateService.cs
@@ -451,7 +451,9 @@ private async Task UpdateGeoFile(string geoName, Config config, Action<bool, str
             _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
@@ -165,7 +165,7 @@ public OptionSettingViewModel(Func<EViewAction, object?, Task<bool>>? updateView
             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 @@ private async Task SaveSettingAsync()
             _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
@@ -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
@@ -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>