github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

adjust style

pull/3187/head
2dust 2023-02-04 14:25:21 +08:00
parent 238086942e
commit 7989d5180b
11 changed files with 171 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
v2rayN/v2rayN/App.xaml
View File

@ -17,6 +17,9 @@
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" /> <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<system:Double x:Key="MenuItemHeight">26</system:Double> <system:Double x:Key="MenuItemHeight">26</system:Double>
<system:Double x:Key="StdFontSize">12</system:Double>
<system:Double x:Key="StdFontSize1">14</system:Double>
<system:Double x:Key="StdFontSize2">16</system:Double>
<Thickness <Thickness
x:Key="ServerItemMargin" x:Key="ServerItemMargin"
Bottom="4" Bottom="4"
@ -33,19 +36,19 @@
x:Key="ModuleTitle" x:Key="ModuleTitle"
BasedOn="{StaticResource MaterialDesignTextBlock}" BasedOn="{StaticResource MaterialDesignTextBlock}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="16" /> <Setter Property="FontSize" Value="{DynamicResource StdFontSize2}" />
</Style> </Style>
<Style <Style
x:Key="ToolbarTextBlock" x:Key="ToolbarTextBlock"
BasedOn="{StaticResource MaterialDesignTextBlock}" BasedOn="{StaticResource MaterialDesignTextBlock}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="12" /> <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
</Style> </Style>
<Style <Style
x:Key="StatusbarItem" x:Key="StatusbarItem"
BasedOn="{StaticResource MaterialDesignTextBlock}" BasedOn="{StaticResource MaterialDesignTextBlock}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="12" /> <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
<Setter Property="Padding" Value="0" /> <Setter Property="Padding" Value="0" />
</Style> </Style>
<Style TargetType="{x:Type TextElement}"> <Style TargetType="{x:Type TextElement}">
@ -58,7 +61,7 @@
</Style> </Style>
<Style x:Key="lvItemSelected" TargetType="{x:Type ListViewItem}"> <Style x:Key="lvItemSelected" TargetType="{x:Type ListViewItem}">
<Setter Property="Height" Value="20" /> <Setter Property="Height" Value="20" />
<Setter Property="FontSize" Value="12" /> <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
<Style.Triggers> <Style.Triggers>
<Trigger Property="IsSelected" Value="true"> <Trigger Property="IsSelected" Value="true">
<Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}" /> <Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}" />
@ -76,22 +79,19 @@
x:Key="ListItemCheckBox" x:Key="ListItemCheckBox"
BasedOn="{StaticResource MaterialDesignUserForegroundCheckBox}" BasedOn="{StaticResource MaterialDesignUserForegroundCheckBox}"
TargetType="{x:Type CheckBox}"> TargetType="{x:Type CheckBox}">
<Setter Property="FontSize" Value="12" /> <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
</Style>
<Style x:Key="ListItemChip" TargetType="{x:Type materialDesign:Chip}">
<Setter Property="FontSize" Value="11" />
</Style> </Style>
<Style <Style
x:Key="DefButton" x:Key="DefButton"
BasedOn="{StaticResource MaterialDesignRaisedButton}" BasedOn="{StaticResource MaterialDesignRaisedButton}"
TargetType="{x:Type ButtonBase}"> TargetType="{x:Type ButtonBase}">
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="{DynamicResource StdFontSize1}" />
</Style> </Style>
<Style <Style
x:Key="DefContextMenu" x:Key="DefContextMenu"
BasedOn="{StaticResource MaterialDesignContextMenu}" BasedOn="{StaticResource MaterialDesignContextMenu}"
TargetType="{x:Type ContextMenu}"> TargetType="{x:Type ContextMenu}">
<Setter Property="FontSize" Value="13" /> <Setter Property="FontSize" Value="{DynamicResource StdFontSize1}" />
<Setter Property="FontFamily" Value="{x:Static conv:MaterialDesignFonts.MyFont}" /> <Setter Property="FontFamily" Value="{x:Static conv:MaterialDesignFonts.MyFont}" />
</Style> </Style>
@ -99,7 +99,7 @@
x:Key="ToolbarMenu" x:Key="ToolbarMenu"
BasedOn="{StaticResource MaterialDesignMenu}" BasedOn="{StaticResource MaterialDesignMenu}"
TargetType="{x:Type Menu}"> TargetType="{x:Type Menu}">
<Setter Property="FontSize" Value="13" /> <Setter Property="FontSize" Value="{DynamicResource StdFontSize1}" />
<Setter Property="FontFamily" Value="{x:Static conv:MaterialDesignFonts.MyFont}" /> <Setter Property="FontFamily" Value="{x:Static conv:MaterialDesignFonts.MyFont}" />
</Style> </Style>
@ -107,15 +107,35 @@
x:Key="DefComboBox" x:Key="DefComboBox"
BasedOn="{StaticResource MaterialDesignComboBox}" BasedOn="{StaticResource MaterialDesignComboBox}"
TargetType="{x:Type ComboBox}"> TargetType="{x:Type ComboBox}">
<Setter Property="FontSize" Value="12" /> <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
</Style> </Style>
<Style <Style
x:Key="DefDataGrid" x:Key="DefDataGrid"
BasedOn="{StaticResource MaterialDesignDataGrid}" BasedOn="{StaticResource MaterialDesignDataGrid}"
TargetType="{x:Type DataGrid}"> TargetType="{x:Type DataGrid}">
<Setter Property="FontSize" Value="12" /> <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
</Style> </Style>
<Style
x:Key="DefTextBox"
BasedOn="{StaticResource MaterialDesignTextBox}"
TargetType="{x:Type TextBox}">
<Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
</Style>
<Style
x:Key="MyOutlinedTextBox"
BasedOn="{StaticResource MaterialDesignOutlinedTextBox}"
TargetType="{x:Type TextBox}">
<Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
</Style>
<Style
x:Key="MyGroupBox"
BasedOn="{StaticResource MaterialDesignGroupBox}"
TargetType="{x:Type GroupBox}">
<Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
</Style>
</ResourceDictionary> </ResourceDictionary>
</Application.Resources> </Application.Resources>

