mirror of
https://github.com/2dust/v2rayN.git
synced 2025-04-19 13:42:24 +00:00
Merge branch 'accessibility' of https://github.com/rezabakhshilaktasaraei/v2rayN-accessibility-improvements into accessibility
This commit is contained in:
commit
ffe09ca5ea
3 changed files with 18 additions and 5 deletions
|
@ -1,7 +1,7 @@
|
||||||
<Project>
|
<Project>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>7.11.1</Version>
|
<Version>7.11.2</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
@ -5,10 +5,10 @@
|
||||||
<CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
|
<CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.6" />
|
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.7" />
|
||||||
<PackageVersion Include="Avalonia.Desktop" Version="11.2.6" />
|
<PackageVersion Include="Avalonia.Desktop" Version="11.2.7" />
|
||||||
<PackageVersion Include="Avalonia.Diagnostics" Version="11.2.6" />
|
<PackageVersion Include="Avalonia.Diagnostics" Version="11.2.7" />
|
||||||
<PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.6" />
|
<PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.7" />
|
||||||
<PackageVersion Include="CliWrap" Version="3.8.2" />
|
<PackageVersion Include="CliWrap" Version="3.8.2" />
|
||||||
<PackageVersion Include="Downloader" Version="3.3.4" />
|
<PackageVersion Include="Downloader" Version="3.3.4" />
|
||||||
<PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
|
<PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
Margin="{StaticResource MarginLeftRight8}"
|
Margin="{StaticResource MarginLeftRight8}"
|
||||||
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgFilterTitle}"
|
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgFilterTitle}"
|
||||||
materialDesign:TextFieldAssist.HasClearButton="True"
|
materialDesign:TextFieldAssist.HasClearButton="True"
|
||||||
|
AutomationProperties.Name="{x:Static resx:ResUI.MsgFilterTitle}"
|
||||||
IsEditable="True"
|
IsEditable="True"
|
||||||
Style="{StaticResource DefComboBox}"
|
Style="{StaticResource DefComboBox}"
|
||||||
AutomationProperties.Name="{x:Static resx:ResUI.MsgFilterTitle}" />
|
AutomationProperties.Name="{x:Static resx:ResUI.MsgFilterTitle}" />
|
||||||
|
@ -34,6 +35,7 @@
|
||||||
Width="24"
|
Width="24"
|
||||||
Height="24"
|
Height="24"
|
||||||
Margin="{StaticResource MarginLeftRight8}"
|
Margin="{StaticResource MarginLeftRight8}"
|
||||||
|
AutomationProperties.Name="{x:Static resx:ResUI.menuMsgViewCopyAll}"
|
||||||
Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
|
Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
|
||||||
ToolTip="{x:Static resx:ResUI.menuMsgViewCopyAll}"
|
ToolTip="{x:Static resx:ResUI.menuMsgViewCopyAll}"
|
||||||
AutomationProperties.Name="{x:Static resx:ResUI.menuMsgViewCopyAll}">
|
AutomationProperties.Name="{x:Static resx:ResUI.menuMsgViewCopyAll}">
|
||||||
|
@ -44,6 +46,7 @@
|
||||||
Width="24"
|
Width="24"
|
||||||
Height="24"
|
Height="24"
|
||||||
Margin="{StaticResource MarginLeftRight8}"
|
Margin="{StaticResource MarginLeftRight8}"
|
||||||
|
AutomationProperties.Name="{x:Static resx:ResUI.menuMsgViewClear}"
|
||||||
Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
|
Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
|
||||||
ToolTip="{x:Static resx:ResUI.menuMsgViewClear}"
|
ToolTip="{x:Static resx:ResUI.menuMsgViewClear}"
|
||||||
AutomationProperties.Name="{x:Static resx:ResUI.menuMsgViewClear}">
|
AutomationProperties.Name="{x:Static resx:ResUI.menuMsgViewClear}">
|
||||||
|
@ -58,8 +61,13 @@
|
||||||
x:Name="togAutoRefresh"
|
x:Name="togAutoRefresh"
|
||||||
Margin="{StaticResource MarginLeftRight8}"
|
Margin="{StaticResource MarginLeftRight8}"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
|
<<<<<<< HEAD
|
||||||
IsChecked="True"
|
IsChecked="True"
|
||||||
AutomationProperties.Name="{x:Static resx:ResUI.TbAutoRefresh}" />
|
AutomationProperties.Name="{x:Static resx:ResUI.TbAutoRefresh}" />
|
||||||
|
=======
|
||||||
|
AutomationProperties.Name="{x:Static resx:ResUI.TbAutoRefresh}"
|
||||||
|
IsChecked="True" />
|
||||||
|
>>>>>>> 456ffb200a76caccad8ad5528bf602492b98ae31
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="{StaticResource MarginLeftRight8}"
|
Margin="{StaticResource MarginLeftRight8}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
@ -69,8 +77,13 @@
|
||||||
x:Name="togScrollToEnd"
|
x:Name="togScrollToEnd"
|
||||||
Margin="{StaticResource MarginLeftRight8}"
|
Margin="{StaticResource MarginLeftRight8}"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
|
<<<<<<< HEAD
|
||||||
IsChecked="True"
|
IsChecked="True"
|
||||||
AutomationProperties.Name="{x:Static resx:ResUI.TbAutoScrollToEnd}" />
|
AutomationProperties.Name="{x:Static resx:ResUI.TbAutoScrollToEnd}" />
|
||||||
|
=======
|
||||||
|
AutomationProperties.Name="{x:Static resx:ResUI.TbAutoScrollToEnd}"
|
||||||
|
IsChecked="True" />
|
||||||
|
>>>>>>> 456ffb200a76caccad8ad5528bf602492b98ae31
|
||||||
</WrapPanel>
|
</WrapPanel>
|
||||||
<TextBox
|
<TextBox
|
||||||
Name="txtMsg"
|
Name="txtMsg"
|
||||||
|
|
Loading…
Reference in a new issue