Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-04-19 13:42:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjust controls margin
Some checks are pending
release Linux / build (Release) (push) Waiting to run
Details
release macOS / build (Release) (push) Waiting to run
Details
release Windows desktop (Avalonia UI) / build (Release) (push) Waiting to run
Details
release Windows / build (Release) (push) Waiting to run
Details

Browse source
This commit is contained in:
2dust 2025-02-20 18:34:25 +08:00
parent b9b4ca6360
commit 42324a2c9e
22 changed files with 533 additions and 540 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
v2rayN/v2rayN.Desktop/Assets/GlobalResources.axaml
View file

@ -10,4 +10,11 @@
<x:Double x:Key="IconButtonWidth">32</x:Double>
<x:Double x:Key="IconButtonHeight">32</x:Double>
<Thickness x:Key="Margin2">2</Thickness>
<Thickness x:Key="MarginLr4">4,0</Thickness>
<Thickness x:Key="Margin4">4</Thickness>
<Thickness x:Key="MarginLr8">8,0</Thickness>
<Thickness x:Key="MarginTb8">0,8</Thickness>
<Thickness x:Key="Margin8">8</Thickness>
</ResourceDictionary>

15
v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml
View file

@ -5,21 +5,6 @@
</Border>
</Design.PreviewWith>
<Style Selector="TextBlock.Margin8">
<Setter Property="Margin" Value="8" />
</Style>
<Style Selector="StackPanel.Margin8">
<Setter Property="Margin" Value="8" />
</Style>
<Style Selector="DockPanel.Margin8">
<Setter Property="Margin" Value="8" />
</Style>
<Style Selector="WrapPanel.Margin8">
<Setter Property="Margin" Value="8" />
</Style>
<Style Selector="Grid.Margin8">
<Setter Property="Margin" Value="8" />
</Style>
<Style Selector="DataGrid">
<Setter Property="RowHeight" Value="24" />
</Style>

44
v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml
View file

@ -1,4 +1,4 @@
<Window
<Window
x:Class="v2rayN.Desktop.Views.AddServer2Window"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@ -13,10 +13,10 @@
ShowInTaskbar="False"
WindowStartupLocation="CenterScreen"
mc:Ignorable="d">
<DockPanel Classes="Margin8">
<DockPanel Margin="{StaticResource Margin8}">
<StackPanel
HorizontalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
DockPanel.Dock="Bottom"
Orientation="Horizontal">
<Button
@ -28,7 +28,7 @@
<Button
x:Name="btnCancel"
Width="100"
Margin="8,0"
Margin="{StaticResource MarginLr8}"
Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand"
IsCancel="True" />
@ -39,14 +39,14 @@
<TextBlock
Grid.Row="0"
Grid.Column="0"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.menuServers}" />
<TextBlock
Grid.Row="1"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.TbRemarks}" />
<TextBox
@ -56,13 +56,13 @@
Width="400"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.TbAddress}" />
<TextBox
x:Name="txtAddress"
@ -71,7 +71,7 @@
Width="400"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
IsReadOnly="True" />
<StackPanel
Grid.Row="2"
@ -80,11 +80,11 @@
Orientation="Horizontal">
<Button
x:Name="btnBrowse"
Margin="2,0"
Margin="{StaticResource MarginLr4}"
Content="{x:Static resx:ResUI.TbBrowse}" />
<Button
x:Name="btnEdit"
Margin="2,0"
Margin="{StaticResource MarginLr4}"
Content="{x:Static resx:ResUI.TbEdit}" />
</StackPanel>
@ -92,7 +92,7 @@
Grid.Row="3"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.TbCoreType}" />
<ComboBox
x:Name="cmbCoreType"
@ -100,27 +100,27 @@
Grid.Column="1"
Width="200"
HorizontalAlignment="Left"
Classes="Margin8"
Margin="{StaticResource Margin4}"
MaxDropDownHeight="1000" />
<TextBlock
Grid.Row="4"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.TbDisplayLog}" />
<StackPanel
Grid.Row="4"
Grid.Column="1"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Orientation="Horizontal">
<ToggleSwitch
x:Name="togDisplayLog"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Margin="8,0"
VerticalAlignment="Center"
Margin="{StaticResource MarginLr8}"
Text="{x:Static resx:ResUI.TipDisplayLog}" />
</StackPanel>
@ -128,7 +128,7 @@
Grid.Row="5"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.TbPreSocksPort}" />
<TextBox
x:Name="txtPreSocksPort"
@ -136,12 +136,12 @@
Grid.Column="1"
Width="200"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<StackPanel
Grid.Row="6"
Grid.Column="1"
Grid.ColumnSpan="2"
Classes="Margin8">
Margin="{StaticResource Margin4}">
<TextBlock
Width="500"
VerticalAlignment="Center"
@ -149,12 +149,12 @@
TextWrapping="Wrap" />
<TextBlock
Width="500"
Margin="8,0"
VerticalAlignment="Center"
Margin="{StaticResource MarginLr8}"
Text="{x:Static resx:ResUI.CustomServerTips}"
TextWrapping="Wrap" />
</StackPanel>
</Grid>
</ScrollViewer>
</DockPanel>
</Window>
</Window>

219
v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
View file