7
v2rayN/v2rayN/Views/AddServer2Window.xaml
View File

@ -73,7 +73,7 @@
Margin="4" Margin="4"
VerticalAlignment="Top" VerticalAlignment="Top"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource MaterialDesignOutlinedTextBox}" /> Style="{StaticResource MyOutlinedTextBox}" />
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"
@ -91,7 +91,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
AcceptsReturn="True" AcceptsReturn="True"
IsReadOnly="True" IsReadOnly="True"
Style="{StaticResource MaterialDesignOutlinedTextBox}" /> Style="{StaticResource MyOutlinedTextBox}" />
<StackPanel <StackPanel
Grid.Row="2" Grid.Row="2"
Grid.Column="2" Grid.Column="2"
@ -125,6 +125,7 @@
Width="200" Width="200"
Margin="4" Margin="4"
HorizontalAlignment="Left" HorizontalAlignment="Left"
FontSize="{DynamicResource StdFontSize}"
MaxDropDownHeight="1000" MaxDropDownHeight="1000"
Style="{StaticResource MaterialDesignOutlinedComboBox}" /> Style="{StaticResource MaterialDesignOutlinedComboBox}" />
@ -157,7 +158,7 @@
Margin="4" Margin="4"
HorizontalAlignment="Left" HorizontalAlignment="Left"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource MaterialDesignOutlinedTextBox}" /> Style="{StaticResource MyOutlinedTextBox}" />
<StackPanel <StackPanel
Grid.Row="6" Grid.Row="6"
Grid.Column="1" Grid.Column="1"

42
v2rayN/v2rayN/Views/AddServerWindow.xaml
View File

@ -83,7 +83,8 @@
Grid.Row="1" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Width="400" Width="400"
Margin="{StaticResource ServerItemMargin}" /> Margin="{StaticResource ServerItemMargin}"
Style="{StaticResource DefTextBox}" />
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"
@ -97,7 +98,8 @@
Grid.Row="2" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
Width="400" Width="400"
Margin="{StaticResource ServerItemMargin}" /> Margin="{StaticResource ServerItemMargin}"
Style="{StaticResource DefTextBox}" />
<TextBlock <TextBlock
Grid.Row="3" Grid.Row="3"
@ -112,7 +114,8 @@
Grid.Column="1" Grid.Column="1"
Width="100" Width="100"
Margin="{StaticResource ServerItemMargin}" Margin="{StaticResource ServerItemMargin}"
HorizontalAlignment="Left" /> HorizontalAlignment="Left"
Style="{StaticResource DefTextBox}" />
</Grid> </Grid>
<Separator <Separator
@ -148,7 +151,8 @@
Grid.Row="1" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Width="400" Width="400"
Margin="{StaticResource ServerItemMargin}" /> Margin="{StaticResource ServerItemMargin}"
Style="{StaticResource DefTextBox}" />
<Button <Button
x:Name="btnGUID" x:Name="btnGUID"
Grid.Row="1" Grid.Row="1"
@ -171,7 +175,8 @@
Grid.Column="1" Grid.Column="1"
Width="100" Width="100"
Margin="{StaticResource ServerItemMargin}" Margin="{StaticResource ServerItemMargin}"
HorizontalAlignment="Left" /> HorizontalAlignment="Left"
Style="{StaticResource DefTextBox}" />
<TextBlock <TextBlock
Grid.Row="3" Grid.Row="3"
@ -216,7 +221,8 @@
Grid.Row="1" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Width="400" Width="400"
Margin="{StaticResource ServerItemMargin}" /> Margin="{StaticResource ServerItemMargin}"
Style="{StaticResource DefTextBox}" />
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"
@ -261,7 +267,8 @@
Grid.Row="1" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Width="400" Width="400"
Margin="{StaticResource ServerItemMargin}" /> Margin="{StaticResource ServerItemMargin}"
Style="{StaticResource DefTextBox}" />
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"
@ -275,7 +282,8 @@
Grid.Row="2" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
Width="400" Width="400"
Margin="{StaticResource ServerItemMargin}" /> Margin="{StaticResource ServerItemMargin}"
Style="{StaticResource DefTextBox}" />
</Grid> </Grid>
<Grid <Grid
@ -306,7 +314,8 @@
Grid.Row="1" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Width="400" Width="400"
Margin="{StaticResource ServerItemMargin}" /> Margin="{StaticResource ServerItemMargin}"
Style="{StaticResource DefTextBox}" />
<Button <Button
x:Name="btnGUID5" x:Name="btnGUID5"
Grid.Row="1" Grid.Row="1"
@ -344,7 +353,8 @@
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource ServerItemMargin}" Margin="{StaticResource ServerItemMargin}"
HorizontalAlignment="Left" /> HorizontalAlignment="Left"
Style="{StaticResource DefTextBox}" />
</Grid> </Grid>
<Grid <Grid
x:Name="gridTrojan" x:Name="gridTrojan"
@ -373,7 +383,8 @@
Grid.Row="1" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Width="400" Width="400"
Margin="{StaticResource ServerItemMargin}" /> Margin="{StaticResource ServerItemMargin}"
Style="{StaticResource DefTextBox}" />
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"
@ -478,7 +489,8 @@
Grid.Row="3" Grid.Row="3"
Grid.Column="1" Grid.Column="1"
Width="400" Width="400"
Margin="{StaticResource ServerItemMargin}" /> Margin="{StaticResource ServerItemMargin}"
Style="{StaticResource DefTextBox}" />
<TextBlock <TextBlock
x:Name="tipRequestHost" x:Name="tipRequestHost"
Grid.Row="3" Grid.Row="3"
@ -500,7 +512,8 @@
Grid.Row="4" Grid.Row="4"
Grid.Column="1" Grid.Column="1"
Width="400" Width="400"
Margin="{StaticResource ServerItemMargin}" /> Margin="{StaticResource ServerItemMargin}"
Style="{StaticResource DefTextBox}" />
<TextBlock <TextBlock
x:Name="tipPath" x:Name="tipPath"
Grid.Row="4" Grid.Row="4"
@ -572,7 +585,8 @@
Grid.Column="1" Grid.Column="1"
Width="400" Width="400"
Margin="{StaticResource ServerItemMargin}" Margin="{StaticResource ServerItemMargin}"
HorizontalAlignment="Left" /> HorizontalAlignment="Left"
Style="{StaticResource DefTextBox}" />
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"

10
v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
View File

@ -71,7 +71,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
AcceptsReturn="True" AcceptsReturn="True"
IsReadOnly="True" IsReadOnly="True"
Style="{StaticResource MaterialDesignOutlinedTextBox}" /> Style="{StaticResource MyOutlinedTextBox}" />
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"
@ -88,7 +88,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
AcceptsReturn="True" AcceptsReturn="True"
IsReadOnly="True" IsReadOnly="True"
Style="{StaticResource MaterialDesignOutlinedTextBox}" /> Style="{StaticResource MyOutlinedTextBox}" />
<TextBlock <TextBlock
Grid.Row="3" Grid.Row="3"
@ -105,7 +105,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
AcceptsReturn="True" AcceptsReturn="True"
IsReadOnly="True" IsReadOnly="True"
Style="{StaticResource MaterialDesignOutlinedTextBox}" /> Style="{StaticResource MyOutlinedTextBox}" />
<TextBlock <TextBlock
Grid.Row="4" Grid.Row="4"
Grid.Column="0" Grid.Column="0"
@ -121,7 +121,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
AcceptsReturn="True" AcceptsReturn="True"
IsReadOnly="True" IsReadOnly="True"
Style="{StaticResource MaterialDesignOutlinedTextBox}" /> Style="{StaticResource MyOutlinedTextBox}" />
<TextBlock <TextBlock
Grid.Row="5" Grid.Row="5"
Grid.Column="0" Grid.Column="0"
@ -137,7 +137,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
AcceptsReturn="True" AcceptsReturn="True"
IsReadOnly="True" IsReadOnly="True"
Style="{StaticResource MaterialDesignOutlinedTextBox}" /> Style="{StaticResource MyOutlinedTextBox}" />
</Grid> </Grid>
<TextBlock <TextBlock

8
v2rayN/v2rayN/Views/MainWindow.xaml
View File

