pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-11-03 19:15:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Adjust controls margin

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
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
+109 -110
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>