@ -13,10 +13,10 @@
ShowInTaskbar="False"
WindowStartupLocation="CenterScreen"
mc:Ignorable="d">
<DockPanel Classes="Margin8">
<DockPanel Margin="{StaticResource Margin8}">
<StackPanel
Margin="{StaticResource Margin4}"
HorizontalAlignment="Center"
Classes="Margin8"
DockPanel.Dock="Bottom"
Orientation="Horizontal">
<Button
@ -28,7 +28,7 @@
<Button
x:Name="btnCancel"
Width="100"
Margin="8,0"
Margin="{StaticResource MarginLr8}"
Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand"
IsCancel="True" />
@ -44,7 +44,7 @@
<TextBlock
Grid.Row="0"
Grid.Column="0"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.menuServers}" />
<StackPanel
Grid.Row="0"
@ -53,52 +53,52 @@
<ComboBox
x:Name="cmbCoreType"
Width="100"
Classes="Margin8"
Margin="{StaticResource Margin4}"
ToolTip.Tip="{x:Static resx:ResUI.TbCoreType}" />
</StackPanel>
<TextBlock
Grid.Row="1"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbRemarks}" />
<TextBox
x:Name="txtRemarks"
Grid.Row="1"
Grid.Column="1"
Width="400"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbAddress}" />
<TextBox
x:Name="txtAddress"
Grid.Row="2"
Grid.Column="1"
Width="400"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="3"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbPort}" />
<TextBox
x:Name="txtPort"
Grid.Row="3"
Grid.Column="1"
Width="200"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" />
</Grid>
<Separator Grid.Row="1" Margin="0,10" />
<Separator Grid.Row="1" Margin="{StaticResource MarginTb8}" />
<Grid
x:Name="gridVMess"
@ -110,48 +110,48 @@
<TextBlock
Grid.Row="1"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbId}" />
<TextBox
x:Name="txtId"
Grid.Row="1"
Grid.Column="1"
Width="400"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<Button
x:Name="btnGUID"
Grid.Row="1"
Grid.Column="2"
Margin="4,0"
Margin="{StaticResource MarginLr4}"
Content="{x:Static resx:ResUI.TbGUID}" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbAlterId}" />
<TextBox
x:Name="txtAlterId"
Grid.Row="2"
Grid.Column="1"
Width="200"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" />
<TextBlock
Grid.Row="3"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSecurity}" />
<ComboBox
x:Name="cmbSecurity"
Grid.Row="3"
Grid.Column="1"
Width="200"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
</Grid>
<Grid
x:Name="gridSs"
@ -163,28 +163,28 @@
<TextBlock
Grid.Row="1"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbId3}" />
<TextBox
x:Name="txtId3"
Grid.Row="1"
Grid.Column="1"
Width="400"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSecurity3}" />
<ComboBox
x:Name="cmbSecurity3"
Grid.Row="2"
Grid.Column="1"
Width="300"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
</Grid>
<Grid
x:Name="gridSocks"
@ -196,28 +196,28 @@
<TextBlock
Grid.Row="1"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSecurity4}" />
<TextBox
x:Name="txtSecurity4"
Grid.Row="1"
Grid.Column="1"
Width="400"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbId4}" />
<TextBox
x:Name="txtId4"
Grid.Row="2"
Grid.Column="1"
Width="400"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
</Grid>
<Grid
x:Name="gridVLESS"
@ -229,48 +229,48 @@
<TextBlock
Grid.Row="1"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbId5}" />
<TextBox
x:Name="txtId5"
Grid.Row="1"
Grid.Column="1"
Width="400"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<Button
x:Name="btnGUID5"
Grid.Row="1"
Grid.Column="2"
Margin="4,0"
Margin="{StaticResource MarginLr4}"
Content="{x:Static resx:ResUI.TbGUID}" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbFlow5}" />
<ComboBox
x:Name="cmbFlow5"
Grid.Row="2"
Grid.Column="1"
Width="200"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="3"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSecurity5}" />
<TextBox
x:Name="txtSecurity5"
Grid.Row="3"
Grid.Column="1"
Width="200"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" />
</Grid>
<Grid
x:Name="gridTrojan"
@ -282,28 +282,28 @@
<TextBlock
Grid.Row="1"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbId3}" />
<TextBox
x:Name="txtId6"
Grid.Row="1"
Grid.Column="1"
Width="400"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbFlow5}" />
<ComboBox
x:Name="cmbFlow6"
Grid.Row="2"
Grid.Column="1"
Width="200"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
</Grid>
<Grid
x:Name="gridHysteria2"
@ -315,28 +315,28 @@
<TextBlock
Grid.Row="1"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbId3}" />
<TextBox
x:Name="txtId7"
Grid.Row="1"
Grid.Column="1"
Width="400"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbPath7}" />
<TextBox
x:Name="txtPath7"
Grid.Row="2"
Grid.Column="1"
Width="400"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
</Grid>
<Grid
x:Name="gridTuic"
@ -348,41 +348,41 @@
<TextBlock
Grid.Row="1"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbId}" />
<TextBox
x:Name="txtId8"
Grid.Row="1"
Grid.Column="1"
Width="400"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbId3}" />
<TextBox
x:Name="txtSecurity8"
Grid.Row="2"
Grid.Column="1"
Width="400"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="3"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbHeaderType8}" />
<ComboBox
x:Name="cmbHeaderType8"
Grid.Row="3"
Grid.Column="1"
Width="200"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
</Grid>
<Grid
x:Name="gridWireguard"
@ -394,75 +394,75 @@
<TextBlock
Grid.Row="1"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbPrivateKey}" />
<TextBox
x:Name="txtId9"
Grid.Row="1"
Grid.Column="1"
Width="400"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbPublicKey}" />
<TextBox
x:Name="txtPublicKey9"
Grid.Row="2"
Grid.Column="1"
Width="400"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" />
<TextBlock
Grid.Row="3"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbReserved}" />
<TextBox
x:Name="txtPath9"
Grid.Row="3"
Grid.Column="1"
Width="400"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="4"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbLocalAddress}" />
<TextBox
x:Name="txtRequestHost9"
Grid.Row="4"
Grid.Column="1"
Width="400"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="5"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="Mtu" />
<TextBox
x:Name="txtShortId9"
Grid.Row="5"
Grid.Column="1"
Width="200"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" />
</Grid>
<Separator
x:Name="sepa2"
Grid.Row="3"
Margin="0,10" />
Margin="{StaticResource MarginTb8}" />
<Grid
x:Name="gridTransport"
@ -473,34 +473,34 @@
<TextBlock
Grid.Row="0"
Grid.ColumnSpan="2"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.GbTransport}" />
<TextBlock
Grid.Row="1"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbNetwork}" />
<ComboBox
x:Name="cmbNetwork"
Grid.Row="1"
Grid.Column="1"
Width="200"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="1"
Grid.Column="2"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TipNetwork}" />
<TextBlock
x:Name="labHeaderType"
Grid.Row="2"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbHeaderType}" />
<StackPanel
Grid.Row="2"
@ -510,33 +510,32 @@
<ComboBox
x:Name="cmbHeaderType"
Width="200"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<Button
x:Name="btnExtra"
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
Margin="10,0"
Margin="{StaticResource MarginLr8}"
Theme="{DynamicResource BorderlessButton}">
<Button.Content>
<PathIcon
Data="{StaticResource building_more}"
Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
<PathIcon Data="{StaticResource building_more}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
</Button.Content>
<Button.Flyout>
<Flyout>
<StackPanel>
<TextBlock
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TransportExtraTip}" />
<TextBox
x:Name="txtExtra"
Width="400"
MinHeight="100"
Margin="{StaticResource Margin4}"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
Classes="TextArea Margin8"
Classes="TextArea"
MinLines="6"
TextWrapping="Wrap" />
</StackPanel>
@ -548,52 +547,52 @@
x:Name="tipHeaderType"
Grid.Row="2"
Grid.Column="2"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbHeaderType}" />
<TextBlock
Grid.Row="3"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbRequestHost}" />
<TextBox
x:Name="txtRequestHost"
Grid.Row="3"
Grid.Column="1"
Width="400"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
x:Name="tipRequestHost"
Grid.Row="3"
Grid.Column="2"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbRequestHost}" />
<TextBlock
Grid.Row="4"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbPath}" />
<TextBox
x:Name="txtPath"
Grid.Row="4"
Grid.Column="1"
Width="400"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
x:Name="tipPath"
Grid.Row="4"
Grid.Column="2"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbPath}" />
</Grid>
<Separator Grid.Row="5" Margin="0,10" />
<Separator Grid.Row="5" Margin="{StaticResource MarginTb8}" />
<Grid
x:Name="gridTls"
@ -604,15 +603,15 @@
<TextBlock
Grid.Row="0"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbStreamSecurity}" />
<ComboBox
x:Name="cmbStreamSecurity"
Grid.Row="0"
Grid.Column="1"
Width="200"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
</Grid>
<Grid
x:Name="gridTlsMore"
@ -624,55 +623,55 @@
<TextBlock
Grid.Row="1"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSNI}" />
<TextBox
x:Name="txtSNI"
Grid.Row="1"
Grid.Column="1"
Width="400"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbFingerprint}" />
<ComboBox
x:Name="cmbFingerprint"
Grid.Row="2"
Grid.Column="1"
Width="200"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="3"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbAlpn}" />
<ComboBox
x:Name="cmbAlpn"
Grid.Row="3"
Grid.Column="1"
Width="200"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="4"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbAllowInsecure}" />
<ComboBox
x:Name="cmbAllowInsecure"
Grid.Row="4"
Grid.Column="1"
Width="200"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
</Grid>
<Grid
x:Name="gridRealityMore"
@ -684,73 +683,73 @@
<TextBlock
Grid.Row="0"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSNI}" />
<TextBox
x:Name="txtSNI2"
Grid.Row="0"
Grid.Column="1"
Width="400"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" />
<TextBlock
Grid.Row="1"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbFingerprint}" />
<ComboBox
x:Name="cmbFingerprint2"
Grid.Row="1"
Grid.Column="1"
Width="200"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbPublicKey}" />
<TextBox
x:Name="txtPublicKey"
Grid.Row="2"
Grid.Column="1"
Width="400"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" />
<TextBlock
Grid.Row="3"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbShortId}" />
<TextBox
x:Name="txtShortId"
Grid.Row="3"
Grid.Column="1"
Width="200"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" />
<TextBlock
Grid.Row="4"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSpiderX}" />
<TextBox
x:Name="txtSpiderX"
Grid.Row="4"
Grid.Column="1"
Width="400"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" />
</Grid>
<Separator Grid.Row="8" Margin="0,10" />
<Separator Grid.Row="8" Margin="{StaticResource MarginTb8}" />
</Grid>
</ScrollViewer>
</DockPanel>