@ -323,7 +323,8 @@
Width="200" Width="200"
Margin="8,0" Margin="8,0"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgServerTitle}" materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgServerTitle}"
materialDesign:TextFieldAssist.HasClearButton="True" /> materialDesign:TextFieldAssist.HasClearButton="True"
Style="{StaticResource DefTextBox}" />
</ToolBar> </ToolBar>
</ToolBarTray> </ToolBarTray>
@ -374,6 +375,7 @@
Width="120" Width="120"
Margin="8,0" Margin="8,0"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuSystemproxy}" materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuSystemproxy}"
FontSize="{DynamicResource StdFontSize}"
Style="{StaticResource MaterialDesignFloatingHintComboBox}"> Style="{StaticResource MaterialDesignFloatingHintComboBox}">
<ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyClear}" /> <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyClear}" />
<ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxySet}" /> <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxySet}" />
@ -387,6 +389,7 @@
Margin="8,0" Margin="8,0"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}" materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
DisplayMemberPath="remarks" DisplayMemberPath="remarks"
FontSize="{DynamicResource StdFontSize}"
Style="{StaticResource MaterialDesignFloatingHintComboBox}" /> Style="{StaticResource MaterialDesignFloatingHintComboBox}" />
</StackPanel> </StackPanel>
@ -495,6 +498,7 @@
Width="200" Width="200"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuSubscription}" materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuSubscription}"
DisplayMemberPath="remarks" DisplayMemberPath="remarks"
FontSize="{DynamicResource StdFontSize}"
Style="{StaticResource MaterialDesignFilledComboBox}" /> Style="{StaticResource MaterialDesignFilledComboBox}" />
</DockPanel> </DockPanel>
</MenuItem.Header> </MenuItem.Header>
@ -703,6 +707,7 @@
MaxWidth="300" MaxWidth="300"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}" materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
DisplayMemberPath="remarks" DisplayMemberPath="remarks"
FontSize="{DynamicResource StdFontSize}"
Style="{StaticResource MaterialDesignFilledComboBox}" /> Style="{StaticResource MaterialDesignFilledComboBox}" />
</DockPanel> </DockPanel>
</MenuItem.Header> </MenuItem.Header>
@ -715,6 +720,7 @@
MaxWidth="300" MaxWidth="300"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuServers}" materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuServers}"
DisplayMemberPath="Text" DisplayMemberPath="Text"
FontSize="{DynamicResource StdFontSize}"
Style="{StaticResource MaterialDesignFilledComboBox}" /> Style="{StaticResource MaterialDesignFilledComboBox}" />
</DockPanel> </DockPanel>
</MenuItem.Header> </MenuItem.Header>

7
v2rayN/v2rayN/Views/MsgView.xaml
View File

@ -20,6 +20,7 @@
Margin="8,0" Margin="8,0"
VerticalAlignment="Center" VerticalAlignment="Center"
Foreground="{DynamicResource PrimaryHueLightBrush}" Foreground="{DynamicResource PrimaryHueLightBrush}"
Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.MsgInformationTitle}" /> Text="{x:Static resx:ResUI.MsgInformationTitle}" />
<ComboBox <ComboBox
x:Name="cmbMsgFilter" x:Name="cmbMsgFilter"
@ -27,10 +28,12 @@
Margin="8,0" Margin="8,0"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgFilterTitle}" materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgFilterTitle}"
materialDesign:TextFieldAssist.HasClearButton="True" materialDesign:TextFieldAssist.HasClearButton="True"
IsEditable="True" /> IsEditable="True"
Style="{StaticResource DefComboBox}" />
<TextBlock <TextBlock
Margin="8,0" Margin="8,0"
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.TbAutoRefresh}" /> Text="{x:Static resx:ResUI.TbAutoRefresh}" />
<ToggleButton <ToggleButton
x:Name="togAutoRefresh" x:Name="togAutoRefresh"
@ -41,7 +44,7 @@
<TextBox <TextBox
Name="txtMsg" Name="txtMsg"
BorderThickness="0" BorderThickness="0"
FontSize="11" FontSize="{DynamicResource StdFontSize}"
HorizontalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"
IsReadOnly="True" IsReadOnly="True"
TextWrapping="Wrap" TextWrapping="Wrap"

89
v2rayN/v2rayN/Views/OptionSettingWindow.xaml
View File

