mirror of
https://github.com/2dust/v2rayN.git
synced 2025-10-29 19:42:51 +00:00
Compare commits
29 commits
47779e433d
...
7841c9fe84
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7841c9fe84 | ||
|
|
59e69b4d66 | ||
|
|
be09e8bc5d | ||
|
|
257bf51ded | ||
|
|
20883380d6 | ||
|
|
9bccdf1dac | ||
|
|
3ed34eb02f | ||
|
|
83c862afea | ||
|
|
8f0d4be095 | ||
|
|
da8417165d | ||
|
|
56b619de1c | ||
|
|
0fbb2f6f32 | ||
|
|
8756e078a7 | ||
|
|
4f4ca3cf91 | ||
|
|
0be355ae8c | ||
|
|
9506e049e7 | ||
|
|
9a56824db5 | ||
|
|
cfe56fad0c | ||
|
|
1bfd3e7d08 | ||
|
|
aec8cb7e64 | ||
|
|
0f96af3142 | ||
|
|
9030830575 | ||
|
|
fcdb46581b | ||
|
|
ddedde53ea | ||
|
|
4f15452fe2 | ||
|
|
648fe837f5 | ||
|
|
5cdaae0a7f | ||
|
|
1a75faaf4f | ||
|
|
563396031f |
5 changed files with 36 additions and 43 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
<Project>
|
<Project>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>7.13.7</Version>
|
<Version>7.13.6</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.3.3" />
|
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.2" />
|
||||||
<PackageVersion Include="Avalonia.Desktop" Version="11.3.3" />
|
<PackageVersion Include="Avalonia.Desktop" Version="11.3.2" />
|
||||||
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.3" />
|
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.2" />
|
||||||
<PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.3" />
|
<PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.2" />
|
||||||
<PackageVersion Include="CliWrap" Version="3.9.0" />
|
<PackageVersion Include="CliWrap" Version="3.9.0" />
|
||||||
<PackageVersion Include="Downloader" Version="4.0.2" />
|
<PackageVersion Include="Downloader" Version="4.0.2" />
|
||||||
<PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
|
<PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,6 @@ public class ThemeSettingViewModel : MyReactiveObject
|
||||||
x.OfType<Button>(),
|
x.OfType<Button>(),
|
||||||
x.OfType<TextBox>(),
|
x.OfType<TextBox>(),
|
||||||
x.OfType<TextBlock>(),
|
x.OfType<TextBlock>(),
|
||||||
x.OfType<SelectableTextBlock>(),
|
|
||||||
x.OfType<Menu>(),
|
x.OfType<Menu>(),
|
||||||
x.OfType<ContextMenu>(),
|
x.OfType<ContextMenu>(),
|
||||||
x.OfType<DataGridRow>(),
|
x.OfType<DataGridRow>(),
|
||||||
|
|
@ -147,7 +146,6 @@ public class ThemeSettingViewModel : MyReactiveObject
|
||||||
x.OfType<Button>(),
|
x.OfType<Button>(),
|
||||||
x.OfType<TextBox>(),
|
x.OfType<TextBox>(),
|
||||||
x.OfType<TextBlock>(),
|
x.OfType<TextBlock>(),
|
||||||
x.OfType<SelectableTextBlock>(),
|
|
||||||
x.OfType<Menu>(),
|
x.OfType<Menu>(),
|
||||||
x.OfType<ContextMenu>(),
|
x.OfType<ContextMenu>(),
|
||||||
x.OfType<DataGridRow>(),
|
x.OfType<DataGridRow>(),
|
||||||
|
|
|
||||||
|
|
@ -69,35 +69,34 @@
|
||||||
IsChecked="True"
|
IsChecked="True"
|
||||||
Theme="{DynamicResource SimpleToggleSwitch}" />
|
Theme="{DynamicResource SimpleToggleSwitch}" />
|
||||||
</WrapPanel>
|
</WrapPanel>
|
||||||
|
<TextBox
|
||||||
<ScrollViewer x:Name="msgScrollViewer" VerticalScrollBarVisibility="Auto">
|
Name="txtMsg"
|
||||||
<SelectableTextBlock
|
VerticalAlignment="Stretch"
|
||||||
Name="txtMsg"
|
BorderThickness="0"
|
||||||
VerticalAlignment="Stretch"
|
Classes="TextArea"
|
||||||
Classes="TextArea"
|
IsReadOnly="True"
|
||||||
TextAlignment="Left"
|
TextAlignment="Left"
|
||||||
TextWrapping="Wrap">
|
TextWrapping="Wrap">
|
||||||
<SelectableTextBlock.ContextMenu>
|
<TextBox.ContextMenu>
|
||||||
<ContextMenu>
|
<ContextMenu>
|
||||||
<MenuItem
|
<MenuItem
|
||||||
x:Name="menuMsgViewSelectAll"
|
x:Name="menuMsgViewSelectAll"
|
||||||
Click="menuMsgViewSelectAll_Click"
|
Click="menuMsgViewSelectAll_Click"
|
||||||
Header="{x:Static resx:ResUI.menuMsgViewSelectAll}" />
|
Header="{x:Static resx:ResUI.menuMsgViewSelectAll}" />
|
||||||
<MenuItem
|
<MenuItem
|
||||||
x:Name="menuMsgViewCopy"
|
x:Name="menuMsgViewCopy"
|
||||||
Click="menuMsgViewCopy_Click"
|
Click="menuMsgViewCopy_Click"
|
||||||
Header="{x:Static resx:ResUI.menuMsgViewCopy}" />
|
Header="{x:Static resx:ResUI.menuMsgViewCopy}" />
|
||||||
<MenuItem
|
<MenuItem
|
||||||
x:Name="menuMsgViewCopyAll"
|
x:Name="menuMsgViewCopyAll"
|
||||||
Click="menuMsgViewCopyAll_Click"
|
Click="menuMsgViewCopyAll_Click"
|
||||||
Header="{x:Static resx:ResUI.menuMsgViewCopyAll}" />
|
Header="{x:Static resx:ResUI.menuMsgViewCopyAll}" />
|
||||||
<MenuItem
|
<MenuItem
|
||||||
x:Name="menuMsgViewClear"
|
x:Name="menuMsgViewClear"
|
||||||
Click="menuMsgViewClear_Click"
|
Click="menuMsgViewClear_Click"
|
||||||
Header="{x:Static resx:ResUI.menuMsgViewClear}" />
|
Header="{x:Static resx:ResUI.menuMsgViewClear}" />
|
||||||
</ContextMenu>
|
</ContextMenu>
|
||||||
</SelectableTextBlock.ContextMenu>
|
</TextBox.ContextMenu>
|
||||||
</SelectableTextBlock>
|
</TextBox>
|
||||||
</ScrollViewer>
|
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
using System.Reactive.Disposables;
|
using System.Reactive.Disposables;
|
||||||
using Avalonia.Controls;
|
|
||||||
using Avalonia.Interactivity;
|
using Avalonia.Interactivity;
|
||||||
using Avalonia.ReactiveUI;
|
using Avalonia.ReactiveUI;
|
||||||
using Avalonia.Threading;
|
using Avalonia.Threading;
|
||||||
|
|
@ -10,12 +9,9 @@ namespace v2rayN.Desktop.Views;
|
||||||
|
|
||||||
public partial class MsgView : ReactiveUserControl<MsgViewModel>
|
public partial class MsgView : ReactiveUserControl<MsgViewModel>
|
||||||
{
|
{
|
||||||
private readonly ScrollViewer _scrollViewer;
|
|
||||||
|
|
||||||
public MsgView()
|
public MsgView()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
_scrollViewer = this.FindControl<ScrollViewer>("msgScrollViewer");
|
|
||||||
|
|
||||||
ViewModel = new MsgViewModel(UpdateViewHandler);
|
ViewModel = new MsgViewModel(UpdateViewHandler);
|
||||||
|
|
||||||
|
|
@ -47,14 +43,14 @@ public partial class MsgView : ReactiveUserControl<MsgViewModel>
|
||||||
txtMsg.Text = msg.ToString();
|
txtMsg.Text = msg.ToString();
|
||||||
if (togScrollToEnd.IsChecked ?? true)
|
if (togScrollToEnd.IsChecked ?? true)
|
||||||
{
|
{
|
||||||
_scrollViewer?.ScrollToEnd();
|
txtMsg.CaretIndex = int.MaxValue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ClearMsg()
|
public void ClearMsg()
|
||||||
{
|
{
|
||||||
ViewModel?.ClearMsg();
|
ViewModel?.ClearMsg();
|
||||||
txtMsg.Text = "";
|
txtMsg.Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void menuMsgViewSelectAll_Click(object? sender, RoutedEventArgs e)
|
private void menuMsgViewSelectAll_Click(object? sender, RoutedEventArgs e)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue