Skip to content

Commit a41617e

Browse files
chenxuuuchenxuuu
committed
add: logo，先写个最简单的关于页面的样子
1 parent 1a81c05 commit a41617e

File tree

8 files changed

+114
-5
lines changed

8 files changed

+114
-5
lines changed

‎llcomNext/LLCOM/Assets/Images/logo.ico‎

109 KB
Binary file not shown.

‎llcomNext/LLCOM/Assets/Images/logo.svg‎

Lines changed: 20 additions & 0 deletions
Loading

‎llcomNext/LLCOM/Assets/llcom-logo.ico‎

-14.4 KB
Binary file not shown.

‎llcomNext/LLCOM/LLCOM.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
9-
<ApplicationIcon>Assets\llcom-logo.ico</ApplicationIcon>
9+
<ApplicationIcon>Assets\Images\logo.ico</ApplicationIcon>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<Content Include="Assets\llcom-logo.ico" />
19+
<Content Include="Assets\Images\logo.ico" />
2020
</ItemGroup>
2121

2222

‎llcomNext/LLCOM/LLCOM.sln‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.5.2.0
4+
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LLCOM", "LLCOM.csproj", "{9210BBA1-F329-ED76-65C9-1FEDD8B33317}"
6+
EndProject
7+
Global
8+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9+
Debug|Any CPU = Debug|Any CPU
10+
Release|Any CPU = Release|Any CPU
11+
EndGlobalSection
12+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
13+
{9210BBA1-F329-ED76-65C9-1FEDD8B33317}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14+
{9210BBA1-F329-ED76-65C9-1FEDD8B33317}.Debug|Any CPU.Build.0 = Debug|Any CPU
15+
{9210BBA1-F329-ED76-65C9-1FEDD8B33317}.Release|Any CPU.ActiveCfg = Release|Any CPU
16+
{9210BBA1-F329-ED76-65C9-1FEDD8B33317}.Release|Any CPU.Build.0 = Release|Any CPU
17+
EndGlobalSection
18+
GlobalSection(SolutionProperties) = preSolution
19+
HideSolutionNode = FALSE
20+
EndGlobalSection
21+
GlobalSection(ExtensibilityGlobals) = postSolution
22+
SolutionGuid = {6C218B09-6538-4A59-9759-19A9F2993DC2}
23+
EndGlobalSection
24+
EndGlobal

‎llcomNext/LLCOM/Views/MainView.axaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<UserControl
2-
Background="{DynamicResource SemiColorBackground0}"
32
d:DesignHeight="800"
43
d:DesignWidth="1200"
54
mc:Ignorable="d"

‎llcomNext/LLCOM/Views/MainWindow.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Window
22
Height="800"
3-
Icon="/Assets/llcom-logo.ico"
3+
Icon="/Assets/Images/logo.ico"
44
MinHeight="300"
55
MinWidth="400"
66
Title="LLCOM Next"

‎llcomNext/LLCOM/Views/Pages/SettingPageView.axaml‎

Lines changed: 67 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,71 @@
1212
<Design.DataContext>
1313
<vm:SettingPageViewModel />
1414
</Design.DataContext>
15-
SettingPageView
15+
<TabControl>
16+
<TabItem Header="常规设置">
17+
<ScrollViewer>
18+
<StackPanel>
19+
<TextBlock Text="常规设置" />
20+
<ToggleSwitch />
21+
</StackPanel>
22+
</ScrollViewer>
23+
</TabItem>
24+
<TabItem Header="外观与字体" />
25+
<TabItem Header="日志与缓存" />
26+
<TabItem Header="关于软件" IsSelected="True">
27+
<ScrollViewer>
28+
<StackPanel Margin="10">
29+
<Border
30+
BorderBrush="{DynamicResource SemiColorBorder}"
31+
BorderThickness="3"
32+
CornerRadius="5"
33+
HorizontalAlignment="Center"
34+
Width="170">
35+
<Svg Margin="10" Path="/Assets/Images/logo.svg" />
36+
</Border>
37+
<TextBlock
38+
FontSize="25"
39+
HorizontalAlignment="Center"
40+
Margin="0,10,0,0"
41+
Text="LLCOM - Next" />
42+
<TextBlock
43+
FontSize="15"
44+
HorizontalAlignment="Center"
45+
Text="多功能调试工具" />
46+
47+
<Panel Margin="0,10,0,0">
48+
<Button Content="检查更新" />
49+
<ProgressBar
50+
Height="30"
51+
IsIndeterminate="True"
52+
Maximum="100"
53+
Minimum="0"
54+
Theme="{DynamicResource ProgressRing}"
55+
Width="30" />
56+
</Panel>
57+
58+
<TextBlock Margin="0,20,0,0" TextWrapping="Wrap">
59+
支持串口、网络、USB等调试工具与自动化脚本，提供一个简单易用的调试工具。
60+
</TextBlock>
61+
<TextBlock TextWrapping="Wrap">
62+
软件支持跨平台，为各平台用户提供一致的体验。
63+
</TextBlock>
64+
<TextBlock Margin="0,5,0,0" Text="本软件为开源项目" />
65+
<HyperlinkButton
66+
Classes="WithIcon Underline"
67+
Content="LLCOM Next GitHub源码仓库"
68+
Height="20"
69+
NavigateUri="https://github.com/chenxuuu/llcom/tree/next" />
70+
71+
<TextBox
72+
AcceptsReturn="True"
73+
FontSize="15"
74+
IsReadOnly="True"
75+
Margin="0,20,0,0"
76+
Text="LLCOM 2.0.0&#13;Window 10 21H1&#13;用来展示系统和软件版本信息&#13;xxx"
77+
TextWrapping="Wrap" />
78+
</StackPanel>
79+
</ScrollViewer>
80+
</TabItem>
81+
</TabControl>
1682
</UserControl>

0 commit comments

Comments
 (0)