@ -85,7 +85,8 @@
Grid.Row="0" Grid.Row="0"
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource SettingItemMargin}" /> Margin="{StaticResource SettingItemMargin}"
Style="{StaticResource DefTextBox}" />
<TextBlock <TextBlock
Grid.Row="0" Grid.Row="0"
Grid.Column="2" Grid.Column="2"
@ -176,7 +177,8 @@
Grid.Row="6" Grid.Row="6"
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource SettingItemMargin}" /> Margin="{StaticResource SettingItemMargin}"
Style="{StaticResource DefTextBox}" />
<TextBlock <TextBlock
Grid.Row="7" Grid.Row="7"
@ -190,7 +192,8 @@
Grid.Row="7" Grid.Row="7"
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource SettingItemMargin}" /> Margin="{StaticResource SettingItemMargin}"
Style="{StaticResource DefTextBox}" />
<TextBlock <TextBlock
Grid.Row="8" Grid.Row="8"
@ -231,8 +234,10 @@
x:Name="cmbloglevel" x:Name="cmbloglevel"
Grid.Row="10" Grid.Row="10"
Grid.Column="1" Grid.Column="1"
Width="200"
Margin="{StaticResource SettingItemMargin}" Margin="{StaticResource SettingItemMargin}"
materialDesign:HintAssist.Hint="Level" /> materialDesign:HintAssist.Hint="Level"
Style="{StaticResource DefComboBox}" />
<TextBlock <TextBlock
Grid.Row="11" Grid.Row="11"
@ -259,8 +264,10 @@
x:Name="cmbdefFingerprint" x:Name="cmbdefFingerprint"
Grid.Row="12" Grid.Row="12"
Grid.Column="1" Grid.Column="1"
Width="200"
Margin="{StaticResource SettingItemMargin}" Margin="{StaticResource SettingItemMargin}"
IsEditable="True" /> IsEditable="True"
Style="{StaticResource DefComboBox}" />
<TextBlock <TextBlock
Grid.Row="13" Grid.Row="13"
@ -273,8 +280,10 @@
x:Name="cmbdefUserAgent" x:Name="cmbdefUserAgent"
Grid.Row="13" Grid.Row="13"
Grid.Column="1" Grid.Column="1"
Width="200"
Margin="{StaticResource SettingItemMargin}" Margin="{StaticResource SettingItemMargin}"
IsEditable="True" /> IsEditable="True"
Style="{StaticResource DefComboBox}" />
<TextBlock <TextBlock
Grid.Row="13" Grid.Row="13"
Grid.Column="3" Grid.Column="3"
@ -296,7 +305,8 @@
<ComboBox <ComboBox
x:Name="cmbdomainStrategy4Freedom" x:Name="cmbdomainStrategy4Freedom"
Width="200" Width="200"
Margin="{StaticResource SettingItemMargin}" /> Margin="{StaticResource SettingItemMargin}"
Style="{StaticResource DefComboBox}" />
</StackPanel> </StackPanel>
<StackPanel DockPanel.Dock="Top" Orientation="Horizontal"> <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
@ -320,6 +330,7 @@
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
AcceptsReturn="True" AcceptsReturn="True"
BorderThickness="1" BorderThickness="1"
Style="{StaticResource DefTextBox}"
TextWrapping="Wrap" TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" /> VerticalScrollBarVisibility="Auto" />
</DockPanel> </DockPanel>
@ -353,7 +364,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}" Style="{StaticResource ToolbarTextBlock}"
Text="mtu" /> Text="mtu" />
<TextBox <TextBox Style="{StaticResource DefTextBox}"
x:Name="txtKcpmtu" x:Name="txtKcpmtu"
Grid.Row="1" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
@ -367,7 +378,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}" Style="{StaticResource ToolbarTextBlock}"
Text="tti" /> Text="tti" />
<TextBox <TextBox Style="{StaticResource DefTextBox}"
x:Name="txtKcptti" x:Name="txtKcptti"
Grid.Row="2" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
@ -381,7 +392,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}" Style="{StaticResource ToolbarTextBlock}"
Text="uplinkCapacity" /> Text="uplinkCapacity" />
<TextBox <TextBox Style="{StaticResource DefTextBox}"
x:Name="txtKcpuplinkCapacity" x:Name="txtKcpuplinkCapacity"
Grid.Row="3" Grid.Row="3"
Grid.Column="1" Grid.Column="1"
@ -395,7 +406,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}" Style="{StaticResource ToolbarTextBlock}"
Text="downlinkCapacity" /> Text="downlinkCapacity" />
<TextBox <TextBox Style="{StaticResource DefTextBox}"
x:Name="txtKcpdownlinkCapacity" x:Name="txtKcpdownlinkCapacity"
Grid.Row="4" Grid.Row="4"
Grid.Column="1" Grid.Column="1"
@ -409,7 +420,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}" Style="{StaticResource ToolbarTextBlock}"
Text="readBufferSize" /> Text="readBufferSize" />
<TextBox <TextBox Style="{StaticResource DefTextBox}"
x:Name="txtKcpreadBufferSize" x:Name="txtKcpreadBufferSize"
Grid.Row="5" Grid.Row="5"
Grid.Column="1" Grid.Column="1"
@ -423,7 +434,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}" Style="{StaticResource ToolbarTextBlock}"
Text="writeBufferSize" /> Text="writeBufferSize" />
<TextBox <TextBox Style="{StaticResource DefTextBox}"
x:Name="txtKcpwriteBufferSize" x:Name="txtKcpwriteBufferSize"
Grid.Row="6" Grid.Row="6"
Grid.Column="1" Grid.Column="1"
@ -521,7 +532,8 @@
Grid.Row="3" Grid.Row="3"
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource SettingItemMargin}" /> Margin="{StaticResource SettingItemMargin}"
Style="{StaticResource DefComboBox}" />
<TextBlock <TextBlock
Grid.Row="4" Grid.Row="4"
@ -647,7 +659,8 @@
Grid.Row="12" Grid.Row="12"
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource SettingItemMargin}" /> Margin="{StaticResource SettingItemMargin}"
Style="{StaticResource DefTextBox}" />
<TextBlock <TextBlock
Grid.Row="13" Grid.Row="13"
@ -661,7 +674,8 @@
Grid.Row="13" Grid.Row="13"
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource SettingItemMargin}" /> Margin="{StaticResource SettingItemMargin}"
Style="{StaticResource DefTextBox}" />
<TextBlock <TextBlock
Grid.Row="14" Grid.Row="14"
@ -675,7 +689,8 @@
Grid.Row="14" Grid.Row="14"
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource SettingItemMargin}" /> Margin="{StaticResource SettingItemMargin}"
Style="{StaticResource DefTextBox}" />
<TextBlock <TextBlock
Grid.Row="15" Grid.Row="15"
@ -688,8 +703,10 @@
x:Name="cmbcurrentFontFamily" x:Name="cmbcurrentFontFamily"
Grid.Row="15" Grid.Row="15"
Grid.Column="1" Grid.Column="1"
Width="200"
Margin="{StaticResource SettingItemMargin}" Margin="{StaticResource SettingItemMargin}"
MaxDropDownHeight="1000" /> MaxDropDownHeight="1000"
Style="{StaticResource DefComboBox}" />
<TextBlock <TextBlock
Grid.Row="15" Grid.Row="15"
Grid.Column="2" Grid.Column="2"
@ -713,8 +730,10 @@
<ComboBox <ComboBox
x:Name="cmbsystemProxyAdvancedProtocol" x:Name="cmbsystemProxyAdvancedProtocol"
Grid.Row="4" Grid.Row="4"
MinWidth="200"
Margin="{StaticResource SettingItemMargin}" Margin="{StaticResource SettingItemMargin}"
materialDesign:HintAssist.Hint="Protocol" /> materialDesign:HintAssist.Hint="Protocol"
Style="{StaticResource DefComboBox}" />
</StackPanel> </StackPanel>
@ -731,6 +750,7 @@
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
AcceptsReturn="True" AcceptsReturn="True"
BorderThickness="1" BorderThickness="1"
Style="{StaticResource DefTextBox}"
TextWrapping="Wrap" TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" /> VerticalScrollBarVisibility="Auto" />
</DockPanel> </DockPanel>
@ -799,7 +819,8 @@
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource SettingItemMargin}" Margin="{StaticResource SettingItemMargin}"
HorizontalAlignment="Left" /> HorizontalAlignment="Left"
Style="{StaticResource DefComboBox}" />
<TextBlock <TextBlock
Grid.Row="4" Grid.Row="4"
@ -814,7 +835,8 @@
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource SettingItemMargin}" Margin="{StaticResource SettingItemMargin}"
HorizontalAlignment="Left" /> HorizontalAlignment="Left"
Style="{StaticResource DefComboBox}" />
<TextBlock <TextBlock
Grid.Row="5" Grid.Row="5"
@ -831,6 +853,7 @@
Margin="{StaticResource SettingItemMargin}" Margin="{StaticResource SettingItemMargin}"
VerticalAlignment="Top" VerticalAlignment="Top"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource DefTextBox}"
TextWrapping="Wrap" /> TextWrapping="Wrap" />
<Button <Button
x:Name="btnBrowse" x:Name="btnBrowse"
@ -852,10 +875,11 @@
<GroupBox <GroupBox
Grid.Column="0" Grid.Column="0"
Header="{x:Static resx:ResUI.TbSettingsTunModeDirectIP}" Header="{x:Static resx:ResUI.TbSettingsTunModeDirectIP}"
Style="{StaticResource MaterialDesignGroupBox}"> Style="{StaticResource MyGroupBox}">
<TextBox <TextBox
Name="txtDirectIP" Name="txtDirectIP"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource DefTextBox}"
TextWrapping="Wrap" TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" /> VerticalScrollBarVisibility="Auto" />
</GroupBox> </GroupBox>
@ -863,10 +887,11 @@
<GroupBox <GroupBox
Grid.Column="2" Grid.Column="2"
Header="{x:Static resx:ResUI.TbSettingsTunModeDirectProcess}" Header="{x:Static resx:ResUI.TbSettingsTunModeDirectProcess}"
Style="{StaticResource MaterialDesignGroupBox}"> Style="{StaticResource MyGroupBox}">
<TextBox <TextBox
Name="txtDirectProcess" Name="txtDirectProcess"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource DefTextBox}"
TextWrapping="Wrap" TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" /> VerticalScrollBarVisibility="Auto" />
</GroupBox> </GroupBox>
@ -901,7 +926,8 @@
Grid.Row="1" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource SettingItemMargin}" /> Margin="{StaticResource SettingItemMargin}"
Style="{StaticResource DefComboBox}" />
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"
@ -915,7 +941,8 @@
Grid.Row="2" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource SettingItemMargin}" /> Margin="{StaticResource SettingItemMargin}"
Style="{StaticResource DefComboBox}" />
<TextBlock <TextBlock
Grid.Row="3" Grid.Row="3"
@ -929,7 +956,8 @@
Grid.Row="3" Grid.Row="3"
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource SettingItemMargin}" /> Margin="{StaticResource SettingItemMargin}"
Style="{StaticResource DefComboBox}" />
<TextBlock <TextBlock
Grid.Row="4" Grid.Row="4"
@ -943,7 +971,8 @@
Grid.Row="4" Grid.Row="4"
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource SettingItemMargin}" /> Margin="{StaticResource SettingItemMargin}"
Style="{StaticResource DefComboBox}" />
<TextBlock <TextBlock
Grid.Row="5" Grid.Row="5"
@ -957,7 +986,8 @@
Grid.Row="5" Grid.Row="5"
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource SettingItemMargin}" /> Margin="{StaticResource SettingItemMargin}"
Style="{StaticResource DefComboBox}" />
<TextBlock <TextBlock
Grid.Row="6" Grid.Row="6"
@ -971,7 +1001,8 @@
Grid.Row="6" Grid.Row="6"
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource SettingItemMargin}" /> Margin="{StaticResource SettingItemMargin}"
Style="{StaticResource DefComboBox}" />
</Grid> </Grid>
</TabItem> </TabItem>
</TabControl> </TabControl>

