Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-04-16 12:35:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Replace JsonEditor with TextBox

Browse source
This commit is contained in:
DHR60 2026-03-14 18:13:41 +08:00
parent d9c6307cb9
commit 51a6fd507a
3 changed files with 10 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
View file

@ -3,6 +3,7 @@
xmlns="https://github.com/avaloniaui" xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:v2rayN.Desktop.Views"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib" xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib" xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
@ -399,12 +400,7 @@
BorderBrush="Gray" BorderBrush="Gray"
BorderThickness="1" BorderThickness="1"
Header="HTTP/SOCKS"> Header="HTTP/SOCKS">
<TextBox <local:JsonEditor Name="txtnormalDNSCompatible" VerticalAlignment="Stretch" />
Name="txtnormalDNSCompatible"
VerticalAlignment="Stretch"
Classes="TextArea"
MinLines="10"
TextWrapping="Wrap" />
</HeaderedContentControl> </HeaderedContentControl>
</DockPanel> </DockPanel>
</TabItem> </TabItem>
@ -473,12 +469,7 @@
BorderBrush="Gray" BorderBrush="Gray"
BorderThickness="1" BorderThickness="1"
Header="HTTP/SOCKS"> Header="HTTP/SOCKS">
<TextBox <local:JsonEditor Name="txtnormalDNS2Compatible" VerticalAlignment="Stretch" />
Name="txtnormalDNS2Compatible"
VerticalAlignment="Stretch"
Classes="TextArea"
MinLines="10"
TextWrapping="Wrap" />
</HeaderedContentControl> </HeaderedContentControl>
<GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" /> <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
@ -488,12 +479,7 @@
BorderBrush="Gray" BorderBrush="Gray"
BorderThickness="1" BorderThickness="1"
Header="{x:Static resx:ResUI.TbSettingsTunMode}"> Header="{x:Static resx:ResUI.TbSettingsTunMode}">
<TextBox <local:JsonEditor Name="txttunDNS2Compatible" VerticalAlignment="Stretch" />
Name="txttunDNS2Compatible"
VerticalAlignment="Stretch"
Classes="TextArea"
MinLines="10"
TextWrapping="Wrap" />
</HeaderedContentControl> </HeaderedContentControl>
</Grid> </Grid>

22
v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml
View file

@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib" xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
xmlns:views="clr-namespace:v2rayN.Desktop.Views"
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib" xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
Title="{x:Static resx:ResUI.menuFullConfigTemplate}" Title="{x:Static resx:ResUI.menuFullConfigTemplate}"
Width="900" Width="900"
@ -94,12 +95,7 @@
BorderBrush="Gray" BorderBrush="Gray"
BorderThickness="1" BorderThickness="1"
Header="xray config template json"> Header="xray config template json">
<TextBox <views:JsonEditor x:Name="rayFullConfigTemplate" VerticalAlignment="Stretch" />
x:Name="rayFullConfigTemplate"
VerticalAlignment="Stretch"
Classes="TextArea"
MinLines="10"
TextWrapping="Wrap" />
</HeaderedContentControl> </HeaderedContentControl>
</DockPanel> </DockPanel>
</TabItem> </TabItem>
@ -166,12 +162,7 @@
BorderBrush="Gray" BorderBrush="Gray"
BorderThickness="1" BorderThickness="1"
Header="sing-box config template json"> Header="sing-box config template json">
<TextBox <views:JsonEditor x:Name="sbFullConfigTemplate" VerticalAlignment="Stretch" />
x:Name="sbFullConfigTemplate"
VerticalAlignment="Stretch"
Classes="TextArea"
MinLines="10"
TextWrapping="Wrap" />
</HeaderedContentControl> </HeaderedContentControl>
<GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" /> <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
@ -181,12 +172,7 @@
BorderBrush="Gray" BorderBrush="Gray"
BorderThickness="1" BorderThickness="1"
Header="sing-box tun config template json"> Header="sing-box tun config template json">
<TextBox <views:JsonEditor x:Name="sbFullTunConfigTemplate" VerticalAlignment="Stretch" />
x:Name="sbFullTunConfigTemplate"
VerticalAlignment="Stretch"
Classes="TextArea"
MinLines="10"
TextWrapping="Wrap" />
</HeaderedContentControl> </HeaderedContentControl>
</Grid> </Grid>
</DockPanel> </DockPanel>

4
v2rayN/v2rayN.Desktop/Views/MsgView.axaml
View file

@ -79,8 +79,8 @@
<MenuItem <MenuItem
x:Name="menuMsgViewSelectAll" x:Name="menuMsgViewSelectAll"
Click="menuMsgViewSelectAll_Click" Click="menuMsgViewSelectAll_Click"
InputGesture="Ctrl+A" Header="{x:Static resx:ResUI.menuMsgViewSelectAll}"
Header="{x:Static resx:ResUI.menuMsgViewSelectAll}" /> InputGesture="Ctrl+A" />
<MenuItem <MenuItem
x:Name="menuMsgViewCopy" x:Name="menuMsgViewCopy"
Click="menuMsgViewCopy_Click" Click="menuMsgViewCopy_Click"