Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-05-02 13:18:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Improve

Browse source
This commit is contained in:
2dust 2024-01-30 18:29:52 +08:00
parent fc52870431
commit 9d43465eab
10 changed files with 97 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
v2rayN/v2rayN/Views/AddServer2Window.xaml
View file

@ -24,27 +24,26 @@
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
mc:Ignorable="d"> mc:Ignorable="d">
<DockPanel Margin="8"> <DockPanel Margin="8">
<Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom"> <StackPanel
<Grid.ColumnDefinitions> Margin="4"
<ColumnDefinition Width="150" /> HorizontalAlignment="Center"
<ColumnDefinition Width="150" /> DockPanel.Dock="Bottom"
</Grid.ColumnDefinitions> Orientation="Horizontal">
<Button <Button
x:Name="btnSave" x:Name="btnSave"
Grid.Column="0" Width="100"
Margin="4"
Content="{x:Static resx:ResUI.TbConfirm}" Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand" Cursor="Hand"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
<Button <Button
x:Name="btnCancel" x:Name="btnCancel"
Grid.Column="1" Width="100"
Margin="4" Margin="8,0"
Content="{x:Static resx:ResUI.TbCancel}" Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand" Cursor="Hand"
IsCancel="true" IsCancel="true"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
</Grid> </StackPanel>
<ScrollViewer <ScrollViewer
materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True" materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
HorizontalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"
@ -120,13 +119,11 @@
Orientation="Horizontal"> Orientation="Horizontal">
<Button <Button
x:Name="btnBrowse" x:Name="btnBrowse"
Width="80"
Margin="2,0" Margin="2,0"
Content="{x:Static resx:ResUI.TbBrowse}" Content="{x:Static resx:ResUI.TbBrowse}"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
<Button <Button
x:Name="btnEdit" x:Name="btnEdit"
Width="80"
Margin="2,0" Margin="2,0"
Content="{x:Static resx:ResUI.TbEdit}" Content="{x:Static resx:ResUI.TbEdit}"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />

14
v2rayN/v2rayN/Views/AddServer2Window.xaml.cs
View file

@ -51,18 +51,6 @@ namespace v2rayN.Views
private void Window_Loaded(object sender, RoutedEventArgs e) private void Window_Loaded(object sender, RoutedEventArgs e)
{ {
txtRemarks.Focus(); txtRemarks.Focus();
} }
private void btnCancel_Click(object sender, System.Windows.RoutedEventArgs e)
{
if (ViewModel?.IsModified == true)
{
this.DialogResult = true;
}
else
{
this.Close();
}
}
} }
} }

27
v2rayN/v2rayN/Views/AddServerWindow.xaml
View file

@ -1,12 +1,12 @@
<reactiveui:ReactiveWindow <reactiveui:ReactiveWindow
x:Class="v2rayN.Views.AddServerWindow" x:Class="v2rayN.Views.AddServerWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:reactiveui="http://reactiveui.net"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:conv="clr-namespace:v2rayN.Converters" xmlns:conv="clr-namespace:v2rayN.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:reactiveui="http://reactiveui.net"
xmlns:resx="clr-namespace:v2rayN.Resx" xmlns:resx="clr-namespace:v2rayN.Resx"
xmlns:vms="clr-namespace:v2rayN.ViewModels" xmlns:vms="clr-namespace:v2rayN.ViewModels"
Title="{x:Static resx:ResUI.menuServers}" Title="{x:Static resx:ResUI.menuServers}"
@ -24,27 +24,26 @@
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
mc:Ignorable="d"> mc:Ignorable="d">
<DockPanel Margin="8"> <DockPanel Margin="8">
<Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom"> <StackPanel
<Grid.ColumnDefinitions> Margin="4"
<ColumnDefinition Width="150" /> HorizontalAlignment="Center"
<ColumnDefinition Width="150" /> DockPanel.Dock="Bottom"
</Grid.ColumnDefinitions> Orientation="Horizontal">
<Button <Button
x:Name="btnSave" x:Name="btnSave"
Grid.Column="0" Width="100"
Margin="4"
Content="{x:Static resx:ResUI.TbConfirm}" Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand" Cursor="Hand"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
<Button <Button
x:Name="btnCancel" x:Name="btnCancel"
Grid.Column="1" Width="100"
Margin="4" Margin="8,0"
Content="{x:Static resx:ResUI.TbCancel}" Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand" Cursor="Hand"
IsCancel="true" IsCancel="true"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
</Grid> </StackPanel>
<ScrollViewer <ScrollViewer
materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True" materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
HorizontalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"

