Skip to content

Commit a37d65a

Browse files
committed
Add font settings and update checks
1 parent ad62bde commit a37d65a

16 files changed

Lines changed: 1021 additions & 10 deletions

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
build/
22
.vs/
3-
.vscode/
3+
.vscode/*
4+
!.vscode/launch.json
5+
!.vscode/tasks.json
46
CMakeUserPresets.json
57
*.user
68
*.autosave

.vscode/launch.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": "Debug FluentSerialAssistant",
6+
"type": "cppdbg",
7+
"request": "launch",
8+
"program": "${workspaceFolder}/build/vscode-debug/FluentSerialAssistant",
9+
"args": [],
10+
"stopAtEntry": false,
11+
"cwd": "${workspaceFolder}",
12+
"environment": [],
13+
"externalConsole": false,
14+
"MIMode": "gdb",
15+
"preLaunchTask": "Build FluentSerialAssistant (Debug)",
16+
"linux": {
17+
"program": "${workspaceFolder}/build/vscode-debug/FluentSerialAssistant",
18+
"MIMode": "gdb"
19+
},
20+
"osx": {
21+
"program": "${workspaceFolder}/build/vscode-debug/FluentSerialAssistant.app/Contents/MacOS/FluentSerialAssistant",
22+
"MIMode": "lldb"
23+
},
24+
"windows": {
25+
"program": "${workspaceFolder}/build/mingw-debug/FluentSerialAssistant.exe",
26+
"MIMode": "gdb",
27+
"miDebuggerPath": "C:/Qt/Tools/mingw1310_64/bin/gdb.exe"
28+
}
29+
}
30+
]
31+
}

.vscode/tasks.json

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "Configure FluentSerialAssistant (Debug)",
6+
"type": "shell",
7+
"command": "cmake",
8+
"args": [
9+
"-S",
10+
"${workspaceFolder}",
11+
"-B",
12+
"${workspaceFolder}/build/vscode-debug",
13+
"-G",
14+
"Ninja",
15+
"-DCMAKE_BUILD_TYPE=Debug"
16+
],
17+
"windows": {
18+
"args": [
19+
"--preset",
20+
"mingw-debug"
21+
]
22+
},
23+
"problemMatcher": []
24+
},
25+
{
26+
"label": "Build FluentSerialAssistant (Debug)",
27+
"type": "shell",
28+
"command": "cmake",
29+
"args": [
30+
"--build",
31+
"${workspaceFolder}/build/vscode-debug",
32+
"--parallel"
33+
],
34+
"windows": {
35+
"args": [
36+
"--build",
37+
"--preset",
38+
"mingw-debug",
39+
"--parallel"
40+
]
41+
},
42+
"dependsOn": [
43+
"Configure FluentSerialAssistant (Debug)"
44+
],
45+
"dependsOrder": "sequence",
46+
"group": {
47+
"kind": "build",
48+
"isDefault": true
49+
},
50+
"problemMatcher": "$gcc"
51+
},
52+
{
53+
"label": "Configure FluentSerialAssistant (Release)",
54+
"type": "shell",
55+
"command": "cmake",
56+
"args": [
57+
"-S",
58+
"${workspaceFolder}",
59+
"-B",
60+
"${workspaceFolder}/build/vscode-release",
61+
"-G",
62+
"Ninja",
63+
"-DCMAKE_BUILD_TYPE=MinSizeRel"
64+
],
65+
"windows": {
66+
"args": [
67+
"--preset",
68+
"mingw-release"
69+
]
70+
},
71+
"problemMatcher": []
72+
},
73+
{
74+
"label": "Build FluentSerialAssistant (Release)",
75+
"type": "shell",
76+
"command": "cmake",
77+
"args": [
78+
"--build",
79+
"${workspaceFolder}/build/vscode-release",
80+
"--parallel"
81+
],
82+
"windows": {
83+
"args": [
84+
"--build",
85+
"--preset",
86+
"mingw-release",
87+
"--parallel"
88+
]
89+
},
90+
"dependsOn": [
91+
"Configure FluentSerialAssistant (Release)"
92+
],
93+
"dependsOrder": "sequence",
94+
"problemMatcher": "$gcc"
95+
}
96+
]
97+
}

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22

33
本项目遵循面向用户的变更记录格式。版本号在正式发布前可能继续调整。
44

5+
## [0.1.2] - 2026-07-08
6+
7+
### 新增
8+
9+
- 设置页支持界面字体、终端字体和终端字号配置。
10+
- 支持导入 TTF、OTF、TTC 自定义字体,并在启动时自动加载。
11+
- 支持检查 GitHub Releases 中的最新应用版本。
12+
- 增加 VS Code 一键构建和调试配置。
13+
14+
### 修复
15+
16+
- 修复终端字号被 FluentQtWidgets 默认 TextBrowser 样式覆盖导致不生效的问题。
17+
518
## [0.1.1] - 2026-07-08
619

720
### 修复

CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.21)
22

33
project(
44
FluentSerialAssistant
5-
VERSION 0.1.1
5+
VERSION 0.1.2
66
DESCRIPTION "A Fluent Qt serial assistant prototype"
77
LANGUAGES CXX
88
)
@@ -20,7 +20,7 @@ if(MINGW)
2020
string(APPEND CMAKE_EXE_LINKER_FLAGS_MINSIZEREL " -Wl,--gc-sections -s")
2121
endif()
2222

23-
find_package(Qt6 6.5 REQUIRED COMPONENTS Core Gui Widgets SerialPort Svg)
23+
find_package(Qt6 6.5 REQUIRED COMPONENTS Core Gui Widgets SerialPort Svg Network)
2424

2525
set(FLUENTQTWIDGETS_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/third_party/FluentQtWidgets" CACHE PATH "Path to FluentQtWidgets checkout")
2626
if(NOT EXISTS "${FLUENTQTWIDGETS_ROOT}/CMakeLists.txt")
@@ -38,8 +38,12 @@ set(FQW_COMPACT_BUILD ON CACHE BOOL "" FORCE)
3838
add_subdirectory("${FLUENTQTWIDGETS_ROOT}" "${CMAKE_BINARY_DIR}/_deps/fluentqtwidgets")
3939

4040
add_executable(FluentSerialAssistant
41+
src/app/core/font_preferences.cpp
42+
src/app/core/font_preferences.h
4143
src/app/core/hex_utils.cpp
4244
src/app/core/hex_utils.h
45+
src/app/core/update_checker.cpp
46+
src/app/core/update_checker.h
4347
src/app/serial/serial_controller.cpp
4448
src/app/serial/serial_controller.h
4549
src/app/view/app_page.cpp
@@ -72,6 +76,7 @@ target_link_libraries(FluentSerialAssistant
7276
Qt6::Gui
7377
Qt6::Widgets
7478
Qt6::SerialPort
79+
Qt6::Network
7580
FluentQtWidgets::Widgets
7681
)
7782

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@ Fluent 串口助手是一个基于 C++17、Qt 6 Widgets 和 FluentQtWidgets 的
3232
- 数据发送:支持文本和 HEX 发送,支持 None、CR、LF、CRLF 行结束符。
3333
- 发送历史:保留最近 20 条唯一发送记录。
3434
- 循环发送:支持毫秒级发送间隔。
35+
- 应用更新:可检查 GitHub Releases 中的最新应用版本。
3536
- 导出记录:支持 TXT、CSV、BIN。
3637
- 接收保存:可将接收原始数据保存到文件。
3738
- 外观设置:支持浅色、深色、跟随系统主题和主题色配置。
39+
- 字体设置:支持界面字体、终端等宽字体、终端字号和 TTF/OTF/TTC 自定义字体导入。
3840

3941
## 预览状态
4042

@@ -131,6 +133,16 @@ cmake --build --preset mingw-release --parallel
131133

132134
如果链接时报 `cannot open output file FluentSerialAssistant.exe: Permission denied`,通常是旧程序仍在运行,请关闭后重新构建。
133135

136+
### VS Code 一键构建
137+
138+
仓库内置 `.vscode/tasks.json`,在 VS Code 中打开项目后可直接使用:
139+
140+
- `Ctrl+Shift+B` / `Cmd+Shift+B`:执行默认 Debug 构建任务。
141+
- `Terminal > Run Build Task...`:选择 Debug 或 Release 构建任务。
142+
- `Run and Debug > Debug FluentSerialAssistant``F5`:构建 Debug 版本并启动调试。
143+
144+
Windows 下任务复用 `CMakePresets.json` 中的 MinGW 预设;macOS 和 Linux 下任务使用 `build/vscode-debug``build/vscode-release` 目录执行 Ninja 构建。
145+
134146
## 打包发布
135147

136148
Windows 紧凑发布包:

0 commit comments

Comments
 (0)