13
v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
View File

@ -65,7 +65,8 @@
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="4" Margin="4"
HorizontalAlignment="Left" /> HorizontalAlignment="Left"
Style="{StaticResource DefTextBox}" />
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"
@ -80,6 +81,7 @@
Grid.Column="1" Grid.Column="1"
Margin="4" Margin="4"
HorizontalAlignment="Left" HorizontalAlignment="Left"
FontSize="{DynamicResource StdFontSize}"
Style="{StaticResource MaterialDesignFilterChipPrimaryListBox}" /> Style="{StaticResource MaterialDesignFilterChipPrimaryListBox}" />
<TextBlock <TextBlock
@ -94,6 +96,7 @@
Grid.Row="3" Grid.Row="3"
Grid.Column="1" Grid.Column="1"
Margin="4" Margin="4"
FontSize="{DynamicResource StdFontSize}"
Style="{StaticResource MaterialDesignFilterChipPrimaryListBox}" /> Style="{StaticResource MaterialDesignFilterChipPrimaryListBox}" />
<TextBlock <TextBlock
@ -143,7 +146,7 @@
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center"> VerticalAlignment="Center">
<CheckBox x:Name="chkAutoSort"> <CheckBox x:Name="chkAutoSort">
<TextBlock Text="{x:Static resx:ResUI.TbAutoSort}" /> <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.TbAutoSort}" />
</CheckBox> </CheckBox>
</StackPanel> </StackPanel>
<Button <Button
@ -172,10 +175,11 @@
<GroupBox <GroupBox
Grid.Column="0" Grid.Column="0"
Header="Domain" Header="Domain"
Style="{StaticResource MaterialDesignGroupBox}"> Style="{StaticResource MyGroupBox}">
<TextBox <TextBox
Name="txtDomain" Name="txtDomain"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource DefTextBox}"
TextWrapping="Wrap" TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" /> VerticalScrollBarVisibility="Auto" />
</GroupBox> </GroupBox>
@ -183,10 +187,11 @@
<GroupBox <GroupBox
Grid.Column="2" Grid.Column="2"
Header="IP" Header="IP"
Style="{StaticResource MaterialDesignGroupBox}"> Style="{StaticResource MyGroupBox}">
<TextBox <TextBox
Name="txtIP" Name="txtIP"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource DefTextBox}"
TextWrapping="Wrap" TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" /> VerticalScrollBarVisibility="Auto" />
</GroupBox> </GroupBox>