58
v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml
View file

@ -14,84 +14,84 @@
</Style>
</UserControl.Styles>
<DockPanel Classes="Margin8">
<StackPanel Classes="Margin8" DockPanel.Dock="Bottom">
<DockPanel Margin="{StaticResource Margin8}">
<StackPanel Margin="{StaticResource Margin4}" DockPanel.Dock="Bottom">
<TextBlock
Name="txtMsg"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
</StackPanel>
<StackPanel>
<Border
Margin="4"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Theme="{DynamicResource CardBorder}">
<Grid
Classes="Margin8"
Margin="{StaticResource Margin4}"
ColumnDefinitions="300,200"
RowDefinitions="Auto,Auto,Auto,Auto">
<TextBlock
Grid.Row="0"
Grid.Column="0"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.menuLocalBackupAndRestore}" />
<TextBlock
Grid.Row="1"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.menuLocalBackup}" />
<Button
Name="menuLocalBackup"
Grid.Row="1"
Grid.Column="1"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Content="{x:Static resx:ResUI.menuLocalBackup}" />
<Separator
Grid.Row="2"
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="0,8" />
Margin="{StaticResource MarginTb8}" />
<TextBlock
Grid.Row="3"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.menuLocalRestore}" />
<Button
Name="menuLocalRestore"
Grid.Row="3"
Grid.Column="1"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Content="{x:Static resx:ResUI.menuLocalRestore}" />
</Grid>
</Border>
<Border
Margin="4"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Theme="{DynamicResource CardBorder}">
<Grid
Classes="Margin8"
Margin="{StaticResource Margin4}"
ColumnDefinitions="300,200"
RowDefinitions="Auto,Auto,Auto,Auto,Auto">
<StackPanel
Grid.Row="0"
Grid.Column="0"
Orientation="Horizontal">
<TextBlock Classes="Margin8" Text="{x:Static resx:ResUI.menuRemoteBackupAndRestore}" />
<TextBlock Margin="{StaticResource Margin4}" Text="{x:Static resx:ResUI.menuRemoteBackupAndRestore}" />
<Button
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
MinWidth="{StaticResource IconButtonWidth}"
Margin="10,0"
Margin="{StaticResource MarginLr8}"
Theme="{DynamicResource BorderlessButton}">
<Button.Content>
<PathIcon Data="{StaticResource building_more}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
@ -104,7 +104,7 @@
Grid.Row="0"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.LvWebDavUrl}" />
<TextBox
@ -112,14 +112,14 @@
Grid.Row="0"
Grid.Column="1"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
TextWrapping="Wrap" />
<TextBlock
Grid.Row="1"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.LvWebDavUserName}" />
<TextBox
@ -127,13 +127,13 @@
Grid.Row="1"
Grid.Column="1"
VerticalAlignment="Center"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.LvWebDavPassword}" />
<TextBox
@ -141,13 +141,13 @@
Grid.Row="2"
Grid.Column="1"
VerticalAlignment="Center"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="3"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.LvWebDavDirName}" />
<TextBox
@ -155,7 +155,7 @@
Grid.Row="3"
Grid.Column="1"
VerticalAlignment="Center"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<Button
x:Name="menuWebDavCheck"
@ -163,7 +163,7 @@
Grid.Column="1"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Content="{x:Static resx:ResUI.LvWebDavCheck}" />
</Grid>
</StackPanel>
@ -177,33 +177,33 @@
Grid.Row="1"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.menuRemoteBackup}" />
<Button
Name="menuRemoteBackup"
Grid.Row="1"
Grid.Column="1"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Content="{x:Static resx:ResUI.menuRemoteBackup}" />
<Separator
Grid.Row="2"
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="0,8" />
Margin="{StaticResource MarginTb8}" />
<TextBlock
Grid.Row="3"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.menuRemoteRestore}" />
<Button
Name="menuRemoteRestore"
Grid.Row="3"
Grid.Column="1"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Content="{x:Static resx:ResUI.menuRemoteRestore}" />
</Grid>
</Border>

18
v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml
View file

@ -11,38 +11,38 @@
x:DataType="vms:CheckUpdateViewModel"
mc:Ignorable="d">
<DockPanel Classes="Margin8">
<DockPanel Margin="{StaticResource Margin8}">
<Border
Margin="4"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
DockPanel.Dock="Bottom"
Theme="{DynamicResource CardBorder}">
<StackPanel
Margin="{StaticResource Margin4}"
HorizontalAlignment="Center"
Classes="Margin8"
Orientation="Horizontal">
<TextBlock
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsEnableCheckPreReleaseUpdate}" />
<ToggleSwitch
x:Name="togEnableCheckPreReleaseUpdate"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" />
<Button
x:Name="btnCheckUpdate"
Width="100"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Content="{x:Static resx:ResUI.menuCheckUpdate}" />
</StackPanel>
</Border>
<Border
Margin="4"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Theme="{DynamicResource CardBorder}">
@ -63,7 +63,7 @@
<ToggleSwitch
x:Name="togAutoRefresh"
Grid.Column="0"
Margin="8"
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left"
VerticalAlignment="Center"
IsChecked="{Binding IsSelected}" />

