github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

update

Browse Source
pull/3315/head
小仙女 2 years ago
parent 8285688ec9
commit ee61363c31
6 changed files with 50 additions and 56 deletions
Show Stats Download Patch File Download Diff File

2
v2rayN/v2rayN/Base/StringEx.cs
Unescape View File

@ -42,7 +42,7 @@ namespace v2rayN.Base
} }
} }
public static string TrimEx(this string value) public static string TrimEx(this string? value)
{ {
return value == null ? string.Empty : value.Trim(); return value == null ? string.Empty : value.Trim();
} }

35
v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
Unescape View File

@ -185,12 +185,12 @@ namespace v2rayN.Views
return; return;
} }
if (network.Equals(Global.DefaultNetwork)) if (network == Global.DefaultNetwork)
{ {
cmbHeaderType.Items.Add(Global.None); cmbHeaderType.Items.Add(Global.None);
cmbHeaderType.Items.Add(Global.TcpHeaderHttp); cmbHeaderType.Items.Add(Global.TcpHeaderHttp);
} }
else if (network.Equals("kcp") || network.Equals("quic")) else if (network is "kcp" or "quic")
{ {
cmbHeaderType.Items.Add(Global.None); cmbHeaderType.Items.Add(Global.None);
Global.kcpHeaderTypes.ForEach(it => Global.kcpHeaderTypes.ForEach(it =>
@ -198,7 +198,7 @@ namespace v2rayN.Views
cmbHeaderType.Items.Add(it); cmbHeaderType.Items.Add(it);
}); });
} }
else if (network.Equals("grpc")) else if (network == "grpc")
{ {
cmbHeaderType.Items.Add(Global.GrpcgunMode); cmbHeaderType.Items.Add(Global.GrpcgunMode);
cmbHeaderType.Items.Add(Global.GrpcmultiMode); cmbHeaderType.Items.Add(Global.GrpcmultiMode);
@ -222,37 +222,34 @@ namespace v2rayN.Views
tipPath.Text = tipPath.Text =
tipHeaderType.Text = string.Empty; tipHeaderType.Text = string.Empty;
if (network.Equals(Global.DefaultNetwork)) switch (network)
{ {
case Global.DefaultNetwork:
tipRequestHost.Text = ResUI.TransportRequestHostTip1; tipRequestHost.Text = ResUI.TransportRequestHostTip1;
tipHeaderType.Text = ResUI.TransportHeaderTypeTip1; tipHeaderType.Text = ResUI.TransportHeaderTypeTip1;
} break;
else if (network.Equals("kcp")) case "kcp":
{
tipHeaderType.Text = ResUI.TransportHeaderTypeTip2; tipHeaderType.Text = ResUI.TransportHeaderTypeTip2;
tipPath.Text = ResUI.TransportPathTip5; tipPath.Text = ResUI.TransportPathTip5;
} break;
else if (network.Equals("ws")) case "ws":
{
tipRequestHost.Text = ResUI.TransportRequestHostTip2; tipRequestHost.Text = ResUI.TransportRequestHostTip2;
tipPath.Text = ResUI.TransportPathTip1; tipPath.Text = ResUI.TransportPathTip1;
} break;
else if (network.Equals("h2")) case "h2":
{
tipRequestHost.Text = ResUI.TransportRequestHostTip3; tipRequestHost.Text = ResUI.TransportRequestHostTip3;
tipPath.Text = ResUI.TransportPathTip2; tipPath.Text = ResUI.TransportPathTip2;
} break;
else if (network.Equals("quic")) case "quic":
{
tipRequestHost.Text = ResUI.TransportRequestHostTip4; tipRequestHost.Text = ResUI.TransportRequestHostTip4;
tipPath.Text = ResUI.TransportPathTip3; tipPath.Text = ResUI.TransportPathTip3;
tipHeaderType.Text = ResUI.TransportHeaderTypeTip3; tipHeaderType.Text = ResUI.TransportHeaderTypeTip3;
} break;
else if (network.Equals("grpc")) case "grpc":
{
tipPath.Text = ResUI.TransportPathTip4; tipPath.Text = ResUI.TransportPathTip4;
tipHeaderType.Text = ResUI.TransportHeaderTypeTip4; tipHeaderType.Text = ResUI.TransportHeaderTypeTip4;
labHeaderType.Visibility = Visibility.Hidden; labHeaderType.Visibility = Visibility.Hidden;
break;
} }
} }

14
v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
Unescape View File

