From 3144f1d1c211cf5d449628e5e80fe8c6803bdbe2 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Fri, 14 Feb 2025 15:00:23 +0800 Subject: [PATCH] Remove SpeedTestPageSize --- v2rayN/ServiceLib/Models/ConfigItems.cs | 5 ++--- v2rayN/ServiceLib/Resx/ResUI.Designer.cs | 9 --------- v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx | 5 +---- v2rayN/ServiceLib/Resx/ResUI.hu.resx | 3 --- v2rayN/ServiceLib/Resx/ResUI.resx | 3 --- v2rayN/ServiceLib/Resx/ResUI.ru.resx | 3 --- v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx | 3 --- v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx | 3 --- .../ViewModels/OptionSettingViewModel.cs | 3 --- .../Views/OptionSettingWindow.axaml | 16 +--------------- .../Views/OptionSettingWindow.axaml.cs | 1 - v2rayN/v2rayN/Views/OptionSettingWindow.xaml | 18 +----------------- .../v2rayN/Views/OptionSettingWindow.xaml.cs | 1 - 13 files changed, 5 insertions(+), 68 deletions(-) diff --git a/v2rayN/ServiceLib/Models/ConfigItems.cs b/v2rayN/ServiceLib/Models/ConfigItems.cs index 05d08c3d..0a5cf36c 100644 --- a/v2rayN/ServiceLib/Models/ConfigItems.cs +++ b/v2rayN/ServiceLib/Models/ConfigItems.cs @@ -1,4 +1,4 @@ -namespace ServiceLib.Models +namespace ServiceLib.Models { [Serializable] public class CoreBasicItem @@ -156,7 +156,6 @@ public int SpeedTestTimeout { get; set; } public string SpeedTestUrl { get; set; } public string SpeedPingTestUrl { get; set; } - public int SpeedTestPageSize { get; set; } } [Serializable] @@ -244,4 +243,4 @@ public string? Length { get; set; } public string? Interval { get; set; } } -} \ No newline at end of file +} diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs index 8305d33d..b793d15e 100644 --- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs +++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs @@ -3355,15 +3355,6 @@ namespace ServiceLib.Resx { } } - /// - /// 查找类似 Number per time for auto batch during speedtest(max 1000) 的本地化字符串。 - /// - public static string TbSettingsSpeedTestPageSize { - get { - return ResourceManager.GetString("TbSettingsSpeedTestPageSize", resourceCulture); - } - } - /// /// 查找类似 SpeedTest Single Timeout Value 的本地化字符串。 /// diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx index 896a406a..459abca2 100644 --- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx +++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx @@ -1372,9 +1372,6 @@ هنگام بستن پنجره در سینی پنهان شوید - - تعداد در هر زمان برای دسته خودکار در طول تست سرعت (حداکثر 1000) - موارد استثنا: از سرور پروکسی برای آدرس های زیر استفاده نکنید. برای جدا کردن ورودی ها از کاما (،) استفاده کنید. @@ -1396,4 +1393,4 @@ شروع آزمایش مجدد قطعات ناموفق، {0} باقی مانده است. برای خاتمه ESC را فشار دهید... - + \ No newline at end of file diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx index 644cd27a..f4a2b17c 100644 --- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx +++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx @@ -1372,9 +1372,6 @@ Minimálás tálcára ablak zárásakor - - Szám / időszak az automatikus batch során a sebességvizsgálat során (maximum 1000) - Kivétel. Ne használj proxy szervert a címeknél, évezz pontosvesszőt (,) diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx index d8539c5d..7c4996ba 100644 --- a/v2rayN/ServiceLib/Resx/ResUI.resx +++ b/v2rayN/ServiceLib/Resx/ResUI.resx @@ -1372,9 +1372,6 @@ Hide to tray when closing the window - - Number per time for auto batch during speedtest(max 1000) - Exclusions: Do not use proxy server for the following addresses. Use comma (,) to separate entries. diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx index 1ffbc926..db781636 100644 --- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx +++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx @@ -1372,9 +1372,6 @@ Hide to tray when closing the window - - Number per time for auto batch during speedtest(max 1000) - Exception. Do not use proxy server for addresses,with a comma (,) diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx index 6acb7575..c5faaa89 100644 --- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx +++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx @@ -1369,9 +1369,6 @@ 关闭窗口时隐藏至托盘 - - 测试时自动分批的每批数量（最大1000） - 例外：对于下列地址不使用代理配置文件。使用逗号(,)分隔。 diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx index 49f1af36..268acab0 100644 --- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx +++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx @@ -1370,9 +1370,6 @@ 關閉視窗時隱藏至托盤 - - 測試時自動分批的每批數量（最大1000） - 例外：對於下列位址不使用代理設定檔，使用逗號(,)分隔。 diff --git a/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs b/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs index 6e94c381..efa5a0e6 100644 --- a/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs +++ b/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs @@ -63,7 +63,6 @@ namespace ServiceLib.ViewModels [Reactive] public int SpeedTestTimeout { get; set; } [Reactive] public string SpeedTestUrl { get; set; } [Reactive] public string SpeedPingTestUrl { get; set; } - //[Reactive] public int SpeedTestPageSize { get; set; } [Reactive] public bool EnableHWA { get; set; } [Reactive] public string SubConvertUrl { get; set; } [Reactive] public int MainGirdOrientation { get; set; } @@ -178,7 +177,6 @@ namespace ServiceLib.ViewModels CurrentFontFamily = _config.UiItem.CurrentFontFamily; SpeedTestTimeout = _config.SpeedTestItem.SpeedTestTimeout; SpeedTestUrl = _config.SpeedTestItem.SpeedTestUrl; - //SpeedTestPageSize = _config.SpeedTestItem.SpeedTestPageSize; SpeedPingTestUrl = _config.SpeedTestItem.SpeedPingTestUrl; EnableHWA = _config.GuiItem.EnableHWA; SubConvertUrl = _config.ConstItem.SubConvertUrl; @@ -332,7 +330,6 @@ namespace ServiceLib.ViewModels _config.GuiItem.TrayMenuServersLimit = TrayMenuServersLimit; _config.UiItem.CurrentFontFamily = CurrentFontFamily; _config.SpeedTestItem.SpeedTestTimeout = SpeedTestTimeout; - //_config.SpeedTestItem.SpeedTestPageSize = SpeedTestPageSize; _config.SpeedTestItem.SpeedTestUrl = SpeedTestUrl; _config.SpeedTestItem.SpeedPingTestUrl = SpeedPingTestUrl; _config.GuiItem.EnableHWA = EnableHWA; diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml index de3b5229..f658087a 100644 --- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml +++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml @@ -518,21 +518,7 @@ Classes="Margin8" Text="{x:Static resx:ResUI.TbSettingsCurrentFontFamilyLinuxTip}" TextWrapping="Wrap" /> - + vm.SpeedTestTimeout, v => v.cmbSpeedTestTimeout.SelectedValue).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.SpeedTestUrl, v => v.cmbSpeedTestUrl.SelectedValue).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.SpeedPingTestUrl, v => v.cmbSpeedPingTestUrl.SelectedValue).DisposeWith(disposables); - //this.Bind(ViewModel, vm => vm.SpeedTestPageSize, v => v.txtSpeedTestPageSize.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.SubConvertUrl, v => v.cmbSubConvertUrl.SelectedValue).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.MainGirdOrientation, v => v.cmbMainGirdOrientation.SelectedIndex).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.GeoFileSourceUrl, v => v.cmbGetFilesSourceUrl.SelectedValue).DisposeWith(disposables); diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml index b7a4310a..eef19974 100644 --- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml +++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml @@ -776,23 +776,7 @@ Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.TbSettingsCurrentFontFamilyTip}" TextWrapping="Wrap" /> - + vm.SpeedTestTimeout, v => v.cmbSpeedTestTimeout.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.SpeedTestUrl, v => v.cmbSpeedTestUrl.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.SpeedPingTestUrl, v => v.cmbSpeedPingTestUrl.Text).DisposeWith(disposables); - //this.Bind(ViewModel, vm => vm.SpeedTestPageSize, v => v.txtSpeedTestPageSize.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.EnableHWA, v => v.togEnableHWA.IsChecked).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.SubConvertUrl, v => v.cmbSubConvertUrl.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.MainGirdOrientation, v => v.cmbMainGirdOrientation.SelectedIndex).DisposeWith(disposables);