19
v2rayN/v2rayN/Views/DNSSettingWindow.xaml
View file

@ -24,27 +24,26 @@
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
mc:Ignorable="d"> mc:Ignorable="d">
<DockPanel Margin="8"> <DockPanel Margin="8">
<Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom"> <StackPanel
<Grid.ColumnDefinitions> Margin="4"
<ColumnDefinition Width="150" /> HorizontalAlignment="Center"
<ColumnDefinition Width="150" /> DockPanel.Dock="Bottom"
</Grid.ColumnDefinitions> Orientation="Horizontal">
<Button <Button
x:Name="btnSave" x:Name="btnSave"
Grid.Column="0" Width="100"
Margin="4"
Content="{x:Static resx:ResUI.TbConfirm}" Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand" Cursor="Hand"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
<Button <Button
x:Name="btnCancel" x:Name="btnCancel"
Grid.Column="1" Width="100"
Margin="4" Margin="8,0"
Content="{x:Static resx:ResUI.TbCancel}" Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand" Cursor="Hand"
IsCancel="true" IsCancel="true"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
</Grid> </StackPanel>
<TabControl HorizontalContentAlignment="Left"> <TabControl HorizontalContentAlignment="Left">

35
v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
View file

@ -1,12 +1,12 @@
<reactiveui:ReactiveWindow <reactiveui:ReactiveWindow
x:Class="v2rayN.Views.GlobalHotkeySettingWindow" x:Class="v2rayN.Views.GlobalHotkeySettingWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:reactiveui="http://reactiveui.net"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:conv="clr-namespace:v2rayN.Converters" xmlns:conv="clr-namespace:v2rayN.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:reactiveui="http://reactiveui.net"
xmlns:resx="clr-namespace:v2rayN.Resx" xmlns:resx="clr-namespace:v2rayN.Resx"
xmlns:vms="clr-namespace:v2rayN.ViewModels" xmlns:vms="clr-namespace:v2rayN.ViewModels"
Title="{x:Static resx:ResUI.menuSetting}" Title="{x:Static resx:ResUI.menuSetting}"
@ -25,34 +25,33 @@
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
mc:Ignorable="d"> mc:Ignorable="d">
<DockPanel Margin="8"> <DockPanel Margin="8">
<Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom"> <StackPanel
<Grid.ColumnDefinitions> Margin="4"
<ColumnDefinition Width="150" /> HorizontalAlignment="Center"
<ColumnDefinition Width="150" /> DockPanel.Dock="Bottom"
<ColumnDefinition Width="150" /> Orientation="Horizontal">
</Grid.ColumnDefinitions>
<Button <Button
x:Name="btnReset" x:Name="btnReset"
Grid.Column="0" Width="100"
Margin="4" Margin="8,0"
Click="btnReset_Click" Click="btnReset_Click"
Content="{x:Static resx:ResUI.TbReset}" Content="{x:Static resx:ResUI.TbReset}"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
<Button <Button
x:Name="btnSave" x:Name="btnSave"
Grid.Column="1" Width="100"
Margin="4"
Click="btnSave_Click"
Content="{x:Static resx:ResUI.TbConfirm}" Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
<Button <Button
x:Name="btnCancel" x:Name="btnCancel"
Grid.Column="2" Width="100"
Margin="4" Margin="8,0"
Content="{x:Static resx:ResUI.TbCancel}" Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand"
IsCancel="true" IsCancel="true"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
</Grid> </StackPanel>
<ScrollViewer <ScrollViewer
materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True" materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
HorizontalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"

