diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
index 88c8e2aa..fbed6030 100644
--- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
@@ -1,4 +1,4 @@
-<Window
+<Window
x:Class="v2rayN.Desktop.Views.OptionSettingWindow"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -63,13 +63,26 @@
TextWrapping="Wrap" />
<TextBlock
- Grid.Row="2"
+ Grid.Row="1"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsSecondLocalPortEnabled}" />
<ToggleSwitch
x:Name="togSecondLocalPortEnabled"
+ Grid.Row="1"
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Classes="Margin8" />
+
+ <TextBlock
+ Grid.Row="2"
+ Grid.Column="0"
+ VerticalAlignment="Center"
+ Classes="Margin8"
+ Text="{x:Static resx:ResUI.TbSettingsUdpEnabled}" />
+ <ToggleSwitch
+ x:Name="togudpEnabled"
Grid.Row="2"
Grid.Column="1"
HorizontalAlignment="Left"
@@ -80,9 +93,9 @@
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
- Text="{x:Static resx:ResUI.TbSettingsUdpEnabled}" />
+ Text="{x:Static resx:ResUI.TbSettingsSniffingEnabled}" />
<ToggleSwitch
- x:Name="togudpEnabled"
+ x:Name="togsniffingEnabled"
Grid.Row="3"
Grid.Column="1"
HorizontalAlignment="Left"
@@ -93,23 +106,10 @@
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
- Text="{x:Static resx:ResUI.TbSettingsSniffingEnabled}" />
- <ToggleSwitch
- x:Name="togsniffingEnabled"
- Grid.Row="4"
- Grid.Column="1"
- HorizontalAlignment="Left"
- Classes="Margin8" />
-
- <TextBlock
- Grid.Row="5"
- Grid.Column="0"
- VerticalAlignment="Center"
- Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsDestOverride}" />
<ListBox
x:Name="clbdestOverride"
- Grid.Row="5"
+ Grid.Row="4"
Grid.Column="1"
Grid.ColumnSpan="2"
HorizontalAlignment="Left"
@@ -118,13 +118,26 @@
Theme="{DynamicResource CardCheckGroupListBox}" />
<TextBlock
- Grid.Row="6"
+ Grid.Row="5"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsRouteOnly}" />
<ToggleSwitch
x:Name="togrouteOnly"
+ Grid.Row="5"
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Classes="Margin8" />
+
+ <TextBlock
+ Grid.Row="6"
+ Grid.Column="0"
+ VerticalAlignment="Center"
+ Classes="Margin8"
+ Text="{x:Static resx:ResUI.TbSettingsAllowLAN}" />
+ <ToggleSwitch
+ x:Name="togAllowLANConn"
Grid.Row="6"
Grid.Column="1"
HorizontalAlignment="Left"
@@ -135,9 +148,9 @@
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
- Text="{x:Static resx:ResUI.TbSettingsAllowLAN}" />
+ Text="{x:Static resx:ResUI.TbSettingsNewPort4LAN}" />
<ToggleSwitch
- x:Name="togAllowLANConn"
+ x:Name="togNewPort4LAN"
Grid.Row="7"
Grid.Column="1"
HorizontalAlignment="Left"
@@ -148,48 +161,48 @@
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
- Text="{x:Static resx:ResUI.TbSettingsNewPort4LAN}" />
- <ToggleSwitch
- x:Name="togNewPort4LAN"
- Grid.Row="8"
- Grid.Column="1"
- HorizontalAlignment="Left"
- Classes="Margin8" />
-
- <TextBlock
- Grid.Row="9"
- Grid.Column="0"
- VerticalAlignment="Center"
- Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsUser}" />
<TextBox
x:Name="txtuser"
- Grid.Row="9"
+ Grid.Row="8"
Grid.Column="1"
Width="200"
Classes="Margin8" />
<TextBlock
- Grid.Row="10"
+ Grid.Row="9"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsPass}" />
<TextBox
x:Name="txtpass"
- Grid.Row="10"
+ Grid.Row="9"
Grid.Column="1"
Width="200"
Classes="Margin8" />
<TextBlock
- Grid.Row="11"
+ Grid.Row="10"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsMuxEnabled}" />
<ToggleSwitch
x:Name="togmuxEnabled"
+ Grid.Row="10"
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Classes="Margin8" />
+
+ <TextBlock
+ Grid.Row="11"
+ Grid.Column="0"
+ VerticalAlignment="Center"
+ Classes="Margin8"
+ Text="{x:Static resx:ResUI.TbSettingsLogEnabledToFile}" />
+ <ToggleSwitch
+ x:Name="toglogEnabled"
Grid.Row="11"
Grid.Column="1"
HorizontalAlignment="Left"
@@ -200,107 +213,94 @@
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
- Text="{x:Static resx:ResUI.TbSettingsLogEnabledToFile}" />
- <ToggleSwitch
- x:Name="toglogEnabled"
- Grid.Row="12"
- Grid.Column="1"
- HorizontalAlignment="Left"
- Classes="Margin8" />
-
- <TextBlock
- Grid.Row="13"
- Grid.Column="0"
- VerticalAlignment="Center"
- Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsLogLevel}" />
<ComboBox
x:Name="cmbloglevel"
- Grid.Row="13"
+ Grid.Row="12"
Grid.Column="1"
Width="200"
Classes="Margin8"
ToolTip.Tip="Level" />
<TextBlock
- Grid.Row="14"
+ Grid.Row="13"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsDefAllowInsecure}" />
<ToggleSwitch
x:Name="togdefAllowInsecure"
- Grid.Row="14"
+ Grid.Row="13"
Grid.Column="1"
HorizontalAlignment="Left"
Classes="Margin8" />
<TextBlock
- Grid.Row="15"
+ Grid.Row="14"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsDefFingerprint}" />
<ComboBox
x:Name="cmbdefFingerprint"
- Grid.Row="15"
+ Grid.Row="14"
Grid.Column="1"
Width="200"
Classes="Margin8" />
<TextBlock
- Grid.Row="16"
+ Grid.Row="15"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsDefUserAgent}" />
<ComboBox
x:Name="cmbdefUserAgent"
- Grid.Row="16"
+ Grid.Row="15"
Grid.Column="1"
Width="200"
Classes="Margin8" />
<TextBlock
- Grid.Row="16"
+ Grid.Row="15"
Grid.Column="3"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsDefUserAgentTips}" />
<TextBlock
- Grid.Row="17"
+ Grid.Row="16"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsMux4SboxProtocol}" />
<ComboBox
x:Name="cmbmux4SboxProtocol"
- Grid.Row="17"
+ Grid.Row="16"
Grid.Column="1"
Width="200"
Classes="Margin8" />
<TextBlock
- Grid.Row="18"
+ Grid.Row="17"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsEnableCacheFile4Sbox}" />
<ToggleSwitch
x:Name="togenableCacheFile4Sbox"
- Grid.Row="18"
+ Grid.Row="17"
Grid.Column="1"
HorizontalAlignment="Left"
Classes="Margin8" />
<TextBlock
- Grid.Row="19"
+ Grid.Row="18"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsHysteriaBandwidth}" />
<StackPanel
- Grid.Row="19"
+ Grid.Row="18"
Grid.Column="1"
Orientation="Horizontal">
@@ -317,19 +317,19 @@
</StackPanel>
<TextBlock
- Grid.Row="20"
+ Grid.Row="19"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsEnableFragment}" />
<ToggleSwitch
x:Name="togenableFragment"
- Grid.Row="20"
+ Grid.Row="19"
Grid.Column="1"
HorizontalAlignment="Left"
Classes="Margin8" />
<TextBlock
- Grid.Row="20"
+ Grid.Row="19"
Grid.Column="2"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsEnableFragmentTips}"
@@ -472,47 +472,61 @@
Classes="Margin8" />
<TextBlock
- Grid.Row="11"
+ Grid.Row="10"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsDoubleClick2Activate}" />
<ToggleSwitch
x:Name="togDoubleClick2Activate"
- Grid.Row="11"
+ Grid.Row="10"
Grid.Column="1"
HorizontalAlignment="Left"
Classes="Margin8" />
<TextBlock
- Grid.Row="14"
+ Grid.Row="11"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsAutoUpdateInterval}" />
<TextBox
x:Name="txtautoUpdateInterval"
- Grid.Row="14"
+ Grid.Row="11"
Grid.Column="1"
Width="200"
HorizontalAlignment="Left"
Classes="Margin8" />
<TextBlock
- Grid.Row="15"
+ Grid.Row="12"
+ Grid.Column="0"
+ VerticalAlignment="Center"
+ Classes="Margin8"
+ Text="{x:Static resx:ResUI.TbSettingsAutoUpdateCoreInterval}" />
+ <TextBox
+ x:Name="txtautoUpdateCoreInterval"
+ Grid.Row="12"
+ Grid.Column="1"
+ Width="200"
+ HorizontalAlignment="Left"
+ Classes="Margin8" />
+
+ <TextBlock
+ Grid.Row="13"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsCurrentFontFamily}" />
<ComboBox
x:Name="cmbcurrentFontFamily"
- Grid.Row="15"
+ Grid.Row="13"
Grid.Column="1"
Width="200"
Classes="Margin8"
MaxDropDownHeight="1000" />
<TextBlock
- Grid.Row="15"
+ Grid.Row="13"
Grid.Column="2"
VerticalAlignment="Center"
Classes="Margin8"
@@ -520,53 +534,80 @@
TextWrapping="Wrap" />
<TextBlock
- Grid.Row="16"
+ Grid.Row="14"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsSpeedTestPageSize}" />
<TextBox
x:Name="txtSpeedTestPageSize"
- Grid.Row="16"
+ Grid.Row="14"
Grid.Column="1"
Width="200"
HorizontalAlignment="Left"
Classes="Margin8" />
<TextBlock
- Grid.Row="17"
+ Grid.Row="15"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsSpeedTestTimeout}" />
<ComboBox
x:Name="cmbSpeedTestTimeout"
- Grid.Row="17"
+ Grid.Row="15"
Grid.Column="1"
Width="200"
Classes="Margin8" />
<TextBlock
- Grid.Row="18"
+ Grid.Row="16"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsSpeedTestUrl}" />
<ComboBox
x:Name="cmbSpeedTestUrl"
- Grid.Row="18"
+ Grid.Row="16"
Grid.Column="1"
Width="300"
Classes="Margin8" />
<TextBlock
- Grid.Row="19"
+ Grid.Row="17"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsSpeedPingTestUrl}" />
<ComboBox
x:Name="cmbSpeedPingTestUrl"
+ Grid.Row="17"
+ Grid.Column="1"
+ Width="300"
+ Classes="Margin8" />
+
+ <TextBlock
+ Grid.Row="18"
+ Grid.Column="0"
+ VerticalAlignment="Center"
+ Classes="Margin8"
+ Text="{x:Static resx:ResUI.TbSettingsSubConvert}" />
+ <ComboBox
+ x:Name="cmbSubConvertUrl"
+ Grid.Row="18"
+ Grid.Column="1"
+ Width="300"
+ Classes="Margin8"
+ ToolTip.Tip="Convert Url" />
+
+ <TextBlock
+ Grid.Row="19"
+ Grid.Column="0"
+ VerticalAlignment="Center"
+ Classes="Margin8"
+ Text="{x:Static resx:ResUI.TbSettingsMainGirdOrientation}" />
+ <ComboBox
+ x:Name="cmbMainGirdOrientation"
Grid.Row="19"
Grid.Column="1"
Width="300"
@@ -577,42 +618,15 @@
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
- Text="{x:Static resx:ResUI.TbSettingsSubConvert}" />
- <ComboBox
- x:Name="cmbSubConvertUrl"
- Grid.Row="20"
- Grid.Column="1"
- Width="300"
- Classes="Margin8"
- ToolTip.Tip="Convert Url" />
-
- <TextBlock
- Grid.Row="21"
- Grid.Column="0"
- VerticalAlignment="Center"
- Classes="Margin8"
- Text="{x:Static resx:ResUI.TbSettingsMainGirdOrientation}" />
- <ComboBox
- x:Name="cmbMainGirdOrientation"
- Grid.Row="21"
- Grid.Column="1"
- Width="300"
- Classes="Margin8" />
-
- <TextBlock
- Grid.Row="22"
- Grid.Column="0"
- VerticalAlignment="Center"
- Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsGeoFilesSource}" />
<ComboBox
x:Name="cmbGetFilesSourceUrl"
- Grid.Row="22"
+ Grid.Row="20"
Grid.Column="1"
Width="300"
Classes="Margin8" />
<TextBlock
- Grid.Row="22"
+ Grid.Row="20"
Grid.Column="2"
VerticalAlignment="Center"
Classes="Margin8"
@@ -620,19 +634,19 @@
TextWrapping="Wrap" />
<TextBlock
- Grid.Row="23"
+ Grid.Row="21"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsSrsFilesSource}" />
<ComboBox
x:Name="cmbSrsFilesSourceUrl"
- Grid.Row="23"
+ Grid.Row="21"
Grid.Column="1"
Width="300"
Classes="Margin8" />
<TextBlock
- Grid.Row="23"
+ Grid.Row="21"
Grid.Column="2"
VerticalAlignment="Center"
Classes="Margin8"
@@ -640,19 +654,19 @@
TextWrapping="Wrap" />
<TextBlock
- Grid.Row="24"
+ Grid.Row="22"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsRoutingRulesSource}" />
<ComboBox
x:Name="cmbRoutingRulesSourceUrl"
- Grid.Row="24"
+ Grid.Row="22"
Grid.Column="1"
Width="300"
Classes="Margin8" />
<TextBlock
- Grid.Row="24"
+ Grid.Row="22"
Grid.Column="2"
VerticalAlignment="Center"
Classes="Margin8"
@@ -896,4 +910,4 @@
</TabItem>
</TabControl>
</DockPanel>
-</Window>
\ No newline at end of file
+</Window>