Skip to content

Commit

Permalink
Improve
Browse files Browse the repository at this point in the history
  • Loading branch information
2dust committed Feb 4, 2024
1 parent 1fa2d55 commit 52e9d30
Showing 1 changed file with 46 additions and 47 deletions.
93 changes: 46 additions & 47 deletions v2rayN/v2rayN/Views/SubEditWindow.xaml
Expand Up @@ -72,7 +72,7 @@
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="400" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>

Expand All @@ -95,7 +95,6 @@
x:Name="txtRemarks"
Grid.Row="1"
Grid.Column="1"
Width="400"
Margin="4"
VerticalAlignment="Top"
AcceptsReturn="True"
Expand All @@ -113,7 +112,6 @@
x:Name="txtUrl"
Grid.Row="2"
Grid.Column="1"
Width="400"
Margin="4"
VerticalAlignment="Top"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
Expand Down Expand Up @@ -153,82 +151,84 @@
VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.LvEnabled}" />
<ToggleButton
x:Name="togEnable"

<DockPanel
Grid.Row="3"
Grid.Column="1"
Margin="4"
HorizontalAlignment="Left" />
Margin="4">
<ToggleButton
x:Name="togEnable"
Margin="4"
HorizontalAlignment="Left"
DockPanel.Dock="Left" />

<TextBlock
Grid.Row="4"
Grid.Column="0"
Margin="4"
VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.LvAutoUpdateInterval}" />
<TextBox
x:Name="txtAutoUpdateInterval"
Grid.Row="4"
Grid.Column="1"
Width="400"
Margin="4"
VerticalAlignment="Top"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
AcceptsReturn="True"
Style="{StaticResource MyOutlinedTextBox}" />
<TextBox
x:Name="txtAutoUpdateInterval"
Width="200"
Margin="4"
VerticalAlignment="Top"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
AcceptsReturn="True"
DockPanel.Dock="Right"
Style="{StaticResource MyOutlinedTextBox}" />

<TextBlock
Margin="4"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.LvAutoUpdateInterval}" />
</DockPanel>

<TextBlock
Grid.Row="5"
Grid.Column="0"
Margin="4"
VerticalAlignment="Center"
Text="{x:Static resx:ResUI.LvUserAgent}" />
Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.LvFilter}" />
<TextBox
x:Name="txtUserAgent"
x:Name="txtFilter"
Grid.Row="5"
Grid.Column="1"
Width="400"
Margin="4"
VerticalAlignment="Top"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
AcceptsReturn="True"
Style="{StaticResource MyOutlinedTextBox}"
TextWrapping="Wrap" />
Style="{StaticResource MyOutlinedTextBox}" />

<TextBlock
Grid.Row="6"
Grid.Column="0"
Margin="4"
VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.LvFilter}" />
<TextBox
x:Name="txtFilter"
Text="{x:Static resx:ResUI.LvConvertTarget}" />
<ComboBox
x:Name="cmbConvertTarget"
Grid.Row="6"
Grid.Column="1"
Width="400"
Margin="4"
VerticalAlignment="Top"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
AcceptsReturn="True"
Style="{StaticResource MyOutlinedTextBox}" />
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvConvertTargetTip}"
MaxDropDownHeight="1000"
Style="{StaticResource MyOutlinedTextComboBox}" />

<TextBlock
Grid.Row="7"
Grid.Column="0"
Margin="4"
VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.LvConvertTarget}" />
<ComboBox
x:Name="cmbConvertTarget"
Text="{x:Static resx:ResUI.LvUserAgent}" />
<TextBox
x:Name="txtUserAgent"
Grid.Row="7"
Grid.Column="1"
Margin="4"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvConvertTargetTip}"
MaxDropDownHeight="1000"
Style="{StaticResource MyOutlinedTextComboBox}" />
VerticalAlignment="Top"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
AcceptsReturn="True"
Style="{StaticResource MyOutlinedTextBox}"
TextWrapping="Wrap" />

<TextBlock
Grid.Row="8"
Expand All @@ -241,8 +241,9 @@
x:Name="txtSort"
Grid.Row="8"
Grid.Column="1"
Width="400"
Width="100"
Margin="4"
HorizontalAlignment="Left"
VerticalAlignment="Top"
AcceptsReturn="True"
Style="{StaticResource MyOutlinedTextBox}" />
Expand All @@ -258,7 +259,6 @@
x:Name="txtPrevProfile"
Grid.Row="9"
Grid.Column="1"
Width="400"
Margin="4"
VerticalAlignment="Top"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvPrevProfileTip}"
Expand All @@ -276,7 +276,6 @@
x:Name="txtNextProfile"
Grid.Row="10"
Grid.Column="1"
Width="400"
Margin="4"
VerticalAlignment="Top"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvPrevProfileTip}"
Expand Down

0 comments on commit 52e9d30

Please sign in to comment.