3
v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
View File

@ -114,6 +114,7 @@
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Top" VerticalAlignment="Top"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource DefTextBox}"
TextWrapping="Wrap" /> TextWrapping="Wrap" />
<TextBlock <TextBlock
@ -146,6 +147,7 @@
Margin="4" Margin="4"
VerticalAlignment="Top" VerticalAlignment="Top"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource DefTextBox}"
TextWrapping="Wrap" /> TextWrapping="Wrap" />
<TextBlock <TextBlock
@ -163,6 +165,7 @@
Margin="4" Margin="4"
VerticalAlignment="Top" VerticalAlignment="Top"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource DefTextBox}"
TextWrapping="Wrap" /> TextWrapping="Wrap" />
<Button <Button
x:Name="btnBrowse" x:Name="btnBrowse"

18
v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
View File

@ -224,10 +224,11 @@
<GroupBox <GroupBox
Grid.Column="0" Grid.Column="0"
Header="Domain" Header="Domain"
Style="{StaticResource MaterialDesignGroupBox}"> Style="{StaticResource MyGroupBox}">
<TextBox <TextBox
Name="txtProxyDomain" Name="txtProxyDomain"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource DefTextBox}"
TextWrapping="Wrap" TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" /> VerticalScrollBarVisibility="Auto" />
</GroupBox> </GroupBox>
@ -235,10 +236,11 @@
<GroupBox <GroupBox
Grid.Column="2" Grid.Column="2"
Header="IP" Header="IP"
Style="{StaticResource MaterialDesignGroupBox}"> Style="{StaticResource MyGroupBox}">
<TextBox <TextBox
Name="txtProxyIP" Name="txtProxyIP"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource DefTextBox}"
TextWrapping="Wrap" TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" /> VerticalScrollBarVisibility="Auto" />
</GroupBox> </GroupBox>
@ -255,10 +257,11 @@
<GroupBox <GroupBox
Grid.Column="0" Grid.Column="0"
Header="Domain" Header="Domain"
Style="{StaticResource MaterialDesignGroupBox}"> Style="{StaticResource MyGroupBox}">
<TextBox <TextBox
Name="txtDirectDomain" Name="txtDirectDomain"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource DefTextBox}"
TextWrapping="Wrap" TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" /> VerticalScrollBarVisibility="Auto" />
</GroupBox> </GroupBox>
@ -266,10 +269,11 @@
<GroupBox <GroupBox
Grid.Column="2" Grid.Column="2"
Header="IP" Header="IP"
Style="{StaticResource MaterialDesignGroupBox}"> Style="{StaticResource MyGroupBox}">
<TextBox <TextBox
Name="txtDirectIP" Name="txtDirectIP"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource DefTextBox}"
TextWrapping="Wrap" TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" /> VerticalScrollBarVisibility="Auto" />
</GroupBox> </GroupBox>
@ -286,10 +290,11 @@
<GroupBox <GroupBox
Grid.Column="0" Grid.Column="0"
Header="Domain" Header="Domain"
Style="{StaticResource MaterialDesignGroupBox}"> Style="{StaticResource MyGroupBox}">
<TextBox <TextBox
Name="txtBlockDomain" Name="txtBlockDomain"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource DefTextBox}"
TextWrapping="Wrap" TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" /> VerticalScrollBarVisibility="Auto" />
</GroupBox> </GroupBox>
@ -297,10 +302,11 @@
<GroupBox <GroupBox
Grid.Column="2" Grid.Column="2"
Header="IP" Header="IP"
Style="{StaticResource MaterialDesignGroupBox}"> Style="{StaticResource MyGroupBox}">
<TextBox <TextBox
Name="txtBlockIP" Name="txtBlockIP"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource DefTextBox}"
TextWrapping="Wrap" TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" /> VerticalScrollBarVisibility="Auto" />
</GroupBox> </GroupBox>