19
v2rayN/v2rayN/Views/OptionSettingWindow.xaml
View file

@ -24,27 +24,26 @@
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
mc:Ignorable="d"> mc:Ignorable="d">
<DockPanel Margin="8"> <DockPanel Margin="8">
<Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom"> <StackPanel
<Grid.ColumnDefinitions> Margin="4"
<ColumnDefinition Width="150" /> HorizontalAlignment="Center"
<ColumnDefinition Width="150" /> DockPanel.Dock="Bottom"
</Grid.ColumnDefinitions> Orientation="Horizontal">
<Button <Button
x:Name="btnSave" x:Name="btnSave"
Grid.Column="0" Width="100"
Margin="4"
Content="{x:Static resx:ResUI.TbConfirm}" Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand" Cursor="Hand"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
<Button <Button
x:Name="btnCancel" x:Name="btnCancel"
Grid.Column="1" Width="100"
Margin="4" Margin="8,0"
Content="{x:Static resx:ResUI.TbCancel}" Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand" Cursor="Hand"
IsCancel="true" IsCancel="true"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
</Grid> </StackPanel>
<TabControl HorizontalContentAlignment="Left"> <TabControl HorizontalContentAlignment="Left">
<TabItem Header="{x:Static resx:ResUI.TbSettingsCore}"> <TabItem Header="{x:Static resx:ResUI.TbSettingsCore}">

23
v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
View file

@ -140,17 +140,13 @@
Text="{x:Static resx:ResUI.TbRoutingTips}" /> Text="{x:Static resx:ResUI.TbRoutingTips}" />
</Grid> </Grid>
<Grid <StackPanel
Margin="8" Margin="8"
HorizontalAlignment="Center" HorizontalAlignment="Right"
DockPanel.Dock="Bottom"> DockPanel.Dock="Bottom"
<Grid.ColumnDefinitions> Orientation="Horizontal">
<ColumnDefinition Width="600" />
<ColumnDefinition Width="150" />
<ColumnDefinition Width="150" />
</Grid.ColumnDefinitions>
<StackPanel <StackPanel
Grid.Column="0" Width="600"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center"> VerticalAlignment="Center">
<CheckBox x:Name="chkAutoSort"> <CheckBox x:Name="chkAutoSort">
@ -159,20 +155,19 @@
</StackPanel> </StackPanel>
<Button <Button
x:Name="btnSave" x:Name="btnSave"
Grid.Column="1" Width="100"
Margin="4"
Content="{x:Static resx:ResUI.TbConfirm}" Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand" Cursor="Hand"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
<Button <Button
x:Name="btnCancel" x:Name="btnCancel"
Grid.Column="2" Width="100"
Margin="4" Margin="8,0"
Content="{x:Static resx:ResUI.TbCancel}" Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand" Cursor="Hand"
IsCancel="true" IsCancel="true"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
</Grid> </StackPanel>
<Grid Margin="{StaticResource SettingItemMargin}"> <Grid Margin="{StaticResource SettingItemMargin}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>

21
v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
View file

@ -72,31 +72,26 @@
</ToolBar> </ToolBar>
</ToolBarTray> </ToolBarTray>
<Grid <StackPanel
Margin="8" Margin="8"
HorizontalAlignment="Center" HorizontalAlignment="Right"
DockPanel.Dock="Bottom"> DockPanel.Dock="Bottom"
<Grid.ColumnDefinitions> Orientation="Horizontal">
<ColumnDefinition Width="600" />
<ColumnDefinition Width="150" />
<ColumnDefinition Width="150" />
</Grid.ColumnDefinitions>
<Button <Button
x:Name="btnSave" x:Name="btnSave"
Grid.Column="1" Width="100"
Margin="4"
Content="{x:Static resx:ResUI.TbConfirm}" Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand" Cursor="Hand"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
<Button <Button
x:Name="btnCancel" x:Name="btnCancel"
Grid.Column="2" Width="100"
Margin="4" Margin="8,0"
Content="{x:Static resx:ResUI.TbCancel}" Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand" Cursor="Hand"
IsCancel="true" IsCancel="true"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
</Grid> </StackPanel>
<Grid Margin="8" DockPanel.Dock="Top"> <Grid Margin="8" DockPanel.Dock="Top">
<Grid.RowDefinitions> <Grid.RowDefinitions>

