mirror of https://github.com/2dust/v2rayN
Add avaloniaEdit for test
parent
d86003df55
commit
148d6ef90b
|
@ -5,6 +5,7 @@
|
||||||
<CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
|
<CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageVersion Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
|
||||||
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.6" />
|
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.6" />
|
||||||
<PackageVersion Include="Avalonia.Desktop" Version="11.3.6" />
|
<PackageVersion Include="Avalonia.Desktop" Version="11.3.6" />
|
||||||
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.6" />
|
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.6" />
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
<semi:SemiTheme />
|
<semi:SemiTheme />
|
||||||
<StyleInclude Source="Assets/GlobalStyles.axaml" />
|
<StyleInclude Source="Assets/GlobalStyles.axaml" />
|
||||||
<StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
|
<StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
|
||||||
|
<StyleInclude Source="avares://AvaloniaEdit/Themes/Simple/AvaloniaEdit.xaml" />
|
||||||
<dialogHost:DialogHostStyles />
|
<dialogHost:DialogHostStyles />
|
||||||
</Application.Styles>
|
</Application.Styles>
|
||||||
<Application.Resources>
|
<Application.Resources>
|
||||||
|
|
|
@ -11,6 +11,8 @@
|
||||||
<x:Double x:Key="IconButtonWidth">32</x:Double>
|
<x:Double x:Key="IconButtonWidth">32</x:Double>
|
||||||
<x:Double x:Key="IconButtonHeight">32</x:Double>
|
<x:Double x:Key="IconButtonHeight">32</x:Double>
|
||||||
<x:Double x:Key="MenuFlyoutMaxHeight">1000</x:Double>
|
<x:Double x:Key="MenuFlyoutMaxHeight">1000</x:Double>
|
||||||
|
<x:Double x:Key="FontSizeNormal">14</x:Double>
|
||||||
|
<FontFamily x:Key="ContentControlThemeFontFamily">Cascadia Code,Consolas,Menlo,Monospace</FontFamily>
|
||||||
|
|
||||||
<Thickness x:Key="Margin2">2</Thickness>
|
<Thickness x:Key="Margin2">2</Thickness>
|
||||||
<Thickness x:Key="MarginLr4">4,0</Thickness>
|
<Thickness x:Key="MarginLr4">4,0</Thickness>
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
x:Class="v2rayN.Desktop.Views.MsgView"
|
x:Class="v2rayN.Desktop.Views.MsgView"
|
||||||
xmlns="https://github.com/avaloniaui"
|
xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:avaloniaEdit="clr-namespace:AvaloniaEdit;assembly=AvaloniaEdit"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
|
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
|
||||||
|
@ -71,34 +72,12 @@
|
||||||
</WrapPanel>
|
</WrapPanel>
|
||||||
|
|
||||||
<ScrollViewer x:Name="msgScrollViewer" VerticalScrollBarVisibility="Auto">
|
<ScrollViewer x:Name="msgScrollViewer" VerticalScrollBarVisibility="Auto">
|
||||||
<SelectableTextBlock
|
<avaloniaEdit:TextEditor
|
||||||
Name="txtMsg"
|
Name="txtMsg"
|
||||||
Margin="{StaticResource Margin8}"
|
HorizontalScrollBarVisibility="Auto"
|
||||||
VerticalAlignment="Stretch"
|
IsReadOnly="True"
|
||||||
Classes="TextArea"
|
ShowLineNumbers="True"
|
||||||
TextAlignment="Left"
|
VerticalScrollBarVisibility="Auto" />
|
||||||
TextWrapping="Wrap">
|
|
||||||
<SelectableTextBlock.ContextMenu>
|
|
||||||
<ContextMenu>
|
|
||||||
<MenuItem
|
|
||||||
x:Name="menuMsgViewSelectAll"
|
|
||||||
Click="menuMsgViewSelectAll_Click"
|
|
||||||
Header="{x:Static resx:ResUI.menuMsgViewSelectAll}" />
|
|
||||||
<MenuItem
|
|
||||||
x:Name="menuMsgViewCopy"
|
|
||||||
Click="menuMsgViewCopy_Click"
|
|
||||||
Header="{x:Static resx:ResUI.menuMsgViewCopy}" />
|
|
||||||
<MenuItem
|
|
||||||
x:Name="menuMsgViewCopyAll"
|
|
||||||
Click="menuMsgViewCopyAll_Click"
|
|
||||||
Header="{x:Static resx:ResUI.menuMsgViewCopyAll}" />
|
|
||||||
<MenuItem
|
|
||||||
x:Name="menuMsgViewClear"
|
|
||||||
Click="menuMsgViewClear_Click"
|
|
||||||
Header="{x:Static resx:ResUI.menuMsgViewClear}" />
|
|
||||||
</ContextMenu>
|
|
||||||
</SelectableTextBlock.ContextMenu>
|
|
||||||
</SelectableTextBlock>
|
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Avalonia.AvaloniaEdit" />
|
||||||
<PackageReference Include="Avalonia.Controls.DataGrid">
|
<PackageReference Include="Avalonia.Controls.DataGrid">
|
||||||
<TreatAsUsed>true</TreatAsUsed>
|
<TreatAsUsed>true</TreatAsUsed>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
|
Loading…
Reference in New Issue