From 51576b54c3dc8eae969837433ce4f2e26388db1c Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 24 Dec 2023 10:34:55 +0800
Subject: [PATCH] Previous and next proxy setting
---
v2rayN/v2rayN/App.xaml | 16 ++-
v2rayN/v2rayN/Resx/ResUI.Designer.cs | 27 +++++
v2rayN/v2rayN/Resx/ResUI.resx | 9 ++
v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx | 9 ++
v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx | 9 ++
v2rayN/v2rayN/ViewModels/SubEditViewModel.cs | 2 +
v2rayN/v2rayN/Views/AddServer2Window.xaml | 13 ++-
v2rayN/v2rayN/Views/SubEditWindow.xaml | 104 ++++++++++++-------
v2rayN/v2rayN/Views/SubEditWindow.xaml.cs | 2 +
9 files changed, 148 insertions(+), 43 deletions(-)
diff --git a/v2rayN/v2rayN/App.xaml b/v2rayN/v2rayN/App.xaml
index 3fc23de2..791d89da 100644
--- a/v2rayN/v2rayN/App.xaml
+++ b/v2rayN/v2rayN/App.xaml
@@ -1,9 +1,9 @@
@@ -34,6 +34,12 @@
Left="8"
Right="8"
Top="8" />
+
+
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
index ef2bb980..4d7adae7 100644
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -447,6 +447,15 @@ namespace v2rayN.Resx {
}
}
+ ///
+ /// 查找类似 Next proxy remarks 的本地化字符串。
+ ///
+ public static string LvNextProfile {
+ get {
+ return ResourceManager.GetString("LvNextProfile", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Port 的本地化字符串。
///
@@ -456,6 +465,24 @@ namespace v2rayN.Resx {
}
}
+ ///
+ /// 查找类似 Previous proxy remakrs 的本地化字符串。
+ ///
+ public static string LvPrevProfile {
+ get {
+ return ResourceManager.GetString("LvPrevProfile", resourceCulture);
+ }
+ }
+
+ ///
+ /// 查找类似 Please make sure the remarks exists and is unique 的本地化字符串。
+ ///
+ public static string LvPrevProfileTip {
+ get {
+ return ResourceManager.GetString("LvPrevProfileTip", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Remarks 的本地化字符串。
///
diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx
index b99e2368..0756f3f5 100644
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -1153,4 +1153,13 @@
Congestion control
+
+ Previous proxy remakrs
+
+
+ Next proxy remarks
+
+
+ Please make sure the remarks exists and is unique
+
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
index 0432350d..25a7e3f0 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -1150,4 +1150,13 @@
拥塞控制算法
+
+ 前置代理别名
+
+
+ 落地代理別名
+
+
+ 请确保别名存在并唯一
+
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
index 06120c4f..f68bd3f0 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
@@ -1138,4 +1138,13 @@
新增[Tuic]伺服器
+
+ 前置代理別名
+
+
+ 落地代理別名
+
+
+ 請確保別名存在並且唯一
+
\ No newline at end of file
diff --git a/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs b/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs
index dcc30d50..d15e9a78 100644
--- a/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs
@@ -69,6 +69,8 @@ namespace v2rayN.ViewModels
item.sort = SelectedSource.sort;
item.filter = SelectedSource.filter;
item.convertTarget = SelectedSource.convertTarget;
+ item.prevProfile = SelectedSource.prevProfile;
+ item.nextProfile = SelectedSource.nextProfile;
}
if (ConfigHandler.AddSubItem(_config, item) == 0)
diff --git a/v2rayN/v2rayN/Views/AddServer2Window.xaml b/v2rayN/v2rayN/Views/AddServer2Window.xaml
index 9ef69639..20dc079d 100644
--- a/v2rayN/v2rayN/Views/AddServer2Window.xaml
+++ b/v2rayN/v2rayN/Views/AddServer2Window.xaml
@@ -97,17 +97,17 @@
Grid.Row="2"
Grid.Column="2"
VerticalAlignment="Center"
- Orientation="Vertical">
+ Orientation="Horizontal">
@@ -126,9 +126,8 @@
Width="200"
Margin="4"
HorizontalAlignment="Left"
- FontSize="{DynamicResource StdFontSize}"
MaxDropDownHeight="1000"
- Style="{StaticResource MaterialDesignOutlinedComboBox}" />
+ Style="{StaticResource MyOutlinedTextComboBox}" />
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
@@ -51,6 +72,8 @@
+
+
@@ -209,9 +232,8 @@
Grid.Column="1"
Margin="4"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvConvertTargetTip}"
- FontSize="{DynamicResource StdFontSize}"
MaxDropDownHeight="1000"
- Style="{StaticResource MaterialDesignOutlinedComboBox}" />
+ Style="{StaticResource MyOutlinedTextComboBox}" />
-
-
-
-
-
-
-
-
+
+ VerticalAlignment="Top"
+ materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvPrevProfileTip}"
+ AcceptsReturn="True"
+ Style="{StaticResource MyOutlinedTextBox}" />
+
+
+
-
-
+
+
+
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs b/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
index 521309d8..b1c35836 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
@@ -43,6 +43,8 @@ namespace v2rayN.Views
this.Bind(ViewModel, vm => vm.SelectedSource.sort, v => v.txtSort.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.SelectedSource.filter, v => v.txtFilter.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.SelectedSource.convertTarget, v => v.cmbConvertTarget.Text).DisposeWith(disposables);
+ this.Bind(ViewModel, vm => vm.SelectedSource.prevProfile, v => v.txtPrevProfile.Text).DisposeWith(disposables);
+ this.Bind(ViewModel, vm => vm.SelectedSource.nextProfile, v => v.txtNextProfile.Text).DisposeWith(disposables);
this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
});