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

Improved

pull/5865/head
2dust 2024-10-19 14:30:14 +08:00
parent fe3836be14
commit 50449df08d
23 changed files with 93 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml
View File

@ -23,13 +23,15 @@
x:Name="btnSave"
Width="100"
Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand" />
Cursor="Hand"
IsDefault="True" />
<Button
x:Name="btnCancel"
Width="100"
Margin="8,0"
Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand" />
Cursor="Hand"
IsCancel="True" />
</StackPanel>
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
<Grid>

6
v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
View File

@ -23,13 +23,15 @@
x:Name="btnSave"
Width="100"
Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand" />
Cursor="Hand"
IsDefault="True" />
<Button
x:Name="btnCancel"
Width="100"
Margin="8,0"
Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand" />
Cursor="Hand"
IsCancel="True" />
</StackPanel>
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
<Grid>

8
v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml
View File

@ -6,14 +6,14 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
d:DesignHeight="450"
d:DesignHeight="600"
d:DesignWidth="800"
x:DataType="vms:CheckUpdateViewModel"
mc:Ignorable="d">
<DockPanel Classes="Margin8">
<StackPanel
HorizontalAlignment="Right"
HorizontalAlignment="Center"
Classes="Margin8"
DockPanel.Dock="Bottom"
Orientation="Horizontal">
@ -67,14 +67,16 @@
Grid.Column="0"
Margin="8"
HorizontalAlignment="Left"
VerticalAlignment="Center"
VerticalAlignment="Top"
IsChecked="{Binding IsSelected}" />
<TextBlock
Grid.Column="1"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Text="{Binding CoreType}" />
<TextBlock
Grid.Column="2"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Text="{Binding Remarks}"
TextWrapping="WrapWithOverflow" />

6
v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
View File

@ -23,13 +23,15 @@
x:Name="btnSave"
Width="100"
Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand" />
Cursor="Hand"
IsDefault="True" />
<Button
x:Name="btnCancel"
Width="100"
Margin="8,0"
Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand" />
Cursor="Hand"
IsCancel="True" />
</StackPanel>
<TabControl HorizontalContentAlignment="Left">

30
v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml
View File

@ -15,8 +15,8 @@
mc:Ignorable="d">
<DockPanel Classes="Margin8">
<StackPanel
Classes="Margin8"
HorizontalAlignment="Center"
Classes="Margin8"
DockPanel.Dock="Bottom"
Orientation="Horizontal">
<Button
@ -28,13 +28,15 @@
x:Name="btnSave"
Width="100"
Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand" />
Cursor="Hand"
IsDefault="True" />
<Button
x:Name="btnCancel"
Width="100"
Margin="8,0"
Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand" />
Cursor="Hand"
IsCancel="True" />
</StackPanel>
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
<Grid>
@ -66,77 +68,77 @@
<TextBlock
Grid.Row="1"
Grid.Column="0"
Classes="Margin8"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbDisplayGUI}" />
<TextBox
x:Name="txtGlobalHotkey0"
Grid.Row="1"
Grid.Column="1"
Classes="Margin8"
VerticalAlignment="Center"
Classes="Margin8"
IsReadOnly="True" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
Classes="Margin8"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbClearSystemProxy}" />
<TextBox
x:Name="txtGlobalHotkey1"
Grid.Row="2"
Grid.Column="1"
Classes="Margin8"
VerticalAlignment="Center"
Classes="Margin8"
IsReadOnly="True" />
<TextBlock
Grid.Row="3"
Grid.Column="0"
Classes="Margin8"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSetSystemProxy}" />
<TextBox
x:Name="txtGlobalHotkey2"
Grid.Row="3"
Grid.Column="1"
Classes="Margin8"
VerticalAlignment="Center"
Classes="Margin8"
IsReadOnly="True" />
<TextBlock
Grid.Row="4"
Grid.Column="0"
Classes="Margin8"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbNotChangeSystemProxy}" />
<TextBox
x:Name="txtGlobalHotkey3"
Grid.Row="4"
Grid.Column="1"
Classes="Margin8"
VerticalAlignment="Center"
Classes="Margin8"
IsReadOnly="True" />
<TextBlock
Grid.Row="5"
Grid.Column="0"
Classes="Margin8"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbSystemProxyPac}" />
<TextBox
x:Name="txtGlobalHotkey4"
Grid.Row="5"
Grid.Column="1"
Classes="Margin8"
VerticalAlignment="Center"
Classes="Margin8"
IsReadOnly="True" />
</Grid>
<TextBlock
Grid.Row="1"
Classes="Margin8"
VerticalAlignment="Center"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbGlobalHotkeySettingTip}" />
</Grid>
</ScrollViewer>

