Skip to content

Commit 6ee6b67

Browse files
chenxuuuchenxuuu
committed
add: 几个终端主题与展示方式
1 parent 4b82fa1 commit 6ee6b67

File tree

8 files changed

+642
-11
lines changed

8 files changed

+642
-11
lines changed

‎llcomNext/LLCOM/App.axaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<u-semi:SemiTheme Locale="zh-CN" />
1818
<StyleInclude Source="/Styles/MainStyle.axaml" />
1919
<StyleInclude Source="/Controls/PacketDataControl.axaml" />
20+
<StyleInclude Source="/Controls/TerminalColorPriview.axaml" />
2021
</Application.Styles>
2122

2223
<Application.Resources>

‎llcomNext/LLCOM/Controls/TerminalColorPriview.axaml‎

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
<Styles
2+
xmlns="https://github.com/avaloniaui"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:controls="using:LLCOM.Controls"
5+
xmlns:services="clr-namespace:LLCOM.Services">
6+
<Design.PreviewWith>
7+
<Panel Background="LightSalmon">
8+
<StackPanel
9+
Width="250"
10+
Margin="5"
11+
Spacing="2">
12+
<TerminalColorPriview MainColor="{x:Static services:TerminalColorSchemes.Campbell_Powershell}" />
13+
<TerminalColorPriview MainColor="{x:Static services:TerminalColorSchemes.One_Half_Dark}" />
14+
<TerminalColorPriview MainColor="{x:Static services:TerminalColorSchemes.Campbell}" />
15+
<TerminalColorPriview MainColor="{x:Static services:TerminalColorSchemes.One_Half_Light}" />
16+
<TerminalColorPriview MainColor="{x:Static services:TerminalColorSchemes.IBM_5153}" />
17+
<TerminalColorPriview MainColor="{x:Static services:TerminalColorSchemes.Tango_Light}" />
18+
</StackPanel>
19+
</Panel>
20+
</Design.PreviewWith>
21+
22+
<Style Selector="Border.PreviewSquare">
23+
<Setter Property="CornerRadius" Value="1" />
24+
<Setter Property="Margin" Value="1.2 1.1 0 0" />
25+
</Style>
26+
<Style Selector="controls|TerminalColorPriview">
27+
<!-- Set Defaults -->
28+
<Setter Property="Template">
29+
<ControlTemplate>
30+
<Border
31+
Height="30"
32+
MinWidth="200"
33+
Background="{Binding MainColor.Background, RelativeSource={RelativeSource TemplatedParent}}"
34+
CornerRadius="4">
35+
<Grid ColumnDefinitions="Auto *">
36+
<TextBlock
37+
Grid.Column="1"
38+
Margin="5,0,0,0"
39+
VerticalAlignment="Center"
40+
FontFamily="{Binding TerminalFontFamily, Source={x:Static services:Utils.Setting}}"
41+
Foreground="{Binding MainColor.Foreground, RelativeSource={RelativeSource TemplatedParent}}"
42+
Text="{Binding MainColor.Name, RelativeSource={RelativeSource TemplatedParent}}" />
43+
<Grid
44+
Margin="5,0,0,0"
45+
VerticalAlignment="Center"
46+
ColumnDefinitions="9 9 9 9 9 9 9 9"
47+
RowDefinitions="9 9">
48+
<Border
49+
Grid.Row="0"
50+
Grid.Column="0"
51+
Background="{Binding MainColor.Code40, RelativeSource={RelativeSource TemplatedParent}}"
52+
Classes="PreviewSquare" />
53+
<Border
54+
Grid.Row="0"
55+
Grid.Column="1"
56+
Background="{Binding MainColor.Code41, RelativeSource={RelativeSource TemplatedParent}}"
57+
Classes="PreviewSquare" />
58+
<Border
59+
Grid.Row="0"
60+
Grid.Column="2"
61+
Background="{Binding MainColor.Code42, RelativeSource={RelativeSource TemplatedParent}}"
62+
Classes="PreviewSquare" />
63+
<Border
64+
Grid.Row="0"
65+
Grid.Column="3"
66+
Background="{Binding MainColor.Code43, RelativeSource={RelativeSource TemplatedParent}}"
67+
Classes="PreviewSquare" />
68+
<Border
69+
Grid.Row="0"
70+
Grid.Column="4"
71+
Background="{Binding MainColor.Code44, RelativeSource={RelativeSource TemplatedParent}}"
72+
Classes="PreviewSquare" />
73+
<Border
74+
Grid.Row="0"
75+
Grid.Column="5"
76+
Background="{Binding MainColor.Code45, RelativeSource={RelativeSource TemplatedParent}}"
77+
Classes="PreviewSquare" />
78+
<Border
79+
Grid.Row="0"
80+
Grid.Column="6"
81+
Background="{Binding MainColor.Code46, RelativeSource={RelativeSource TemplatedParent}}"
82+
Classes="PreviewSquare" />
83+
<Border
84+
Grid.Row="0"
85+
Grid.Column="7"
86+
Background="{Binding MainColor.Code47, RelativeSource={RelativeSource TemplatedParent}}"
87+
Classes="PreviewSquare" />
88+
<Border
89+
Grid.Row="1"
90+
Grid.Column="0"
91+
Background="{Binding MainColor.Code30, RelativeSource={RelativeSource TemplatedParent}}"
92+
Classes="PreviewSquare" />
93+
<Border
94+
Grid.Row="1"
95+
Grid.Column="1"
96+
Background="{Binding MainColor.Code31, RelativeSource={RelativeSource TemplatedParent}}"
97+
Classes="PreviewSquare" />
98+
<Border
99+
Grid.Row="1"
100+
Grid.Column="2"
101+
Background="{Binding MainColor.Code32, RelativeSource={RelativeSource TemplatedParent}}"
102+
Classes="PreviewSquare" />
103+
<Border
104+
Grid.Row="1"
105+
Grid.Column="3"
106+
Background="{Binding MainColor.Code33, RelativeSource={RelativeSource TemplatedParent}}"
107+
Classes="PreviewSquare" />
108+
<Border
109+
Grid.Row="1"
110+
Grid.Column="4"
111+
Background="{Binding MainColor.Code34, RelativeSource={RelativeSource TemplatedParent}}"
112+
Classes="PreviewSquare" />
113+
<Border
114+
Grid.Row="1"
115+
Grid.Column="5"
116+
Background="{Binding MainColor.Code35, RelativeSource={RelativeSource TemplatedParent}}"
117+
Classes="PreviewSquare" />
118+
<Border
119+
Grid.Row="1"
120+
Grid.Column="6"
121+
Background="{Binding MainColor.Code36, RelativeSource={RelativeSource TemplatedParent}}"
122+
Classes="PreviewSquare" />
123+
<Border
124+
Grid.Row="1"
125+
Grid.Column="7"
126+
Background="{Binding MainColor.Code37, RelativeSource={RelativeSource TemplatedParent}}"
127+
Classes="PreviewSquare" />
128+
</Grid>
129+
</Grid>
130+
</Border>
131+
</ControlTemplate>
132+
</Setter>
133+
</Style>
134+
</Styles>