14
v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml
View file

@ -14,23 +14,23 @@
<DockPanel Margin="2">
<WrapPanel
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
DockPanel.Dock="Top"
Orientation="Horizontal">
<TextBox
x:Name="txtHostFilter"
Width="200"
Margin="8,0"
VerticalContentAlignment="Center"
Margin="{StaticResource MarginLr8}"
Watermark="{x:Static resx:ResUI.ConnectionsHostFilterTitle}" />
<Button
x:Name="btnConnectionCloseAll"
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
Margin="8,0"
Classes="Success"
Margin="{StaticResource MarginLr8}"
Theme="{DynamicResource BorderlessButton}"
ToolTip.Tip="{x:Static resx:ResUI.menuConnectionCloseAll}">
<Button.Content>
@ -42,8 +42,8 @@
x:Name="btnAutofitColumnWidth"
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
Margin="8,0"
Classes="Success"
Margin="{StaticResource MarginLr8}"
Theme="{DynamicResource BorderlessButton}"
ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
<Button.Content>
@ -52,13 +52,13 @@
</Button>
<TextBlock
Margin="8,0"
VerticalAlignment="Center"
Margin="{StaticResource MarginLr8}"
Text="{x:Static resx:ResUI.TbAutoRefresh}" />
<ToggleSwitch
x:Name="togAutoRefresh"
Margin="8,0"
HorizontalAlignment="Left" />
HorizontalAlignment="Left"
Margin="{StaticResource MarginLr8}" />
</WrapPanel>
<DataGrid

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

@ -17,32 +17,32 @@
<DockPanel Margin="2">
<WrapPanel
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
DockPanel.Dock="Top"
Orientation="Horizontal">
<TextBlock
Margin="8,0"
Margin="{StaticResource MarginLr8}"
VerticalAlignment="Center"
Text="{x:Static resx:ResUI.menuRulemode}" />
<ComboBox
x:Name="cmbRulemode"
Width="100"
Margin="8,0">
Margin="{StaticResource MarginLr8}">
<ComboBoxItem Content="{x:Static resx:ResUI.menuModeRule}" />
<ComboBoxItem Content="{x:Static resx:ResUI.menuModeGlobal}" />
<ComboBoxItem Content="{x:Static resx:ResUI.menuModeDirect}" />
</ComboBox>
<TextBlock
Margin="8,0"
Margin="{StaticResource MarginLr8}"
VerticalAlignment="Center"
Text="{x:Static resx:ResUI.TbSorting}" />
<ComboBox
x:Name="cmbSorting"
Width="100"
Margin="8,0">
Margin="{StaticResource MarginLr8}">
<ComboBoxItem Content="{x:Static resx:ResUI.TbSortingDelay}" />
<ComboBoxItem Content="{x:Static resx:ResUI.TbSortingName}" />
<ComboBoxItem Content="{x:Static resx:ResUI.TbSortingDefault}" />
@ -52,7 +52,7 @@
x:Name="menuProxiesReload"
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
Margin="8,0"
Margin="{StaticResource MarginLr8}"
Classes="Success"
Theme="{DynamicResource BorderlessButton}"
ToolTip.Tip="{x:Static resx:ResUI.menuProxiesReload}">
@ -65,7 +65,7 @@
x:Name="menuProxiesDelaytest"
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
Margin="8,0"
Margin="{StaticResource MarginLr8}"
Classes="Success"
Theme="{DynamicResource BorderlessButton}"
ToolTip.Tip="{x:Static resx:ResUI.menuProxiesDelaytest}">
@ -75,12 +75,12 @@
</Button>
<TextBlock
Margin="8,0"
Margin="{StaticResource MarginLr8}"
VerticalAlignment="Center"
Text="{x:Static resx:ResUI.TbAutoRefresh}" />
<ToggleSwitch
x:Name="togAutoRefresh"
Margin="8,0"
Margin="{StaticResource MarginLr8}"
HorizontalAlignment="Left" />
</WrapPanel>
<DockPanel>
@ -101,7 +101,7 @@
Margin="-8,-4"
Padding="0"
Theme="{StaticResource CardBorder}">
<Grid Classes="Margin8" RowDefinitions="1*,8,1*">
<Grid Margin="{StaticResource Margin4}" RowDefinitions="1*,8,1*">
<DockPanel Grid.Row="0">
<TextBlock DockPanel.Dock="Right" Text="{Binding Type}" />
<TextBlock Text="{Binding Name}" />
@ -143,7 +143,7 @@
CornerRadius="4"
DockPanel.Dock="Left"
IsVisible="{Binding IsActive}" />
<Grid Classes="Margin8" RowDefinitions="1*,8,1*">
<Grid Margin="{StaticResource Margin4}" RowDefinitions="1*,8,1*">
<TextBlock Grid.Row="0" Text="{Binding Name}" />
<DockPanel Grid.Row="2">
<TextBlock

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