18
v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
View File

@ -320,17 +320,17 @@ namespace v2rayN.Desktop.Views
public async Task ScanScreenTaskAsync()
{
ShowHideWindow(false);
//var dpiXY = QRCodeHelper.GetDpiXY(Application.Current.MainWindow);
//string result = await Task.Run(() =>
//ShowHideWindow(false);
NoticeHandler.Instance.SendMessageAndEnqueue("Not yet implemented.(还未实现)");
return;
//if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
//{
// return QRCodeHelper.ScanScreen(dpiXY.Item1, dpiXY.Item2);
//});
// //var bytes = QRCodeHelper.CaptureScreen(desktop);
// //await ViewModel?.ScanScreenResult(bytes);
//}
ShowHideWindow(true);
//ViewModel?.ScanScreenResult(result);
//ShowHideWindow(true);
}
private async Task ScanImageTaskAsync()
{

6
v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
View File

@ -23,13 +23,15 @@
x:Name="btnSave"
Width="100"
Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand" />
Cursor="Hand"
IsDefault="True" />
<Button
x:Name="btnCancel"
Width="100"
Margin="8,0"
Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand" />
Cursor="Hand"
IsCancel="True" />
</StackPanel>
<TabControl HorizontalContentAlignment="Stretch">

12
v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs
View File

@ -17,9 +17,15 @@ namespace v2rayN.Desktop.Views
private Bitmap? GetQRCode(string? url)
{
var qrCodeImage = QRCodeHelper.GenQRCode(url);
if (qrCodeImage is null) return null;
var ms = new MemoryStream(qrCodeImage);
var bytes = QRCodeHelper.GenQRCode(url);
return ByteToBitmap(bytes);
}
private Bitmap? ByteToBitmap(byte[]? bytes)
{
if (bytes is null) return null;
using var ms = new MemoryStream(bytes);
return new Bitmap(ms);
}
}

6
v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml
View File

@ -158,13 +158,15 @@
x:Name="btnSave"
Width="100"
Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand" />
Cursor="Hand"
IsDefault="True" />
<Button
x:Name="btnCancel"
Width="100"
Margin="8,0"
Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand" />
Cursor="Hand"
IsCancel="True" />
</StackPanel>
<Grid Classes="Margin8">

6
v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml
View File

@ -35,13 +35,15 @@
x:Name="btnSave"
Width="100"
Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand" />
Cursor="Hand"
IsDefault="True" />
<Button
x:Name="btnCancel"
Width="100"
Margin="8,0"
Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand" />
Cursor="Hand"
IsCancel="True" />
</StackPanel>
<Grid Classes="Margin8" DockPanel.Dock="Top">

6
v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
View File

@ -71,13 +71,15 @@
x:Name="btnSave"
Width="100"
Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand" />
Cursor="Hand"
IsDefault="True" />
<Button
x:Name="btnCancel"
Width="100"
Margin="8,0"
Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand" />
Cursor="Hand"
IsCancel="True" />
</StackPanel>
<DockPanel>

6
v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
View File

@ -24,13 +24,15 @@
x:Name="btnSave"
Width="100"
Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand" />
Cursor="Hand"
IsDefault="True" />
<Button
x:Name="btnCancel"
Width="100"
Margin="8,0"
Content="{x:Static resx:ResUI.TbCancel}"
Cursor="Hand" />
Cursor="Hand"
IsCancel="True" />
</StackPanel>
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">

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

