Skip to content

Commit b80ae61

Browse files
QianyiazQianyiaz
committed
界面更新
1 parent b0feedb commit b80ae61

File tree

4 files changed

+63
-69
lines changed

4 files changed

+63
-69
lines changed

‎cat2/CAT2.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
<PropertyGroup>
44
<UseWPF>true</UseWPF>
5-
<Version>1.1.7.8</Version>
5+
<Version>1.1.8.0</Version>
66
<OutputType>WinExe</OutputType>
7-
<FileVersion>0.0.2.7</FileVersion>
7+
<FileVersion>0.0.3.0</FileVersion>
88
<LangVersion>preview</LangVersion>
99
<ApplicationIcon>logo.ico</ApplicationIcon>
1010
<TargetFramework>net9.0-windows</TargetFramework>

‎cat2/Views/Pages/NodePage.xaml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,29 +41,31 @@
4141
Grid.Row="1">
4242
<ui:ListView.ItemTemplate>
4343
<DataTemplate>
44-
<ui:CardControl>
45-
<ui:CardControl.ContextMenu>
44+
<ui:Card>
45+
<ui:Card.ContextMenu>
4646
<ContextMenu>
4747
<MenuItem
4848
Header="添加隧道"
4949
Icon="{ui:SymbolIcon Add48}"
5050
Command="{Binding ShowDialogCommand}" />
5151
</ContextMenu>
52-
</ui:CardControl.ContextMenu>
53-
<ui:CardControl.Header>
52+
</ui:Card.ContextMenu>
53+
<Grid
54+
ToolTip="{Binding Notes}"
55+
Margin="10,0,10,0">
5456
<ui:TextBlock
5557
FontTypography="BodyStrong"
5658
FontSize="16"
5759
FontWeight="Bold"
60+
HorizontalAlignment="Left"
61+
Margin="5,0,0,0"
5862
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
5963
Text="{Binding Name}"
6064
ToolTip="{Binding Id}"
6165
TextWrapping="WrapWithOverflow" />
62-
</ui:CardControl.Header>
63-
<Grid
64-
ToolTip="{Binding Notes}"
65-
Margin="10,0,10,0">
66+
6667
<TextBlock
68+
Margin="0,0,0,5"
6769
TextWrapping="WrapWithOverflow"
6870
Foreground="{ui:ThemeResource TextFillColorDisabledBrush}"
6971
HorizontalAlignment="Right">
@@ -74,10 +76,10 @@
7476
</TextBlock>
7577

7678
<ProgressBar
77-
Margin="0,20,0,0"
79+
VerticalAlignment="Bottom"
7880
Value="{Binding Load15}" />
7981
</Grid>
80-
</ui:CardControl>
82+
</ui:Card>
8183
</DataTemplate>
8284
</ui:ListView.ItemTemplate>
8385
</ui:ListView>

‎cat2/Views/Pages/SettingPage.xaml‎

Lines changed: 48 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,29 @@
1313
<StackPanel
1414
Margin="15"
1515
Orientation="Vertical">
16-
1716
<Label
18-
Margin="0,5,0,5"
17+
Margin="5"
1918
FontWeight="Bold"
2019
Content="设置" />
2120

2221
<ui:CardExpander
22+
Padding="14"
2323
Margin="0,0,0,5">
24+
<ui:CardExpander.Icon>
25+
<ui:SymbolIcon
26+
Symbol="DocumentTextClock24" />
27+
</ui:CardExpander.Icon>
2428
<ui:CardExpander.Header>
2529
<Grid>
26-
<StackPanel
27-
Orientation="Horizontal">
28-
<ui:SymbolIcon
29-
FontSize="25"
30-
Margin="10,0,10,0"
31-
Symbol="DocumentTextClock24" />
32-
<TextBlock>
33-
<Run
34-
Text="隧道日志记录" />
35-
<LineBreak />
36-
<Run
37-
FontSize="14"
38-
Text="查看日志记录或清除它。"
39-
Foreground="{ui:ThemeResource TextFillColorDisabledBrush}" />
40-
</TextBlock>
41-
</StackPanel>
30+
<TextBlock>
31+
<Run
32+
Text="隧道日志记录" />
33+
<LineBreak />
34+
<Run
35+
FontSize="14"
36+
Text="查看日志记录或清除它。"
37+
Foreground="{ui:ThemeResource TextFillColorDisabledBrush}" />
38+
</TextBlock>
4239