@ -1,4 +1,4 @@
<Window
<Window
x:Class="v2rayN.Desktop.Views.DNSSettingWindow"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@ -13,10 +13,10 @@
ShowInTaskbar="False"
WindowStartupLocation="CenterScreen"
mc:Ignorable="d">
<DockPanel Classes="Margin8">
<DockPanel Margin="{StaticResource Margin8}">
<StackPanel
Margin="{StaticResource Margin4}"
HorizontalAlignment="Center"
Classes="Margin8"
DockPanel.Dock="Bottom"
Orientation="Horizontal">
<Button
@ -28,7 +28,7 @@
<Button
x:Name="btnCancel"
Width="100"
Margin="8,0"
Margin="{StaticResource MarginLr8}"
Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand"
IsCancel="True" />
@ -36,21 +36,21 @@
<TabControl HorizontalContentAlignment="Left">
<TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDns}">
<DockPanel Classes="Margin8">
<DockPanel Margin="{StaticResource Margin8}">
<StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
<TextBlock
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsRemoteDNS}" />
<TextBlock VerticalAlignment="Center" Classes="Margin8">
<TextBlock Margin="{StaticResource Margin4}" VerticalAlignment="Center">
<HyperlinkButton Classes="WithIcon" Click="linkDnsObjectDoc_Click">
<TextBlock Text="{x:Static resx:ResUI.TbDnsObjectDoc}" />
</HyperlinkButton>
</TextBlock>
<Button
x:Name="btnImportDefConfig4V2ray"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
Cursor="Hand" />
</StackPanel>
@ -58,44 +58,45 @@
<WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsUseSystemHosts}" />
<ToggleSwitch
x:Name="togUseSystemHosts"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsDomainStrategy4Freedom}" />
<ComboBox
x:Name="cmbdomainStrategy4Freedom"
Width="150"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
<ComboBox
x:Name="cmbdomainDNSAddress"
Width="150"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
</StackPanel>
</WrapPanel>
<Grid Classes="Margin8">
<Grid Margin="{StaticResource Margin4}">
<TextBox
x:Name="txtnormalDNS"
Margin="{StaticResource Margin4}"
VerticalAlignment="Stretch"
BorderThickness="1"
Classes="TextArea Margin8"
Classes="TextArea"
TextWrapping="Wrap"
Watermark="HTTP/SOCKS" />
</Grid>
@ -103,16 +104,16 @@
</TabItem>
<TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDnsSingbox}">
<DockPanel Classes="Margin8">
<DockPanel Margin="{StaticResource Margin8}">
<StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Classes="Margin8">
<TextBlock Margin="{StaticResource Margin4}" VerticalAlignment="Center">
<HyperlinkButton Classes="WithIcon" Click="linkDnsSingboxObjectDoc_Click">
<TextBlock Text="{x:Static resx:ResUI.TbDnsSingboxObjectDoc}" />
</HyperlinkButton>
</TextBlock>
<Button
x:Name="btnImportDefConfig4Singbox"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
Cursor="Hand" />
</StackPanel>
@ -120,28 +121,28 @@
<WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsDomainStrategy4Out}" />
<ComboBox
x:Name="cmbdomainStrategy4Out"
Width="150"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
<ComboBox
x:Name="cmbdomainDNSAddress2"
Width="150"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
</StackPanel>
</WrapPanel>
<Grid Classes="Margin8" ColumnDefinitions="*,10,*">
<Grid Margin="{StaticResource Margin4}" ColumnDefinitions="*,10,*">
<TextBox
x:Name="txtnormalDNS2"
@ -150,7 +151,8 @@
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
BorderThickness="1"
Classes="TextArea Margin8"
Classes="TextArea"
Margin="{StaticResource Margin4}"
TextWrapping="Wrap"
Watermark="HTTP/SOCKS" />
@ -163,7 +165,8 @@
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
BorderThickness="1"
Classes="TextArea Margin8"
Classes="TextArea"
Margin="{StaticResource Margin4}"
TextWrapping="Wrap"
Watermark="{x:Static resx:ResUI.TbSettingsTunMode}" />
</Grid>
@ -171,4 +174,4 @@
</TabItem>
</TabControl>
</DockPanel>
</Window>
</Window>

36
v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml
View file

@ -1,4 +1,4 @@
<Window
<Window
x:Class="v2rayN.Desktop.Views.GlobalHotkeySettingWindow"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@ -13,16 +13,16 @@
ShowInTaskbar="False"
WindowStartupLocation="CenterScreen"
mc:Ignorable="d">
<DockPanel Classes="Margin8">
<DockPanel Margin="{StaticResource Margin8}">
<StackPanel
HorizontalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
DockPanel.Dock="Bottom"
Orientation="Horizontal">
<Button
x:Name="btnReset"
Width="100"
Margin="8,0"
Margin="{StaticResource MarginLr8}"
Content="{x:Static resx:ResUI.TbReset}" />
<Button
x:Name="btnSave"
@ -33,7 +33,7 @@
<Button
x:Name="btnCancel"
Width="100"
Margin="8,0"
Margin="{StaticResource MarginLr8}"
Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand"
IsCancel="True" />
@ -49,14 +49,14 @@
<TextBlock
Grid.Row="0"
Grid.Column="0"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.TbGlobalHotkeySetting}" />
<TextBlock
Grid.Row="1"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.TbDisplayGUI}" />
<TextBox
@ -64,70 +64,70 @@
Grid.Row="1"
Grid.Column="1"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
IsReadOnly="True" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.TbClearSystemProxy}" />
<TextBox
x:Name="txtGlobalHotkey1"
Grid.Row="2"
Grid.Column="1"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
IsReadOnly="True" />
<TextBlock
Grid.Row="3"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.TbSetSystemProxy}" />
<TextBox
x:Name="txtGlobalHotkey2"
Grid.Row="3"
Grid.Column="1"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
IsReadOnly="True" />
<TextBlock
Grid.Row="4"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.TbNotChangeSystemProxy}" />
<TextBox
x:Name="txtGlobalHotkey3"
Grid.Row="4"
Grid.Column="1"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
IsReadOnly="True" />
<TextBlock
Grid.Row="5"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.TbSystemProxyPac}" />
<TextBox
x:Name="txtGlobalHotkey4"
Grid.Row="5"
Grid.Column="1"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
IsReadOnly="True" />
</Grid>
<TextBlock
Grid.Row="1"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.TbGlobalHotkeySettingTip}" />
</Grid>
</ScrollViewer>
</DockPanel>
</Window>
</Window>

2
v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
View file

@ -22,7 +22,7 @@
CloseOnClickAway="True"
DisableOpeningAnimation="True">
<DockPanel>
<DockPanel Classes="Margin8" DockPanel.Dock="Top">
<DockPanel Margin="{StaticResource Margin8}" DockPanel.Dock="Top">
<ContentControl x:Name="conTheme" DockPanel.Dock="Right" />
<Menu Margin="0,1">
<MenuItem Padding="8,0">

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

@ -11,14 +11,14 @@
<DockPanel Margin="2">
<WrapPanel
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
DockPanel.Dock="Top"
Orientation="Horizontal">
<TextBox
x:Name="cmbMsgFilter"
Width="200"
Margin="8,0"
Margin="{StaticResource MarginLr8}"
VerticalContentAlignment="Center"
Watermark="{x:Static resx:ResUI.MsgFilterTitle}" />
@ -26,7 +26,7 @@
x:Name="btnCopy"
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
Margin="8,0"
Margin="{StaticResource MarginLr8}"
Classes="Success"
Click="menuMsgViewCopyAll_Click"
Theme="{DynamicResource BorderlessButton}"
@ -37,7 +37,7 @@
</Button>
<Button
x:Name="btnClear"
Margin="8,0"
Margin="{StaticResource MarginLr8}"
Classes="Success"
Click="menuMsgViewClear_Click"
Theme="{DynamicResource BorderlessButton}"
@ -47,22 +47,22 @@
</Button.Content>
</Button>
<TextBlock
Margin="8,0"
Margin="{StaticResource MarginLr8}"
VerticalAlignment="Center"
Text="{x:Static resx:ResUI.TbAutoRefresh}" />
<ToggleSwitch
x:Name="togAutoRefresh"
Margin="8,0"
Margin="{StaticResource MarginLr8}"
HorizontalAlignment="Left"
IsChecked="True"
Theme="{DynamicResource SimpleToggleSwitch}" />
<TextBlock
Margin="8,0"
Margin="{StaticResource MarginLr8}"
VerticalAlignment="Center"
Text="{x:Static resx:ResUI.TbAutoScrollToEnd}" />
<ToggleSwitch
x:Name="togScrollToEnd"
Margin="8,0"
Margin="{StaticResource MarginLr8}"
HorizontalAlignment="Left"
IsChecked="True"
Theme="{DynamicResource SimpleToggleSwitch}" />