@ -85,19 +85,19 @@ namespace v2rayN.Views
if (item.Control) if (item.Control)
{ {
keys += $"{Forms.Keys.Control.ToString()} + "; keys += $"{Forms.Keys.Control} + ";
} }
if (item.Alt) if (item.Alt)
{ {
keys += $"{Forms.Keys.Alt.ToString()} + "; keys += $"{Forms.Keys.Alt} + ";
} }
if (item.Shift) if (item.Shift)
{ {
keys += $"{Forms.Keys.Shift.ToString()} + "; keys += $"{Forms.Keys.Shift} + ";
} }
if (item.KeyCode != null) if (item.KeyCode != null)
{ {
keys += $"{item.KeyCode.ToString()}"; keys += $"{item.KeyCode}";
} }
SetText($"txtGlobalHotkey{k}", keys); SetText($"txtGlobalHotkey{k}", keys);
@ -148,11 +148,11 @@ namespace v2rayN.Views
{ {
foreach (UIElement element in gridText.Children) foreach (UIElement element in gridText.Children)
{ {
if (element is TextBox) if (element is TextBox box)
{ {
if (((TextBox)element).Name == name) if (box.Name == name)
{ {
((TextBox)element).Text = txt; box.Text = txt;
} }
} }
} }

1
v2rayN/v2rayN/Views/MainWindow.xaml
Unescape View File

@ -359,6 +359,7 @@
Margin="4,0" Margin="4,0"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgServerTitle}" materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgServerTitle}"
materialDesign:TextFieldAssist.HasClearButton="True" materialDesign:TextFieldAssist.HasClearButton="True"
VerticalContentAlignment="Center"
Style="{StaticResource DefTextBox}" /> Style="{StaticResource DefTextBox}" />
</WrapPanel> </WrapPanel>

19
v2rayN/v2rayN/Views/MainWindow.xaml.cs
Unescape View File

@ -197,13 +197,13 @@ namespace v2rayN.Views
{ {
if (action == "AdjustMainLvColWidth") if (action == "AdjustMainLvColWidth")
{ {
Application.Current.Dispatcher.Invoke((Action)(() => Application.Current.Dispatcher.Invoke(() =>
{ {
foreach (var it in lstProfiles.Columns) foreach (var it in lstProfiles.Columns)
{ {
it.Width = new DataGridLength(1, DataGridLengthUnitType.Auto); it.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);
} }
})); });
} }
else if (action == "ProfilesFocus") else if (action == "ProfilesFocus")
{ {
@ -355,7 +355,7 @@ namespace v2rayN.Views
} }
else else
{ {
if (e.Key == Key.Enter || e.Key == Key.Return) if (e.Key is Key.Enter or Key.Return)
{ {
ViewModel?.SetDefaultServer(); ViewModel?.SetDefaultServer();
} }
@ -471,9 +471,8 @@ namespace v2rayN.Views
} }
private void MenuItem_Click(object sender, RoutedEventArgs e) private void MenuItem_Click(object sender, RoutedEventArgs e)
{ {
if (sender is MenuItem) if (sender is MenuItem item)
{ {
MenuItem item = (MenuItem)sender;
Utils.ProcessStart(item.Tag.ToString()); Utils.ProcessStart(item.Tag.ToString());
} }
} }
@ -482,7 +481,7 @@ namespace v2rayN.Views
#endregion #endregion
#region Drag and Drop #region Drag and Drop
private Point startPoint = new Point(); private Point startPoint = new();
private int startIndex = -1; private int startIndex = -1;
private string formatData = "ProfileItemModel"; private string formatData = "ProfileItemModel";
@ -523,8 +522,7 @@ namespace v2rayN.Views
Math.Abs(diff.Y) > SystemParameters.MinimumVerticalDragDistance)) Math.Abs(diff.Y) > SystemParameters.MinimumVerticalDragDistance))
{ {
// Get the dragged Item // Get the dragged Item
var listView = sender as DataGrid; if (sender is not DataGrid listView) return;
if (listView == null) return;
var listViewItem = FindAnchestor<DataGridRow>((DependencyObject)e.OriginalSource); var listViewItem = FindAnchestor<DataGridRow>((DependencyObject)e.OriginalSource);
if (listViewItem == null) return; // Abort if (listViewItem == null) return; // Abort
// Find the data behind the ListViewItem // Find the data behind the ListViewItem
@ -532,7 +530,7 @@ namespace v2rayN.Views
if (item == null) return; // Abort if (item == null) return; // Abort
// Initialize the drag & drop operation // Initialize the drag & drop operation
startIndex = lstProfiles.SelectedIndex; startIndex = lstProfiles.SelectedIndex;
DataObject dragData = new DataObject(formatData, item); DataObject dragData = new(formatData, item);
DragDrop.DoDragDrop(listViewItem, dragData, DragDropEffects.Copy | DragDropEffects.Move); DragDrop.DoDragDrop(listViewItem, dragData, DragDropEffects.Copy | DragDropEffects.Move);
} }
} }
@ -550,8 +548,7 @@ namespace v2rayN.Views
if (e.Data.GetDataPresent(formatData) && sender == e.Source) if (e.Data.GetDataPresent(formatData) && sender == e.Source)
{ {
// Get the drop Item destination // Get the drop Item destination
var listView = sender as DataGrid; if (sender is not DataGrid listView) return;
if (listView == null) return;
var listViewItem = FindAnchestor<DataGridRow>((DependencyObject)e.OriginalSource); var listViewItem = FindAnchestor<DataGridRow>((DependencyObject)e.OriginalSource);
if (listViewItem == null) if (listViewItem == null)
{ {

7
v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
Unescape View File

@ -76,13 +76,12 @@ namespace v2rayN.Views
//fill fonts //fill fonts
try try
{ {
var dir = new DirectoryInfo(Utils.GetFontsPath()); var files = Directory.GetFiles(Utils.GetFontsPath(), "*.ttf");
var files = dir.GetFiles("*.ttf");
var culture = _config.uiItem.currentLanguage.Equals(Global.Languages[0]) ? "zh-cn" : "en-us"; var culture = _config.uiItem.currentLanguage.Equals(Global.Languages[0]) ? "zh-cn" : "en-us";
var culture2 = "en-us"; var culture2 = "en-us";
foreach (var it in files) foreach (var ttf in files)
{ {
var families = Fonts.GetFontFamilies(Utils.GetFontsPath(it.Name)); var families = Fonts.GetFontFamilies(Utils.GetFontsPath(ttf));
foreach (FontFamily family in families) foreach (FontFamily family in families)
{ {
var typefaces = family.GetTypefaces(); var typefaces = family.GetTypefaces();

Write Preview
Loading…
Cancel
Save