Skip to content

Commit 47a21cb

Browse files
committed
add logs view
1 parent c8a9330 commit 47a21cb

19 files changed

+266
-30
lines changed

clashN/clashN/App.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
x:Key="ListItemSubTitle2"
5050
BasedOn="{StaticResource MaterialDesignTextBlock}"
5151
TargetType="{x:Type TextBlock}">
52-
<Setter Property="FontSize" Value="9" />
52+
<Setter Property="FontSize" Value="10" />
5353
</Style>
5454
<Style
5555
x:Key="ToolbarItem"

clashN/clashN/Global.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System.Windows.Controls;
2-
3-
namespace clashN
1+
namespace clashN
42
{
53
class Global
64
{

clashN/clashN/Handler/UpdateHandle.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using clashN.Base;
22
using clashN.Mode;
33
using clashN.Resx;
4+
using Splat;
45
using System.Diagnostics;
56
using System.IO;
67
using System.Net.Http.Headers;
@@ -146,6 +147,7 @@ public void CheckUpdateCore(ECoreType type, Config config, Action<bool, string>
146147
}
147148
else
148149
{
150+
Locator.Current.GetService<NoticeHandler>()?.Enqueue(args.Msg);
149151
_updateFunc(false, args.Msg);
150152
}
151153
};

clashN/clashN/Resx/ResUI.Designer.cs

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

clashN/clashN/Resx/ResUI.resx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,4 +613,13 @@
613613
<data name="menuProfileQrcode" xml:space="preserve">
614614
<value>Share Qrcode</value>
615615
</data>
616+
<data name="TbLogs" xml:space="preserve">
617+
<value>Logs</value>
618+
</data>
619+
<data name="TbFilter" xml:space="preserve">
620+
<value>Filter</value>
621+
</data>
622+
<data name="TbLineCount" xml:space="preserve">
623+
<value>Max Line</value>
624+
</data>
616625
</root>

clashN/clashN/Resx/ResUI.zh-Hans.resx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,4 +613,13 @@
613613
<data name="menuProfileQrcode" xml:space="preserve">
614614
<value>分享二维码</value>
615615
</data>
616+
<data name="TbLogs" xml:space="preserve">
617+
<value>日志信息</value>
618+
</data>
619+
<data name="TbFilter" xml:space="preserve">
620+
<value>过滤器</value>
621+
</data>
622+
<data name="TbLineCount" xml:space="preserve">
623+
<value>最大行数</value>
624+
</data>
616625
</root>
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using ReactiveUI;
2+
using ReactiveUI.Fody.Helpers;
3+
4+
namespace clashN.ViewModels
5+
{
6+
public class LogsViewModel : ReactiveObject
7+
{
8+
[Reactive]
9+
public int SortingSelected { get; set; }
10+
[Reactive]
11+
public bool AutoRefresh { get; set; }
12+
[Reactive]
13+
public string MsgFilter { get; set; }
14+
[Reactive]
15+
public int LineCount { get; set; }
16+
17+
public LogsViewModel()
18+
{
19+
AutoRefresh = true;
20+
MsgFilter = string.Empty;
21+
LineCount = 1000;
22+
}
23+
}
24+
}

clashN/clashN/ViewModels/MainWindowViewModel.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public class MainWindowViewModel : ReactiveObject
2929
//public DashboardView GetDashboardView { get; }
3030
public ProxiesView GetProxyView { get; }
3131
public ProfilesView GetProfilesView { get; }
32+
public LogsView GetLogsView { get; }
3233
public ConnectionsView GetConnectionsView { get; }
3334
public SettingsView GetSettingsView { get; }
3435
public HelpView GetHelpView { get; }
@@ -95,6 +96,7 @@ public MainWindowViewModel(ISnackbarMessageQueue snackbarMessageQueue)
9596
//GetDashboardView = new();
9697
GetProxyView = new();
9798
GetProfilesView = new();
99+
GetLogsView = new();
98100
GetConnectionsView = new();
99101
GetSettingsView = new();
100102
GetHelpView = new();

clashN/clashN/Views/ConnectionsView.xaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@
1313
d:DesignWidth="800"
1414
x:TypeArguments="vms:ConnectionsViewModel"
1515
mc:Ignorable="d">
16-
<UserControl.Resources>
17-
<BooleanToVisibilityConverter x:Key="BoolToVisConverter" />
18-
</UserControl.Resources>
19-
<DockPanel Margin="16">
16+
<DockPanel Margin="8">
2017
<StackPanel
2118
Margin="8,0,8,8"
2219
HorizontalAlignment="Left"

clashN/clashN/Views/HelpView.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
d:DesignWidth="800"
1414
x:TypeArguments="vms:HelpViewModel"
1515
mc:Ignorable="d">
16-
<DockPanel Grid.Row="0" Margin="16">
16+
<DockPanel Margin="8">
1717
<TextBlock
1818
Margin="8,0,8,8"
1919
DockPanel.Dock="Top"
2020
Style="{StaticResource ModuleTitle}"
2121
Text="{x:Static resx:ResUI.TbHelp}" />
2222
<ScrollViewer VerticalScrollBarVisibility="Auto">
23-
<WrapPanel Margin="16">
23+
<WrapPanel>
2424
<materialDesign:Card
2525
Width="300"
2626
Margin="8"

0 commit comments

Comments
 (0)