‎llcomNext/LLCOM/Controls/TerminalColorPriview.axaml.cs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using Avalonia;
2+
using Avalonia.Controls;
3+
using Avalonia.Controls.Primitives;
4+
using LLCOM.Models;
5+
6+
namespace LLCOM.Controls;
7+
8+
public class TerminalColorPriview : TemplatedControl
9+
{
10+
//主题色
11+
public static readonly StyledProperty<TerminalColorScheme?> MainColorProperty =
12+
AvaloniaProperty.Register<PacketDataControl, TerminalColorScheme?>(nameof(MainColor));
13+
public TerminalColorScheme? MainColor
14+
{
15+
get => GetValue(MainColorProperty);
16+
set => SetValue(MainColorProperty, value);
17+
}
18+
}

‎llcomNext/LLCOM/Models/TerminalColorScheme.cs‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
using Avalonia.Media;
2+
3+
namespace LLCOM.Models;
4+
5+
public class TerminalColorScheme(string name)
6+
{
7+
public string Name { get; set; } = name;
8+
9+
public required IBrush Foreground { get; set; }
10+
public required IBrush Background { get; set; }
11+
public required IBrush Cursor { get; set; }
12+
public required IBrush SelectionBackground { get; set; }
13+
14+
//black
15+
public required IBrush Code40 { get; set; }
16+
//red
17+
public required IBrush Code41 { get; set; }
18+
//green
19+
public required IBrush Code42 { get; set; }
20+
//yellow
21+
public required IBrush Code43 { get; set; }
22+
//blue
23+
public required IBrush Code44 { get; set; }
24+
//purple
25+
public required IBrush Code45 { get; set; }
26+
//cyan
27+
public required IBrush Code46 { get; set; }
28+
//white
29+
public required IBrush Code47 { get; set; }
30+
31+
//bright black
32+
public required IBrush Code30 { get; set; }
33+
//bright red
34+
public required IBrush Code31 { get; set; }
35+
//bright green
36+
public required IBrush Code32 { get; set; }
37+
//bright yellow
38+
public required IBrush Code33 { get; set; }
39+
//bright blue
40+
public required IBrush Code34 { get; set; }
41+
//bright purple
42+
public required IBrush Code35 { get; set; }
43+
//bright cyan
44+
public required IBrush Code36 { get; set; }
45+
//bright white
46+
public required IBrush Code37 { get; set; }
47+
}

‎llcomNext/LLCOM/Services/Setting.cs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,31 @@ public FontFamily? PacketExtraFontFamily
118118
//字体名称
119119
[ObservableProperty]
120120
private string _packetExtraFont = Database.Get(nameof(PacketExtraFont), "").Result;
121+
///////////终端模式下的字体
122+
public FontFamily? TerminalFontFamily
123+
{
124+
get
125+
{
126+
if(string.IsNullOrEmpty(TerminalFont))
127+
TerminalFont = Utils.CheckFontName(TerminalFont);
128+
return TerminalFont;
129+
}
130+
set
131+
{
132+
if (value is null)
133+
return;
134+
TerminalFont = value.Name;
135+
OnPropertyChanged();
136+
}
137+
}
138+
//字体名称
139+
[ObservableProperty]
140+
private string _terminalFont = Database.Get(nameof(TerminalFont), "").Result;
141+
142+
//终端模式的主题
143+
[ObservableProperty]
144+
private int _terminalTheme = Database.Get(nameof(TerminalTheme), 0).Result;
145+
121146

122147

123148
public Setting()
@@ -134,6 +159,7 @@ public Setting()
134159
nameof(PacketHexFontFamily),
135160
nameof(PacketHeaderFontFamily),
136161
nameof(PacketExtraFontFamily),
162+
nameof(TerminalFontFamily),
137163
];
138164
if (name == null || dismissList.Contains(name))
139165
return;

0 commit comments

Comments
 (0)