diff --git a/v2rayN/v2rayN/Base/MyDGBoolColumn.cs b/v2rayN/v2rayN/Base/MyDGBoolColumn.cs new file mode 100644 index 00000000..19fbb829 --- /dev/null +++ b/v2rayN/v2rayN/Base/MyDGBoolColumn.cs @@ -0,0 +1,9 @@ +using System.Windows.Controls; + +namespace v2rayN.Base +{ + internal class MyDGBoolColumn : DataGridCheckBoxColumn + { + public string ExName { get; set; } + } +} diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs index d0177f28..46f72d07 100644 --- a/v2rayN/v2rayN/Handler/ConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs @@ -813,6 +813,7 @@ namespace v2rayN.Handler from t33 in t3b.DefaultIfEmpty() select new ProfileItemModel { + autoSwitch= t.autoSwitch, indexId = t.indexId, configType = t.configType, remarks = t.remarks, diff --git a/v2rayN/v2rayN/Mode/EServerColName.cs b/v2rayN/v2rayN/Mode/EServerColName.cs index be49c2cb..47b5f5b8 100644 --- a/v2rayN/v2rayN/Mode/EServerColName.cs +++ b/v2rayN/v2rayN/Mode/EServerColName.cs @@ -3,6 +3,7 @@ public enum EServerColName { def = 0, + autoSwitch, configType, remarks, address, diff --git a/v2rayN/v2rayN/Mode/ProfileItem.cs b/v2rayN/v2rayN/Mode/ProfileItem.cs index 797587e5..e1afe8c7 100644 --- a/v2rayN/v2rayN/Mode/ProfileItem.cs +++ b/v2rayN/v2rayN/Mode/ProfileItem.cs @@ -8,6 +8,7 @@ namespace v2rayN.Mode public ProfileItem() { indexId = string.Empty; + autoSwitch = false; configType = EConfigType.VMess; configVersion = 2; address = string.Empty; @@ -89,6 +90,7 @@ namespace v2rayN.Mode /// public EConfigType configType { get; set; } + public bool autoSwitch { get; set; } /// /// 版本(现在=2) /// diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs index 35d926d5..60e21744 100644 --- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs +++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs @@ -366,6 +366,15 @@ namespace v2rayN.Resx { } } + /// + /// 查找类似 Automatic update interval(minutes) 的本地化字符串。 + /// + public static string LvAutoSwitch { + get { + return ResourceManager.GetString("LvAutoSwitch", resourceCulture); + } + } + /// /// 查找类似 Automatic update interval(minutes) 的本地化字符串。 /// diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx index 962c9de4..95c42760 100644 --- a/v2rayN/v2rayN/Resx/ResUI.resx +++ b/v2rayN/v2rayN/Resx/ResUI.resx @@ -204,6 +204,9 @@ Type + + AutoSwitch + Subs group diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx index e9fd31bf..42cac502 100644 --- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx +++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx @@ -204,6 +204,9 @@ 类型 + + 切换 + 订阅分组 diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs index de6a2b4c..ee306b54 100644 --- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs @@ -818,6 +818,7 @@ namespace v2rayN.ViewModels select new ProfileItemModel { indexId = t.indexId, + autoSwitch=t.autoSwitch, configType = t.configType, remarks = t.remarks, address = t.address, diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml index 1644b640..90e483c6 100644 --- a/v2rayN/v2rayN/Views/MainWindow.xaml +++ b/v2rayN/v2rayN/Views/MainWindow.xaml @@ -667,8 +667,23 @@ - - + + + + + + + +