322
v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
View file

File diff suppressed because it is too large Load diff

16
v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
View file

@ -19,7 +19,7 @@
<WrapPanel Margin="2" DockPanel.Dock="Top">
<ListBox
x:Name="lstGroup"
Margin="4,0"
Margin="{StaticResource MarginLr4}"
DisplayMemberBinding="{Binding Remarks}"
ItemsSource="{Binding SubItems}"
Theme="{DynamicResource PureCardRadioGroupListBox}">
@ -34,7 +34,7 @@
x:Name="btnEditSub"
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
Margin="4,0"
Margin="{StaticResource MarginLr4}"
Classes="Success"
Theme="{DynamicResource BorderlessButton}"
ToolTip.Tip="{x:Static resx:ResUI.menuSubEdit}">
@ -46,7 +46,7 @@
x:Name="btnAddSub"
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
Margin="4,0"
Margin="{StaticResource MarginLr4}"
Classes="Success"
Theme="{DynamicResource BorderlessButton}"
ToolTip.Tip="{x:Static resx:ResUI.menuSubAdd}">
@ -59,7 +59,7 @@
x:Name="btnAutofitColumnWidth"
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
Margin="4,0"
Margin="{StaticResource MarginLr4}"
Classes="Success"
Theme="{DynamicResource BorderlessButton}"
ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
@ -71,7 +71,7 @@
<TextBox
x:Name="txtServerFilter"
Width="200"
Margin="4,0"
Margin="{StaticResource MarginLr4}"
VerticalContentAlignment="Center"
Watermark="{x:Static resx:ResUI.MsgServerTitle}" />
</WrapPanel>
@ -157,9 +157,9 @@
</DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<StackPanel Margin="8,0" Orientation="Horizontal">
<StackPanel Margin="{StaticResource MarginLr8}" Orientation="Horizontal">
<Label
Margin="0,0,8,0"
Margin="{StaticResource MarginLr4}"
Classes="Solid Red"
Content="{x:Static resx:ResUI.TipActiveServer}"
IsVisible="{Binding IsActive}"
@ -205,7 +205,7 @@
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock
Margin="8,0"
Margin="{StaticResource MarginLr8}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Foreground="{Binding Delay, Converter={StaticResource DelayColorConverter}}"

8
v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml
View file

@ -1,4 +1,4 @@
<UserControl
<UserControl
x:Class="v2rayN.Desktop.Views.QrcodeView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@ -7,7 +7,7 @@
d:DesignHeight="480"
d:DesignWidth="400"
mc:Ignorable="d">
<Grid Margin="30" RowDefinitions="Auto,Auto">
<Grid Margin="32" RowDefinitions="Auto,Auto">
<Image
Name="imgQrcode"
Width="300"
@ -17,10 +17,10 @@
x:Name="txtContent"
Grid.Row="1"
Width="300"
Margin="0,8"
Margin="{StaticResource MarginTb8}"
VerticalAlignment="Center"
IsReadOnly="True"
MaxLines="1" />
</Grid>
</UserControl>
</UserControl>

46
v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml
View file

@ -1,4 +1,4 @@
<Window
<Window
x:Class="v2rayN.Desktop.Views.RoutingRuleDetailsWindow"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@ -15,7 +15,7 @@
mc:Ignorable="d">
<DockPanel>
<Grid
Classes="Margin8"
Margin="{StaticResource Margin4}"
ColumnDefinitions="Auto,Auto,Auto"
DockPanel.Dock="Top"
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
@ -23,7 +23,7 @@
Grid.Row="0"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.LvRemarks}" />
<TextBox
x:Name="txtRemarks"
@ -31,39 +31,39 @@
Grid.Column="1"
Width="200"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<ToggleSwitch
x:Name="togEnabled"
Grid.Row="0"
Grid.Column="2"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="1"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="outboundTag" />
<ComboBox
x:Name="cmbOutboundTag"
Grid.Row="1"
Grid.Column="1"
Width="200"
Classes="Margin8"
Margin="{StaticResource Margin4}"
MaxDropDownHeight="1000" />
<TextBlock
Grid.Row="1"
Grid.Column="2"
HorizontalAlignment="Left"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.TbRuleMatchingTips}" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="port" />
<TextBox
x:Name="txtPort"
@ -71,12 +71,12 @@
Grid.Column="1"
Width="200"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
Grid.Row="2"
Grid.Column="2"
VerticalAlignment="Center"
Classes="Margin8">
Margin="{StaticResource Margin4}">
<HyperlinkButton Classes="WithIcon" Click="linkRuleobjectDoc_Click">
<TextBlock Text="{x:Static resx:ResUI.TbRuleobjectDoc}" />
</HyperlinkButton>
@ -86,14 +86,14 @@
Grid.Row="3"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="protocol" />
<ListBox
x:Name="clbProtocol"
Grid.Row="3"
Grid.Column="1"
HorizontalAlignment="Left"
Classes="Margin8"
Margin="{StaticResource Margin4}"
SelectionMode="Multiple,Toggle"
Theme="{DynamicResource CardCheckGroupListBox}" />
@ -101,20 +101,20 @@
Grid.Row="4"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="inboundTag" />
<ListBox
x:Name="clbInboundTag"
Grid.Row="4"
Grid.Column="1"
Classes="Margin8"
Margin="{StaticResource Margin4}"
SelectionMode="Multiple,Toggle"
Theme="{DynamicResource CardCheckGroupListBox}" />
<TextBlock
Grid.Row="4"
Grid.Column="2"
HorizontalAlignment="Left"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.TbRoutingInboundTagTips}" />
@ -122,26 +122,26 @@
Grid.Row="5"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="network" />
<ComboBox
x:Name="cmbNetwork"
Grid.Row="5"
Grid.Column="1"
Width="200"
Classes="Margin8"
Margin="{StaticResource Margin4}"
MaxDropDownHeight="1000" />
<TextBlock
Grid.Row="5"
Grid.Column="2"
HorizontalAlignment="Left"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.TbRoutingTips}" />
</Grid>
<StackPanel
HorizontalAlignment="Right"
Classes="Margin8"
Margin="{StaticResource Margin4}"
DockPanel.Dock="Bottom"
Orientation="Horizontal">
<StackPanel
@ -161,13 +161,13 @@
<Button
x:Name="btnCancel"
Width="100"
Margin="8,0"
Margin="{StaticResource MarginLr8}"
Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand"
IsCancel="True" />
</StackPanel>
<Grid Classes="Margin8" ColumnDefinitions="1*,10,1*,10,1*">
<Grid Margin="{StaticResource Margin4}" ColumnDefinitions="1*,10,1*,10,1*">
<HeaderedContentControl
Grid.Column="0"
BorderBrush="Gray"
@ -208,4 +208,4 @@
</HeaderedContentControl>
</Grid>
</DockPanel>
</Window>
</Window>