10
v2rayN/v2rayN/Views/SubEditWindow.xaml
View File

@ -69,7 +69,7 @@
Margin="4" Margin="4"
VerticalAlignment="Top" VerticalAlignment="Top"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource MaterialDesignOutlinedTextBox}" Style="{StaticResource MyOutlinedTextBox}"
TextWrapping="Wrap" /> TextWrapping="Wrap" />
<TextBlock <TextBlock
@ -88,7 +88,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}" materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource MaterialDesignOutlinedTextBox}" Style="{StaticResource MyOutlinedTextBox}"
TextWrapping="Wrap" /> TextWrapping="Wrap" />
<TextBlock <TextBlock
@ -120,7 +120,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}" materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource MaterialDesignOutlinedTextBox}" Style="{StaticResource MyOutlinedTextBox}"
TextWrapping="Wrap" /> TextWrapping="Wrap" />
<TextBlock <TextBlock
@ -139,7 +139,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}" materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource MaterialDesignOutlinedTextBox}" /> Style="{StaticResource MyOutlinedTextBox}" />
<TextBlock <TextBlock
Grid.Row="6" Grid.Row="6"
@ -156,7 +156,7 @@
Margin="4" Margin="4"
VerticalAlignment="Top" VerticalAlignment="Top"
AcceptsReturn="True" AcceptsReturn="True"
Style="{StaticResource MaterialDesignOutlinedTextBox}" /> Style="{StaticResource MyOutlinedTextBox}" />
</Grid> </Grid>
<Grid <Grid