4340
<Button
4441
Margin="0,0,10,0"
@@ -49,34 +46,31 @@
4946
</ui:CardExpander.Header>
5047

5148
<MenuItem
52-
Padding="10"
5349
FontSize="18"
5450
Header="清除隧道日志缓存"
5551
Icon="{ui:SymbolIcon CommentOff24}"
5652
IsEnabled="{Binding IsClearedEnabled}"
5753
Command="{Binding ClearedCommand}" />
5854
</ui:CardExpander>
59-
55+
6056
<ui:CardExpander
57+
Padding="13"
6158
Margin="0,0,0,5">
59+
<ui:CardExpander.Icon>
60+
<ui:SymbolIcon
61+
Symbol="DocumentTextExtract24" />
62+
</ui:CardExpander.Icon>
6263
<ui:CardExpander.Header>
6364
<Grid>
64-
<StackPanel
65-
Orientation="Horizontal">
66-
<ui:SymbolIcon
67-
FontSize="25"
68-
Margin="10,0,10,0"
69-
Symbol="DocumentTextExtract24" />
70-
<TextBlock>
71-
<Run
72-
Text="隧道自启动" />
73-
<LineBreak />
74-
<Run
75-
FontSize="14"
76-
Text="当转到管理隧道页时自启动选好的隧道。"
77-
Foreground="{ui:ThemeResource TextFillColorDisabledBrush}" />
78-
</TextBlock>
79-
</StackPanel>
65+
<ui:TextBlock>
66+
<Run
67+
Text="隧道自启动" />
68+
<LineBreak />
69+
<Run
70+
FontSize="14"
71+
Text="当转到管理隧道页时自启动选好的隧道。"
72+
Foreground="{ui:ThemeResource TextFillColorDisabledBrush}" />
73+
</ui:TextBlock>
8074

8175
<Button
8276
Margin="0,0,10,0"
@@ -114,31 +108,29 @@
114108
</ui:CardExpander>
115109

116110
<Label
117-
Margin="0,20,0,5"
111+
Margin="5"
118112
FontWeight="Bold"
119113
Content="关于" />
120114

121-
<ui:CardExpander>
115+
<ui:CardExpander
116+
Padding="13">
117+
<ui:CardExpander.Icon>
118+
<ui:ImageIcon
119+
Height="25"
120+
Source="pack://application:,,,/logo.ico" />
121+
</ui:CardExpander.Icon>
122122
<ui:CardExpander.Header>
123123
<Grid>
124-
<StackPanel
125-
Orientation="Horizontal"
126-
VerticalAlignment="Center">
127-
<ui:ImageIcon
128-
Height="30"
129-
Margin="10,0,10,0"
130-
Source="pack://application:,,,/logo.ico" />
131-
132-
<ui:TextBlock>
133-
<Run
134-
Text="{Binding AssemblyName}" />
135-
<LineBreak />
136-
<Run
137-
Foreground="{ui:ThemeResource TextFillColorDisabledBrush}"
138-
Text="{Binding Copyright}"
139-
FontSize="14" />
140-
</ui:TextBlock>
141-
</StackPanel>
124+
<ui:TextBlock
125+
TextWrapping="WrapWithOverflow">
126+
<Run
127+
Text="{Binding AssemblyName}" />
128+
<LineBreak />
129+
<Run
130+
Foreground="{ui:ThemeResource TextFillColorDisabledBrush}"
131+
Text="{Binding Copyright}"
132+
FontSize="14" />
133+
</ui:TextBlock>
142134

143135
<Label
144136
Margin="10"

‎cat2/Views/Pages/TunnelPage.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686
FontSize="18"
8787
FontWeight="Bold"
8888
Text="{Binding Name}" />
89+
8990
<ui:TextBlock
90-
Appearance="Secondary"
9191
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
9292
TextWrapping="WrapWithOverflow"
9393
ToolTip="{Binding ToolTip}">

0 commit comments

Comments
 (0)