44
v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml
View file

@ -1,4 +1,4 @@
<Window
<Window
x:Class="v2rayN.Desktop.Views.RoutingRuleSettingWindow"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@ -15,7 +15,7 @@
mc:Ignorable="d">
<DockPanel>
<StackPanel
Classes="Margin8"
Margin="{StaticResource Margin4}"
DockPanel.Dock="Top"
Orientation="Horizontal">
<Menu>
@ -28,7 +28,7 @@
<StackPanel
HorizontalAlignment="Right"
Classes="Margin8"
Margin="{StaticResource Margin4}"
DockPanel.Dock="Bottom"
Orientation="Horizontal">
<Button
@ -40,14 +40,14 @@
<Button
x:Name="btnCancel"
Width="100"
Margin="8,0"
Margin="{StaticResource MarginLr8}"
Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand"
IsCancel="True" />
</StackPanel>
<Grid
Classes="Margin8"
Margin="{StaticResource Margin4}"
ColumnDefinitions="Auto,Auto,Auto"
DockPanel.Dock="Top"
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
@ -55,7 +55,7 @@
Grid.Row="0"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.LvRemarks}" />
<StackPanel
Grid.Row="0"
@ -69,25 +69,25 @@
Width="300"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
TextWrapping="Wrap" />
<TextBlock
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.LvSort}" />
<TextBox
x:Name="txtSort"
Width="100"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
</StackPanel>
<TextBlock
Grid.Row="1"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.TbdomainStrategy}" />
<StackPanel
Grid.Row="1"
@ -96,22 +96,22 @@
<ComboBox
x:Name="cmbdomainStrategy"
Width="200"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
<TextBlock
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
<ComboBox
x:Name="cmbdomainStrategy4Singbox"
Width="200"
Classes="Margin8" />
Margin="{StaticResource Margin4}" />
</StackPanel>
<TextBlock
Grid.Row="2"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.LvUrl}" />
<TextBox
x:Name="txtUrl"
@ -120,7 +120,7 @@
Width="600"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
TextWrapping="Wrap" />
<!--
@ -128,7 +128,7 @@
Grid.Row="3"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.LvCustomIcon}" />
<TextBox
x:Name="txtCustomIcon"
@ -137,13 +137,13 @@
Width="600"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
TextWrapping="Wrap" />
<Button
x:Name="btnBrowseCustomIcon"
Grid.Row="3"
Grid.Column="2"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Content="{x:Static resx:ResUI.TbBrowse}" />
-->
@ -151,7 +151,7 @@
Grid.Row="4"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin8">
Margin="{StaticResource Margin4}">
<HyperlinkButton Classes="WithIcon" Click="linkCustomRulesetPath4Singbox">
<TextBlock Text="{x:Static resx:ResUI.LvCustomRulesetPath4Singbox}" />
</HyperlinkButton>
@ -163,13 +163,13 @@
Width="600"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
TextWrapping="Wrap" />
<Button
x:Name="btnBrowseCustomRulesetPath4Singbox"
Grid.Row="4"
Grid.Column="2"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Content="{x:Static resx:ResUI.TbBrowse}" />
</Grid>
@ -242,4 +242,4 @@
</TabItem>
</TabControl>
</DockPanel>
</Window>
</Window>

10
v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
View file

@ -1,4 +1,4 @@
<Window
<Window
x:Class="v2rayN.Desktop.Views.RoutingSettingWindow"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@ -16,7 +16,7 @@
<DockPanel>
<StackPanel
Classes="Margin8"
Margin="{StaticResource Margin4}"
DockPanel.Dock="Top"
Orientation="Horizontal"
Spacing="4">
@ -45,7 +45,7 @@
<StackPanel
HorizontalAlignment="Right"
Classes="Margin8"
Margin="{StaticResource Margin4}"
DockPanel.Dock="Bottom"
Orientation="Horizontal">
<StackPanel
@ -63,7 +63,7 @@
<Button
x:Name="btnCancel"
Width="100"
Margin="8,0"
Margin="{StaticResource MarginLr8}"
Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand"
IsCancel="True" />
@ -123,4 +123,4 @@
</TabControl>
</DockPanel>
</DockPanel>
</Window>
</Window>

20
v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml
View file

@ -11,10 +11,10 @@
x:DataType="vms:StatusBarViewModel"
mc:Ignorable="d">
<Grid>
<DockPanel Margin="4">
<DockPanel Margin="{StaticResource Margin8}">
<StackPanel
Margin="8,0"
VerticalAlignment="Center"
Margin="{StaticResource MarginLr8}"
DockPanel.Dock="Right">
<TextBlock x:Name="txtSpeedProxyDisplay" HorizontalAlignment="Right" />
<Border Margin="1" />
@ -22,8 +22,8 @@
</StackPanel>
<StackPanel
Margin="8,0"
VerticalAlignment="Center"
Margin="{StaticResource MarginLr8}"
DockPanel.Dock="Left">
<TextBlock x:Name="txtInboundDisplay" />
<Border Margin="1" />
@ -32,30 +32,30 @@
<StackPanel
x:Name="spEnableTun"
Margin="8,0"
VerticalAlignment="Center"
Margin="{StaticResource MarginLr8}"
DockPanel.Dock="Left"
Orientation="Horizontal">
<TextBlock
Margin="8,0"
VerticalAlignment="Center"
Margin="{StaticResource MarginLr8}"
Text="{x:Static resx:ResUI.TbEnableTunAs}" />
<ToggleSwitch
x:Name="togEnableTun"
HorizontalAlignment="Center"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Theme="{DynamicResource SimpleToggleSwitch}" />
</StackPanel>
<StackPanel
Margin="8,0"
VerticalAlignment="Center"
Margin="{StaticResource MarginLr8}"
DockPanel.Dock="Left"
Orientation="Horizontal">
<ComboBox
x:Name="cmbSystemProxy"
Width="160"
Margin="8,0"
Margin="{StaticResource MarginLr8}"
ToolTip.Tip="{x:Static resx:ResUI.menuSystemproxy}">
<ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyClear}" />
<ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxySet}" />
@ -66,13 +66,13 @@
<ComboBox
x:Name="cmbRoutings2"
Width="160"
Margin="8,0"
Margin="{StaticResource MarginLr8}"
DisplayMemberBinding="{Binding Remarks}"
ItemsSource="{Binding RoutingItems}"
ToolTip.Tip="{x:Static resx:ResUI.menuRouting}" />
</StackPanel>
<StackPanel Margin="8,0" VerticalAlignment="Center">
<StackPanel VerticalAlignment="Center" Margin="{StaticResource MarginLr8}">
<TextBlock x:Name="txtRunningServerDisplay" />
<Border Margin="1" />
<TextBlock x:Name="txtRunningInfoDisplay" />