@ -33,6 +33,7 @@
Width="100"
Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand"
IsDefault="True"
Style="{StaticResource DefButton}" />
<Button
x:Name="btnCancel"

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

@ -33,6 +33,7 @@
Width="100"
Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand"
IsDefault="True"
Style="{StaticResource DefButton}" />
<Button
x:Name="btnCancel"

1
v2rayN/v2rayN/Views/BackupAndRestoreView.xaml
View File

@ -30,7 +30,6 @@
Content="{x:Static resx:ResUI.menuClose}"
DockPanel.Dock="Right"
IsCancel="True"
IsDefault="True"
Style="{StaticResource MaterialDesignFlatButton}" />
<TextBlock

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

@ -37,7 +37,6 @@
Width="100"
Margin="{StaticResource Margin8}"
Content="{x:Static resx:ResUI.menuCheckUpdate}"
IsCancel="True"
IsDefault="True"
Style="{StaticResource MaterialDesignFlatButton}" />
@ -48,7 +47,6 @@
Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
Content="{x:Static resx:ResUI.menuClose}"
IsCancel="True"
IsDefault="True"
Style="{StaticResource MaterialDesignFlatButton}" />
</StackPanel>
@ -84,6 +82,7 @@
Grid.Column="0"
Margin="{StaticResource Margin8}"
HorizontalAlignment="Left"
VerticalAlignment="Top"
IsChecked="{Binding IsSelected}" />
<TextBlock
Grid.Column="1"

1
v2rayN/v2rayN/Views/DNSSettingWindow.xaml
View File

@ -33,6 +33,7 @@
Width="100"
Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand"
IsDefault="True"
Style="{StaticResource DefButton}" />
<Button
x:Name="btnCancel"

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

@ -40,6 +40,7 @@
Width="100"
Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand"
IsDefault="True"
Style="{StaticResource DefButton}" />
<Button
x:Name="btnCancel"

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

@ -33,6 +33,7 @@
Width="100"
Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand"
IsDefault="True"
Style="{StaticResource DefButton}" />
<Button
x:Name="btnCancel"

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

@ -1,14 +1,14 @@
<reactiveui:ReactiveWindow
x:Class="v2rayN.Views.RoutingRuleDetailsWindow"
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: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:ServiceLib.Resx;assembly=ServiceLib"
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
xmlns:conv="clr-namespace:v2rayN.Converters"
Title="{x:Static resx:ResUI.menuRoutingRuleDetailsSetting}"
Width="900"
Height="700"
@ -184,6 +184,7 @@
Width="100"
Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand"
IsDefault="True"
Style="{StaticResource DefButton}" />
<Button
x:Name="btnCancel"

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

@ -1,14 +1,14 @@
<reactiveui:ReactiveWindow
x:Class="v2rayN.Views.RoutingRuleSettingWindow"
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: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:ServiceLib.Resx;assembly=ServiceLib"
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
xmlns:conv="clr-namespace:v2rayN.Converters"
Title="{x:Static resx:ResUI.menuRoutingRuleSetting}"
Width="960"
Height="700"
@ -81,6 +81,7 @@
Width="100"
Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand"
IsDefault="True"
Style="{StaticResource DefButton}" />
<Button
x:Name="btnCancel"

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

@ -142,6 +142,7 @@
Width="100"
Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand"
IsDefault="True"
Style="{StaticResource DefButton}" />
<Button
x:Name="btnCancel"

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

@ -1,14 +1,14 @@
<reactiveui:ReactiveWindow
x:Class="v2rayN.Views.SubEditWindow"
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: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:ServiceLib.Resx;assembly=ServiceLib"
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
xmlns:conv="clr-namespace:v2rayN.Converters"
Title="{x:Static resx:ResUI.menuSubSetting}"
Width="700"
Height="600"
@ -40,6 +40,7 @@
Width="100"
Content="{x:Static resx:ResUI.TbConfirm}"
Cursor="Hand"
IsDefault="True"
Style="{StaticResource DefButton}" />
<Button
x:Name="btnCancel"