23
v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
View file

@ -125,38 +125,33 @@
</ToolBar> </ToolBar>
</ToolBarTray> </ToolBarTray>
<Grid <StackPanel
Margin="8" Margin="8"
HorizontalAlignment="Center" HorizontalAlignment="Right"
DockPanel.Dock="Bottom"> DockPanel.Dock="Bottom"
<Grid.ColumnDefinitions> Orientation="Horizontal">
<ColumnDefinition Width="600" />
<ColumnDefinition Width="150" />
<ColumnDefinition Width="150" />
</Grid.ColumnDefinitions>
<StackPanel <StackPanel
Grid.Column="0" Width="600"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center"> VerticalAlignment="Center">
<TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.TbRoutingTips}" /> <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.TbRoutingTips}" />
</StackPanel> </StackPanel>
<Button <Button
x:Name="btnSave" x:Name="btnSave"
Grid.Column="1" Width="100"
Margin="4"
Content="{x:Static resx:ResUI.TbConfirm}" Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand" Cursor="Hand"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
<Button <Button
x:Name="btnCancel" x:Name="btnCancel"
Grid.Column="2" Width="100"
Margin="4" Margin="8,0"
Click="btnCancel_Click" Click="btnCancel_Click"
Content="{x:Static resx:ResUI.TbCancel}" Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand" Cursor="Hand"
IsCancel="true" IsCancel="true"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
</Grid> </StackPanel>
<DockPanel> <DockPanel>
<TabControl x:Name="tabAdvanced"> <TabControl x:Name="tabAdvanced">

27
v2rayN/v2rayN/Views/SubEditWindow.xaml
View file

@ -1,12 +1,12 @@
<reactiveui:ReactiveWindow <reactiveui:ReactiveWindow
x:Class="v2rayN.Views.SubEditWindow" x:Class="v2rayN.Views.SubEditWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:reactiveui="http://reactiveui.net"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:conv="clr-namespace:v2rayN.Converters" xmlns:conv="clr-namespace:v2rayN.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:reactiveui="http://reactiveui.net"
xmlns:resx="clr-namespace:v2rayN.Resx" xmlns:resx="clr-namespace:v2rayN.Resx"
xmlns:vms="clr-namespace:v2rayN.ViewModels" xmlns:vms="clr-namespace:v2rayN.ViewModels"
Title="{x:Static resx:ResUI.menuSubSetting}" Title="{x:Static resx:ResUI.menuSubSetting}"
@ -31,27 +31,26 @@
</ResourceDictionary> </ResourceDictionary>
</Window.Resources> </Window.Resources>
<DockPanel Margin="8"> <DockPanel Margin="8">
<Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom"> <StackPanel
<Grid.ColumnDefinitions> Margin="4"
<ColumnDefinition Width="150" /> HorizontalAlignment="Center"
<ColumnDefinition Width="150" /> DockPanel.Dock="Bottom"
</Grid.ColumnDefinitions> Orientation="Horizontal">
<Button <Button
x:Name="btnSave" x:Name="btnSave"
Grid.Column="0" Width="100"
Margin="4"
Content="{x:Static resx:ResUI.TbConfirm}" Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand" Cursor="Hand"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
<Button <Button
x:Name="btnCancel" x:Name="btnCancel"
Grid.Column="1" Width="100"
Margin="4" Margin="8,0"
Content="{x:Static resx:ResUI.TbCancel}" Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand" Cursor="Hand"
IsCancel="true" IsCancel="true"
Style="{StaticResource DefButton}" /> Style="{StaticResource DefButton}" />
</Grid> </StackPanel>
<ScrollViewer <ScrollViewer
materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True" materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
HorizontalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"