69
v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
View file

@ -12,10 +12,10 @@
ShowInTaskbar="False"
WindowStartupLocation="CenterScreen"
mc:Ignorable="d">
<DockPanel Classes="Margin8">
<DockPanel Margin="{StaticResource Margin8}">
<StackPanel
Margin="{StaticResource Margin4}"
HorizontalAlignment="Center"
Classes="Margin8"
DockPanel.Dock="Bottom"
Orientation="Horizontal">
<Button
@ -27,7 +27,7 @@
<Button
x:Name="btnCancel"
Width="100"
Margin="8,0"
Margin="{StaticResource MarginLr8}"
Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand"
IsCancel="True" />
@ -39,36 +39,36 @@
<TextBlock
Grid.Row="0"
Grid.Column="0"
Classes="Margin8"
Margin="{StaticResource Margin4}"
Text="{x:Static resx:ResUI.menuSubscription}" />
<TextBlock
Grid.Row="1"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvRemarks}" />
<TextBox
x:Name="txtRemarks"
Grid.Row="1"
Grid.Column="1"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
TextWrapping="Wrap" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvUrl}" />
<TextBox
x:Name="txtUrl"
Grid.Row="2"
Grid.Column="1"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
TextWrapping="Wrap"
Watermark="{x:Static resx:ResUI.SubUrlTips}" />
<Button
@ -76,7 +76,7 @@
Grid.Column="2"
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
Margin="10,0"
Margin="{StaticResource MarginLr8}"
Theme="{DynamicResource BorderlessButton}">
<Button.Content>
<PathIcon Data="{StaticResource building_more}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
@ -85,16 +85,17 @@
<Flyout>
<StackPanel>
<TextBlock
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvMoreUrl}" />
<TextBox
x:Name="txtMoreUrl"
Width="400"
MinHeight="100"
Margin="{StaticResource Margin4}"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
Classes="TextArea Margin8"
Classes="TextArea"
MinLines="4"
TextWrapping="Wrap"
Watermark="{x:Static resx:ResUI.SubUrlTips}" />
@ -106,150 +107,148 @@
<TextBlock
Grid.Row="3"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvEnabled}" />
<DockPanel
Grid.Row="3"
Grid.Column="1"
Classes="Margin8">
Margin="{StaticResource Margin4}">
<ToggleSwitch
x:Name="togEnable"
Margin="{StaticResource Margin4}"
HorizontalAlignment="Center"
Classes="Margin8"
DockPanel.Dock="Left" />
<TextBox
x:Name="txtAutoUpdateInterval"
Width="100"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
DockPanel.Dock="Right"
Watermark="{x:Static resx:ResUI.SubUrlTips}" />
<TextBlock
Margin="{StaticResource Margin4}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvAutoUpdateInterval}" />
</DockPanel>
<TextBlock
Grid.Row="5"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvFilter}" />
<TextBox
x:Name="txtFilter"
Grid.Row="5"
Grid.Column="1"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Watermark="{x:Static resx:ResUI.SubUrlTips}" />
<TextBlock
Grid.Row="6"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvConvertTarget}" />
<ComboBox
x:Name="cmbConvertTarget"
Grid.Row="6"
Grid.Column="1"
Width="200"
Classes="Margin8"
Margin="{StaticResource Margin4}"
ToolTip.Tip="{x:Static resx:ResUI.LvConvertTargetTip}" />
<TextBlock
Grid.Row="7"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvUserAgent}" />
<TextBox
x:Name="txtUserAgent"
Grid.Row="7"
Grid.Column="1"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
TextWrapping="Wrap"
Watermark="{x:Static resx:ResUI.SubUrlTips}" />
<TextBlock
Grid.Row="8"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvSort}" />
<TextBox
x:Name="txtSort"
Grid.Row="8"
Grid.Column="1"
Width="100"
HorizontalAlignment="Left"
Classes="Margin8" />
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" />
<TextBlock
Grid.Row="9"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvPrevProfile}" />
<TextBox
x:Name="txtPrevProfile"
Grid.Row="9"
Grid.Column="1"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Watermark="{x:Static resx:ResUI.LvPrevProfileTip}" />
<TextBlock
Grid.Row="10"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvNextProfile}" />
<TextBox
x:Name="txtNextProfile"
Grid.Row="10"
Grid.Column="1"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Watermark="{x:Static resx:ResUI.LvPrevProfileTip}" />
<TextBlock
Grid.Row="11"
Grid.Column="0"
Margin="4"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbPreSocksPort4Sub}" />
<TextBox
x:Name="txtPreSocksPort"
Grid.Row="11"
Grid.Column="1"
Width="200"
Margin="4"
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left"
Classes="Margin8"
ToolTip.Tip="{x:Static resx:ResUI.TipPreSocksPort}"
Watermark="{x:Static resx:ResUI.TipPreSocksPort}" />
<TextBlock
Grid.Row="12"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.LvMemo}" />
<TextBox
x:Name="txtMemo"
Grid.Row="12"
Grid.Column="1"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
TextWrapping="Wrap" />
</Grid>

6
v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml
View file

@ -1,4 +1,4 @@
<Window
<Window
x:Class="v2rayN.Desktop.Views.SubSettingWindow"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@ -19,9 +19,9 @@
CloseOnClickAway="True"
DisableOpeningAnimation="True"
Identifier="dialogHostSub">
<DockPanel Classes="Margin8">
<DockPanel Margin="{StaticResource Margin8}">
<StackPanel
Classes="Margin8"
Margin="{StaticResource Margin4}"
DockPanel.Dock="Top"
Orientation="Horizontal">
<Menu>

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

@ -22,43 +22,43 @@
<Button
Width="{StaticResource IconButtonWidth}"
Height="{StaticResource IconButtonHeight}"
Margin="10,0"
Margin="{StaticResource MarginLr8}"
Theme="{DynamicResource BorderlessButton}">
<Button.Content>
<PathIcon Data="{StaticResource building_more}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
</Button.Content>
<Button.Flyout>
<Flyout>
<StackPanel Margin="0,12">
<StackPanel Margin="{StaticResource MarginTb8}">
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsTheme}" />
<ComboBox
x:Name="cmbCurrentTheme"
HorizontalAlignment="Center"
Classes="Margin8" />
Margin="{StaticResource Margin4}"
HorizontalAlignment="Center" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsFontSize}" />
<ComboBox
x:Name="cmbCurrentFontSize"
HorizontalAlignment="Center"
Classes="Margin8" />
Margin="{StaticResource Margin4}"
HorizontalAlignment="Center" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSettingsLanguage}" />
<ComboBox
x:Name="cmbCurrentLanguage"
HorizontalAlignment="Center"
Classes="Margin8" />
Margin="{StaticResource Margin4}"
HorizontalAlignment="Center" />
</StackPanel>
</StackPanel>
</Flyout>