mirror of
https://github.com/zhuzichu520/FluentUI.git
synced 2025-04-03 21:25:05 +08:00
Compare commits
171 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
b4a1eaa860 | ||
|
ef1f70683a | ||
|
8377fb5227 | ||
|
9ac58a8ca7 | ||
|
ee87a718ed | ||
|
80dd3ebd35 | ||
|
1990203f3b | ||
|
df7cd94eec | ||
|
2cc17e9db3 | ||
|
aa8fcb304f | ||
|
882cc8989f | ||
|
444cc1aeee | ||
|
db0588edcd | ||
|
99f6b16aa1 | ||
|
65b7737454 | ||
|
7a6efa41fb | ||
|
113810879d | ||
|
09e0430293 | ||
|
29686d07ba | ||
|
7204e18afe | ||
|
985e90bffc | ||
|
e82000e6f8 | ||
|
444d9b2d28 | ||
|
1a8e3d5ab2 | ||
|
fb720b29ec | ||
|
552772391c | ||
|
3a34e98d80 | ||
|
1beb900455 | ||
|
bb537f4328 | ||
|
2f38232dcf | ||
|
cd6a46c22e | ||
|
a8ca78f3f1 | ||
|
282b6ebce0 | ||
|
d13c5a9c2c | ||
|
2a639022ec | ||
|
d75ecfeca7 | ||
|
8ab0cde2e9 | ||
|
0171c3609a | ||
|
489526988d | ||
|
9d32e8e13b | ||
|
c9e0732f99 | ||
|
4920407ed7 | ||
|
3647197d3b | ||
|
a72ff03eeb | ||
|
3eaaa228d8 | ||
|
e0892fdb66 | ||
|
8f5fbb4053 | ||
|
b5295ffe4c | ||
|
d82e0ed529 | ||
|
5c63b7b73a | ||
|
77a5c347fc | ||
|
add1a86376 | ||
|
e771293269 | ||
|
4420c6c608 | ||
|
a3b4c6cb28 | ||
|
29fe40002c | ||
|
1797276e52 | ||
|
d07de0d33c | ||
|
fb8c0b79b3 | ||
|
80eadd5d19 | ||
|
8ef4bbe322 | ||
|
901ca8077e | ||
|
8de79d3336 | ||
|
dbde052d4a | ||
|
9716c3c98c | ||
|
8f8a1a6124 | ||
|
12300ef081 | ||
|
5ea71e2c1a | ||
|
a26f643ba3 | ||
|
4b49fb1340 | ||
|
3e28c42e1c | ||
|
50b89e7eb2 | ||
|
893000e40f | ||
|
f2eca9a2b9 | ||
|
76f40a6265 | ||
|
86f347edad | ||
|
b6c7afc744 | ||
|
f099d3c737 | ||
|
cfbaf44a05 | ||
|
0f5e16464c | ||
|
13bfae4681 | ||
|
2ee9bfed73 | ||
|
4a457e15fa | ||
|
b723cfec4e | ||
|
1b92928487 | ||
|
4e4016ae3f | ||
|
78312d7bb5 | ||
|
a2faf8479d | ||
|
06775a97c7 | ||
|
45852bed28 | ||
|
5794d8d9ce | ||
|
8d1ee6fc36 | ||
|
1dc726a61a | ||
|
2f4b4ee85e | ||
|
0803042e90 | ||
|
7c4cfceb8f | ||
|
41a1775cee | ||
|
fdaaa85541 | ||
|
649edbea0d | ||
|
155307fe6a | ||
|
6feaf80991 | ||
|
68462706e2 | ||
|
4fd979e8ce | ||
|
78ee7258ce | ||
|
b11fccd758 | ||
|
a3fa54a02b | ||
|
97af2d7126 | ||
|
2c288e830e | ||
|
fa14f5824d | ||
|
c05222bd81 | ||
|
2b528a7072 | ||
|
436ae3f8df | ||
|
012f30c979 | ||
|
ef65183320 | ||
|
2e379fcd7e | ||
|
0a8732c91b | ||
|
b98c5d327a | ||
|
7163c739c2 | ||
|
5cfd9824a8 | ||
|
a27554bfb2 | ||
|
7a67ccc1e1 | ||
|
39f58278ff | ||
|
354f7f2e3e | ||
|
876b230141 | ||
|
2367c6978a | ||
|
6b941697b0 | ||
|
4997b991db | ||
|
cd3abc01e9 | ||
|
e6c4b79298 | ||
|
f830d5a9bf | ||
|
ed49e3f6af | ||
|
9aa6615189 | ||
|
c36515f19c | ||
|
402579f32a | ||
|
655eff4f62 | ||
|
b916221d9f | ||
|
4cca680029 | ||
|
fe2543ab4d | ||
|
394a42cb94 | ||
|
ac253a3de5 | ||
|
0d61e33ef1 | ||
|
132ab12c32 | ||
|
af270951da | ||
|
18685b17ec | ||
|
0eb4d9f346 | ||
|
8015dcc2f1 | ||
|
0b1755e9eb | ||
|
e471d5a230 | ||
|
f922978338 | ||
|
91bda2a22c | ||
|
6638fe2e06 | ||
|
bf001d99d2 | ||
|
30531079b5 | ||
|
a746bc2684 | ||
|
96a6d0e7fa | ||
|
c733f3c60e | ||
|
effd9f3058 | ||
|
d93aac3518 | ||
|
5f6745b630 | ||
|
4f202831b8 | ||
|
29cee84edd | ||
|
2d4e61445e | ||
|
cc79854191 | ||
|
500efa6298 | ||
|
355332da96 | ||
|
a0d662a8a5 | ||
|
aecc3fe3b4 | ||
|
3554fb99cd | ||
|
24fdff7e35 | ||
|
d2fdd08604 | ||
|
1f5d6ce1aa |
130
.clang-format
Normal file
130
.clang-format
Normal file
@ -0,0 +1,130 @@
|
|||||||
|
# References:
|
||||||
|
# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
|
||||||
|
# https://code.qt.io/cgit/qt/qt5.git/tree/_clang-format
|
||||||
|
|
||||||
|
BasedOnStyle: LLVM
|
||||||
|
|
||||||
|
Standard: c++17
|
||||||
|
|
||||||
|
# 指针和引用的对齐方式。
|
||||||
|
# 可能的值有:
|
||||||
|
# PAS_Left (在配置中: Left) 指针左对齐。
|
||||||
|
# PAS_Right (在配置中: Right) 指针右对齐。
|
||||||
|
# PAS_Middle (在配置中: Middle) 指针中间对齐。
|
||||||
|
PointerAlignment: Right
|
||||||
|
|
||||||
|
# public/protected/private 等访问修饰符偏移量
|
||||||
|
AccessModifierOffset: -4
|
||||||
|
|
||||||
|
# 缩进长度
|
||||||
|
IndentWidth: 4
|
||||||
|
|
||||||
|
# 连续空行的最大数
|
||||||
|
MaxEmptyLinesToKeep: 999
|
||||||
|
|
||||||
|
# 在OC中的@property后面添加一个空格。例如:使用“@property (readonly)”而不是“@property(readonly)”
|
||||||
|
ObjCSpaceAfterProperty: true
|
||||||
|
|
||||||
|
# OC块中所拍的字符数
|
||||||
|
ObjCBlockIndentWidth: 4
|
||||||
|
|
||||||
|
# 取决于值, 语句“int f() { return 0; }”可以被放到一个单行。
|
||||||
|
# 可能的值有:
|
||||||
|
# SFS_None (在配置中: None) 从不合并方法或函数到单独的一行。
|
||||||
|
# SFS_Empty (在配置中: Empty) 仅合并空的函数。
|
||||||
|
# SFS_Inline (在配置中: Inline) 仅合并类中定义的方法或函数. 意味着 “empty”.
|
||||||
|
# SFS_All (在配置中: All) 合并所有的方法适应单行.
|
||||||
|
AllowShortFunctionsOnASingleLine: None
|
||||||
|
|
||||||
|
# 如果为真(true), 语句“if (a) return;” 能被放到单行。
|
||||||
|
AllowShortIfStatementsOnASingleLine: false
|
||||||
|
|
||||||
|
# 如果为真(true), 对齐注释。
|
||||||
|
AlignTrailingComments: true
|
||||||
|
|
||||||
|
# 如果为真,对齐连续的宏定义
|
||||||
|
AlignConsecutiveMacros: true
|
||||||
|
|
||||||
|
# 如果为真(true),将会在“[”之后和“]”之前插入空格。
|
||||||
|
SpacesInSquareBrackets: false
|
||||||
|
|
||||||
|
# 如果为真(true), 将会在“(”之后和“)”之前插入空格。
|
||||||
|
SpacesInParentheses : false
|
||||||
|
|
||||||
|
# 如果为真(true), 校准连续的声明。
|
||||||
|
# 这将会校准连续多行的声明的名字。这将会导致像下面这样的格式:
|
||||||
|
# int aaaa = 12;
|
||||||
|
# float b = 23;
|
||||||
|
# std::string ccc = 23;
|
||||||
|
AlignConsecutiveDeclarations: false
|
||||||
|
|
||||||
|
# 如果为真(true),连续调整多行
|
||||||
|
# 这将会调整连续行中的分配操作符。这将会导致像下面这样的格式:
|
||||||
|
# int aaaa = 12;
|
||||||
|
# int b = 23;
|
||||||
|
# int ccc = 23;
|
||||||
|
AlignConsecutiveAssignments: false
|
||||||
|
|
||||||
|
# 如果为假(false),移除分配操作符(=)前空格。
|
||||||
|
SpaceBeforeAssignmentOperators: true
|
||||||
|
|
||||||
|
# 如果为真(true), 将会在字面量容器中插入空格(例如 OC和Javascript的数组和字典字面量)。
|
||||||
|
SpacesInContainerLiterals: false
|
||||||
|
|
||||||
|
# 缩进case标签
|
||||||
|
IndentCaseLabels: true
|
||||||
|
|
||||||
|
# 如果表达式中包含函数调用,并且函数调用因为表达式太长被放到了下一行,是否缩进
|
||||||
|
IndentWrappedFunctionNames: true
|
||||||
|
|
||||||
|
# 如果为真(true), 保持块的起始空行。
|
||||||
|
# true: false:
|
||||||
|
# if (foo) { vs. if (foo) {
|
||||||
|
# bar();
|
||||||
|
# bar(); }
|
||||||
|
# }
|
||||||
|
KeepEmptyLinesAtTheStartOfBlocks: true
|
||||||
|
|
||||||
|
# 允许所有参数都被放在下一行
|
||||||
|
AllowAllParametersOfDeclarationOnNextLine: false
|
||||||
|
|
||||||
|
# 使用C风格强制类型转换后,是否在中间添加一个空格
|
||||||
|
SpaceAfterCStyleCast: true
|
||||||
|
|
||||||
|
# 在模板定义后换行
|
||||||
|
AlwaysBreakTemplateDeclarations: Yes
|
||||||
|
|
||||||
|
# Tab长度
|
||||||
|
TabWidth: 4
|
||||||
|
|
||||||
|
# 是否使用Tab
|
||||||
|
UseTab: Never
|
||||||
|
|
||||||
|
# 在括号后对齐参数
|
||||||
|
# someLongFunction(argument1,
|
||||||
|
# argument2);
|
||||||
|
AlignAfterOpenBracket: Align
|
||||||
|
|
||||||
|
# 名字空间内部缩进
|
||||||
|
NamespaceIndentation: All
|
||||||
|
|
||||||
|
# 一行最长列数
|
||||||
|
ColumnLimit: 100
|
||||||
|
|
||||||
|
# 按层次缩进宏定义
|
||||||
|
IndentPPDirectives: AfterHash
|
||||||
|
|
||||||
|
# 预处理语句缩进为 2
|
||||||
|
PPIndentWidth: 2
|
||||||
|
|
||||||
|
# 数组元素对齐
|
||||||
|
AlignArrayOfStructures: Left
|
||||||
|
|
||||||
|
# 不对头文件排序
|
||||||
|
SortIncludes: Never
|
||||||
|
|
||||||
|
FixNamespaceComments: false
|
||||||
|
|
||||||
|
StatementMacros: ['__qas_attr__', '__qas_exclude__', '__qas_include__']
|
||||||
|
|
||||||
|
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]
|
2
.github/workflows/macos.yml
vendored
2
.github/workflows/macos.yml
vendored
@ -60,7 +60,7 @@ jobs:
|
|||||||
# 拷贝依赖
|
# 拷贝依赖
|
||||||
sudo macdeployqt bin/Release/${targetName}.app -qmldir=. -dmg
|
sudo macdeployqt bin/Release/${targetName}.app -qmldir=. -dmg
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v2
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}
|
name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}
|
||||||
path: bin/release/${{ env.targetName }}.app
|
path: bin/release/${{ env.targetName }}.app
|
||||||
|
7
.github/workflows/ubuntu.yml
vendored
7
.github/workflows/ubuntu.yml
vendored
@ -69,6 +69,11 @@ jobs:
|
|||||||
- name: Check if svg file exists
|
- name: Check if svg file exists
|
||||||
run: if [ ! -f "${targetName}.svg" ]; then echo "File not found, creating..."; touch ${targetName}.svg; fi
|
run: if [ ! -f "${targetName}.svg" ]; then echo "File not found, creating..."; touch ${targetName}.svg; fi
|
||||||
|
|
||||||
|
- name: Copy translation files
|
||||||
|
run: |
|
||||||
|
mkdir -p bin/release/usr/bin/
|
||||||
|
cp -r bin/Release/i18n/ bin/release/usr/bin/i18n/
|
||||||
|
|
||||||
- name: package
|
- name: package
|
||||||
run: |
|
run: |
|
||||||
# make sure Qt plugin finds QML sources so it can deploy the imported files
|
# make sure Qt plugin finds QML sources so it can deploy the imported files
|
||||||
@ -77,7 +82,7 @@ jobs:
|
|||||||
linuxdeploy-x86_64.AppImage --plugin=qt --output=appimage --create-desktop-file --icon-file=${targetName}.svg --executable=bin/Release/${targetName} --appdir bin/release/
|
linuxdeploy-x86_64.AppImage --plugin=qt --output=appimage --create-desktop-file --icon-file=${targetName}.svg --executable=bin/Release/${targetName} --appdir bin/release/
|
||||||
mv ${{ env.targetName }}-*.AppImage ${{ env.targetName }}.AppImage
|
mv ${{ env.targetName }}-*.AppImage ${{ env.targetName }}.AppImage
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v2
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}
|
name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}
|
||||||
path: ${{ env.targetName }}.AppImage
|
path: ${{ env.targetName }}.AppImage
|
||||||
|
2
.github/workflows/windows-mingw.yml
vendored
2
.github/workflows/windows-mingw.yml
vendored
@ -82,7 +82,7 @@ jobs:
|
|||||||
$name = ${env:archiveName}
|
$name = ${env:archiveName}
|
||||||
echo "::set-output name=packageName::$name"
|
echo "::set-output name=packageName::$name"
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v2
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: ${{ steps.package.outputs.packageName }}
|
name: ${{ steps.package.outputs.packageName }}
|
||||||
path: dist
|
path: dist
|
||||||
|
2
.github/workflows/windows-qt5.yml
vendored
2
.github/workflows/windows-qt5.yml
vendored
@ -69,7 +69,7 @@ jobs:
|
|||||||
$name = ${env:archiveName}
|
$name = ${env:archiveName}
|
||||||
echo "::set-output name=packageName::$name"
|
echo "::set-output name=packageName::$name"
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v2
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: ${{ steps.package.outputs.packageName }}
|
name: ${{ steps.package.outputs.packageName }}
|
||||||
path: dist
|
path: dist
|
||||||
|
2
.github/workflows/windows.yml
vendored
2
.github/workflows/windows.yml
vendored
@ -76,7 +76,7 @@ jobs:
|
|||||||
$name = ${env:archiveName}
|
$name = ${env:archiveName}
|
||||||
echo "::set-output name=packageName::$name"
|
echo "::set-output name=packageName::$name"
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v2
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: ${{ steps.package.outputs.packageName }}
|
name: ${{ steps.package.outputs.packageName }}
|
||||||
path: dist
|
path: dist
|
||||||
|
20
.vscode/settings.json
vendored
Normal file
20
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"MicroPython.executeButton": [
|
||||||
|
{
|
||||||
|
"text": "▶",
|
||||||
|
"tooltip": "运行",
|
||||||
|
"alignment": "left",
|
||||||
|
"command": "extension.executeFile",
|
||||||
|
"priority": 3.5
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"MicroPython.syncButton": [
|
||||||
|
{
|
||||||
|
"text": "$(sync)",
|
||||||
|
"tooltip": "同步",
|
||||||
|
"alignment": "left",
|
||||||
|
"command": "extension.execute",
|
||||||
|
"priority": 4
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
@ -13,7 +13,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.cmake/)
|
|||||||
include(GetGitRevisionDescription)
|
include(GetGitRevisionDescription)
|
||||||
|
|
||||||
option(FLUENTUI_BUILD_EXAMPLES "Build FluentUI demo applications." ON)
|
option(FLUENTUI_BUILD_EXAMPLES "Build FluentUI demo applications." ON)
|
||||||
set(FLUENTUI_BUILD_STATIC_LIB OFF)
|
option(FLUENTUI_BUILD_STATIC_LIB "Build static library." OFF)
|
||||||
|
|
||||||
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
|
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
|
||||||
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
|
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
|
||||||
|
71
README.md
71
README.md
@ -1,23 +1,23 @@
|
|||||||
|
# ATTENTION!
|
||||||
|
# PLEASE USE THE BRAND NEW [FluentUI Pro](https://github.com/zhuzichu520/FluentUI2) INSTEAD!
|
||||||
<div align=center>
|
<div align=center>
|
||||||
<img width=64 src="doc/preview/fluent_design.svg">
|
<img width=64 src="doc/preview/fluent_design.svg">
|
||||||
</div>
|
|
||||||
|
|
||||||
<h1 align="center">
|
# QML FluentUI
|
||||||
QML FluentUI
|
|
||||||
</h1>
|
A Fluent Design component library for Qt QML, You need PySide6 [PySide6-FluentUI-QML](https://github.com/zhuzichu520/PySide6-FluentUI-QML).
|
||||||
<p align="center">
|
|
||||||
A fluent design component library for Qt QML, You need Pyside6 <a href="https://github.com/zhuzichu520/PySide6-FluentUI-QML">PySide6-FluentUI-QML</a>。
|
</div>
|
||||||
</p>
|
|
||||||
|
|
||||||
![win-badge] ![ubuntu-badge] ![macos-badge] ![release-badge] ![download-badge] ![download-latest]
|
![win-badge] ![ubuntu-badge] ![macos-badge] ![release-badge] ![download-badge] ![download-latest]
|
||||||
|
|
||||||
<p align="center">
|
|
||||||
English | <a href="README_zh_CN.md">简体中文</a>
|
|
||||||
</p>
|
|
||||||
<div align=center>
|
<div align=center>
|
||||||
<img src="doc/preview/demo_large.png">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
English | [简体中文](README_zh_CN.md)
|
||||||
|
|
||||||
|
<img src="doc/preview/demo_large.png">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
[win-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AWindows "WindowsAction"
|
[win-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AWindows "WindowsAction"
|
||||||
[win-badge]: https://github.com/zhuzichu520/FluentUI/workflows/Windows/badge.svg "Windows"
|
[win-badge]: https://github.com/zhuzichu520/FluentUI/workflows/Windows/badge.svg "Windows"
|
||||||
@ -31,7 +31,6 @@ English | <a href="README_zh_CN.md">简体中文</a>
|
|||||||
[download-badge]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/total.svg "Download status"
|
[download-badge]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/total.svg "Download status"
|
||||||
[download-latest]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/latest/total.svg "latest status"
|
[download-latest]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/latest/total.svg "latest status"
|
||||||
|
|
||||||
|
|
||||||
<p align=center>
|
<p align=center>
|
||||||
This is a beautiful FluentUI component library based on Qt QML. Currently the main branch supports Qt 6. If you want to use it in Qt 5, checkout the Qt 5 branch.
|
This is a beautiful FluentUI component library based on Qt QML. Currently the main branch supports Qt 6. If you want to use it in Qt 5, checkout the Qt 5 branch.
|
||||||
</p>
|
</p>
|
||||||
@ -50,17 +49,17 @@ Use [Qt Online Installers](https://download.qt.io/archive/online_installers/) to
|
|||||||
|
|
||||||
+ run `example` program.
|
+ run `example` program.
|
||||||
|
|
||||||
or
|
or
|
||||||
|
|
||||||
+ Clone the repository.
|
+ Clone the repository.
|
||||||
|
|
||||||
```SHELL
|
```bash
|
||||||
git clone --recursive https://github.com/zhuzichu520/FluentUI.git
|
git clone --recursive https://github.com/zhuzichu520/FluentUI.git
|
||||||
```
|
```
|
||||||
|
|
||||||
+ Build
|
+ Build
|
||||||
|
|
||||||
```
|
```bash
|
||||||
git clone --recursive https://github.com/zhuzichu520/FluentUI.git
|
git clone --recursive https://github.com/zhuzichu520/FluentUI.git
|
||||||
cd FluentUI
|
cd FluentUI
|
||||||
mkdir build
|
mkdir build
|
||||||
@ -79,38 +78,35 @@ cmake --build . --config Release --target all --parallel
|
|||||||
|
|
||||||
+ Great! Now you are ready to write your first QML FluentUI program! Check the documentations for more details.
|
+ Great! Now you are ready to write your first QML FluentUI program! Check the documentations for more details.
|
||||||
|
|
||||||
|
|
||||||
## 📑 Documentations
|
## 📑 Documentations
|
||||||
|
|
||||||
(Work in progress...🚀)
|
(Work in progress...🚀)
|
||||||
|
|
||||||
## Supported components
|
## Supported components
|
||||||
|
|
||||||
|Catalog|Detail|Notes / Demos|
|
| Catalog | Detail | Notes / Demos |
|
||||||
|:----:|:----:|:----:|
|
| :-----------------: | :------------------------------: | :-------------------------------------------------: |
|
||||||
|FluApp|The initial entry of the program|Router supported(SPA)|
|
| FluApp | The initial entry of the program | Router supported(SPA) |
|
||||||
|FluWindow|Frameless Window|*This only works on windows|
|
| FluWindow | Frameless Window | *This only works on windows |
|
||||||
|FluAppBar|Title bar on top of the window|Drag, minimize, maximize and close are supported.|
|
| FluAppBar | Title bar on top of the window | Drag, minimize, maximize and close are supported. |
|
||||||
|FluText|Common text||
|
| FluText | Common text | |
|
||||||
|FluButton|Common button| |
|
| FluButton | Common button |  |
|
||||||
|FluFilledButton|Filled button||
|
| FluFilledButton | Filled button |  |
|
||||||
|FluTextButton|Text button||
|
| FluTextButton | Text button |  |
|
||||||
|FluToggleButton|Toggle buttons||
|
| FluToggleButton | Toggle buttons |  |
|
||||||
|FluIcon|Common icon||
|
| FluIcon | Common icon |  |
|
||||||
|FluRadioButton|radio button||
|
| FluRadioButton | radio button |  |
|
||||||
|FluTextBox|Single-line input box||
|
| FluTextBox | Single-line input box |  |
|
||||||
|FluMultiLineTextBox|Multi-lines input area||
|
| FluMultiLineTextBox | Multi-lines input area |  |
|
||||||
|FluToggleSwitch|toggle switch||
|
| FluToggleSwitch | toggle switch |  |
|
||||||
|
|
||||||
|
|
||||||
View more [`here`](doc/md/all_components.md)!
|
View more [`here`](doc/md/all_components.md)!
|
||||||
|
|
||||||
|
|
||||||
## Reference
|
## Reference
|
||||||
|
|
||||||
+ [**Windows design**: Design guidelines and toolkits of Microsoft.](https://learn.microsoft.com/en-us/windows/apps/design/)
|
+ [**Windows design**: Design guidelines and toolkits of Microsoft.](https://learn.microsoft.com/en-us/windows/apps/design/)
|
||||||
+ [**Microsoft/WinUI-Gallery**: Microsoft's demo](https://github.com/microsoft/WinUI-Gallery)
|
+ [**Microsoft/WinUI-Gallery**: Microsoft's demo](https://github.com/microsoft/WinUI-Gallery)
|
||||||
|
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
This FluentUI library currently licensed under [MIT License](./License)
|
This FluentUI library currently licensed under [MIT License](./License)
|
||||||
@ -120,4 +116,5 @@ This FluentUI library currently licensed under [MIT License](./License)
|
|||||||
[](https://star-history.com/#zhuzichu520/FluentUI&Date)
|
[](https://star-history.com/#zhuzichu520/FluentUI&Date)
|
||||||
|
|
||||||
## ⚡ Visitor count
|
## ⚡ Visitor count
|
||||||

|
|
||||||
|

|
||||||
|
163
README_zh_CN.md
163
README_zh_CN.md
@ -1,99 +1,118 @@
|
|||||||
# FluentUI
|
<div align=center>
|
||||||
|
<img width=64 src="doc/preview/fluent_design.svg">
|
||||||
|
|
||||||
## 简介
|
# QML FluentUI
|
||||||
|
|
||||||
这是一个漂亮的Fluent组件库,使用QML插件开发的。main分支是Qt6.4.3,<a href="https://github.com/zhuzichu520/FluentUI/wiki/%E6%96%B0%E6%89%8B%E5%85%A5%E9%97%A8" target="_blank">如何使用?</a>。如果需要qt5的请切换至qt5分支,<a href="https://github.com/zhuzichu520/FluentUI/wiki/%E6%96%B0%E6%89%8B%E5%85%A5%E9%97%A8%EF%BC%881.2.7%E4%BB%A5%E5%8F%8A%E4%B9%8B%E5%89%8D%E7%89%88%E6%9C%AC%EF%BC%89" target="_blank">如何使用?</a>
|
一个 Qt QML 的 Fluent Design 组件库,需要 PySide6 [PySide6-FluentUI-QML](https://github.com/zhuzichu520/PySide6-FluentUI-QML)。
|
||||||
|
|
||||||
## 编译状态
|
</div>
|
||||||
| [Windows][win-link]| [Ubuntu][ubuntu-link]|[MacOS][macos-link]|
|
|
||||||
|---------------|---------------|-----------------|
|
![win-badge] ![ubuntu-badge] ![macos-badge] ![release-badge] ![download-badge] ![download-latest]
|
||||||
| ![win-badge] | ![ubuntu-badge] | ![macos-badge] |
|
|
||||||
|
<div align=center>
|
||||||
|
|
||||||
|
[English](README.md) | 简体中文
|
||||||
|
|
||||||
|
<img src="doc/preview/demo_large.png">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
[win-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AWindows "WindowsAction"
|
[win-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AWindows "WindowsAction"
|
||||||
[win-badge]: https://github.com/zhuzichu520/FluentUI/workflows/Windows/badge.svg "Windows"
|
[win-badge]: https://github.com/zhuzichu520/FluentUI/workflows/Windows/badge.svg "Windows"
|
||||||
|
|
||||||
[ubuntu-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AUbuntu "UbuntuAction"
|
[ubuntu-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AUbuntu "UbuntuAction"
|
||||||
[ubuntu-badge]: https://github.com/zhuzichu520/FluentUI/workflows/Ubuntu/badge.svg "Ubuntu"
|
[ubuntu-badge]: https://github.com/zhuzichu520/FluentUI/workflows/Ubuntu/badge.svg "Ubuntu"
|
||||||
|
|
||||||
[macos-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AMacOS "MacOSAction"
|
[macos-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AMacOS "MacOSAction"
|
||||||
[macos-badge]: https://github.com/zhuzichu520/FluentUI/workflows/MacOS/badge.svg "MacOS"
|
[macos-badge]: https://github.com/zhuzichu520/FluentUI/workflows/MacOS/badge.svg "MacOS"
|
||||||
|
|
||||||
## 发布
|
|
||||||
|
|
||||||
|[已发布][release-link]|[下载][download-link]|下载次数|
|
|
||||||
|:--:|:--:|:--:|
|
|
||||||
|![release-badge] |![download-badge]|![download-latest]|
|
|
||||||
|
|
||||||
[release-link]: https://github.com/zhuzichu520/FluentUI/releases "Release status"
|
[release-link]: https://github.com/zhuzichu520/FluentUI/releases "Release status"
|
||||||
[release-badge]: https://img.shields.io/github/release/zhuzichu520/FluentUI.svg?style=flat-square "Release status"
|
[release-badge]: https://img.shields.io/github/release/zhuzichu520/FluentUI.svg?style=flat-square "Release status"
|
||||||
[download-link]: https://github.com/zhuzichu520/FluentUI/releases/latest "Download status"
|
[download-link]: https://github.com/zhuzichu520/FluentUI/releases/latest "Download status"
|
||||||
[download-badge]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/total.svg "Download status"
|
[download-badge]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/total.svg "Download status"
|
||||||
[download-latest]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/latest/total.svg "latest status"
|
[download-latest]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/latest/total.svg "latest status"
|
||||||
|
|
||||||
|
<p align=center>
|
||||||
|
这是一个基于 Qt QML 的漂亮 FluentUI 组件库。目前主分支支持 Qt 6。如果您想在 Qt 5 中使用它,请切换至 Qt 5 分支。
|
||||||
|
</p>
|
||||||
|
|
||||||
|
## 必要条件
|
||||||
|
|
||||||
|
+ Qt Core、Qt Quick、Qt QML、Qt ShaderTool、Qt 5 Compatibility Module.(**重要**)
|
||||||
|
+ Qt LinguistTool(可选,用于翻译)
|
||||||
|
+ Qt Svg(可选,但对于 Qt 5 来说必不可少)
|
||||||
|
|
||||||
|
在使用库之前使用 [Qt 在线安装程序](https://download.qt.io/archive/online_installers/) 获取模块(**推荐**),或先编译模块。
|
||||||
|
|
||||||
|
## ⚽ 快速开始
|
||||||
|
|
||||||
|
+ 下载 [预编译版本](https://github.com/zhuzichu520/FluentUI/releases)。(请注意您的平台和编译器)。
|
||||||
|
|
||||||
|
+ 运行 `example` 程序。
|
||||||
|
|
||||||
|
或者
|
||||||
|
|
||||||
|
+ 克隆此仓库
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git clone --recursive https://github.com/zhuzichu520/FluentUI.git
|
||||||
|
```
|
||||||
|
|
||||||
|
+ 构建
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git clone --recursive https://github.com/zhuzichu520/FluentUI.git
|
||||||
|
cd FluentUI
|
||||||
|
mkdir build
|
||||||
|
cd build
|
||||||
|
cmake -DCMAKE_PREFIX_PATH=<YOUR_QT_SDK_DIR_PATH> -DCMAKE_BUILD_TYPE=Release -GNinja <仓库路径>
|
||||||
|
cmake --build . --config Release --target all --parallel
|
||||||
|
```
|
||||||
|
|
||||||
|
+ 使用 IDE(`Qt Creator` 或者 `CLion`)打开项目。(仅支持 **CMake**)。
|
||||||
|
|
||||||
|
<div align=center>
|
||||||
|
<img src="doc/preview/qt_creator_project.png">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
+ 编译项目。然后尝试执行 `example` 演示程序。
|
||||||
|
|
||||||
|
+ 太好了!现在您可以编写第一个 QML FluentUI 程序了!查看文档了解更多详情。
|
||||||
|
|
||||||
|
## 📑 文档
|
||||||
|
|
||||||
|
(正在进行中...🚀)
|
||||||
|
|
||||||
## 支持的组件
|
## 支持的组件
|
||||||
|
|
||||||
|目录|说明|备注|
|
| 目录 | 详情 | 备注 / Demos |
|
||||||
|----|----|----|
|
| :-----------------: | :--------------: | :-------------------------------------------------: |
|
||||||
|FluApp|初始化入口|支持路由跳转|
|
| FluApp | 程序初始入口 | 支持路由(SPA) |
|
||||||
|FluWindow|无边框窗口|解决windows拖动闪烁问题|
|
| FluWindow | 无框窗口 | *仅适用于 Windows |
|
||||||
|FluAppBar|窗口顶部标题栏|支持拖动窗口,最小化、最大化、关闭窗口|
|
| FluAppBar | 窗口顶部的标题栏 | 支持拖动、最小化、最大化和关闭。 |
|
||||||
|FluText|Text文本||
|
| FluText | 通用文本 | |
|
||||||
|FluButton|按钮||
|
| FluButton | 通用按钮 |  |
|
||||||
|FluFilledButton|实心按钮||
|
| FluFilledButton | Filled 按钮 |  |
|
||||||
|FluIconButton|图标按钮||
|
| FluTextButton | 文本按钮 |  |
|
||||||
|FluTextButton|文本按钮||
|
| FluToggleButton | 切换按钮 |  |
|
||||||
|FluIcon|图标||
|
| FluIcon | 通用图标 |  |
|
||||||
|FluRadioButton|单选按钮||
|
| FluRadioButton | 单选框 |  |
|
||||||
|FluTextBox|单行输入框||
|
| FluTextBox | 单行输入框 |  |
|
||||||
|FluMultiLineTextBox|多行输入框||
|
| FluMultiLineTextBox | 多行输入框 |  |
|
||||||
|FluToggleSwitch|开关按钮||
|
| FluToggleSwitch | 开关 |  |
|
||||||
|FluSlider|拖动条||
|
|
||||||
|FluInfoBar|提示Toast||
|
|
||||||
|FluContentDialog|对话框||
|
|
||||||
|FluProgressBar|条形进度条||
|
|
||||||
|FluProgressRing|圆形进度条||
|
|
||||||
|FluRectangle|矩形|支持部分圆角、clip|
|
|
||||||
|FluMenu|菜单框||
|
|
||||||
|FluTooltip|tooltip提示框||
|
|
||||||
|FluTreeView|树控件||
|
|
||||||
|FluTheme|主题设置|支持主题颜色切换,夜间模式|
|
|
||||||
|FluCarousel|轮播图组件|支持无限轮播|
|
|
||||||
|FluTimePicker|时间选择器||
|
|
||||||
|FluDatePicker|日期选择器||
|
|
||||||
|FluMenu|菜单Popup||
|
|
||||||
|FluNavigationView|响应式导航布局||
|
|
||||||
|FluScrollbar|滚动条||
|
|
||||||
|FluToggleButton|开关按钮||
|
|
||||||
|FluPagination|分页组件||
|
|
||||||
|FluTableView|表格组件||
|
|
||||||
|FluMediaPlayer|播放器||
|
|
||||||
|FluFlipView|FlipView||
|
|
||||||
|
|
||||||
# 部分效果预览
|
在 [`这里`](doc/md/all_components.md) 查看更多!
|
||||||
|
|
||||||
## 首页
|
## 参考
|
||||||
|
|
||||||

|
+ [**Windows 设计**:Microsoft 的设计指南和工具包。](https://learn.microsoft.com/zh-CN/windows/apps/design/)
|
||||||
|
+ [**Microsoft/WinUI-Gallery**: Microsoft's demo](https://github.com/microsoft/WinUI-Gallery)
|
||||||
|
|
||||||
## 各种Button按钮
|
## 许可
|
||||||
|
|
||||||

|
本 FluentUI 库目前采用 [MIT License](./License) 许可。
|
||||||
|
|
||||||
## 主题颜色切换、夜间模式
|
## 星标历史
|
||||||
|
|
||||||

|
[](https://star-history.com/#zhuzichu520/FluentUI&Date)
|
||||||
|
|
||||||
## TableView表格组件
|
## ⚡ 游客数量
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
## FluTreeView树组件
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
## 轮播图组件
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
### ⚡ Visitor count
|
|
||||||

|
|
||||||
|
@ -34,6 +34,38 @@ providing powerful tools and support for this project.
|
|||||||
For more information about the Qt project,
|
For more information about the Qt project,
|
||||||
please visit the official Qt website (https://www.qt.io/).
|
please visit the official Qt website (https://www.qt.io/).
|
||||||
|
|
||||||
|
|
||||||
|
************************************************************************************
|
||||||
|
QHotkey
|
||||||
|
|
||||||
|
Copyright (c) 2016, Felix Barz
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
modification, are permitted provided that the following conditions are met:
|
||||||
|
|
||||||
|
* Redistributions of source code must retain the above copyright notice, this
|
||||||
|
list of conditions and the following disclaimer.
|
||||||
|
|
||||||
|
* Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
this list of conditions and the following disclaimer in the documentation
|
||||||
|
and/or other materials provided with the distribution.
|
||||||
|
|
||||||
|
* Neither the name of QHotkey nor the names of its
|
||||||
|
contributors may be used to endorse or promote products derived from
|
||||||
|
this software without specific prior written permission.
|
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||||
|
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||||
|
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||||
|
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
************************************************************************************
|
************************************************************************************
|
||||||
framelesshelper
|
framelesshelper
|
||||||
|
|
||||||
@ -312,4 +344,683 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
|
|
||||||
|
************************************************************************************
|
||||||
|
QmlQCustomPlot
|
||||||
|
|
||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
||||||
|
|
||||||
|
@ -24,8 +24,8 @@ else ()
|
|||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
#导入Qt相关依赖包
|
#导入Qt相关依赖包
|
||||||
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Quick Svg Network)
|
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Quick Svg Network Widgets)
|
||||||
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Quick Svg Network)
|
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Quick Svg Network Widgets)
|
||||||
|
|
||||||
#添加国际化脚本
|
#添加国际化脚本
|
||||||
find_program(QT_LUPDATE NAMES lupdate lupdate-qt6)
|
find_program(QT_LUPDATE NAMES lupdate lupdate-qt6)
|
||||||
@ -73,11 +73,7 @@ if (WIN32)
|
|||||||
)
|
)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
#加快qrc编译
|
list(APPEND sources_files ${PROJECT_NAME}.qrc)
|
||||||
qt_add_big_resources(QRC_RESOURCES ${PROJECT_NAME}.qrc)
|
|
||||||
list(APPEND QRC_RESOURCES ${PROJECT_NAME}.qrc)
|
|
||||||
set_property(SOURCE ${PROJECT_NAME}.qrc PROPERTY SKIP_AUTORCC ON)
|
|
||||||
list(APPEND sources_files ${QRC_RESOURCES})
|
|
||||||
|
|
||||||
#添加可执行文件
|
#添加可执行文件
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
@ -145,6 +141,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
|
|||||||
Qt${QT_VERSION_MAJOR}::Quick
|
Qt${QT_VERSION_MAJOR}::Quick
|
||||||
Qt${QT_VERSION_MAJOR}::Svg
|
Qt${QT_VERSION_MAJOR}::Svg
|
||||||
Qt${QT_VERSION_MAJOR}::Network
|
Qt${QT_VERSION_MAJOR}::Network
|
||||||
|
Qt${QT_VERSION_MAJOR}::Widgets
|
||||||
fluentuiplugin
|
fluentuiplugin
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -209,6 +209,10 @@
|
|||||||
<file>qml/window/FluentInitializrWindow.qml</file>
|
<file>qml/window/FluentInitializrWindow.qml</file>
|
||||||
<file>qml/page/T_OpenGL.qml</file>
|
<file>qml/page/T_OpenGL.qml</file>
|
||||||
<file>qml/page/T_Icons.qml</file>
|
<file>qml/page/T_Icons.qml</file>
|
||||||
|
<file>qml/window/HotkeyWindow.qml</file>
|
||||||
|
<file>qml/page/T_CustomPlot.qml</file>
|
||||||
|
<file>res/image/logo_pro.png</file>
|
||||||
|
<file>qml/page/T_FluentPro.qml</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
<qresource prefix="/"/>
|
<qresource prefix="/"/>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -43,7 +43,8 @@ FluLauncher {
|
|||||||
"/singleTaskWindow":"qrc:/example/qml/window/SingleTaskWindow.qml",
|
"/singleTaskWindow":"qrc:/example/qml/window/SingleTaskWindow.qml",
|
||||||
"/standardWindow":"qrc:/example/qml/window/StandardWindow.qml",
|
"/standardWindow":"qrc:/example/qml/window/StandardWindow.qml",
|
||||||
"/singleInstanceWindow":"qrc:/example/qml/window/SingleInstanceWindow.qml",
|
"/singleInstanceWindow":"qrc:/example/qml/window/SingleInstanceWindow.qml",
|
||||||
"/pageWindow":"qrc:/example/qml/window/PageWindow.qml"
|
"/pageWindow":"qrc:/example/qml/window/PageWindow.qml",
|
||||||
|
"/hotkey":"qrc:/example/qml/window/HotkeyWindow.qml"
|
||||||
}
|
}
|
||||||
var args = Qt.application.arguments
|
var args = Qt.application.arguments
|
||||||
if(args.length>=2 && args[1].startsWith("-crashed=")){
|
if(args.length>=2 && args[1].startsWith("-crashed=")){
|
||||||
@ -52,4 +53,73 @@ FluLauncher {
|
|||||||
FluRouter.navigate("/")
|
FluRouter.navigate("/")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
property alias hotkeys: object_hotkey
|
||||||
|
FluObject{
|
||||||
|
id: object_hotkey
|
||||||
|
FluHotkey{
|
||||||
|
name: qsTr("Quit")
|
||||||
|
sequence: "Ctrl+Alt+Q"
|
||||||
|
onActivated: {
|
||||||
|
FluRouter.exit()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluHotkey{
|
||||||
|
name: qsTr("Test1")
|
||||||
|
sequence: "Alt+A"
|
||||||
|
onActivated: {
|
||||||
|
FluRouter.navigate("/hotkey",{sequence:sequence})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluHotkey{
|
||||||
|
name: qsTr("Test2")
|
||||||
|
sequence: "Alt+B"
|
||||||
|
onActivated: {
|
||||||
|
FluRouter.navigate("/hotkey",{sequence:sequence})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluHotkey{
|
||||||
|
name: qsTr("Test3")
|
||||||
|
sequence: "Alt+C"
|
||||||
|
onActivated: {
|
||||||
|
FluRouter.navigate("/hotkey",{sequence:sequence})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluHotkey{
|
||||||
|
name: qsTr("Test4")
|
||||||
|
sequence: "Alt+D"
|
||||||
|
onActivated: {
|
||||||
|
FluRouter.navigate("/hotkey",{sequence:sequence})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluHotkey{
|
||||||
|
name: qsTr("Test5")
|
||||||
|
sequence: "Alt+E"
|
||||||
|
onActivated: {
|
||||||
|
FluRouter.navigate("/hotkey",{sequence:sequence})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluHotkey{
|
||||||
|
name: qsTr("Test6")
|
||||||
|
sequence: "Alt+F"
|
||||||
|
onActivated: {
|
||||||
|
FluRouter.navigate("/hotkey",{sequence:sequence})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluHotkey{
|
||||||
|
name: qsTr("Test7")
|
||||||
|
sequence: "Alt+G"
|
||||||
|
onActivated: {
|
||||||
|
FluRouter.navigate("/hotkey",{sequence:sequence})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluHotkey{
|
||||||
|
name: qsTr("Test8")
|
||||||
|
sequence: "Alt+H"
|
||||||
|
onActivated: {
|
||||||
|
FluRouter.navigate("/hotkey",{sequence:sequence})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,9 @@ import "../component"
|
|||||||
|
|
||||||
FluScrollablePage{
|
FluScrollablePage{
|
||||||
|
|
||||||
|
id: root
|
||||||
title: qsTr("Line Chart")
|
title: qsTr("Line Chart")
|
||||||
|
property var data : []
|
||||||
|
|
||||||
FluFrame{
|
FluFrame{
|
||||||
Layout.preferredWidth: 500
|
Layout.preferredWidth: 500
|
||||||
@ -15,13 +17,14 @@ FluScrollablePage{
|
|||||||
padding: 10
|
padding: 10
|
||||||
Layout.topMargin: 20
|
Layout.topMargin: 20
|
||||||
FluChart{
|
FluChart{
|
||||||
|
id: chart
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
chartType: 'line'
|
chartType: 'line'
|
||||||
chartData: { return {
|
chartData: { return {
|
||||||
labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
|
labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
|
||||||
datasets: [{
|
datasets: [{
|
||||||
label: 'My First Dataset',
|
label: 'My First Dataset',
|
||||||
data: [65, 59, 80, 81, 56, 55, 40],
|
data: root.data,
|
||||||
fill: false,
|
fill: false,
|
||||||
borderColor: 'rgb(75, 192, 192)',
|
borderColor: 'rgb(75, 192, 192)',
|
||||||
tension: 0.1
|
tension: 0.1
|
||||||
@ -41,5 +44,20 @@ FluScrollablePage{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Timer{
|
||||||
|
id: timer
|
||||||
|
interval: 300
|
||||||
|
repeat: true
|
||||||
|
onTriggered: {
|
||||||
|
root.data.push(Math.random()*100)
|
||||||
|
if(root.data.length>7){
|
||||||
|
root.data.shift()
|
||||||
|
}
|
||||||
|
chart.animateToNewData()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Component.onCompleted: {
|
||||||
|
timer.restart()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,7 @@ FluExpander{
|
|||||||
id:content
|
id:content
|
||||||
width:parent.width
|
width:parent.width
|
||||||
text:highlightQmlCode(code)
|
text:highlightQmlCode(code)
|
||||||
textFormat: FluMultilineTextBox.RichText
|
textFormat: FluCopyableText.RichText
|
||||||
padding: 10
|
padding: 10
|
||||||
topPadding: 10
|
topPadding: 10
|
||||||
leftPadding: 10
|
leftPadding: 10
|
||||||
|
@ -30,4 +30,13 @@ FluObject{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
FluPaneItem{
|
||||||
|
title:qsTr("FluentUI Pro")
|
||||||
|
menuDelegate: paneItemMenu
|
||||||
|
icon: FluentIcons.Airplane
|
||||||
|
url:"qrc:/example/qml/page/T_FluentPro.qml"
|
||||||
|
onTap:{
|
||||||
|
navigationView.push(url)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -432,6 +432,12 @@ FluObject{
|
|||||||
url: "qrc:/example/qml/page/T_OpenGL.qml"
|
url: "qrc:/example/qml/page/T_OpenGL.qml"
|
||||||
onTap: { navigationView.push(url) }
|
onTap: { navigationView.push(url) }
|
||||||
}
|
}
|
||||||
|
FluPaneItem{
|
||||||
|
title: qsTr("QCustomPlot")
|
||||||
|
menuDelegate: paneItemMenu
|
||||||
|
url: "qrc:/example/qml/page/T_CustomPlot.qml"
|
||||||
|
onTap: { navigationView.push(url) }
|
||||||
|
}
|
||||||
FluPaneItem{
|
FluPaneItem{
|
||||||
title: qsTr("QRCode")
|
title: qsTr("QRCode")
|
||||||
menuDelegate: paneItemMenu
|
menuDelegate: paneItemMenu
|
||||||
|
@ -12,7 +12,7 @@ FluScrollablePage{
|
|||||||
RowLayout{
|
RowLayout{
|
||||||
spacing: 10
|
spacing: 10
|
||||||
FluText{
|
FluText{
|
||||||
text:"tintColor:"
|
text: qsTr("tintColor:")
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
FluColorPicker{
|
FluColorPicker{
|
||||||
@ -22,7 +22,7 @@ FluScrollablePage{
|
|||||||
RowLayout{
|
RowLayout{
|
||||||
spacing: 10
|
spacing: 10
|
||||||
FluText{
|
FluText{
|
||||||
text:"tintOpacity:"
|
text: qsTr("tintOpacity:")
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
FluSlider{
|
FluSlider{
|
||||||
@ -33,7 +33,7 @@ FluScrollablePage{
|
|||||||
RowLayout{
|
RowLayout{
|
||||||
spacing: 10
|
spacing: 10
|
||||||
FluText{
|
FluText{
|
||||||
text:"blurRadius:"
|
text: qsTr("blurRadius:")
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
FluSlider{
|
FluSlider{
|
||||||
@ -69,7 +69,7 @@ FluScrollablePage{
|
|||||||
y:(image.height-height)/2
|
y:(image.height-height)/2
|
||||||
FluText {
|
FluText {
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
text: "Acrylic"
|
text: qsTr("Acrylic")
|
||||||
color: "#FFFFFF"
|
color: "#FFFFFF"
|
||||||
font: FluTextStyle.Subtitle
|
font: FluTextStyle.Subtitle
|
||||||
}
|
}
|
||||||
|
@ -12,7 +12,7 @@ FluScrollablePage{
|
|||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
var items = []
|
var items = []
|
||||||
for(var i=0;i<10;i++){
|
for(var i=0;i<10;i++){
|
||||||
items.push({title:"Item_"+(i+1)})
|
items.push({title: qsTr("Item_%1").arg(i+1)})
|
||||||
}
|
}
|
||||||
breadcrumb_1.items = items
|
breadcrumb_1.items = items
|
||||||
breadcrumb_2.items = items
|
breadcrumb_2.items = items
|
||||||
@ -51,7 +51,7 @@ FluScrollablePage{
|
|||||||
onClicked:{
|
onClicked:{
|
||||||
var items = []
|
var items = []
|
||||||
for(var i=0;i<10;i++){
|
for(var i=0;i<10;i++){
|
||||||
items.push({title:"Item_"+(i+1)})
|
items.push({title: qsTr("Item_")+(i+1)})
|
||||||
}
|
}
|
||||||
breadcrumb_2.items = items
|
breadcrumb_2.items = items
|
||||||
}
|
}
|
||||||
|
@ -219,7 +219,7 @@ FluScrollablePage{
|
|||||||
FluLoadingButton{
|
FluLoadingButton{
|
||||||
id: btn_loading
|
id: btn_loading
|
||||||
loading: loading_button_switch.checked
|
loading: loading_button_switch.checked
|
||||||
text: qsTr("Loading Button")
|
text: loading_button_switch.checked ? qsTr("Loading") : qsTr("Loading Button")
|
||||||
anchors{
|
anchors{
|
||||||
verticalCenter: parent.verticalCenter
|
verticalCenter: parent.verticalCenter
|
||||||
left: parent.left
|
left: parent.left
|
||||||
@ -235,7 +235,7 @@ FluScrollablePage{
|
|||||||
right: parent.right
|
right: parent.right
|
||||||
verticalCenter: parent.verticalCenter
|
verticalCenter: parent.verticalCenter
|
||||||
}
|
}
|
||||||
text: qsTr("Loading")
|
text: loading_button_switch.checked ? qsTr("Loading") : qsTr("Normal")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
CodeExpander{
|
CodeExpander{
|
||||||
@ -399,16 +399,14 @@ FluScrollablePage{
|
|||||||
verticalCenter: parent.verticalCenter
|
verticalCenter: parent.verticalCenter
|
||||||
left: parent.left
|
left: parent.left
|
||||||
}
|
}
|
||||||
|
disabled: radio_button_switch.checked
|
||||||
FluRadioButton{
|
FluRadioButton{
|
||||||
disabled:radio_button_switch.checked
|
|
||||||
text: qsTr("Radio Button_1")
|
text: qsTr("Radio Button_1")
|
||||||
}
|
}
|
||||||
FluRadioButton{
|
FluRadioButton{
|
||||||
disabled:radio_button_switch.checked
|
|
||||||
text: qsTr("Radio Button_2")
|
text: qsTr("Radio Button_2")
|
||||||
}
|
}
|
||||||
FluRadioButton{
|
FluRadioButton{
|
||||||
disabled:radio_button_switch.checked
|
|
||||||
text: qsTr("Radio Button_3")
|
text: qsTr("Radio Button_3")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -45,7 +45,7 @@ FluScrollablePage{
|
|||||||
Layout.preferredWidth: 240
|
Layout.preferredWidth: 240
|
||||||
}
|
}
|
||||||
FluButton{
|
FluButton{
|
||||||
text:"verify"
|
text: qsTr("verify")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
var success = captcha.verify(text_box.text)
|
var success = captcha.verify(text_box.text)
|
||||||
if(success){
|
if(success){
|
||||||
|
@ -121,7 +121,6 @@ FluScrollablePage{
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CodeExpander{
|
CodeExpander{
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.topMargin: -6
|
Layout.topMargin: -6
|
||||||
@ -140,6 +139,90 @@ FluScrollablePage{
|
|||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
carousel.model = [{url:"qrc:/example/res/image/banner_1.jpg"},{url:"qrc:/example/res/image/banner_2.jpg"},{url:"qrc:/example/res/image/banner_3.jpg"}]
|
carousel.model = [{url:"qrc:/example/res/image/banner_1.jpg"},{url:"qrc:/example/res/image/banner_2.jpg"},{url:"qrc:/example/res/image/banner_3.jpg"}]
|
||||||
}
|
}
|
||||||
|
}'
|
||||||
|
}
|
||||||
|
|
||||||
|
FluFrame{
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.preferredHeight: 300 + topPadding + bottomPadding
|
||||||
|
padding: 10
|
||||||
|
Layout.topMargin: 10
|
||||||
|
RowLayout{
|
||||||
|
anchors.fill: parent
|
||||||
|
Item{
|
||||||
|
Layout.preferredWidth: 400
|
||||||
|
Layout.fillHeight: true
|
||||||
|
FluShadow{
|
||||||
|
radius: 8
|
||||||
|
}
|
||||||
|
FluCarousel{
|
||||||
|
anchors.fill: parent
|
||||||
|
orientation: Qt.Vertical
|
||||||
|
autoPlay: auto_play_switch.checked
|
||||||
|
loopTime:1500
|
||||||
|
indicatorGravity: Qt.AlignVCenter | Qt.AlignRight
|
||||||
|
indicatorMarginTop:15
|
||||||
|
delegate: Component{
|
||||||
|
Item{
|
||||||
|
anchors.fill: parent
|
||||||
|
Image {
|
||||||
|
anchors.fill: parent
|
||||||
|
source: model.url
|
||||||
|
asynchronous: true
|
||||||
|
fillMode:Image.PreserveAspectCrop
|
||||||
|
}
|
||||||
|
Rectangle{
|
||||||
|
height: 40
|
||||||
|
width: parent.width
|
||||||
|
anchors.bottom: parent.bottom
|
||||||
|
color: "#33000000"
|
||||||
|
FluText{
|
||||||
|
anchors.fill: parent
|
||||||
|
verticalAlignment: Qt.AlignVCenter
|
||||||
|
horizontalAlignment: Qt.AlignHCenter
|
||||||
|
text:model.title
|
||||||
|
color: FluColors.Grey10
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Layout.topMargin: 20
|
||||||
|
Layout.leftMargin: 5
|
||||||
|
Component.onCompleted: {
|
||||||
|
var arr = []
|
||||||
|
arr.push({url:"qrc:/example/res/image/banner_1.jpg",title:"共同应对全球性问题"})
|
||||||
|
arr.push({url:"qrc:/example/res/image/banner_2.jpg",title:"三小只全程没互动"})
|
||||||
|
arr.push({url:"qrc:/example/res/image/banner_3.jpg",title:"有效投资扩大 激发增长动能"})
|
||||||
|
model = arr
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluToggleSwitch{
|
||||||
|
id: auto_play_switch
|
||||||
|
Layout.alignment: Qt.AlignRight
|
||||||
|
text: qsTr("Auto play")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
CodeExpander{
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.topMargin: -6
|
||||||
|
code:'FluCarousel{
|
||||||
|
id:carousel
|
||||||
|
width: 400
|
||||||
|
height: 300
|
||||||
|
orientation: Qt.Vertical
|
||||||
|
delegate: Component{
|
||||||
|
Image {
|
||||||
|
anchors.fill: parent
|
||||||
|
source: model.url
|
||||||
|
asynchronous: true
|
||||||
|
fillMode:Image.PreserveAspectCrop
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Component.onCompleted: {
|
||||||
|
carousel.model = [{url:"qrc:/example/res/image/banner_1.jpg"},{url:"qrc:/example/res/image/banner_2.jpg"},{url:"qrc:/example/res/image/banner_3.jpg"}]
|
||||||
|
}
|
||||||
}'
|
}'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -17,15 +17,15 @@ FluScrollablePage{
|
|||||||
spacing: 5
|
spacing: 5
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
FluText{
|
FluText{
|
||||||
text: "editable=false"
|
text: qsTr("editable=false")
|
||||||
x:10
|
x:10
|
||||||
}
|
}
|
||||||
FluComboBox {
|
FluComboBox {
|
||||||
model: ListModel {
|
model: ListModel {
|
||||||
id: model_1
|
id: model_1
|
||||||
ListElement { text: "Banana" }
|
ListElement { text: qsTr("Banana") }
|
||||||
ListElement { text: "Apple" }
|
ListElement { text: qsTr("Apple") }
|
||||||
ListElement { text: "Coconut" }
|
ListElement { text: qsTr("Coconut") }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -40,16 +40,16 @@ FluScrollablePage{
|
|||||||
spacing: 5
|
spacing: 5
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
FluText{
|
FluText{
|
||||||
text: "disabled=true"
|
text: qsTr("disabled=true")
|
||||||
x:10
|
x:10
|
||||||
}
|
}
|
||||||
FluComboBox {
|
FluComboBox {
|
||||||
disabled: true
|
disabled: true
|
||||||
model: ListModel {
|
model: ListModel {
|
||||||
id: model_2
|
id: model_2
|
||||||
ListElement { text: "Banana" }
|
ListElement { text: qsTr("Banana") }
|
||||||
ListElement { text: "Apple" }
|
ListElement { text: qsTr("Apple") }
|
||||||
ListElement { text: "Coconut" }
|
ListElement { text: qsTr("Coconut") }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -64,16 +64,16 @@ FluScrollablePage{
|
|||||||
spacing: 5
|
spacing: 5
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
FluText{
|
FluText{
|
||||||
text: "editable=true"
|
text: qsTr("editable=true")
|
||||||
x:5
|
x:5
|
||||||
}
|
}
|
||||||
FluComboBox {
|
FluComboBox {
|
||||||
editable: true
|
editable: true
|
||||||
model: ListModel {
|
model: ListModel {
|
||||||
id: model_3
|
id: model_3
|
||||||
ListElement { text: "Banana" }
|
ListElement { text: qsTr("Banana") }
|
||||||
ListElement { text: "Apple" }
|
ListElement { text: qsTr("Apple") }
|
||||||
ListElement { text: "Coconut" }
|
ListElement { text: qsTr("Coconut") }
|
||||||
}
|
}
|
||||||
onAccepted: {
|
onAccepted: {
|
||||||
if (find(editText) === -1)
|
if (find(editText) === -1)
|
||||||
@ -85,19 +85,21 @@ FluScrollablePage{
|
|||||||
CodeExpander{
|
CodeExpander{
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.topMargin: -6
|
Layout.topMargin: -6
|
||||||
code:'FluComboBox{
|
code:qsTr('FluComboBox{
|
||||||
editable: true
|
editable: true
|
||||||
model: ListModel {
|
model: ListModel {
|
||||||
id: model
|
id: model
|
||||||
ListElement { text: "Banana" }
|
ListElement { text: "%1" }
|
||||||
ListElement { text: "Apple" }
|
ListElement { text: "%2" }
|
||||||
ListElement { text: "Coconut" }
|
ListElement { text: "%3" }
|
||||||
}
|
}
|
||||||
onAccepted: {
|
onAccepted: {
|
||||||
if (find(editText) === -1)
|
if (find(editText) === -1)
|
||||||
model.append({text: editText})
|
model.append({text: editText})
|
||||||
}
|
}
|
||||||
}'
|
}').arg(qsTr("Banana"))
|
||||||
|
.arg(qsTr("Apple"))
|
||||||
|
.arg(qsTr("Coconut"))
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
49
example/qml/page/T_CustomPlot.qml
Normal file
49
example/qml/page/T_CustomPlot.qml
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
import QtQuick 2.15
|
||||||
|
import QtQuick.Layouts 1.15
|
||||||
|
import QtQuick.Window 2.15
|
||||||
|
import QtQuick.Controls 2.15
|
||||||
|
import FluentUI 1.0
|
||||||
|
import "../component"
|
||||||
|
|
||||||
|
FluPage{
|
||||||
|
|
||||||
|
title: qsTr("QCustomPlot")
|
||||||
|
TimePlot {
|
||||||
|
id: timePlot
|
||||||
|
anchors.fill: parent
|
||||||
|
plotTimeRangeInMilliseconds: 10
|
||||||
|
xAxis.visible: true
|
||||||
|
yAxis.visible: true
|
||||||
|
x1Axis.visible: false
|
||||||
|
y1Axis.visible: false
|
||||||
|
yAxis.ticker.tickCount: 6
|
||||||
|
yAxis.ticker.ticks: false
|
||||||
|
yAxis.ticker.subTicks: false
|
||||||
|
yAxis.ticker.baseColor: "transparent"
|
||||||
|
yAxis.grid.lineColor: "mediumaquamarine"
|
||||||
|
xAxis.ticker.baseColor: "midnightblue"
|
||||||
|
xAxis.ticker.baseWidth: 2
|
||||||
|
xAxis.grid.lineColor: "transparent"
|
||||||
|
backgroundColor: "mistyrose"
|
||||||
|
Component.onCompleted: {
|
||||||
|
yAxis.setRange(0, 100)
|
||||||
|
addGraph("1")
|
||||||
|
graphs["1"].graphColor = "slategrey"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Timer {
|
||||||
|
running: true
|
||||||
|
repeat: true
|
||||||
|
interval: 20
|
||||||
|
property int data: 60
|
||||||
|
onTriggered: {
|
||||||
|
data = data - 1
|
||||||
|
if(data == 20) {
|
||||||
|
data = 60
|
||||||
|
}
|
||||||
|
timePlot.addCurrentTimeValue("1", data)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
@ -105,5 +105,147 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
|
|||||||
}'
|
}'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
FluFrame {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
padding: 10
|
||||||
|
Layout.topMargin: 20
|
||||||
|
Column {
|
||||||
|
spacing: 15
|
||||||
|
FluExpander {
|
||||||
|
headerHeight: 60
|
||||||
|
contentHeight: content_layout.implicitHeight
|
||||||
|
headerDelegate: Component {
|
||||||
|
Item {
|
||||||
|
RowLayout {
|
||||||
|
anchors {
|
||||||
|
verticalCenter: parent.verticalCenter
|
||||||
|
left: parent.left
|
||||||
|
leftMargin: 15
|
||||||
|
}
|
||||||
|
spacing: 15
|
||||||
|
FluImage {
|
||||||
|
width: 20
|
||||||
|
height: 20
|
||||||
|
sourceSize.width: 20
|
||||||
|
sourceSize.height: 20
|
||||||
|
source: "qrc:/example/res/image/favicon.ico"
|
||||||
|
}
|
||||||
|
ColumnLayout {
|
||||||
|
spacing: 0
|
||||||
|
FluText {
|
||||||
|
text: "FluentUI"
|
||||||
|
}
|
||||||
|
FluText {
|
||||||
|
text: "%1".arg(AppInfo.version)
|
||||||
|
textColor: FluTheme.fontSecondaryColor
|
||||||
|
font.pixelSize: 12
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluLoadingButton {
|
||||||
|
id: btn_checkupdate
|
||||||
|
anchors {
|
||||||
|
verticalCenter: parent.verticalCenter
|
||||||
|
right: parent.right
|
||||||
|
rightMargin: 15
|
||||||
|
}
|
||||||
|
text: qsTr("Check for Updates")
|
||||||
|
onClicked: {
|
||||||
|
loading = true;
|
||||||
|
FluEventBus.post("checkUpdate");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluEvent {
|
||||||
|
name: "checkUpdateFinish"
|
||||||
|
onTriggered: {
|
||||||
|
btn_checkupdate.loading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
content: ColumnLayout {
|
||||||
|
id: content_layout
|
||||||
|
spacing: 0
|
||||||
|
RowLayout {
|
||||||
|
Layout.topMargin: 15
|
||||||
|
Layout.leftMargin: 15
|
||||||
|
spacing: 0
|
||||||
|
FluText {
|
||||||
|
text: "GitHub: "
|
||||||
|
}
|
||||||
|
FluTextButton {
|
||||||
|
text: "https://github.com/zhuzichu520/FluentUI"
|
||||||
|
onClicked: {
|
||||||
|
Qt.openUrlExternally(text);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RowLayout {
|
||||||
|
Layout.bottomMargin: 15
|
||||||
|
Layout.leftMargin: 15
|
||||||
|
spacing: 0
|
||||||
|
FluText {
|
||||||
|
text: "bilibili: "
|
||||||
|
}
|
||||||
|
FluTextButton {
|
||||||
|
text: "https://www.bilibili.com/video/BV1mg4y1M71w"
|
||||||
|
onClicked: {
|
||||||
|
Qt.openUrlExternally(text);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
FluExpander {
|
||||||
|
contentHeight: 100
|
||||||
|
headerHeight: 45
|
||||||
|
headerDelegate: Component {
|
||||||
|
Item {
|
||||||
|
FluToggleButton {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
text: qsTr("This is a ToggleButton in the header")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
content: Item {
|
||||||
|
anchors.fill: parent
|
||||||
|
FluButton {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
text: qsTr("This is a StandardButton in the content")
|
||||||
|
onClicked: {
|
||||||
|
showInfo(qsTr("Click StandardButton"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
CodeExpander {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.topMargin: -6
|
||||||
|
code: 'FluExpander {
|
||||||
|
contentHeight: 100
|
||||||
|
headerHeight: 45
|
||||||
|
headerDelegate: Component {
|
||||||
|
Item {
|
||||||
|
FluToggleButton {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
text: qsTr("This is a ToggleButton in the header")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
content: Item {
|
||||||
|
anchors.fill: parent
|
||||||
|
FluButton {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
text: qsTr("This is a StandardButton in the content")
|
||||||
|
onClicked: {
|
||||||
|
showInfo(qsTr("Click StandardButton"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
65
example/qml/page/T_FluentPro.qml
Normal file
65
example/qml/page/T_FluentPro.qml
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
import QtQuick 2.15
|
||||||
|
import QtQuick.Layouts 1.15
|
||||||
|
import QtQuick.Controls 2.15
|
||||||
|
import QtQuick.Window 2.15
|
||||||
|
import FluentUI 1.0
|
||||||
|
import "../component"
|
||||||
|
|
||||||
|
FluContentPage{
|
||||||
|
|
||||||
|
title: "FluentUI Pro"
|
||||||
|
|
||||||
|
Image{
|
||||||
|
id: iamge_logo
|
||||||
|
width: 80
|
||||||
|
height: 80
|
||||||
|
source: "qrc:/example/res/image/logo_pro.png"
|
||||||
|
}
|
||||||
|
|
||||||
|
Flickable{
|
||||||
|
anchors{
|
||||||
|
top: iamge_logo.bottom
|
||||||
|
left: parent.left
|
||||||
|
right: parent.right
|
||||||
|
bottom: parent.bottom
|
||||||
|
}
|
||||||
|
ScrollBar.vertical: FluScrollBar {}
|
||||||
|
ScrollBar.horizontal: FluScrollBar {}
|
||||||
|
contentWidth: text.width
|
||||||
|
contentHeight: text.height
|
||||||
|
clip: true
|
||||||
|
FluText{
|
||||||
|
id: text
|
||||||
|
textFormat: Text.MarkdownText
|
||||||
|
onLinkActivated:
|
||||||
|
(link)=> {
|
||||||
|
Qt.openUrlExternally(link)
|
||||||
|
}
|
||||||
|
onLinkHovered:
|
||||||
|
(link)=> {
|
||||||
|
if(link === ""){
|
||||||
|
FluTools.restoreOverrideCursor()
|
||||||
|
}else{
|
||||||
|
FluTools.setOverrideCursor(Qt.PointingHandCursor)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
text:'
|
||||||
|
基于[FluentUI](https://github.com/zhuzichu520/FluentUI)开源版本重新打造的项目,代码更加漂亮,API更加好用,界面更加细腻
|
||||||
|
|
||||||
|
## 与开源版本有啥不同?
|
||||||
|
|
||||||
|
1. 开源版本支持Qt6与Qt5.15.2,Pro版本仅支持Qt6
|
||||||
|
2. 开源版本所有组件都有Flu前缀,Pro版本去掉Flu前缀,只需添加一行```qputenv("QT_QUICK_CONTROLS_STYLE", "FluentUI");```代码,就能将原有Button换成FluentUI样式
|
||||||
|
3. 项目整体架构不同,开源版本代码都写在一个模块下,Pro版本分为FluentUI,FluentUI.Controls,FluentUI.impl三个模块
|
||||||
|
4. 开源版本不支持热加载,Pro版本支持热加载,运行之后修改代码可实时关注QML界面变化,支持一键关闭开启
|
||||||
|
5. 开源版不支持wasm编译,Pro版本支持wasm编译
|
||||||
|
6. 开源版本过于臃肿,Pro版本做了减法,去其糟粕,取其精华,重新打造
|
||||||
|
7. 开源版默认动态库依赖,Pro版本默认静态库依赖
|
||||||
|
8. 开源版MIT协议免费,Pro版本付费,如有需要请联系作者wx购买:FluentUI
|
||||||
|
|
||||||
|
## 下载Pro版本
|
||||||
|
[下载地址](https://github.com/zhuzichu520/FluentUI-Pro-Installer/releases)'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -22,18 +22,37 @@ FluScrollablePage{
|
|||||||
|
|
||||||
FluGroupBox {
|
FluGroupBox {
|
||||||
title: qsTr("RadioButton Group")
|
title: qsTr("RadioButton Group")
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.preferredHeight: 150
|
||||||
|
Layout.topMargin: 20
|
||||||
FluRadioButtons {
|
FluRadioButtons {
|
||||||
|
anchors{
|
||||||
|
verticalCenter: parent.verticalCenter
|
||||||
|
left: parent.left
|
||||||
|
}
|
||||||
spacing: 10
|
spacing: 10
|
||||||
|
disabled: radio_button_switch.checked
|
||||||
FluRadioButton { text: qsTr("E-mail") }
|
FluRadioButton { text: qsTr("E-mail") }
|
||||||
FluRadioButton { text: qsTr("Calendar") }
|
FluRadioButton { text: qsTr("Calendar") }
|
||||||
FluRadioButton { text: qsTr("Contacts") }
|
FluRadioButton { text: qsTr("Contacts") }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
FluToggleSwitch{
|
||||||
|
id: radio_button_switch
|
||||||
|
anchors{
|
||||||
|
right: parent.right
|
||||||
|
verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
text: qsTr("Disabled")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
CodeExpander{
|
CodeExpander{
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.topMargin: 4
|
Layout.topMargin: 4
|
||||||
code:'FluGroupBox {
|
code:`
|
||||||
|
FluGroupBox {
|
||||||
title: qsTr("CheckBox Group")
|
title: qsTr("CheckBox Group")
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
spacing: 10
|
spacing: 10
|
||||||
@ -42,7 +61,20 @@ FluScrollablePage{
|
|||||||
FluCheckBox { text: qsTr("Calendar") }
|
FluCheckBox { text: qsTr("Calendar") }
|
||||||
FluCheckBox { text: qsTr("Contacts") }
|
FluCheckBox { text: qsTr("Contacts") }
|
||||||
}
|
}
|
||||||
}'
|
}
|
||||||
|
|
||||||
|
FluGroupBox {
|
||||||
|
title: qsTr("RadioButton Group")
|
||||||
|
FluRadioButtons {
|
||||||
|
spacing: 10
|
||||||
|
disabled: true // 禁用所有FluRadioButton子组件
|
||||||
|
manuallyDisabled: true // 是否指定每个FluRadioButton上的disabled选项
|
||||||
|
FluRadioButton { text: qsTr("E-mail") }
|
||||||
|
FluRadioButton { text: qsTr("Calendar") }
|
||||||
|
FluRadioButton { text: qsTr("Contacts") }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -14,6 +14,15 @@ FluScrollablePage{
|
|||||||
|
|
||||||
ListModel{
|
ListModel{
|
||||||
id: model_header
|
id: model_header
|
||||||
|
ListElement{
|
||||||
|
icon: "qrc:/example/res/image/logo_pro.png"
|
||||||
|
title: qsTr("FluentUI Pro")
|
||||||
|
desc: qsTr("The latest FluentUI Pro controls and styles for your applications.")
|
||||||
|
url: "https://github.com/zhuzichu520/FluentUI-Pro-Installer"
|
||||||
|
clicked: function(model){
|
||||||
|
Qt.openUrlExternally(model.url)
|
||||||
|
}
|
||||||
|
}
|
||||||
ListElement{
|
ListElement{
|
||||||
icon: "qrc:/example/res/image/ic_home_github.png"
|
icon: "qrc:/example/res/image/ic_home_github.png"
|
||||||
title: qsTr("FluentUI GitHub")
|
title: qsTr("FluentUI GitHub")
|
||||||
|
@ -14,18 +14,18 @@ FluContentPage {
|
|||||||
anchors{
|
anchors{
|
||||||
top: parent.top
|
top: parent.top
|
||||||
}
|
}
|
||||||
|
onTextChanged: {
|
||||||
|
grid_view.model = FluApp.iconData(text_box.text)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
FluToggleSwitch{
|
||||||
FluFilledButton{
|
id: toggle_switch
|
||||||
text: qsTr("Search")
|
|
||||||
anchors{
|
anchors{
|
||||||
left: text_box.right
|
left: text_box.right
|
||||||
verticalCenter: text_box.verticalCenter
|
verticalCenter: text_box.verticalCenter
|
||||||
leftMargin: 14
|
leftMargin: 10
|
||||||
}
|
|
||||||
onClicked: {
|
|
||||||
grid_view.model = FluApp.iconDatas(text_box.text)
|
|
||||||
}
|
}
|
||||||
|
text: qsTr("Disabled")
|
||||||
}
|
}
|
||||||
GridView{
|
GridView{
|
||||||
id: grid_view
|
id: grid_view
|
||||||
@ -33,7 +33,7 @@ FluContentPage {
|
|||||||
cellHeight: 110
|
cellHeight: 110
|
||||||
clip: true
|
clip: true
|
||||||
boundsBehavior: GridView.StopAtBounds
|
boundsBehavior: GridView.StopAtBounds
|
||||||
model: FluApp.iconDatas()
|
model: FluApp.iconData()
|
||||||
ScrollBar.vertical: FluScrollBar {}
|
ScrollBar.vertical: FluScrollBar {}
|
||||||
anchors{
|
anchors{
|
||||||
topMargin: 10
|
topMargin: 10
|
||||||
@ -54,6 +54,7 @@ FluContentPage {
|
|||||||
horizontalPadding: 0
|
horizontalPadding: 0
|
||||||
bottomPadding: 30
|
bottomPadding: 30
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
disabled: toggle_switch.checked
|
||||||
onClicked: {
|
onClicked: {
|
||||||
var text ="FluentIcons."+modelData.name;
|
var text ="FluentIcons."+modelData.name;
|
||||||
FluTools.clipText(text)
|
FluTools.clipText(text)
|
||||||
@ -66,6 +67,7 @@ FluContentPage {
|
|||||||
text: modelData.name
|
text: modelData.name
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.topMargin: 60
|
anchors.topMargin: 60
|
||||||
|
enabled: !toggle_switch.checked
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,9 +9,13 @@ FluScrollablePage{
|
|||||||
|
|
||||||
title: qsTr("InfoBar")
|
title: qsTr("InfoBar")
|
||||||
|
|
||||||
|
property var info1
|
||||||
|
property var info2
|
||||||
|
property var info3
|
||||||
|
|
||||||
FluFrame{
|
FluFrame{
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.preferredHeight: 270
|
Layout.preferredHeight: 350
|
||||||
padding: 10
|
padding: 10
|
||||||
ColumnLayout{
|
ColumnLayout{
|
||||||
spacing: 14
|
spacing: 14
|
||||||
@ -32,13 +36,13 @@ FluScrollablePage{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluButton{
|
FluButton{
|
||||||
text:"Error"
|
text: qsTr("Error")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
showError(qsTr("This is an InfoBar in the Error Style"))
|
showError(qsTr("This is an InfoBar in the Error Style"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluButton{
|
FluButton{
|
||||||
text:"Success"
|
text: qsTr("Success")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
showSuccess(qsTr("This is an InfoBar in the Success Style"))
|
showSuccess(qsTr("This is an InfoBar in the Success Style"))
|
||||||
}
|
}
|
||||||
@ -49,8 +53,54 @@ FluScrollablePage{
|
|||||||
showInfo(qsTr("This is an InfoBar in the Info Style"),0,qsTr("Manual shutdown is supported"))
|
showInfo(qsTr("This is an InfoBar in the Info Style"),0,qsTr("Manual shutdown is supported"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
FluText{
|
||||||
|
wrapMode: Text.WrapAnywhere
|
||||||
|
width: parent.width
|
||||||
|
text: qsTr("Manually close the info message box")
|
||||||
|
}
|
||||||
|
Row{
|
||||||
|
spacing: 5
|
||||||
|
FluButton{
|
||||||
|
text: (info1 ? qsTr("close '%1'") : qsTr("show '%1'")).arg(qsTr("info1"))
|
||||||
|
onClicked: {
|
||||||
|
if(info1) {
|
||||||
|
info1.close()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
info1 = showInfo(qsTr("This is an '%1'").arg(qsTr("info1")), 0)
|
||||||
|
info1.close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluButton{
|
||||||
|
text: (info2 ? qsTr("close '%1'") : qsTr("show '%1'")).arg(qsTr("info2"))
|
||||||
|
onClicked: {
|
||||||
|
if(info2) {
|
||||||
|
info2.close()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
info2 = showInfo(qsTr("This is an '%1'").arg(qsTr("info2")), 0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluButton{
|
||||||
|
text: (info3 ? qsTr("close '%1'") : qsTr("show '%1'")).arg(qsTr("info3"))
|
||||||
|
onClicked: {
|
||||||
|
if(info3) {
|
||||||
|
info3.close()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
info3 = showInfo(qsTr("This is an '%1'").arg(qsTr("info3")), 0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluButton{
|
||||||
|
text: qsTr("clear all info")
|
||||||
|
onClicked: {
|
||||||
|
clearAllInfo()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
FluButton{
|
FluButton{
|
||||||
text:"Loading"
|
text: qsTr("Loading")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
showLoading()
|
showLoading()
|
||||||
}
|
}
|
||||||
@ -60,12 +110,17 @@ FluScrollablePage{
|
|||||||
CodeExpander{
|
CodeExpander{
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.topMargin: -6
|
Layout.topMargin: -6
|
||||||
code:'showInfo(qsTr("This is an InfoBar in the Info Style"))
|
code:`
|
||||||
|
showInfo(qsTr("This is an InfoBar in the Info Style"))
|
||||||
|
|
||||||
showWarning(qsTr("This is an InfoBar in the Warning Style"))
|
showWarning(qsTr("This is an InfoBar in the Warning Style"))
|
||||||
|
|
||||||
showError(qsTr("This is an InfoBar in the Error Style"))
|
showError(qsTr("This is an InfoBar in the Error Style"))
|
||||||
|
|
||||||
showSuccess(qsTr("This is an InfoBar in the Success Style"))'
|
showSuccess(qsTr("This is an InfoBar in the Success Style"))
|
||||||
|
|
||||||
|
var info1 = showInfo(qsTr("This is an 'Info1'"), 0)
|
||||||
|
info1.close()
|
||||||
|
`
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -49,26 +49,26 @@ FluScrollablePage{
|
|||||||
Layout.topMargin: -6
|
Layout.topMargin: -6
|
||||||
code:'FluPivot{
|
code:'FluPivot{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
FluPivotItem:{
|
FluPivotItem {
|
||||||
text: qsTr("All")
|
title: qsTr("All")
|
||||||
contentItem: FluText{
|
contentItem: FluText{
|
||||||
text: qsTr("All emails go here.")
|
text: qsTr("All emails go here.")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluPivotItem:{
|
FluPivotItem {
|
||||||
text: qsTr("Unread")
|
title: qsTr("Unread")
|
||||||
contentItem: FluText{
|
contentItem: FluText{
|
||||||
text: qsTr("Unread emails go here.")
|
text: qsTr("Unread emails go here.")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluPivotItem:{
|
FluPivotItem {
|
||||||
text: qsTr("Flagged")
|
title: qsTr("Flagged")
|
||||||
contentItem: FluText{
|
contentItem: FluText{
|
||||||
text: qsTr("Flagged emails go here.")
|
text: qsTr("Flagged emails go here.")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluPivotItem:{
|
FluPivotItem {
|
||||||
text: qsTr("Urgent")
|
title: qsTr("Urgent")
|
||||||
contentItem: FluText{
|
contentItem: FluText{
|
||||||
text: qsTr("Urgent emails go here.")
|
text: qsTr("Urgent emails go here.")
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,7 @@ FluScrollablePage{
|
|||||||
spacing: 10
|
spacing: 10
|
||||||
Layout.topMargin: 20
|
Layout.topMargin: 20
|
||||||
FluText{
|
FluText{
|
||||||
text:"text:"
|
text: qsTr("text:")
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
FluTextBox{
|
FluTextBox{
|
||||||
@ -38,7 +38,7 @@ FluScrollablePage{
|
|||||||
spacing: 10
|
spacing: 10
|
||||||
Layout.topMargin: 10
|
Layout.topMargin: 10
|
||||||
FluText{
|
FluText{
|
||||||
text:"color:"
|
text: qsTr("color:")
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
FluColorPicker{
|
FluColorPicker{
|
||||||
@ -51,7 +51,7 @@ FluScrollablePage{
|
|||||||
spacing: 10
|
spacing: 10
|
||||||
Layout.topMargin: 10
|
Layout.topMargin: 10
|
||||||
FluText{
|
FluText{
|
||||||
text:"bgColor:"
|
text: qsTr("bgColor:")
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
FluColorPicker{
|
FluColorPicker{
|
||||||
@ -63,7 +63,7 @@ FluScrollablePage{
|
|||||||
RowLayout{
|
RowLayout{
|
||||||
spacing: 10
|
spacing: 10
|
||||||
FluText{
|
FluText{
|
||||||
text:"margins:"
|
text: qsTr("margins:")
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
FluSlider{
|
FluSlider{
|
||||||
@ -77,7 +77,7 @@ FluScrollablePage{
|
|||||||
RowLayout{
|
RowLayout{
|
||||||
spacing: 10
|
spacing: 10
|
||||||
FluText{
|
FluText{
|
||||||
text:"size:"
|
text: qsTr("size:")
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
FluSlider{
|
FluSlider{
|
||||||
|
@ -53,21 +53,20 @@ FluScrollablePage{
|
|||||||
Layout.topMargin: 20
|
Layout.topMargin: 20
|
||||||
FluRadioButtons{
|
FluRadioButtons{
|
||||||
spacing: 8
|
spacing: 8
|
||||||
|
disabled: radio_button_switch2.checked
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
anchors{
|
anchors{
|
||||||
verticalCenter: parent.verticalCenter
|
verticalCenter: parent.verticalCenter
|
||||||
left: parent.left
|
left: parent.left
|
||||||
}
|
}
|
||||||
|
currentIndex: 1
|
||||||
FluRadioButton{
|
FluRadioButton{
|
||||||
disabled: radio_button_switch2.checked
|
|
||||||
text: qsTr("Radio Button_1")
|
text: qsTr("Radio Button_1")
|
||||||
}
|
}
|
||||||
FluRadioButton{
|
FluRadioButton{
|
||||||
disabled: radio_button_switch2.checked
|
|
||||||
text: qsTr("Radio Button_2")
|
text: qsTr("Radio Button_2")
|
||||||
}
|
}
|
||||||
FluRadioButton{
|
FluRadioButton{
|
||||||
disabled: radio_button_switch2.checked
|
|
||||||
text: qsTr("Radio Button_3")
|
text: qsTr("Radio Button_3")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -97,4 +96,106 @@ FluScrollablePage{
|
|||||||
}'
|
}'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
FluFrame{
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.preferredHeight: 60
|
||||||
|
padding: 10
|
||||||
|
Layout.topMargin: 20
|
||||||
|
FluRadioButtons{
|
||||||
|
spacing: 8
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
anchors{
|
||||||
|
verticalCenter: parent.verticalCenter
|
||||||
|
left: parent.left
|
||||||
|
}
|
||||||
|
disabled: radio_button_switch3.checked
|
||||||
|
orientation: Qt.Horizontal
|
||||||
|
currentIndex: 1
|
||||||
|
FluRadioButton{
|
||||||
|
text: qsTr("Radio Button_1")
|
||||||
|
}
|
||||||
|
FluRadioButton{
|
||||||
|
text: qsTr("Radio Button_2")
|
||||||
|
}
|
||||||
|
FluRadioButton{
|
||||||
|
text: qsTr("Radio Button_3")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluToggleSwitch{
|
||||||
|
id: radio_button_switch3
|
||||||
|
anchors{
|
||||||
|
right: parent.right
|
||||||
|
verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
text: qsTr("Disabled")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
CodeExpander{
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.topMargin: -6
|
||||||
|
code:'FluRadioButtons{
|
||||||
|
spacing: 8
|
||||||
|
orientation: Qt.Horizontal
|
||||||
|
FluRadioButton{
|
||||||
|
text:"Radio Button_1"
|
||||||
|
}
|
||||||
|
FluRadioButton{
|
||||||
|
text:"Radio Button_2"
|
||||||
|
}
|
||||||
|
FluRadioButton{
|
||||||
|
text:"Radio Button_3"
|
||||||
|
}
|
||||||
|
}'
|
||||||
|
}
|
||||||
|
|
||||||
|
FluFrame{
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.preferredHeight: 100
|
||||||
|
padding: 10
|
||||||
|
Layout.topMargin: 20
|
||||||
|
FluRadioButtons{
|
||||||
|
spacing: 8
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
anchors{
|
||||||
|
verticalCenter: parent.verticalCenter
|
||||||
|
left: parent.left
|
||||||
|
}
|
||||||
|
disabled: radio_button_switch4.checked
|
||||||
|
currentIndex: -1
|
||||||
|
FluCheckBox{
|
||||||
|
text: qsTr("Radio Button_1")
|
||||||
|
}
|
||||||
|
FluCheckBox{
|
||||||
|
text: qsTr("Radio Button_2")
|
||||||
|
}
|
||||||
|
FluCheckBox{
|
||||||
|
text: qsTr("Radio Button_3")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluToggleSwitch{
|
||||||
|
id: radio_button_switch4
|
||||||
|
anchors{
|
||||||
|
right: parent.right
|
||||||
|
verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
text: qsTr("Disabled")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
CodeExpander{
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.topMargin: -6
|
||||||
|
code:'FluRadioButtons{
|
||||||
|
spacing: 8
|
||||||
|
FluCheckBox{
|
||||||
|
text:"Radio Button_1"
|
||||||
|
}
|
||||||
|
FluCheckBox{
|
||||||
|
text:"Radio Button_2"
|
||||||
|
}
|
||||||
|
FluCheckBox{
|
||||||
|
text:"Radio Button_3"
|
||||||
|
}
|
||||||
|
}'
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -11,12 +11,26 @@ FluScrollablePage{
|
|||||||
|
|
||||||
FluFrame{
|
FluFrame{
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.preferredHeight: 100
|
Layout.preferredHeight: childrenRect.height
|
||||||
padding: 10
|
ColumnLayout{
|
||||||
FluShortcutPicker{
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
Item{
|
||||||
|
Layout.preferredHeight: 15
|
||||||
|
}
|
||||||
|
Repeater{
|
||||||
|
model: FluApp.launcher.hotkeys.children
|
||||||
|
delegate: FluShortcutPicker{
|
||||||
|
text: model.name
|
||||||
|
syncHotkey: FluApp.launcher.hotkeys.children[index]
|
||||||
|
Layout.leftMargin: 15
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Item{
|
||||||
|
Layout.preferredHeight: 15
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CodeExpander{
|
CodeExpander{
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.topMargin: -6
|
Layout.topMargin: -6
|
||||||
@ -26,5 +40,3 @@ FluScrollablePage{
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -15,21 +15,21 @@ FluContentPage{
|
|||||||
top: parent.top
|
top: parent.top
|
||||||
}
|
}
|
||||||
FluText{
|
FluText{
|
||||||
text:"orientation:"
|
text: qsTr("orientation:")
|
||||||
}
|
}
|
||||||
FluDropDownButton{
|
FluDropDownButton{
|
||||||
id:btn_orientation
|
id:btn_orientation
|
||||||
Layout.preferredWidth: 120
|
Layout.preferredWidth: 120
|
||||||
text:"Horizontal"
|
text: qsTr("Horizontal")
|
||||||
FluMenuItem{
|
FluMenuItem{
|
||||||
text:"Horizontal"
|
text: qsTr("Horizontal")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
btn_orientation.text = text
|
btn_orientation.text = text
|
||||||
split_layout.orientation = Qt.Horizontal
|
split_layout.orientation = Qt.Horizontal
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluMenuItem{
|
FluMenuItem{
|
||||||
text:"Vertical"
|
text: qsTr("Vertical")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
btn_orientation.text = text
|
btn_orientation.text = text
|
||||||
split_layout.orientation = Qt.Vertical
|
split_layout.orientation = Qt.Vertical
|
||||||
@ -54,7 +54,7 @@ FluContentPage{
|
|||||||
SplitView.maximumWidth: 400
|
SplitView.maximumWidth: 400
|
||||||
SplitView.maximumHeight: 400
|
SplitView.maximumHeight: 400
|
||||||
FluText {
|
FluText {
|
||||||
text: "Page 1"
|
text: qsTr("Page 1")
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -66,7 +66,7 @@ FluContentPage{
|
|||||||
SplitView.fillWidth: true
|
SplitView.fillWidth: true
|
||||||
SplitView.fillHeight: true
|
SplitView.fillHeight: true
|
||||||
FluText {
|
FluText {
|
||||||
text: "Page 2"
|
text: qsTr("Page 2")
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -75,7 +75,7 @@ FluContentPage{
|
|||||||
implicitWidth: 200
|
implicitWidth: 200
|
||||||
implicitHeight: 200
|
implicitHeight: 200
|
||||||
FluText {
|
FluText {
|
||||||
text: "Page 3"
|
text: qsTr("Page 3")
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,30 +19,30 @@ FluScrollablePage{
|
|||||||
FluDropDownButton{
|
FluDropDownButton{
|
||||||
id:btn_status_mode
|
id:btn_status_mode
|
||||||
Layout.preferredWidth: 140
|
Layout.preferredWidth: 140
|
||||||
text:"Loading"
|
text: qsTr("Loading")
|
||||||
FluMenuItem{
|
FluMenuItem{
|
||||||
text:"Loading"
|
text: qsTr("Loading")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
btn_status_mode.text = text
|
btn_status_mode.text = text
|
||||||
status_view.statusMode = FluStatusLayoutType.Loading
|
status_view.statusMode = FluStatusLayoutType.Loading
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluMenuItem{
|
FluMenuItem{
|
||||||
text:"Empty"
|
text: qsTr("Empty")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
btn_status_mode.text = text
|
btn_status_mode.text = text
|
||||||
status_view.statusMode = FluStatusLayoutType.Empty
|
status_view.statusMode = FluStatusLayoutType.Empty
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluMenuItem{
|
FluMenuItem{
|
||||||
text:"Error"
|
text: qsTr("Error")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
btn_status_mode.text = text
|
btn_status_mode.text = text
|
||||||
status_view.statusMode = FluStatusLayoutType.Error
|
status_view.statusMode = FluStatusLayoutType.Error
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluMenuItem{
|
FluMenuItem{
|
||||||
text:"Success"
|
text: qsTr("Success")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
btn_status_mode.text = text
|
btn_status_mode.text = text
|
||||||
status_view.statusMode = FluStatusLayoutType.Success
|
status_view.statusMode = FluStatusLayoutType.Success
|
||||||
|
@ -35,52 +35,58 @@ FluScrollablePage{
|
|||||||
padding: 10
|
padding: 10
|
||||||
RowLayout{
|
RowLayout{
|
||||||
spacing: 14
|
spacing: 14
|
||||||
|
FluCopyableText{
|
||||||
|
text: qsTr("Tab Width Behavior:")
|
||||||
|
}
|
||||||
FluDropDownButton{
|
FluDropDownButton{
|
||||||
id:btn_tab_width_behavior
|
id:btn_tab_width_behavior
|
||||||
Layout.preferredWidth: 140
|
Layout.preferredWidth: 140
|
||||||
text:"Equal"
|
text: qsTr("Equal")
|
||||||
FluMenuItem{
|
FluMenuItem{
|
||||||
text:"Equal"
|
text: qsTr("Equal")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
btn_tab_width_behavior.text = text
|
btn_tab_width_behavior.text = text
|
||||||
tab_view.tabWidthBehavior = FluTabViewType.Equal
|
tab_view.tabWidthBehavior = FluTabViewType.Equal
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluMenuItem{
|
FluMenuItem{
|
||||||
text:"SizeToContent"
|
text: qsTr("SizeToContent")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
btn_tab_width_behavior.text = text
|
btn_tab_width_behavior.text = text
|
||||||
tab_view.tabWidthBehavior = FluTabViewType.SizeToContent
|
tab_view.tabWidthBehavior = FluTabViewType.SizeToContent
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluMenuItem{
|
FluMenuItem{
|
||||||
text:"Compact"
|
text: qsTr("Compact")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
btn_tab_width_behavior.text = text
|
btn_tab_width_behavior.text = text
|
||||||
tab_view.tabWidthBehavior = FluTabViewType.Compact
|
tab_view.tabWidthBehavior = FluTabViewType.Compact
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
FluCopyableText{
|
||||||
|
text: qsTr("Tab Close Button Visibility:")
|
||||||
|
}
|
||||||
FluDropDownButton{
|
FluDropDownButton{
|
||||||
id:btn_close_button_visibility
|
id:btn_close_button_visibility
|
||||||
text:"Always"
|
text: qsTr("Always")
|
||||||
Layout.preferredWidth: 120
|
Layout.preferredWidth: 120
|
||||||
FluMenuItem{
|
FluMenuItem{
|
||||||
text:"Never"
|
text: qsTr("Never")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
btn_close_button_visibility.text = text
|
btn_close_button_visibility.text = text
|
||||||
tab_view.closeButtonVisibility = FluTabViewType.Never
|
tab_view.closeButtonVisibility = FluTabViewType.Never
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluMenuItem{
|
FluMenuItem{
|
||||||
text:"Always"
|
text: qsTr("Always")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
btn_close_button_visibility.text = text
|
btn_close_button_visibility.text = text
|
||||||
tab_view.closeButtonVisibility = FluTabViewType.Always
|
tab_view.closeButtonVisibility = FluTabViewType.Always
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluMenuItem{
|
FluMenuItem{
|
||||||
text:"OnHover"
|
text: qsTr("OnHover")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
btn_close_button_visibility.text = text
|
btn_close_button_visibility.text = text
|
||||||
tab_view.closeButtonVisibility = FluTabViewType.OnHover
|
tab_view.closeButtonVisibility = FluTabViewType.OnHover
|
||||||
|
@ -11,9 +11,8 @@ FluContentPage{
|
|||||||
title: qsTr("TableView")
|
title: qsTr("TableView")
|
||||||
signal checkBoxChanged
|
signal checkBoxChanged
|
||||||
|
|
||||||
property var dataSource : []
|
|
||||||
property int sortType: 0
|
property int sortType: 0
|
||||||
property bool seletedAll: true
|
property bool selectedAll: true
|
||||||
property string nameKeyword: ""
|
property string nameKeyword: ""
|
||||||
|
|
||||||
onNameKeywordChanged: {
|
onNameKeywordChanged: {
|
||||||
@ -32,11 +31,11 @@ FluContentPage{
|
|||||||
onCheckBoxChanged: {
|
onCheckBoxChanged: {
|
||||||
for(var i =0;i< table_view.rows ;i++){
|
for(var i =0;i< table_view.rows ;i++){
|
||||||
if(false === table_view.getRow(i).checkbox.options.checked){
|
if(false === table_view.getRow(i).checkbox.options.checked){
|
||||||
root.seletedAll = false
|
root.selectedAll = false
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
root.seletedAll = true
|
root.selectedAll = true
|
||||||
}
|
}
|
||||||
|
|
||||||
onSortTypeChanged: {
|
onSortTypeChanged: {
|
||||||
@ -238,13 +237,15 @@ FluContentPage{
|
|||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
FluCheckBox{
|
FluCheckBox{
|
||||||
checked: true === root.seletedAll
|
checked: true === root.selectedAll
|
||||||
animationEnabled: false
|
animationEnabled: false
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
clickListener: function(){
|
clickListener: function(){
|
||||||
root.seletedAll = !root.seletedAll
|
root.selectedAll = !root.selectedAll
|
||||||
var checked = root.seletedAll
|
var checked = root.selectedAll
|
||||||
itemModel.display = table_view.customItem(com_column_checbox,{"checked":checked})
|
var columnModel = model.display
|
||||||
|
columnModel.title = table_view.customItem(com_column_checbox,{"checked":checked})
|
||||||
|
model.display = columnModel
|
||||||
for(var i =0;i< table_view.rows ;i++){
|
for(var i =0;i< table_view.rows ;i++){
|
||||||
var rowData = table_view.getRow(i)
|
var rowData = table_view.getRow(i)
|
||||||
rowData.checkbox = table_view.customItem(com_checbox,{"checked":checked})
|
rowData.checkbox = table_view.customItem(com_checbox,{"checked":checked})
|
||||||
@ -271,7 +272,8 @@ FluContentPage{
|
|||||||
}
|
}
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
currentIndex=["100","300","500","1000"].findIndex((element) => element === display)
|
currentIndex=["100","300","500","1000"].findIndex((element) => element === display)
|
||||||
selectAll()
|
textBox.forceActiveFocus()
|
||||||
|
textBox.selectAll()
|
||||||
}
|
}
|
||||||
onCommit: {
|
onCommit: {
|
||||||
editTextChaged(editText)
|
editTextChaged(editText)
|
||||||
@ -280,6 +282,29 @@ FluContentPage{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Component{
|
||||||
|
id:com_auto_suggestbox
|
||||||
|
FluAutoSuggestBox {
|
||||||
|
id: textbox
|
||||||
|
anchors.fill: parent
|
||||||
|
focus: true
|
||||||
|
Component.onCompleted: {
|
||||||
|
var data = ["傲来国界花果山水帘洞","傲来国界坎源山脏水洞","大唐国界黑风山黑风洞","大唐国界黄风岭黄风洞","大唐国界骷髅山白骨洞","宝象国界碗子山波月洞","宝象国界平顶山莲花洞","宝象国界压龙山压龙洞","乌鸡国界号山枯松涧火云洞","乌鸡国界衡阳峪黑水河河神府"]
|
||||||
|
var result = data.map(function(item) {
|
||||||
|
return {title: item};
|
||||||
|
});
|
||||||
|
items = result
|
||||||
|
textbox.text= String(display)
|
||||||
|
forceActiveFocus()
|
||||||
|
selectAll()
|
||||||
|
}
|
||||||
|
onCommit: {
|
||||||
|
editTextChaged(textbox.text)
|
||||||
|
tableView.closeEditor()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Component{
|
Component{
|
||||||
id:com_avatar
|
id:com_avatar
|
||||||
Item{
|
Item{
|
||||||
@ -290,12 +315,7 @@ FluContentPage{
|
|||||||
radius: [20,20,20,20]
|
radius: [20,20,20,20]
|
||||||
Image{
|
Image{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
source: {
|
source: options && options.avatar ? options.avatar : ""
|
||||||
if(options && options.avatar){
|
|
||||||
return options.avatar
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
sourceSize: Qt.size(80,80)
|
sourceSize: Qt.size(80,80)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -323,7 +343,9 @@ FluContentPage{
|
|||||||
cursorShape: Qt.PointingHandCursor
|
cursorShape: Qt.PointingHandCursor
|
||||||
onClicked: {
|
onClicked: {
|
||||||
custom_update_dialog.showDialog(options.title,function(text){
|
custom_update_dialog.showDialog(options.title,function(text){
|
||||||
itemModel.display = table_view.customItem(com_column_update_title,{"title":text})
|
var columnModel = model.display
|
||||||
|
columnModel.title = table_view.customItem(com_column_update_title,{"title":text})
|
||||||
|
model.display = columnModel
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -421,15 +443,15 @@ FluContentPage{
|
|||||||
var data = []
|
var data = []
|
||||||
var rows = []
|
var rows = []
|
||||||
for (var i = 0; i < table_view.rows; i++) {
|
for (var i = 0; i < table_view.rows; i++) {
|
||||||
var item = table_view.getRow(i);
|
var item = table_view.getRow(i)
|
||||||
rows.push(item)
|
rows.push(item)
|
||||||
if (!item.checkbox.options.checked) {
|
if (!item.checkbox.options.checked) {
|
||||||
data.push(item);
|
data.push(item);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var sourceModel = table_view.sourceModel;
|
var sourceModel = table_view.sourceModel
|
||||||
for (i = 0; i < sourceModel.rowCount; i++) {
|
for (i = 0; i < sourceModel.rowCount; i++) {
|
||||||
var sourceItem = sourceModel.getRow(i);
|
var sourceItem = sourceModel.getRow(i)
|
||||||
const foundItem = rows.find(item=> item._key === sourceItem._key)
|
const foundItem = rows.find(item=> item._key === sourceItem._key)
|
||||||
if (!foundItem) {
|
if (!foundItem) {
|
||||||
data.push(sourceItem);
|
data.push(sourceItem);
|
||||||
@ -438,14 +460,24 @@ FluContentPage{
|
|||||||
table_view.dataSource = data
|
table_view.dataSource = data
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
FluButton{
|
FluButton{
|
||||||
text: qsTr("Add a row of Data")
|
text: qsTr("Add a row of Data")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
table_view.appendRow(genTestObject())
|
table_view.appendRow(genTestObject())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
FluButton{
|
||||||
|
text: qsTr("Insert a Row")
|
||||||
|
onClicked: {
|
||||||
|
var index = table_view.currentIndex()
|
||||||
|
if(index !== -1){
|
||||||
|
var testObj = genTestObject()
|
||||||
|
table_view.insertRow(index,testObj)
|
||||||
|
}else{
|
||||||
|
showWarning(qsTr("Focus not acquired: Please click any item in the form as the target for insertion!"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -465,20 +497,19 @@ FluContentPage{
|
|||||||
{
|
{
|
||||||
title: table_view.customItem(com_column_checbox,{checked:true}),
|
title: table_view.customItem(com_column_checbox,{checked:true}),
|
||||||
dataIndex: 'checkbox',
|
dataIndex: 'checkbox',
|
||||||
width:100,
|
frozen: true
|
||||||
minimumWidth:100,
|
|
||||||
maximumWidth:100
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: table_view.customItem(com_column_update_title,{title:qsTr("Avatar")}),
|
|
||||||
dataIndex: 'avatar',
|
|
||||||
width:100
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: table_view.customItem(com_column_filter_name,{title:qsTr("Name")}),
|
title: table_view.customItem(com_column_filter_name,{title:qsTr("Name")}),
|
||||||
dataIndex: 'name',
|
dataIndex: 'name',
|
||||||
readOnly:true
|
readOnly:true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: table_view.customItem(com_column_update_title,{title:qsTr("Avatar")}),
|
||||||
|
dataIndex: 'avatar',
|
||||||
|
width:100,
|
||||||
|
frozen:true
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: table_view.customItem(com_column_sort_age,{sort:0}),
|
title: table_view.customItem(com_column_sort_age,{sort:0}),
|
||||||
dataIndex: 'age',
|
dataIndex: 'age',
|
||||||
@ -490,6 +521,7 @@ FluContentPage{
|
|||||||
{
|
{
|
||||||
title: qsTr("Address"),
|
title: qsTr("Address"),
|
||||||
dataIndex: 'address',
|
dataIndex: 'address',
|
||||||
|
editDelegate: com_auto_suggestbox,
|
||||||
width:200,
|
width:200,
|
||||||
minimumWidth:100,
|
minimumWidth:100,
|
||||||
maximumWidth:250
|
maximumWidth:250
|
||||||
@ -513,8 +545,7 @@ FluContentPage{
|
|||||||
title: qsTr("Options"),
|
title: qsTr("Options"),
|
||||||
dataIndex: 'action',
|
dataIndex: 'action',
|
||||||
width:160,
|
width:160,
|
||||||
minimumWidth:160,
|
frozen:true
|
||||||
maximumWidth:160
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@ -566,7 +597,7 @@ FluContentPage{
|
|||||||
return avatars[randomIndex];
|
return avatars[randomIndex];
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
checkbox: table_view.customItem(com_checbox,{checked:root.seletedAll}),
|
checkbox: table_view.customItem(com_checbox,{checked:root.selectedAll}),
|
||||||
avatar:table_view.customItem(com_avatar,{avatar:getAvatar()}),
|
avatar:table_view.customItem(com_avatar,{avatar:getAvatar()}),
|
||||||
name: getRandomName(),
|
name: getRandomName(),
|
||||||
age:getRandomAge(),
|
age:getRandomAge(),
|
||||||
@ -579,12 +610,11 @@ FluContentPage{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
function loadData(page,count){
|
function loadData(page,count){
|
||||||
root.seletedAll = true
|
root.selectedAll = true
|
||||||
const dataSource = []
|
const dataSource = []
|
||||||
for(var i=0;i<count;i++){
|
for(var i=0;i<count;i++){
|
||||||
dataSource.push(genTestObject())
|
dataSource.push(genTestObject())
|
||||||
}
|
}
|
||||||
root.dataSource = dataSource
|
table_view.dataSource = dataSource
|
||||||
table_view.dataSource = root.dataSource
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -15,10 +15,19 @@ FluScrollablePage{
|
|||||||
padding: 10
|
padding: 10
|
||||||
|
|
||||||
FluCopyableText{
|
FluCopyableText{
|
||||||
|
enabled: !toggle_switch.checked
|
||||||
text: qsTr("This is a text that can be copied")
|
text: qsTr("This is a text that can be copied")
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
}
|
}
|
||||||
|
|
||||||
|
FluToggleSwitch{
|
||||||
|
id: toggle_switch
|
||||||
|
anchors{
|
||||||
|
right: parent.right
|
||||||
|
verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
text: qsTr("Disabled")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
CodeExpander{
|
CodeExpander{
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
@ -13,7 +13,7 @@ FluScrollablePage{
|
|||||||
|
|
||||||
FluFrame{
|
FluFrame{
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.preferredHeight: 408
|
Layout.fillHeight: true
|
||||||
padding: 10
|
padding: 10
|
||||||
|
|
||||||
ColumnLayout{
|
ColumnLayout{
|
||||||
@ -124,12 +124,69 @@ FluScrollablePage{
|
|||||||
Layout.topMargin: 20
|
Layout.topMargin: 20
|
||||||
}
|
}
|
||||||
FluToggleSwitch{
|
FluToggleSwitch{
|
||||||
|
id: toggle_blur
|
||||||
Layout.topMargin: 5
|
Layout.topMargin: 5
|
||||||
checked: FluTheme.blurBehindWindowEnabled
|
checked: FluTheme.blurBehindWindowEnabled
|
||||||
onClicked: {
|
onClicked: {
|
||||||
FluTheme.blurBehindWindowEnabled = !FluTheme.blurBehindWindowEnabled
|
FluTheme.blurBehindWindowEnabled = !FluTheme.blurBehindWindowEnabled
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
FluText{
|
||||||
|
text: qsTr("window effect")
|
||||||
|
Layout.topMargin: 20
|
||||||
|
}
|
||||||
|
Row{
|
||||||
|
spacing: 10
|
||||||
|
Repeater{
|
||||||
|
model: window.availableEffects
|
||||||
|
delegate: FluRadioButton{
|
||||||
|
checked: window.effect === modelData
|
||||||
|
text: qsTr(`${modelData}`)
|
||||||
|
clickListener:function(){
|
||||||
|
window.effect = modelData
|
||||||
|
if(window.effective){
|
||||||
|
FluTheme.blurBehindWindowEnabled = false
|
||||||
|
toggle_blur.checked = Qt.binding( function() {return FluTheme.blurBehindWindowEnabled})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluText{
|
||||||
|
visible: FluTheme.blurBehindWindowEnabled || window.effect === qsTr("dwm-blur")
|
||||||
|
text: qsTr("window tintOpacity")
|
||||||
|
Layout.topMargin: 20
|
||||||
|
}
|
||||||
|
FluSlider{
|
||||||
|
visible: FluTheme.blurBehindWindowEnabled || window.effect === qsTr("dwm-blur")
|
||||||
|
Layout.topMargin: 5
|
||||||
|
to:1
|
||||||
|
stepSize:0.1
|
||||||
|
onValueChanged: {
|
||||||
|
window.tintOpacity = value
|
||||||
|
}
|
||||||
|
Component.onCompleted: {
|
||||||
|
value = window.tintOpacity
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluText{
|
||||||
|
visible: FluTheme.blurBehindWindowEnabled
|
||||||
|
text: qsTr("window blurRadius")
|
||||||
|
Layout.topMargin: 20
|
||||||
|
}
|
||||||
|
FluSlider{
|
||||||
|
visible: FluTheme.blurBehindWindowEnabled
|
||||||
|
Layout.topMargin: 5
|
||||||
|
to:100
|
||||||
|
stepSize:1
|
||||||
|
onValueChanged: {
|
||||||
|
window.blurRadius = value
|
||||||
|
}
|
||||||
|
Component.onCompleted: {
|
||||||
|
value = window.blurRadius
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
CodeExpander{
|
CodeExpander{
|
||||||
|
@ -44,7 +44,6 @@ FluScrollablePage{
|
|||||||
wrapMode: Text.WrapAnywhere
|
wrapMode: Text.WrapAnywhere
|
||||||
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
|
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
|
||||||
text: modelData.text
|
text: modelData.text
|
||||||
font.bold: true
|
|
||||||
linkColor: FluTheme.dark ? FluColors.Teal.lighter : FluColors.Teal.dark
|
linkColor: FluTheme.dark ? FluColors.Teal.lighter : FluColors.Teal.dark
|
||||||
onLinkActivated:
|
onLinkActivated:
|
||||||
(link)=> {
|
(link)=> {
|
||||||
@ -128,28 +127,28 @@ FluScrollablePage{
|
|||||||
RowLayout{
|
RowLayout{
|
||||||
Layout.topMargin: 10
|
Layout.topMargin: 10
|
||||||
FluText{
|
FluText{
|
||||||
text:"mode:"
|
text: qsTr("mode:")
|
||||||
}
|
}
|
||||||
FluDropDownButton{
|
FluDropDownButton{
|
||||||
id: btn_mode
|
id: btn_mode
|
||||||
Layout.preferredWidth: 100
|
Layout.preferredWidth: 100
|
||||||
text: "Alternate"
|
text: qsTr("Alternate")
|
||||||
FluMenuItem{
|
FluMenuItem{
|
||||||
text: "Left"
|
text: qsTr("Left")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
btn_mode.text = text
|
btn_mode.text = text
|
||||||
time_line.mode = FluTimelineType.Left
|
time_line.mode = FluTimelineType.Left
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluMenuItem{
|
FluMenuItem{
|
||||||
text: "Right"
|
text: qsTr("Right")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
btn_mode.text = text
|
btn_mode.text = text
|
||||||
time_line.mode = FluTimelineType.Right
|
time_line.mode = FluTimelineType.Right
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluMenuItem{
|
FluMenuItem{
|
||||||
text: "Alternate"
|
text: qsTr("Alternate")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
btn_mode.text = text
|
btn_mode.text = text
|
||||||
time_line.mode = FluTimelineType.Alternate
|
time_line.mode = FluTimelineType.Alternate
|
||||||
|
@ -9,7 +9,6 @@ FluContentPage {
|
|||||||
|
|
||||||
title: qsTr("TreeView")
|
title: qsTr("TreeView")
|
||||||
|
|
||||||
|
|
||||||
function treeData(){
|
function treeData(){
|
||||||
const names = ["孙悟空", "猪八戒", "沙和尚", "唐僧","白骨夫人","金角大王","熊山君","黄风怪","银角大王"]
|
const names = ["孙悟空", "猪八戒", "沙和尚", "唐僧","白骨夫人","金角大王","熊山君","黄风怪","银角大王"]
|
||||||
function getRandomName(){
|
function getRandomName(){
|
||||||
@ -90,7 +89,7 @@ FluContentPage {
|
|||||||
RowLayout{
|
RowLayout{
|
||||||
spacing: 10
|
spacing: 10
|
||||||
FluText{
|
FluText{
|
||||||
text: "cellHeight:"
|
text: qsTr("cellHeight:")
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
FluSlider{
|
FluSlider{
|
||||||
@ -103,7 +102,7 @@ FluContentPage {
|
|||||||
RowLayout{
|
RowLayout{
|
||||||
spacing: 10
|
spacing: 10
|
||||||
FluText{
|
FluText{
|
||||||
text: "depthPadding:"
|
text: qsTr("depthPadding:")
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
FluSlider{
|
FluSlider{
|
||||||
@ -119,12 +118,12 @@ FluContentPage {
|
|||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
FluToggleSwitch{
|
FluToggleSwitch{
|
||||||
id: switch_showline
|
id: switch_showline
|
||||||
text:"showLine"
|
text: qsTr("showLine")
|
||||||
checked: false
|
checked: false
|
||||||
}
|
}
|
||||||
FluToggleSwitch{
|
FluToggleSwitch{
|
||||||
id: switch_checkable
|
id: switch_checkable
|
||||||
text:"checkable"
|
text: qsTr("checkable")
|
||||||
checked: false
|
checked: false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -132,20 +131,20 @@ FluContentPage {
|
|||||||
spacing: 8
|
spacing: 8
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
FluButton{
|
FluButton{
|
||||||
text: "all expand"
|
text: qsTr("all expand")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
tree_view.allExpand()
|
tree_view.allExpand()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluButton{
|
FluButton{
|
||||||
text: "all collapse"
|
text: qsTr("all collapse")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
tree_view.allCollapse()
|
tree_view.allCollapse()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluButton{
|
FluButton{
|
||||||
text: "print selection model"
|
text: qsTr("print selection model")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
var printData = []
|
var printData = []
|
||||||
var data = tree_view.selectionModel();
|
var data = tree_view.selectionModel();
|
||||||
|
@ -24,43 +24,43 @@ FluContentPage {
|
|||||||
transformOrigin: Item.TopLeft
|
transformOrigin: Item.TopLeft
|
||||||
FluText{
|
FluText{
|
||||||
id:text_Display
|
id:text_Display
|
||||||
text:"Display"
|
text: qsTr("Display")
|
||||||
padding: 0
|
padding: 0
|
||||||
font: FluTextStyle.Display
|
font: FluTextStyle.Display
|
||||||
}
|
}
|
||||||
FluText{
|
FluText{
|
||||||
id:text_TitleLarge
|
id:text_TitleLarge
|
||||||
text:"Title Large"
|
text: qsTr("Title Large")
|
||||||
padding: 0
|
padding: 0
|
||||||
font: FluTextStyle.TitleLarge
|
font: FluTextStyle.TitleLarge
|
||||||
}
|
}
|
||||||
FluText{
|
FluText{
|
||||||
id:text_Title
|
id:text_Title
|
||||||
text:"Title"
|
text: qsTr("Title")
|
||||||
padding: 0
|
padding: 0
|
||||||
font: FluTextStyle.Title
|
font: FluTextStyle.Title
|
||||||
}
|
}
|
||||||
FluText{
|
FluText{
|
||||||
id:text_Subtitle
|
id:text_Subtitle
|
||||||
text:"Subtitle"
|
text: qsTr("Subtitle")
|
||||||
padding: 0
|
padding: 0
|
||||||
font: FluTextStyle.Subtitle
|
font: FluTextStyle.Subtitle
|
||||||
}
|
}
|
||||||
FluText{
|
FluText{
|
||||||
id:text_BodyStrong
|
id:text_BodyStrong
|
||||||
text:"Body Strong"
|
text: qsTr("Body Strong")
|
||||||
padding: 0
|
padding: 0
|
||||||
font: FluTextStyle.BodyStrong
|
font: FluTextStyle.BodyStrong
|
||||||
}
|
}
|
||||||
FluText{
|
FluText{
|
||||||
id:text_Body
|
id:text_Body
|
||||||
text:"Body"
|
text: qsTr("Body")
|
||||||
padding: 0
|
padding: 0
|
||||||
font: FluTextStyle.Body
|
font: FluTextStyle.Body
|
||||||
}
|
}
|
||||||
FluText{
|
FluText{
|
||||||
id:text_Caption
|
id:text_Caption
|
||||||
text:"Caption"
|
text: qsTr("Caption")
|
||||||
padding: 0
|
padding: 0
|
||||||
font: FluTextStyle.Caption
|
font: FluTextStyle.Caption
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,7 @@ FluContentPage{
|
|||||||
spacing: 10
|
spacing: 10
|
||||||
Layout.topMargin: 14
|
Layout.topMargin: 14
|
||||||
FluText{
|
FluText{
|
||||||
text: "text:"
|
text: qsTr("text:")
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
FluTextBox{
|
FluTextBox{
|
||||||
@ -35,7 +35,7 @@ FluContentPage{
|
|||||||
RowLayout{
|
RowLayout{
|
||||||
spacing: 10
|
spacing: 10
|
||||||
FluText{
|
FluText{
|
||||||
text: "textSize:"
|
text: qsTr("textSize:")
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
FluSlider{
|
FluSlider{
|
||||||
@ -48,7 +48,7 @@ FluContentPage{
|
|||||||
RowLayout{
|
RowLayout{
|
||||||
spacing: 10
|
spacing: 10
|
||||||
FluText{
|
FluText{
|
||||||
text: "gapX:"
|
text: qsTr("gapX:")
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
FluSlider{
|
FluSlider{
|
||||||
@ -59,7 +59,7 @@ FluContentPage{
|
|||||||
RowLayout{
|
RowLayout{
|
||||||
spacing: 10
|
spacing: 10
|
||||||
FluText{
|
FluText{
|
||||||
text: "gapY:"
|
text: qsTr("gapY:")
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
FluSlider{
|
FluSlider{
|
||||||
@ -70,7 +70,7 @@ FluContentPage{
|
|||||||
RowLayout{
|
RowLayout{
|
||||||
spacing: 10
|
spacing: 10
|
||||||
FluText{
|
FluText{
|
||||||
text: "offsetX:"
|
text: qsTr("offsetX:")
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
FluSlider{
|
FluSlider{
|
||||||
@ -81,7 +81,7 @@ FluContentPage{
|
|||||||
RowLayout{
|
RowLayout{
|
||||||
spacing: 10
|
spacing: 10
|
||||||
FluText{
|
FluText{
|
||||||
text: "offsetY:"
|
text: qsTr("offsetY:")
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
FluSlider{
|
FluSlider{
|
||||||
@ -92,7 +92,7 @@ FluContentPage{
|
|||||||
RowLayout{
|
RowLayout{
|
||||||
spacing: 10
|
spacing: 10
|
||||||
FluText{
|
FluText{
|
||||||
text: "rotate:"
|
text: qsTr("rotate:")
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
FluSlider{
|
FluSlider{
|
||||||
@ -105,7 +105,7 @@ FluContentPage{
|
|||||||
RowLayout{
|
RowLayout{
|
||||||
spacing: 10
|
spacing: 10
|
||||||
FluText{
|
FluText{
|
||||||
text: "textColor:"
|
text: qsTr("textColor:")
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
}
|
}
|
||||||
FluColorPicker{
|
FluColorPicker{
|
||||||
|
26
example/qml/window/HotkeyWindow.qml
Normal file
26
example/qml/window/HotkeyWindow.qml
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
import QtQuick 2.15
|
||||||
|
import QtQuick.Controls 2.15
|
||||||
|
import QtQuick.Layouts 1.15
|
||||||
|
import FluentUI 1.0
|
||||||
|
import "../component"
|
||||||
|
|
||||||
|
FluWindow {
|
||||||
|
|
||||||
|
id: window
|
||||||
|
property string sequence: ""
|
||||||
|
title: qsTr("Hotkey")
|
||||||
|
width: 250
|
||||||
|
height: 250
|
||||||
|
fixSize: true
|
||||||
|
launchMode: FluWindowType.SingleInstance
|
||||||
|
onInitArgument:
|
||||||
|
(argument)=>{
|
||||||
|
window.sequence = argument.sequence
|
||||||
|
}
|
||||||
|
FluText{
|
||||||
|
anchors.centerIn: parent
|
||||||
|
color: FluTheme.primaryColor
|
||||||
|
font: FluTextStyle.Title
|
||||||
|
text: window.sequence
|
||||||
|
}
|
||||||
|
}
|
@ -14,13 +14,12 @@ FluWindow {
|
|||||||
id:window
|
id:window
|
||||||
title: "FluentUI"
|
title: "FluentUI"
|
||||||
width: 1000
|
width: 1000
|
||||||
height: 680
|
height: 668
|
||||||
minimumWidth: 1000
|
minimumWidth: 668
|
||||||
minimumHeight: 200
|
minimumHeight: 320
|
||||||
launchMode: FluWindowType.SingleTask
|
launchMode: FluWindowType.SingleTask
|
||||||
fitsAppBarWindows: true
|
fitsAppBarWindows: true
|
||||||
appBar: FluAppBar {
|
appBar: FluAppBar {
|
||||||
width: window.width
|
|
||||||
height: 30
|
height: 30
|
||||||
showDark: true
|
showDark: true
|
||||||
darkClickListener:(button)=>handleDarkChanged(button)
|
darkClickListener:(button)=>handleDarkChanged(button)
|
||||||
@ -235,8 +234,9 @@ FluWindow {
|
|||||||
id: com_reveal
|
id: com_reveal
|
||||||
CircularReveal{
|
CircularReveal{
|
||||||
id: reveal
|
id: reveal
|
||||||
target: window.contentItem
|
target: window.containerItem()
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
darkToLight: FluTheme.dark
|
||||||
onAnimationFinished:{
|
onAnimationFinished:{
|
||||||
//动画结束后释放资源
|
//动画结束后释放资源
|
||||||
loader_reveal.sourceComponent = undefined
|
loader_reveal.sourceComponent = undefined
|
||||||
@ -257,17 +257,14 @@ FluWindow {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function handleDarkChanged(button){
|
function handleDarkChanged(button){
|
||||||
if(!FluTheme.animationEnabled || window.fitsAppBarWindows === false){
|
if(FluTools.isMacos() || !FluTheme.animationEnabled){
|
||||||
changeDark()
|
changeDark()
|
||||||
}else{
|
}else{
|
||||||
if(loader_reveal.sourceComponent){
|
|
||||||
return
|
|
||||||
}
|
|
||||||
loader_reveal.sourceComponent = com_reveal
|
loader_reveal.sourceComponent = com_reveal
|
||||||
var target = window.contentItem
|
var target = window.containerItem()
|
||||||
var pos = button.mapToItem(target,0,0)
|
var pos = button.mapToItem(target,0,0)
|
||||||
var mouseX = pos.x
|
var mouseX = pos.x + button.width / 2
|
||||||
var mouseY = pos.y
|
var mouseY = pos.y + button.height / 2
|
||||||
var radius = Math.max(distance(mouseX,mouseY,0,0),distance(mouseX,mouseY,target.width,0),distance(mouseX,mouseY,0,target.height),distance(mouseX,mouseY,target.width,target.height))
|
var radius = Math.max(distance(mouseX,mouseY,0,0),distance(mouseX,mouseY,target.width,0),distance(mouseX,mouseY,0,target.height),distance(mouseX,mouseY,target.width,target.height))
|
||||||
var reveal = loader_reveal.item
|
var reveal = loader_reveal.item
|
||||||
reveal.start(reveal.width*Screen.devicePixelRatio,reveal.height*Screen.devicePixelRatio,Qt.point(mouseX,mouseY),radius)
|
reveal.start(reveal.width*Screen.devicePixelRatio,reveal.height*Screen.devicePixelRatio,Qt.point(mouseX,mouseY),radius)
|
||||||
|
BIN
example/res/image/logo_pro.png
Normal file
BIN
example/res/image/logo_pro.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 31 KiB |
@ -32,13 +32,9 @@ add_custom_target(Script-UpdateTranslations
|
|||||||
SOURCES ${TS_FILE_PATHS}
|
SOURCES ${TS_FILE_PATHS}
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_add_big_resources(QRC_RESOURCES qml.qrc)
|
|
||||||
list(APPEND QRC_RESOURCES qml.qrc)
|
|
||||||
set_property(SOURCE qml.qrc PROPERTY SKIP_AUTORCC ON)
|
|
||||||
|
|
||||||
set(PROJECT_SOURCES
|
set(PROJECT_SOURCES
|
||||||
main.cpp
|
main.cpp
|
||||||
${QRC_RESOURCES}
|
qml.qrc
|
||||||
)
|
)
|
||||||
|
|
||||||
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
|
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
|
||||||
@ -76,11 +72,6 @@ install(TARGETS ${PROJECT_NAME}
|
|||||||
BUNDLE DESTINATION .
|
BUNDLE DESTINATION .
|
||||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||||
|
|
||||||
if(QT_VERSION_MAJOR EQUAL 6)
|
|
||||||
qt_import_qml_plugins(${PROJECT_NAME})
|
|
||||||
qt_finalize_executable(${PROJECT_NAME})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (CMAKE_BUILD_TYPE MATCHES "Release")
|
if (CMAKE_BUILD_TYPE MATCHES "Release")
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
find_program(QT_DEPLOY_QT NAMES macdeployqt)
|
find_program(QT_DEPLOY_QT NAMES macdeployqt)
|
||||||
|
@ -4,11 +4,11 @@
|
|||||||
#include <QGuiApplication>
|
#include <QGuiApplication>
|
||||||
#include "Version.h"
|
#include "Version.h"
|
||||||
|
|
||||||
AppInfo::AppInfo(QObject *parent)
|
AppInfo::AppInfo(QObject *parent) : QObject{parent} {
|
||||||
: QObject{parent} {
|
|
||||||
version(APPLICATION_VERSION);
|
version(APPLICATION_VERSION);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
[[maybe_unused]] void AppInfo::testCrash() {
|
[[maybe_unused]] void AppInfo::testCrash() {
|
||||||
auto *crash = reinterpret_cast<volatile int *>(0);
|
auto *crash = reinterpret_cast<volatile int *>(0);
|
||||||
*crash = 0;
|
*crash = 0;
|
||||||
|
@ -2,17 +2,17 @@
|
|||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QQmlApplicationEngine>
|
#include <QQmlApplicationEngine>
|
||||||
#include "stdafx.h"
|
|
||||||
#include "singleton.h"
|
#include "singleton.h"
|
||||||
|
#include "stdafx.h"
|
||||||
|
|
||||||
class AppInfo : public QObject {
|
class AppInfo : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY_AUTO(QString, version)
|
Q_PROPERTY_AUTO(QString, version)
|
||||||
private:
|
private:
|
||||||
explicit AppInfo(QObject *parent = nullptr);
|
explicit AppInfo(QObject *parent = nullptr);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
SINGLETON(AppInfo)
|
SINGLETON(AppInfo)
|
||||||
|
[[maybe_unused]] Q_INVOKABLE void testCrash();
|
||||||
[[maybe_unused]] Q_INVOKABLE void testCrash();
|
|
||||||
};
|
};
|
||||||
|
@ -11,21 +11,28 @@
|
|||||||
|
|
||||||
#pragma comment(lib, "Dbghelp.lib")
|
#pragma comment(lib, "Dbghelp.lib")
|
||||||
|
|
||||||
static void
|
static void miniDumpWriteDump(HANDLE hProcess, DWORD ProcessId, HANDLE hFile,
|
||||||
miniDumpWriteDump(HANDLE hProcess, DWORD ProcessId, HANDLE hFile, CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam, CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam) {
|
CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
|
||||||
typedef HRESULT (WINAPI *MiniDumpWriteDumpPtr)(HANDLE hProcess, DWORD ProcessId, HANDLE hFile, MINIDUMP_TYPE DumpType, CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
|
CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam) {
|
||||||
CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam);
|
typedef HRESULT(WINAPI * MiniDumpWriteDumpPtr)(
|
||||||
|
HANDLE hProcess, DWORD ProcessId, HANDLE hFile, MINIDUMP_TYPE DumpType,
|
||||||
|
CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
|
||||||
|
CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
|
||||||
|
CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam);
|
||||||
HMODULE module = LoadLibraryW(L"Dbghelp.dll");
|
HMODULE module = LoadLibraryW(L"Dbghelp.dll");
|
||||||
if (module) {
|
if (module) {
|
||||||
MiniDumpWriteDumpPtr mini_dump_write_dump;
|
MiniDumpWriteDumpPtr mini_dump_write_dump;
|
||||||
mini_dump_write_dump = reinterpret_cast<MiniDumpWriteDumpPtr>(GetProcAddress(module, "MiniDumpWriteDump"));
|
mini_dump_write_dump =
|
||||||
|
reinterpret_cast<MiniDumpWriteDumpPtr>(GetProcAddress(module, "MiniDumpWriteDump"));
|
||||||
if (mini_dump_write_dump) {
|
if (mini_dump_write_dump) {
|
||||||
mini_dump_write_dump(hProcess, ProcessId, hFile, static_cast<MINIDUMP_TYPE>(80), ExceptionParam, nullptr, CallbackParam);
|
mini_dump_write_dump(hProcess, ProcessId, hFile, static_cast<MINIDUMP_TYPE>(80),
|
||||||
|
ExceptionParam, nullptr, CallbackParam);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL CALLBACK MyMiniDumpCallback(PVOID, const PMINIDUMP_CALLBACK_INPUT input, PMINIDUMP_CALLBACK_OUTPUT output) {
|
BOOL CALLBACK MyMiniDumpCallback(PVOID, const PMINIDUMP_CALLBACK_INPUT input,
|
||||||
|
PMINIDUMP_CALLBACK_OUTPUT output) {
|
||||||
if (input == nullptr || output == nullptr)
|
if (input == nullptr || output == nullptr)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
@ -42,8 +49,7 @@ BOOL CALLBACK MyMiniDumpCallback(PVOID, const PMINIDUMP_CALLBACK_INPUT input, PM
|
|||||||
output->ModuleWriteFlags &= ~ModuleWriteModule;
|
output->ModuleWriteFlags &= ~ModuleWriteModule;
|
||||||
}
|
}
|
||||||
ret = TRUE;
|
ret = TRUE;
|
||||||
}
|
} break;
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -51,7 +57,9 @@ BOOL CALLBACK MyMiniDumpCallback(PVOID, const PMINIDUMP_CALLBACK_INPUT input, PM
|
|||||||
}
|
}
|
||||||
|
|
||||||
void WriteDump(EXCEPTION_POINTERS *exp, const std::wstring &path) {
|
void WriteDump(EXCEPTION_POINTERS *exp, const std::wstring &path) {
|
||||||
HANDLE h = ::CreateFileW(path.c_str(), GENERIC_WRITE | GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
|
HANDLE h = ::CreateFileW(path.c_str(), GENERIC_WRITE | GENERIC_READ,
|
||||||
|
FILE_SHARE_WRITE | FILE_SHARE_READ, nullptr, CREATE_ALWAYS,
|
||||||
|
FILE_ATTRIBUTE_NORMAL, nullptr);
|
||||||
MINIDUMP_EXCEPTION_INFORMATION info;
|
MINIDUMP_EXCEPTION_INFORMATION info;
|
||||||
info.ThreadId = ::GetCurrentThreadId();
|
info.ThreadId = ::GetCurrentThreadId();
|
||||||
info.ExceptionPointers = exp;
|
info.ExceptionPointers = exp;
|
||||||
@ -64,8 +72,10 @@ void WriteDump(EXCEPTION_POINTERS *exp, const std::wstring &path) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
LONG WINAPI MyUnhandledExceptionFilter(EXCEPTION_POINTERS *exp) {
|
LONG WINAPI MyUnhandledExceptionFilter(EXCEPTION_POINTERS *exp) {
|
||||||
const QString dumpFileName = QString("%1_%2.dmp").arg("crash", QDateTime::currentDateTime().toString("yyyyMMdd_hhmmss"));
|
const QString dumpFileName =
|
||||||
const QString dumpDirPath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/dmp";
|
QString("%1_%2.dmp").arg("crash", QDateTime::currentDateTime().toString("yyyyMMdd_hhmmss"));
|
||||||
|
const QString dumpDirPath =
|
||||||
|
QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/dmp";
|
||||||
const QDir dumpDir(dumpDirPath);
|
const QDir dumpDir(dumpDirPath);
|
||||||
if (!dumpDir.exists()) {
|
if (!dumpDir.exists()) {
|
||||||
dumpDir.mkpath(dumpDirPath);
|
dumpDir.mkpath(dumpDirPath);
|
||||||
@ -76,4 +86,4 @@ LONG WINAPI MyUnhandledExceptionFilter(EXCEPTION_POINTERS *exp) {
|
|||||||
arguments << "-crashed=" + dumpFilePath;
|
arguments << "-crashed=" + dumpFilePath;
|
||||||
QProcess::startDetached(QGuiApplication::applicationFilePath(), arguments);
|
QProcess::startDetached(QGuiApplication::applicationFilePath(), arguments);
|
||||||
return EXCEPTION_EXECUTE_HANDLER;
|
return EXCEPTION_EXECUTE_HANDLER;
|
||||||
}
|
}
|
||||||
|
@ -15,9 +15,7 @@ CircularReveal::CircularReveal(QQuickItem *parent) : QQuickPaintedItem(parent) {
|
|||||||
setVisible(false);
|
setVisible(false);
|
||||||
Q_EMIT animationFinished();
|
Q_EMIT animationFinished();
|
||||||
});
|
});
|
||||||
connect(this, &CircularReveal::radiusChanged, this, [=]() {
|
connect(this, &CircularReveal::radiusChanged, this, [=]() { update(); });
|
||||||
update();
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CircularReveal::paint(QPainter *painter) {
|
void CircularReveal::paint(QPainter *painter) {
|
||||||
@ -27,16 +25,36 @@ void CircularReveal::paint(QPainter *painter) {
|
|||||||
path.moveTo(_center.x(), _center.y());
|
path.moveTo(_center.x(), _center.y());
|
||||||
path.addEllipse(QPointF(_center.x(), _center.y()), _radius, _radius);
|
path.addEllipse(QPointF(_center.x(), _center.y()), _radius, _radius);
|
||||||
painter->setCompositionMode(QPainter::CompositionMode_Clear);
|
painter->setCompositionMode(QPainter::CompositionMode_Clear);
|
||||||
painter->fillPath(path, Qt::black);
|
if(_darkToLight){
|
||||||
|
painter->fillPath(path, Qt::white);
|
||||||
|
}else{
|
||||||
|
QPainterPath outerRect;
|
||||||
|
outerRect.addRect(0, 0, width(), height());
|
||||||
|
outerRect = outerRect.subtracted(path);
|
||||||
|
painter->fillPath(outerRect, Qt::black);
|
||||||
|
}
|
||||||
painter->restore();
|
painter->restore();
|
||||||
}
|
}
|
||||||
|
|
||||||
[[maybe_unused]] void CircularReveal::start(int w, int h, const QPoint ¢er, int radius) {
|
[[maybe_unused]] void CircularReveal::start(int w, int h, const QPoint ¢er, int radius) {
|
||||||
_anim->setStartValue(0);
|
if (_anim->state() == QAbstractAnimation::Running) {
|
||||||
_anim->setEndValue(radius);
|
_anim->stop();
|
||||||
|
int currentRadius = _radius;
|
||||||
|
_anim->setStartValue(currentRadius);
|
||||||
|
_anim->setEndValue(_darkToLight ? 0 : radius);
|
||||||
|
} else {
|
||||||
|
if(_darkToLight){
|
||||||
|
_anim->setStartValue(radius);
|
||||||
|
_anim->setEndValue(0);
|
||||||
|
}else{
|
||||||
|
_anim->setStartValue(0);
|
||||||
|
_anim->setEndValue(radius);
|
||||||
|
}
|
||||||
|
}
|
||||||
_center = center;
|
_center = center;
|
||||||
_grabResult = _target->grabToImage(QSize(w, h));
|
_grabResult = _target->grabToImage(QSize(w, h));
|
||||||
connect(_grabResult.data(), &QQuickItemGrabResult::ready, this, &CircularReveal::handleGrabResult);
|
connect(_grabResult.data(), &QQuickItemGrabResult::ready, this,
|
||||||
|
&CircularReveal::handleGrabResult);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CircularReveal::handleGrabResult() {
|
void CircularReveal::handleGrabResult() {
|
||||||
|
@ -7,20 +7,16 @@
|
|||||||
#include "src/stdafx.h"
|
#include "src/stdafx.h"
|
||||||
|
|
||||||
class CircularReveal : public QQuickPaintedItem {
|
class CircularReveal : public QQuickPaintedItem {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY_AUTO_P(QQuickItem*, target)
|
Q_PROPERTY_AUTO_P(QQuickItem *, target)
|
||||||
Q_PROPERTY_AUTO(int, radius)
|
Q_PROPERTY_AUTO(int, radius)
|
||||||
|
Q_PROPERTY_AUTO(bool, darkToLight)
|
||||||
public:
|
public:
|
||||||
explicit CircularReveal(QQuickItem *parent = nullptr);
|
explicit CircularReveal(QQuickItem *parent = nullptr);
|
||||||
|
|
||||||
void paint(QPainter *painter) override;
|
void paint(QPainter *painter) override;
|
||||||
|
|
||||||
[[maybe_unused]] Q_INVOKABLE void start(int w, int h, const QPoint ¢er, int radius);
|
[[maybe_unused]] Q_INVOKABLE void start(int w, int h, const QPoint ¢er, int radius);
|
||||||
|
|
||||||
Q_SIGNAL void imageChanged();
|
Q_SIGNAL void imageChanged();
|
||||||
|
|
||||||
Q_SIGNAL void animationFinished();
|
Q_SIGNAL void animationFinished();
|
||||||
|
|
||||||
Q_SLOT void handleGrabResult();
|
Q_SLOT void handleGrabResult();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -6,11 +6,10 @@
|
|||||||
#include "src/stdafx.h"
|
#include "src/stdafx.h"
|
||||||
|
|
||||||
class FileWatcher : public QObject {
|
class FileWatcher : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY_AUTO(QString, path);
|
Q_PROPERTY_AUTO(QString, path)
|
||||||
public:
|
public:
|
||||||
explicit FileWatcher(QObject *parent = nullptr);
|
explicit FileWatcher(QObject *parent = nullptr);
|
||||||
|
|
||||||
Q_SIGNAL void fileChanged();
|
Q_SIGNAL void fileChanged();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -12,7 +12,9 @@ FpsItem::FpsItem() {
|
|||||||
});
|
});
|
||||||
connect(this, &QQuickItem::windowChanged, this, [this] {
|
connect(this, &QQuickItem::windowChanged, this, [this] {
|
||||||
if (window()) {
|
if (window()) {
|
||||||
connect(window(), &QQuickWindow::afterRendering, this, [this] { _frameCount++; }, Qt::DirectConnection);
|
connect(
|
||||||
|
window(), &QQuickWindow::afterRendering, this, [this] { _frameCount++; },
|
||||||
|
Qt::DirectConnection);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
timer->start(1000);
|
timer->start(1000);
|
||||||
|
@ -4,12 +4,11 @@
|
|||||||
#include "src/stdafx.h"
|
#include "src/stdafx.h"
|
||||||
|
|
||||||
class FpsItem : public QQuickItem {
|
class FpsItem : public QQuickItem {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY_AUTO(int, fps)
|
Q_PROPERTY_AUTO(int, fps)
|
||||||
public:
|
public:
|
||||||
FpsItem();
|
FpsItem();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int _frameCount = 0;
|
int _frameCount = 0;
|
||||||
|
};
|
||||||
};
|
|
||||||
|
@ -2,15 +2,13 @@
|
|||||||
|
|
||||||
#include <QOpenGLFramebufferObjectFormat>
|
#include <QOpenGLFramebufferObjectFormat>
|
||||||
#include <QOpenGLShaderProgram>
|
#include <QOpenGLShaderProgram>
|
||||||
|
#include <QQuickWindow>
|
||||||
|
|
||||||
class FBORenderer : public QQuickFramebufferObject::Renderer, protected QOpenGLFunctions {
|
class FBORenderer : public QQuickFramebufferObject::Renderer, protected QOpenGLFunctions {
|
||||||
public:
|
public:
|
||||||
explicit FBORenderer(const OpenGLItem *item);
|
explicit FBORenderer(const OpenGLItem *item);
|
||||||
|
|
||||||
void render() override;
|
void render() override;
|
||||||
|
|
||||||
QOpenGLFramebufferObject *createFramebufferObject(const QSize &size) override;
|
QOpenGLFramebufferObject *createFramebufferObject(const QSize &size) override;
|
||||||
|
|
||||||
QOpenGLShaderProgram program;
|
QOpenGLShaderProgram program;
|
||||||
const OpenGLItem *item = nullptr;
|
const OpenGLItem *item = nullptr;
|
||||||
};
|
};
|
||||||
@ -18,22 +16,22 @@ public:
|
|||||||
FBORenderer::FBORenderer(const OpenGLItem *item) {
|
FBORenderer::FBORenderer(const OpenGLItem *item) {
|
||||||
this->item = item;
|
this->item = item;
|
||||||
initializeOpenGLFunctions();
|
initializeOpenGLFunctions();
|
||||||
program.addCacheableShaderFromSourceCode(QOpenGLShader::Vertex,
|
program.addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, "attribute highp vec4 vertices;"
|
||||||
"attribute highp vec4 vertices;"
|
"varying highp vec2 coords;"
|
||||||
"varying highp vec2 coords;"
|
"void main() {"
|
||||||
"void main() {"
|
" gl_Position = vertices;"
|
||||||
" gl_Position = vertices;"
|
" coords = vertices.xy;"
|
||||||
" coords = vertices.xy;"
|
"}");
|
||||||
"}");
|
program.addCacheableShaderFromSourceCode(
|
||||||
program.addCacheableShaderFromSourceCode(QOpenGLShader::Fragment,
|
QOpenGLShader::Fragment,
|
||||||
"uniform lowp float t;"
|
"uniform lowp float t;"
|
||||||
"varying highp vec2 coords;"
|
"varying highp vec2 coords;"
|
||||||
"void main() {"
|
"void main() {"
|
||||||
" lowp float i = 1. - (pow(abs(coords.x), 4.) + pow(abs(coords.y), 4.));"
|
" lowp float i = 1. - (pow(abs(coords.x), 4.) + pow(abs(coords.y), 4.));"
|
||||||
" i = smoothstep(t - 0.8, t + 0.8, i);"
|
" i = smoothstep(t - 0.8, t + 0.8, i);"
|
||||||
" i = floor(i * 20.) / 20.;"
|
" i = floor(i * 20.) / 20.;"
|
||||||
" gl_FragColor = vec4(coords * .5 + .5, i, i);"
|
" gl_FragColor = vec4(coords * .5 + .5, i, i);"
|
||||||
"}");
|
"}");
|
||||||
|
|
||||||
program.bindAttributeLocation("vertices", 0);
|
program.bindAttributeLocation("vertices", 0);
|
||||||
program.link();
|
program.link();
|
||||||
@ -47,21 +45,17 @@ QOpenGLFramebufferObject *FBORenderer::createFramebufferObject(const QSize &size
|
|||||||
}
|
}
|
||||||
|
|
||||||
void FBORenderer::render() {
|
void FBORenderer::render() {
|
||||||
|
auto pixelRatio = item->window()->devicePixelRatio();
|
||||||
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
|
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
|
||||||
glEnable(GL_DEPTH_TEST);
|
glEnable(GL_DEPTH_TEST);
|
||||||
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
||||||
program.bind();
|
program.bind();
|
||||||
program.enableAttributeArray(0);
|
program.enableAttributeArray(0);
|
||||||
float values[] = {
|
float values[] = {-1, -1, 1, -1, -1, 1, 1, 1};
|
||||||
-1, -1,
|
|
||||||
1, -1,
|
|
||||||
-1, 1,
|
|
||||||
1, 1
|
|
||||||
};
|
|
||||||
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
||||||
program.setAttributeArray(0, GL_FLOAT, values, 2);
|
program.setAttributeArray(0, GL_FLOAT, values, 2);
|
||||||
program.setUniformValue("t", (float) item->t());
|
program.setUniformValue("t", (float) item->t());
|
||||||
glViewport(0, 0, qRound(item->width()), qRound(item->height()));
|
glViewport(0, 0, qRound(item->width() * pixelRatio), qRound(item->height() * pixelRatio));
|
||||||
glDisable(GL_DEPTH_TEST);
|
glDisable(GL_DEPTH_TEST);
|
||||||
glEnable(GL_BLEND);
|
glEnable(GL_BLEND);
|
||||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
|
||||||
|
@ -7,21 +7,17 @@
|
|||||||
class FBORenderer;
|
class FBORenderer;
|
||||||
|
|
||||||
class OpenGLItem : public QQuickFramebufferObject, protected QOpenGLFunctions {
|
class OpenGLItem : public QQuickFramebufferObject, protected QOpenGLFunctions {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY(qreal t READ t WRITE setT NOTIFY tChanged)
|
Q_PROPERTY(qreal t READ t WRITE setT NOTIFY tChanged)
|
||||||
public:
|
public:
|
||||||
explicit OpenGLItem(QQuickItem *parent = nullptr);
|
explicit OpenGLItem(QQuickItem *parent = nullptr);
|
||||||
|
|
||||||
[[nodiscard]] QQuickFramebufferObject::Renderer *createRenderer() const override;
|
[[nodiscard]] QQuickFramebufferObject::Renderer *createRenderer() const override;
|
||||||
|
|
||||||
void timerEvent(QTimerEvent *) override;
|
void timerEvent(QTimerEvent *) override;
|
||||||
|
[[nodiscard]] qreal t() const {
|
||||||
[[nodiscard]] qreal t() const { return m_t; }
|
return m_t;
|
||||||
|
}
|
||||||
void setT(qreal t);
|
void setT(qreal t);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
|
|
||||||
void tChanged();
|
void tChanged();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -4,11 +4,11 @@
|
|||||||
#include <QGuiApplication>
|
#include <QGuiApplication>
|
||||||
|
|
||||||
[[maybe_unused]] InitializrHelper::InitializrHelper(QObject *parent) : QObject(parent) {
|
[[maybe_unused]] InitializrHelper::InitializrHelper(QObject *parent) : QObject(parent) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
InitializrHelper::~InitializrHelper() = default;
|
InitializrHelper::~InitializrHelper() = default;
|
||||||
|
|
||||||
|
|
||||||
bool InitializrHelper::copyDir(const QDir &fromDir, const QDir &toDir, bool coverIfFileExists) {
|
bool InitializrHelper::copyDir(const QDir &fromDir, const QDir &toDir, bool coverIfFileExists) {
|
||||||
const QDir &_formDir = fromDir;
|
const QDir &_formDir = fromDir;
|
||||||
QDir _toDir = toDir;
|
QDir _toDir = toDir;
|
||||||
@ -17,25 +17,25 @@ bool InitializrHelper::copyDir(const QDir &fromDir, const QDir &toDir, bool cove
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
QFileInfoList fileInfoList = _formDir.entryInfoList();
|
QFileInfoList fileInfoList = _formDir.entryInfoList();
|
||||||
foreach(QFileInfo fileInfo, fileInfoList) {
|
foreach (QFileInfo fileInfo, fileInfoList) {
|
||||||
if (fileInfo.fileName() == "." || fileInfo.fileName() == "..")
|
if (fileInfo.fileName() == "." || fileInfo.fileName() == "..")
|
||||||
continue;
|
continue;
|
||||||
if (fileInfo.isDir()) {
|
if (fileInfo.isDir()) {
|
||||||
if (!copyDir(fileInfo.filePath(), _toDir.filePath(fileInfo.fileName()), true))
|
if (!copyDir(fileInfo.filePath(), _toDir.filePath(fileInfo.fileName()), true))
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
if (coverIfFileExists && _toDir.exists(fileInfo.fileName())) {
|
if (coverIfFileExists && _toDir.exists(fileInfo.fileName())) {
|
||||||
_toDir.remove(fileInfo.fileName());
|
_toDir.remove(fileInfo.fileName());
|
||||||
}
|
}
|
||||||
if (!QFile::copy(fileInfo.filePath(), _toDir.filePath(fileInfo.fileName()))) {
|
if (!QFile::copy(fileInfo.filePath(), _toDir.filePath(fileInfo.fileName()))) {
|
||||||
return false;
|
return false;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename...Args>
|
template <typename... Args>
|
||||||
void InitializrHelper::templateToFile(const QString &source, const QString &dest, Args &&...args) {
|
void InitializrHelper::templateToFile(const QString &source, const QString &dest, Args &&...args) {
|
||||||
QFile file(source);
|
QFile file(source);
|
||||||
if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
|
if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
|
||||||
@ -61,7 +61,8 @@ void InitializrHelper::templateToFile(const QString &source, const QString &dest
|
|||||||
|
|
||||||
void InitializrHelper::copyFile(const QString &source, const QString &dest) {
|
void InitializrHelper::copyFile(const QString &source, const QString &dest) {
|
||||||
QFile::copy(source, dest);
|
QFile::copy(source, dest);
|
||||||
QFile::setPermissions(dest, QFile::WriteOwner | QFile::WriteUser | QFile::WriteGroup | QFile::WriteOther);
|
QFile::setPermissions(dest, QFile::WriteOwner | QFile::WriteUser | QFile::WriteGroup |
|
||||||
|
QFile::WriteOther);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[maybe_unused]] void InitializrHelper::generate(const QString &name, const QString &path) {
|
[[maybe_unused]] void InitializrHelper::generate(const QString &name, const QString &path) {
|
||||||
@ -87,15 +88,21 @@ void InitializrHelper::copyFile(const QString &source, const QString &dest) {
|
|||||||
projectDir.mkpath(projectPath);
|
projectDir.mkpath(projectPath);
|
||||||
QDir fluentDir(projectDir.filePath("FluentUI"));
|
QDir fluentDir(projectDir.filePath("FluentUI"));
|
||||||
copyDir(QDir(QGuiApplication::applicationDirPath() + "/source"), fluentDir);
|
copyDir(QDir(QGuiApplication::applicationDirPath() + "/source"), fluentDir);
|
||||||
templateToFile(":/example/res/template/CMakeLists.txt.in", projectDir.filePath("CMakeLists.txt"), name);
|
templateToFile(":/example/res/template/CMakeLists.txt.in",
|
||||||
templateToFile(":/example/res/template/src/CMakeLists.txt.in", projectDir.filePath("src/CMakeLists.txt"), name);
|
projectDir.filePath("CMakeLists.txt"), name);
|
||||||
templateToFile(":/example/res/template/src/main.cpp.in", projectDir.filePath("src/main.cpp"), name);
|
templateToFile(":/example/res/template/src/CMakeLists.txt.in",
|
||||||
templateToFile(":/example/res/template/src/main.qml.in", projectDir.filePath("src/main.qml"), name);
|
projectDir.filePath("src/CMakeLists.txt"), name);
|
||||||
templateToFile(":/example/res/template/src/en_US.ts.in", projectDir.filePath("src/" + name + "_en_US.ts"), name);
|
templateToFile(":/example/res/template/src/main.cpp.in", projectDir.filePath("src/main.cpp"),
|
||||||
templateToFile(":/example/res/template/src/zh_CN.ts.in", projectDir.filePath("src/" + name + "_zh_CN.ts"), name);
|
name);
|
||||||
|
templateToFile(":/example/res/template/src/main.qml.in", projectDir.filePath("src/main.qml"),
|
||||||
|
name);
|
||||||
|
templateToFile(":/example/res/template/src/en_US.ts.in",
|
||||||
|
projectDir.filePath("src/" + name + "_en_US.ts"), name);
|
||||||
|
templateToFile(":/example/res/template/src/zh_CN.ts.in",
|
||||||
|
projectDir.filePath("src/" + name + "_zh_CN.ts"), name);
|
||||||
copyFile(":/example/res/template/src/App.qml.in", projectDir.filePath("src/App.qml"));
|
copyFile(":/example/res/template/src/App.qml.in", projectDir.filePath("src/App.qml"));
|
||||||
copyFile(":/example/res/template/src/qml.qrc.in", projectDir.filePath("src/qml.qrc"));
|
copyFile(":/example/res/template/src/qml.qrc.in", projectDir.filePath("src/qml.qrc"));
|
||||||
copyFile(":/example/res/template/src/logo.ico.in", projectDir.filePath("src/logo.ico"));
|
copyFile(":/example/res/template/src/logo.ico.in", projectDir.filePath("src/logo.ico"));
|
||||||
copyFile(":/example/res/template/src/README.md.in", projectDir.filePath("src/README.md"));
|
copyFile(":/example/res/template/src/README.md.in", projectDir.filePath("src/README.md"));
|
||||||
return this->success(projectPath+"/CMakeLists.txt");
|
return this->success(projectPath + "/CMakeLists.txt");
|
||||||
}
|
}
|
||||||
|
@ -6,25 +6,18 @@
|
|||||||
#include "src/singleton.h"
|
#include "src/singleton.h"
|
||||||
|
|
||||||
class InitializrHelper : public QObject {
|
class InitializrHelper : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
private:
|
private:
|
||||||
[[maybe_unused]] explicit InitializrHelper(QObject *parent = nullptr);
|
[[maybe_unused]] explicit InitializrHelper(QObject *parent = nullptr);
|
||||||
|
|
||||||
bool copyDir(const QDir &fromDir, const QDir &toDir, bool coverIfFileExists = true);
|
bool copyDir(const QDir &fromDir, const QDir &toDir, bool coverIfFileExists = true);
|
||||||
|
|
||||||
static void copyFile(const QString &source, const QString &dest);
|
static void copyFile(const QString &source, const QString &dest);
|
||||||
|
template <typename... Args>
|
||||||
template<typename...Args>
|
|
||||||
void templateToFile(const QString &source, const QString &dest, Args &&...args);
|
void templateToFile(const QString &source, const QString &dest, Args &&...args);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
SINGLETON(InitializrHelper)
|
SINGLETON(InitializrHelper)
|
||||||
|
|
||||||
~InitializrHelper() override;
|
~InitializrHelper() override;
|
||||||
|
|
||||||
[[maybe_unused]] Q_INVOKABLE void generate(const QString &name, const QString &path);
|
[[maybe_unused]] Q_INVOKABLE void generate(const QString &name, const QString &path);
|
||||||
|
|
||||||
Q_SIGNAL void error(const QString &message);
|
Q_SIGNAL void error(const QString &message);
|
||||||
|
|
||||||
Q_SIGNAL void success(const QString &path);
|
Q_SIGNAL void success(const QString &path);
|
||||||
};
|
};
|
||||||
|
@ -13,11 +13,9 @@
|
|||||||
#include "Version.h"
|
#include "Version.h"
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
|
# include <process.h>
|
||||||
#include <process.h>
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
#include <unistd.h>
|
# include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef QT_ENDL
|
#ifndef QT_ENDL
|
||||||
@ -38,19 +36,20 @@ static std::unique_ptr<QTextStream> g_logStream = nullptr;
|
|||||||
static int g_logLevel = 4;
|
static int g_logLevel = 4;
|
||||||
|
|
||||||
std::map<QtMsgType, int> logLevelMap = {
|
std::map<QtMsgType, int> logLevelMap = {
|
||||||
{QtFatalMsg, 0},
|
{QtFatalMsg, 0},
|
||||||
{QtCriticalMsg, 1},
|
{QtCriticalMsg, 1},
|
||||||
{QtWarningMsg, 2},
|
{QtWarningMsg, 2},
|
||||||
{QtInfoMsg, 3},
|
{QtInfoMsg, 3},
|
||||||
{QtDebugMsg, 4}
|
{QtDebugMsg, 4}
|
||||||
};
|
};
|
||||||
|
|
||||||
QString Log::prettyProductInfoWrapper() {
|
QString Log::prettyProductInfoWrapper() {
|
||||||
auto productName = QSysInfo::prettyProductName();
|
auto productName = QSysInfo::prettyProductName();
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
|
#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
|
||||||
#if defined(Q_OS_MACOS)
|
# if defined(Q_OS_MACOS)
|
||||||
auto macosVersionFile = QString::fromUtf8("/System/Library/CoreServices/.SystemVersionPlatform.plist");
|
auto macosVersionFile =
|
||||||
auto fi = QFileInfo (macosVersionFile);
|
QString::fromUtf8("/System/Library/CoreServices/.SystemVersionPlatform.plist");
|
||||||
|
auto fi = QFileInfo(macosVersionFile);
|
||||||
if (fi.exists() && fi.isReadable()) {
|
if (fi.exists() && fi.isReadable()) {
|
||||||
auto plistFile = QFile(macosVersionFile);
|
auto plistFile = QFile(macosVersionFile);
|
||||||
plistFile.open(QIODevice::ReadOnly);
|
plistFile.open(QIODevice::ReadOnly);
|
||||||
@ -69,10 +68,12 @@ QString Log::prettyProductInfoWrapper() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
#if defined(Q_OS_WIN)
|
#if defined(Q_OS_WIN)
|
||||||
QSettings regKey{QString::fromUtf8(R"(HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion)"), QSettings::NativeFormat};
|
QSettings regKey{
|
||||||
|
QString::fromUtf8(R"(HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion)"),
|
||||||
|
QSettings::NativeFormat};
|
||||||
if (regKey.contains(QString::fromUtf8("CurrentBuildNumber"))) {
|
if (regKey.contains(QString::fromUtf8("CurrentBuildNumber"))) {
|
||||||
auto buildNumber = regKey.value(QString::fromUtf8("CurrentBuildNumber")).toInt();
|
auto buildNumber = regKey.value(QString::fromUtf8("CurrentBuildNumber")).toInt();
|
||||||
if (buildNumber > 0) {
|
if (buildNumber > 0) {
|
||||||
@ -91,7 +92,8 @@ QString Log::prettyProductInfoWrapper() {
|
|||||||
return productName;
|
return productName;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void messageHandler(const QtMsgType type, const QMessageLogContext &context, const QString &message) {
|
static inline void messageHandler(const QtMsgType type, const QMessageLogContext &context,
|
||||||
|
const QString &message) {
|
||||||
if (message == "Could not get the INetworkConnection instance for the adapter GUID.") {
|
if (message == "Could not get the INetworkConnection instance for the adapter GUID.") {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -132,14 +134,15 @@ static inline void messageHandler(const QtMsgType type, const QMessageLogContext
|
|||||||
sprintf(fn, "%s", ptrTmp + 1);
|
sprintf(fn, "%s", ptrTmp + 1);
|
||||||
strFileTmp = fn;
|
strFileTmp = fn;
|
||||||
}
|
}
|
||||||
fileAndLineLogStr = QString::fromStdString("[%1:%2]").arg(QString::fromStdString(strFileTmp), QString::number(context.line));
|
fileAndLineLogStr = QString::fromStdString("[%1:%2]").arg(
|
||||||
|
QString::fromStdString(strFileTmp), QString::number(context.line));
|
||||||
}
|
}
|
||||||
const QString finalMessage = QString::fromStdString("%1[%2]%3[%4]:%5").arg(
|
const QString finalMessage =
|
||||||
QDateTime::currentDateTime().toString("yyyy/MM/dd hh:mm:ss.zzz"),
|
QString::fromStdString("%1[%2]%3[%4]:%5")
|
||||||
levelName,
|
.arg(QDateTime::currentDateTime().toString("yyyy/MM/dd hh:mm:ss.zzz"), levelName,
|
||||||
fileAndLineLogStr,
|
fileAndLineLogStr,
|
||||||
QString::number(reinterpret_cast<quintptr>(QThread::currentThreadId())),
|
QString::number(reinterpret_cast<quintptr>(QThread::currentThreadId())),
|
||||||
message);
|
message);
|
||||||
if ((type == QtInfoMsg) || (type == QtDebugMsg)) {
|
if ((type == QtInfoMsg) || (type == QtDebugMsg)) {
|
||||||
std::cout << qPrintable(finalMessage) << std::endl;
|
std::cout << qPrintable(finalMessage) << std::endl;
|
||||||
} else {
|
} else {
|
||||||
@ -151,7 +154,8 @@ static inline void messageHandler(const QtMsgType type, const QMessageLogContext
|
|||||||
if (!g_logFile) {
|
if (!g_logFile) {
|
||||||
g_logFile = std::make_unique<QFile>(g_file_path);
|
g_logFile = std::make_unique<QFile>(g_file_path);
|
||||||
if (!g_logFile->open(QFile::WriteOnly | QFile::Text | QFile::Append)) {
|
if (!g_logFile->open(QFile::WriteOnly | QFile::Text | QFile::Append)) {
|
||||||
std::cerr << "Can't open file to write: " << qPrintable(g_logFile->errorString()) << std::endl;
|
std::cerr << "Can't open file to write: " << qPrintable(g_logFile->errorString())
|
||||||
|
<< std::endl;
|
||||||
g_logFile.reset();
|
g_logFile.reset();
|
||||||
g_logError = true;
|
g_logError = true;
|
||||||
return;
|
return;
|
||||||
@ -179,8 +183,10 @@ void Log::setup(char *argv[], const QString &app, int level) {
|
|||||||
QString applicationPath = QString::fromStdString(argv[0]);
|
QString applicationPath = QString::fromStdString(argv[0]);
|
||||||
once = true;
|
once = true;
|
||||||
g_app = app;
|
g_app = app;
|
||||||
const QString logFileName = QString("%1_%2.log").arg(g_app, QDateTime::currentDateTime().toString("yyyyMMdd"));
|
const QString logFileName =
|
||||||
const QString logDirPath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/log";
|
QString("%1_%2.log").arg(g_app, QDateTime::currentDateTime().toString("yyyyMMdd"));
|
||||||
|
const QString logDirPath =
|
||||||
|
QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/log";
|
||||||
const QDir logDir(logDirPath);
|
const QDir logDir(logDirPath);
|
||||||
if (!logDir.exists()) {
|
if (!logDir.exists()) {
|
||||||
logDir.mkpath(logDirPath);
|
logDir.mkpath(logDirPath);
|
||||||
@ -195,7 +201,7 @@ void Log::setup(char *argv[], const QString &app, int level) {
|
|||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
qInfo() << "[ProcessId]" << QString::number(_getpid());
|
qInfo() << "[ProcessId]" << QString::number(_getpid());
|
||||||
#else
|
#else
|
||||||
qInfo()<<"[ProcessId]"<<QString::number(getpid());
|
qInfo() << "[ProcessId]" << QString::number(getpid());
|
||||||
#endif
|
#endif
|
||||||
qInfo() << "[GitHashCode]" << COMMIT_HASH;
|
qInfo() << "[GitHashCode]" << COMMIT_HASH;
|
||||||
qInfo() << "[DeviceInfo]";
|
qInfo() << "[DeviceInfo]";
|
||||||
|
@ -4,6 +4,5 @@
|
|||||||
|
|
||||||
namespace Log {
|
namespace Log {
|
||||||
QString prettyProductInfoWrapper();
|
QString prettyProductInfoWrapper();
|
||||||
|
|
||||||
void setup(char *argv[], const QString &app, int level = 4);
|
void setup(char *argv[], const QString &app, int level = 4);
|
||||||
}
|
}
|
||||||
|
@ -19,9 +19,7 @@
|
|||||||
#include <QGuiApplication>
|
#include <QGuiApplication>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
|
|
||||||
NetworkCallable::NetworkCallable(QObject *parent) : QObject{parent} {
|
NetworkCallable::NetworkCallable(QObject *parent) : QObject{parent} {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString NetworkParams::method2String() const {
|
QString NetworkParams::method2String() const {
|
||||||
@ -64,12 +62,11 @@ bool NetworkParams::getOpenLog() const {
|
|||||||
return Network::getInstance()->openLog();
|
return Network::getInstance()->openLog();
|
||||||
}
|
}
|
||||||
|
|
||||||
FluDownloadParam::FluDownloadParam(QObject *parent)
|
FluDownloadParam::FluDownloadParam(QObject *parent) : QObject{parent} {
|
||||||
: QObject{parent} {
|
|
||||||
}
|
}
|
||||||
|
|
||||||
FluDownloadParam::FluDownloadParam(QString destPath, bool append, QObject *parent)
|
FluDownloadParam::FluDownloadParam(QString destPath, bool append, QObject *parent)
|
||||||
: QObject{parent} {
|
: QObject{parent} {
|
||||||
this->_destPath = std::move(destPath);
|
this->_destPath = std::move(destPath);
|
||||||
this->_append = append;
|
this->_append = append;
|
||||||
}
|
}
|
||||||
@ -80,7 +77,7 @@ NetworkParams::NetworkParams(QObject *parent) : QObject{parent} {
|
|||||||
}
|
}
|
||||||
|
|
||||||
NetworkParams::NetworkParams(QString url, Type type, Method method, QObject *parent)
|
NetworkParams::NetworkParams(QString url, Type type, Method method, QObject *parent)
|
||||||
: QObject{parent} {
|
: QObject{parent} {
|
||||||
this->_method = method;
|
this->_method = method;
|
||||||
this->_url = std::move(url);
|
this->_url = std::move(url);
|
||||||
this->_type = type;
|
this->_type = type;
|
||||||
@ -178,12 +175,14 @@ void Network::handle(NetworkParams *params, NetworkCallable *c) {
|
|||||||
callable->start();
|
callable->start();
|
||||||
}
|
}
|
||||||
QString cacheKey = params->buildCacheKey();
|
QString cacheKey = params->buildCacheKey();
|
||||||
if (params->_cacheMode == NetworkType::CacheMode::FirstCacheThenRequest && cacheExists(cacheKey)) {
|
if (params->_cacheMode == NetworkType::CacheMode::FirstCacheThenRequest &&
|
||||||
|
cacheExists(cacheKey)) {
|
||||||
if (!callable.isNull()) {
|
if (!callable.isNull()) {
|
||||||
callable->cache(readCache(cacheKey));
|
callable->cache(readCache(cacheKey));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (params->_cacheMode == NetworkType::CacheMode::IfNoneCacheRequest && cacheExists(cacheKey)) {
|
if (params->_cacheMode == NetworkType::CacheMode::IfNoneCacheRequest &&
|
||||||
|
cacheExists(cacheKey)) {
|
||||||
if (!callable.isNull()) {
|
if (!callable.isNull()) {
|
||||||
callable->cache(readCache(cacheKey));
|
callable->cache(readCache(cacheKey));
|
||||||
callable->finish();
|
callable->finish();
|
||||||
@ -194,7 +193,8 @@ void Network::handle(NetworkParams *params, NetworkCallable *c) {
|
|||||||
QNetworkAccessManager manager;
|
QNetworkAccessManager manager;
|
||||||
manager.setTransferTimeout(params->getTimeout());
|
manager.setTransferTimeout(params->getTimeout());
|
||||||
QEventLoop loop;
|
QEventLoop loop;
|
||||||
connect(&manager, &QNetworkAccessManager::finished, &manager, [&loop](QNetworkReply *reply) { loop.quit(); });
|
connect(&manager, &QNetworkAccessManager::finished, &manager,
|
||||||
|
[&loop](QNetworkReply *reply) { loop.quit(); });
|
||||||
for (int i = 0; i <= params->getRetry() - 1; ++i) {
|
for (int i = 0; i <= params->getRetry() - 1; ++i) {
|
||||||
QUrl url(params->_url);
|
QUrl url(params->_url);
|
||||||
addQueryParam(&url, params->_queryMap);
|
addQueryParam(&url, params->_queryMap);
|
||||||
@ -216,9 +216,11 @@ void Network::handle(NetworkParams *params, NetworkCallable *c) {
|
|||||||
QMetaObject::Connection conn_destroyed = {};
|
QMetaObject::Connection conn_destroyed = {};
|
||||||
QMetaObject::Connection conn_quit = {};
|
QMetaObject::Connection conn_quit = {};
|
||||||
if (params->_target) {
|
if (params->_target) {
|
||||||
conn_destroyed = connect(params->_target, &QObject::destroyed, &manager, abortCallable);
|
conn_destroyed =
|
||||||
|
connect(params->_target, &QObject::destroyed, &manager, abortCallable);
|
||||||
}
|
}
|
||||||
conn_quit = connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit, &manager, abortCallable);
|
conn_quit = connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit,
|
||||||
|
&manager, abortCallable);
|
||||||
loop.exec();
|
loop.exec();
|
||||||
if (conn_destroyed) {
|
if (conn_destroyed) {
|
||||||
disconnect(conn_destroyed);
|
disconnect(conn_destroyed);
|
||||||
@ -247,7 +249,8 @@ void Network::handle(NetworkParams *params, NetworkCallable *c) {
|
|||||||
} else {
|
} else {
|
||||||
if (i == params->getRetry() - 1) {
|
if (i == params->getRetry() - 1) {
|
||||||
if (!callable.isNull()) {
|
if (!callable.isNull()) {
|
||||||
if (params->_cacheMode == NetworkType::CacheMode::RequestFailedReadCache && cacheExists(cacheKey)) {
|
if (params->_cacheMode == NetworkType::CacheMode::RequestFailedReadCache &&
|
||||||
|
cacheExists(cacheKey)) {
|
||||||
if (!callable.isNull()) {
|
if (!callable.isNull()) {
|
||||||
callable->cache(readCache(cacheKey));
|
callable->cache(readCache(cacheKey));
|
||||||
}
|
}
|
||||||
@ -332,35 +335,41 @@ void Network::handleDownload(NetworkParams *params, NetworkCallable *c) {
|
|||||||
reply->abort();
|
reply->abort();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
connect(&manager, &QNetworkAccessManager::finished, &manager, [&loop](QNetworkReply *reply) { loop.quit(); });
|
connect(&manager, &QNetworkAccessManager::finished, &manager,
|
||||||
connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit, &manager, [&loop, reply]() { reply->abort(), loop.quit(); });
|
[&loop](QNetworkReply *reply) { loop.quit(); });
|
||||||
|
connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit, &manager,
|
||||||
|
[&loop, reply]() { reply->abort(), loop.quit(); });
|
||||||
QMetaObject::Connection conn_destroyed = {};
|
QMetaObject::Connection conn_destroyed = {};
|
||||||
QMetaObject::Connection conn_quit = {};
|
QMetaObject::Connection conn_quit = {};
|
||||||
if (params->_target) {
|
if (params->_target) {
|
||||||
conn_destroyed = connect(params->_target, &QObject::destroyed, &manager, abortCallable);
|
conn_destroyed = connect(params->_target, &QObject::destroyed, &manager, abortCallable);
|
||||||
}
|
}
|
||||||
conn_quit = connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit, &manager, abortCallable);
|
conn_quit = connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit, &manager,
|
||||||
connect(reply, &QNetworkReply::readyRead, reply, [reply, seek, destFile, cacheFile, callable] {
|
abortCallable);
|
||||||
if (!reply || !destFile || reply->error() != QNetworkReply::NoError) {
|
connect(reply, &QNetworkReply::readyRead, reply,
|
||||||
return;
|
[reply, seek, destFile, cacheFile, callable] {
|
||||||
}
|
if (!reply || !destFile || reply->error() != QNetworkReply::NoError) {
|
||||||
QMap<QString, QVariant> downInfo;
|
return;
|
||||||
qint64 contentLength = reply->header(QNetworkRequest::ContentLengthHeader).toLongLong() + seek;
|
}
|
||||||
downInfo.insert("contentLength", contentLength);
|
QMap<QString, QVariant> downInfo;
|
||||||
QString eTag = reply->header(QNetworkRequest::ETagHeader).toString();
|
qint64 contentLength =
|
||||||
downInfo.insert("eTag", eTag);
|
reply->header(QNetworkRequest::ContentLengthHeader).toLongLong() + seek;
|
||||||
destFile->write(reply->readAll());
|
downInfo.insert("contentLength", contentLength);
|
||||||
destFile->flush();
|
QString eTag = reply->header(QNetworkRequest::ETagHeader).toString();
|
||||||
downInfo.insert("fileSize", destFile->size());
|
downInfo.insert("eTag", eTag);
|
||||||
if (cacheFile->isOpen()) {
|
destFile->write(reply->readAll());
|
||||||
cacheFile->resize(0);
|
destFile->flush();
|
||||||
cacheFile->write(QJsonDocument::fromVariant(QVariant(downInfo)).toJson().toBase64());
|
downInfo.insert("fileSize", destFile->size());
|
||||||
cacheFile->flush();
|
if (cacheFile->isOpen()) {
|
||||||
}
|
cacheFile->resize(0);
|
||||||
if (!callable.isNull()) {
|
cacheFile->write(
|
||||||
callable->downloadProgress(destFile->size(), contentLength);
|
QJsonDocument::fromVariant(QVariant(downInfo)).toJson().toBase64());
|
||||||
}
|
cacheFile->flush();
|
||||||
});
|
}
|
||||||
|
if (!callable.isNull()) {
|
||||||
|
callable->downloadProgress(destFile->size(), contentLength);
|
||||||
|
}
|
||||||
|
});
|
||||||
loop.exec();
|
loop.exec();
|
||||||
int httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
int httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||||
if (httpStatus == 200) {
|
if (httpStatus == 200) {
|
||||||
@ -430,7 +439,9 @@ QString Network::map2String(const QMap<QString, QVariant> &map) {
|
|||||||
return parameters.join(" ");
|
return parameters.join(" ");
|
||||||
}
|
}
|
||||||
|
|
||||||
void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest request, NetworkParams *params, QNetworkReply *&reply, bool isFirst, const QPointer<NetworkCallable> &callable) {
|
void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest request,
|
||||||
|
NetworkParams *params, QNetworkReply *&reply, bool isFirst,
|
||||||
|
const QPointer<NetworkCallable> &callable) {
|
||||||
QByteArray verb = params->method2String().toUtf8();
|
QByteArray verb = params->method2String().toUtf8();
|
||||||
switch (params->_type) {
|
switch (params->_type) {
|
||||||
case NetworkParams::TYPE_FORM: {
|
case NetworkParams::TYPE_FORM: {
|
||||||
@ -438,13 +449,14 @@ void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest reques
|
|||||||
if (isFormData) {
|
if (isFormData) {
|
||||||
auto *multiPart = new QHttpMultiPart();
|
auto *multiPart = new QHttpMultiPart();
|
||||||
multiPart->setContentType(QHttpMultiPart::FormDataType);
|
multiPart->setContentType(QHttpMultiPart::FormDataType);
|
||||||
for (const auto &each: params->_paramMap.toStdMap()) {
|
for (const auto &each : params->_paramMap.toStdMap()) {
|
||||||
QHttpPart part;
|
QHttpPart part;
|
||||||
part.setHeader(QNetworkRequest::ContentDispositionHeader, QString("form-data; name=\"%1\"").arg(each.first));
|
part.setHeader(QNetworkRequest::ContentDispositionHeader,
|
||||||
|
QString("form-data; name=\"%1\"").arg(each.first));
|
||||||
part.setBody(each.second.toByteArray());
|
part.setBody(each.second.toByteArray());
|
||||||
multiPart->append(part);
|
multiPart->append(part);
|
||||||
}
|
}
|
||||||
for (const auto &each: params->_fileMap.toStdMap()) {
|
for (const auto &each : params->_fileMap.toStdMap()) {
|
||||||
QString filePath = each.second.toString();
|
QString filePath = each.second.toString();
|
||||||
QString name = each.first;
|
QString name = each.first;
|
||||||
auto *file = new QFile(filePath);
|
auto *file = new QFile(filePath);
|
||||||
@ -452,21 +464,25 @@ void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest reques
|
|||||||
file->open(QIODevice::ReadOnly);
|
file->open(QIODevice::ReadOnly);
|
||||||
file->setParent(multiPart);
|
file->setParent(multiPart);
|
||||||
QHttpPart part;
|
QHttpPart part;
|
||||||
part.setHeader(QNetworkRequest::ContentDispositionHeader, QString(R"(form-data; name="%1"; filename="%2")").arg(name, fileName));
|
part.setHeader(
|
||||||
|
QNetworkRequest::ContentDispositionHeader,
|
||||||
|
QString(R"(form-data; name="%1"; filename="%2")").arg(name, fileName));
|
||||||
part.setBodyDevice(file);
|
part.setBodyDevice(file);
|
||||||
multiPart->append(part);
|
multiPart->append(part);
|
||||||
}
|
}
|
||||||
reply = manager->sendCustomRequest(request, verb, multiPart);
|
reply = manager->sendCustomRequest(request, verb, multiPart);
|
||||||
multiPart->setParent(reply);
|
multiPart->setParent(reply);
|
||||||
connect(reply, &QNetworkReply::uploadProgress, reply, [callable](qint64 bytesSent, qint64 bytesTotal) {
|
connect(reply, &QNetworkReply::uploadProgress, reply,
|
||||||
if (!callable.isNull() && bytesSent != 0 && bytesTotal != 0) {
|
[callable](qint64 bytesSent, qint64 bytesTotal) {
|
||||||
Q_EMIT callable->uploadProgress(bytesSent, bytesTotal);
|
if (!callable.isNull() && bytesSent != 0 && bytesTotal != 0) {
|
||||||
}
|
Q_EMIT callable->uploadProgress(bytesSent, bytesTotal);
|
||||||
});
|
}
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
request.setHeader(QNetworkRequest::ContentTypeHeader, QString("application/x-www-form-urlencoded"));
|
request.setHeader(QNetworkRequest::ContentTypeHeader,
|
||||||
|
QString("application/x-www-form-urlencoded"));
|
||||||
QString value;
|
QString value;
|
||||||
for (const auto &each: params->_paramMap.toStdMap()) {
|
for (const auto &each : params->_paramMap.toStdMap()) {
|
||||||
value += QString("%1=%2").arg(each.first, each.second.toString());
|
value += QString("%1=%2").arg(each.first, each.second.toString());
|
||||||
value += "&";
|
value += "&";
|
||||||
}
|
}
|
||||||
@ -479,9 +495,10 @@ void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest reques
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case NetworkParams::TYPE_JSON: {
|
case NetworkParams::TYPE_JSON: {
|
||||||
request.setHeader(QNetworkRequest::ContentTypeHeader, QString("application/json;charset=utf-8"));
|
request.setHeader(QNetworkRequest::ContentTypeHeader,
|
||||||
|
QString("application/json;charset=utf-8"));
|
||||||
QJsonObject json;
|
QJsonObject json;
|
||||||
for (const auto &each: params->_paramMap.toStdMap()) {
|
for (const auto &each : params->_paramMap.toStdMap()) {
|
||||||
json.insert(each.first, each.second.toJsonValue());
|
json.insert(each.first, each.second.toJsonValue());
|
||||||
}
|
}
|
||||||
QByteArray data = QJsonDocument(json).toJson(QJsonDocument::Compact);
|
QByteArray data = QJsonDocument(json).toJson(QJsonDocument::Compact);
|
||||||
@ -489,9 +506,10 @@ void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest reques
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case NetworkParams::TYPE_JSONARRAY: {
|
case NetworkParams::TYPE_JSONARRAY: {
|
||||||
request.setHeader(QNetworkRequest::ContentTypeHeader, QString("application/json;charset=utf-8"));
|
request.setHeader(QNetworkRequest::ContentTypeHeader,
|
||||||
|
QString("application/json;charset=utf-8"));
|
||||||
QJsonArray jsonArray;
|
QJsonArray jsonArray;
|
||||||
for (const auto &each: params->_paramMap.toStdMap()) {
|
for (const auto &each : params->_paramMap.toStdMap()) {
|
||||||
QJsonObject json;
|
QJsonObject json;
|
||||||
json.insert(each.first, each.second.toJsonValue());
|
json.insert(each.first, each.second.toJsonValue());
|
||||||
jsonArray.append(json);
|
jsonArray.append(json);
|
||||||
@ -501,7 +519,8 @@ void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest reques
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case NetworkParams::TYPE_BODY: {
|
case NetworkParams::TYPE_BODY: {
|
||||||
request.setHeader(QNetworkRequest::ContentTypeHeader, QString("text/plain;charset=utf-8"));
|
request.setHeader(QNetworkRequest::ContentTypeHeader,
|
||||||
|
QString("text/plain;charset=utf-8"));
|
||||||
QByteArray data = params->_body.toUtf8();
|
QByteArray data = params->_body.toUtf8();
|
||||||
reply = manager->sendCustomRequest(request, verb, data);
|
reply = manager->sendCustomRequest(request, verb, data);
|
||||||
break;
|
break;
|
||||||
@ -519,15 +538,20 @@ void Network::printRequestStartLog(const QNetworkRequest &request, NetworkParams
|
|||||||
if (!params->getOpenLog()) {
|
if (!params->getOpenLog()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
qDebug() << "<------" << qUtf8Printable(request.header(QNetworkRequest::UserAgentHeader).toString()) << "Request Start ------>";
|
qDebug() << "<------"
|
||||||
qDebug() << qUtf8Printable(QString::fromStdString("<%1>").arg(params->method2String())) << qUtf8Printable(params->_url);
|
<< qUtf8Printable(request.header(QNetworkRequest::UserAgentHeader).toString())
|
||||||
|
<< "Request Start ------>";
|
||||||
|
qDebug() << qUtf8Printable(QString::fromStdString("<%1>").arg(params->method2String()))
|
||||||
|
<< qUtf8Printable(params->_url);
|
||||||
auto contentType = request.header(QNetworkRequest::ContentTypeHeader).toString();
|
auto contentType = request.header(QNetworkRequest::ContentTypeHeader).toString();
|
||||||
if (!contentType.isEmpty()) {
|
if (!contentType.isEmpty()) {
|
||||||
qDebug() << qUtf8Printable(QString::fromStdString("<Header> %1=%2").arg("Content-Type", contentType));
|
qDebug() << qUtf8Printable(
|
||||||
|
QString::fromStdString("<Header> %1=%2").arg("Content-Type", contentType));
|
||||||
}
|
}
|
||||||
QList<QByteArray> headers = request.rawHeaderList();
|
QList<QByteArray> headers = request.rawHeaderList();
|
||||||
for (const QByteArray &header: headers) {
|
for (const QByteArray &header : headers) {
|
||||||
qDebug() << qUtf8Printable(QString::fromStdString("<Header> %1=%2").arg(header, request.rawHeader(header)));
|
qDebug() << qUtf8Printable(
|
||||||
|
QString::fromStdString("<Header> %1=%2").arg(header, request.rawHeader(header)));
|
||||||
}
|
}
|
||||||
if (!params->_queryMap.isEmpty()) {
|
if (!params->_queryMap.isEmpty()) {
|
||||||
qDebug() << "<Query>" << qUtf8Printable(map2String(params->_queryMap));
|
qDebug() << "<Query>" << qUtf8Printable(map2String(params->_queryMap));
|
||||||
@ -543,12 +567,16 @@ void Network::printRequestStartLog(const QNetworkRequest &request, NetworkParams
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Network::printRequestEndLog(const QNetworkRequest &request, NetworkParams *params, QNetworkReply *&reply, const QString &response) {
|
void Network::printRequestEndLog(const QNetworkRequest &request, NetworkParams *params,
|
||||||
|
QNetworkReply *&reply, const QString &response) {
|
||||||
if (!params->getOpenLog()) {
|
if (!params->getOpenLog()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
qDebug() << "<------" << qUtf8Printable(request.header(QNetworkRequest::UserAgentHeader).toString()) << "Request End ------>";
|
qDebug() << "<------"
|
||||||
qDebug() << qUtf8Printable(QString::fromStdString("<%1>").arg(params->method2String())) << qUtf8Printable(params->_url);
|
<< qUtf8Printable(request.header(QNetworkRequest::UserAgentHeader).toString())
|
||||||
|
<< "Request End ------>";
|
||||||
|
qDebug() << qUtf8Printable(QString::fromStdString("<%1>").arg(params->method2String()))
|
||||||
|
<< qUtf8Printable(params->_url);
|
||||||
qDebug() << "<Result>" << qUtf8Printable(response);
|
qDebug() << "<Result>" << qUtf8Printable(response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -562,7 +590,10 @@ void Network::saveResponse(const QString &key, const QString &response) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Network::addHeaders(QNetworkRequest *request, const QMap<QString, QVariant> &headers) {
|
void Network::addHeaders(QNetworkRequest *request, const QMap<QString, QVariant> &headers) {
|
||||||
request->setHeader(QNetworkRequest::UserAgentHeader, QString::fromStdString("Mozilla/5.0 %1/%2").arg(QGuiApplication::applicationName(), QGuiApplication::applicationVersion()));
|
request->setHeader(
|
||||||
|
QNetworkRequest::UserAgentHeader,
|
||||||
|
QString::fromStdString("Mozilla/5.0 %1/%2")
|
||||||
|
.arg(QGuiApplication::applicationName(), QGuiApplication::applicationVersion()));
|
||||||
QMapIterator<QString, QVariant> iter(headers);
|
QMapIterator<QString, QVariant> iter(headers);
|
||||||
while (iter.hasNext()) {
|
while (iter.hasNext()) {
|
||||||
iter.next();
|
iter.next();
|
||||||
@ -584,7 +615,9 @@ Network::Network(QObject *parent) : QObject{parent} {
|
|||||||
_timeout = 5000;
|
_timeout = 5000;
|
||||||
_retry = 3;
|
_retry = 3;
|
||||||
_openLog = false;
|
_openLog = false;
|
||||||
_cacheDir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation).append(QDir::separator()).append("network");
|
_cacheDir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
|
||||||
|
.append(QDir::separator())
|
||||||
|
.append("network");
|
||||||
}
|
}
|
||||||
|
|
||||||
NetworkParams *Network::get(const QString &url) {
|
NetworkParams *Network::get(const QString &url) {
|
||||||
@ -656,7 +689,8 @@ NetworkParams *Network::patchJsonArray(const QString &url) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
NetworkParams *Network::deleteJsonArray(const QString &url) {
|
NetworkParams *Network::deleteJsonArray(const QString &url) {
|
||||||
return new NetworkParams(url, NetworkParams::TYPE_JSONARRAY, NetworkParams::METHOD_DELETE, this);
|
return new NetworkParams(url, NetworkParams::TYPE_JSONARRAY, NetworkParams::METHOD_DELETE,
|
||||||
|
this);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Network::setInterceptor(QJSValue interceptor) {
|
void Network::setInterceptor(QJSValue interceptor) {
|
||||||
|
@ -28,7 +28,7 @@ namespace NetworkType {
|
|||||||
* @brief The NetworkCallable class
|
* @brief The NetworkCallable class
|
||||||
*/
|
*/
|
||||||
class NetworkCallable : public QObject {
|
class NetworkCallable : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
QML_NAMED_ELEMENT(NetworkCallable)
|
QML_NAMED_ELEMENT(NetworkCallable)
|
||||||
public:
|
public:
|
||||||
explicit NetworkCallable(QObject *parent = nullptr);
|
explicit NetworkCallable(QObject *parent = nullptr);
|
||||||
@ -52,7 +52,7 @@ public:
|
|||||||
* @brief The FluDownloadParam class
|
* @brief The FluDownloadParam class
|
||||||
*/
|
*/
|
||||||
class FluDownloadParam : public QObject {
|
class FluDownloadParam : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit FluDownloadParam(QObject *parent = nullptr);
|
explicit FluDownloadParam(QObject *parent = nullptr);
|
||||||
|
|
||||||
@ -67,24 +67,11 @@ public:
|
|||||||
* @brief The NetworkParams class
|
* @brief The NetworkParams class
|
||||||
*/
|
*/
|
||||||
class NetworkParams : public QObject {
|
class NetworkParams : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
QML_NAMED_ELEMENT(NetworkParams)
|
QML_NAMED_ELEMENT(NetworkParams)
|
||||||
public:
|
public:
|
||||||
enum Method {
|
enum Method { METHOD_GET, METHOD_HEAD, METHOD_POST, METHOD_PUT, METHOD_PATCH, METHOD_DELETE };
|
||||||
METHOD_GET,
|
enum Type { TYPE_NONE, TYPE_FORM, TYPE_JSON, TYPE_JSONARRAY, TYPE_BODY };
|
||||||
METHOD_HEAD,
|
|
||||||
METHOD_POST,
|
|
||||||
METHOD_PUT,
|
|
||||||
METHOD_PATCH,
|
|
||||||
METHOD_DELETE
|
|
||||||
};
|
|
||||||
enum Type {
|
|
||||||
TYPE_NONE,
|
|
||||||
TYPE_FORM,
|
|
||||||
TYPE_JSON,
|
|
||||||
TYPE_JSONARRAY,
|
|
||||||
TYPE_BODY
|
|
||||||
};
|
|
||||||
|
|
||||||
explicit NetworkParams(QObject *parent = nullptr);
|
explicit NetworkParams(QObject *parent = nullptr);
|
||||||
|
|
||||||
@ -145,11 +132,11 @@ public:
|
|||||||
* @brief The Network class
|
* @brief The Network class
|
||||||
*/
|
*/
|
||||||
class Network : public QObject {
|
class Network : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY_AUTO(int, timeout)
|
Q_PROPERTY_AUTO(int, timeout)
|
||||||
Q_PROPERTY_AUTO(int, retry)
|
Q_PROPERTY_AUTO(int, retry)
|
||||||
Q_PROPERTY_AUTO(QString, cacheDir)
|
Q_PROPERTY_AUTO(QString, cacheDir)
|
||||||
Q_PROPERTY_AUTO(bool, openLog)
|
Q_PROPERTY_AUTO(bool, openLog)
|
||||||
QML_NAMED_ELEMENT(Network)
|
QML_NAMED_ELEMENT(Network)
|
||||||
QML_SINGLETON
|
QML_SINGLETON
|
||||||
|
|
||||||
@ -157,9 +144,11 @@ private:
|
|||||||
explicit Network(QObject *parent = nullptr);
|
explicit Network(QObject *parent = nullptr);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
SINGLETON(Network)
|
SINGLETON(Network)
|
||||||
|
|
||||||
static Network *create(QQmlEngine *qmlEngine, QJSEngine *jsEngine) { return getInstance(); }
|
static Network *create(QQmlEngine *qmlEngine, QJSEngine *jsEngine) {
|
||||||
|
return getInstance();
|
||||||
|
}
|
||||||
|
|
||||||
Q_INVOKABLE NetworkParams *get(const QString &url);
|
Q_INVOKABLE NetworkParams *get(const QString &url);
|
||||||
|
|
||||||
@ -204,7 +193,9 @@ SINGLETON(Network)
|
|||||||
void handleDownload(NetworkParams *params, NetworkCallable *result);
|
void handleDownload(NetworkParams *params, NetworkCallable *result);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static void sendRequest(QNetworkAccessManager *manager, QNetworkRequest request, NetworkParams *params, QNetworkReply *&reply, bool isFirst, const QPointer<NetworkCallable> &callable);
|
static void sendRequest(QNetworkAccessManager *manager, QNetworkRequest request,
|
||||||
|
NetworkParams *params, QNetworkReply *&reply, bool isFirst,
|
||||||
|
const QPointer<NetworkCallable> &callable);
|
||||||
|
|
||||||
static void addQueryParam(QUrl *url, const QMap<QString, QVariant> ¶ms);
|
static void addQueryParam(QUrl *url, const QMap<QString, QVariant> ¶ms);
|
||||||
|
|
||||||
@ -222,7 +213,8 @@ private:
|
|||||||
|
|
||||||
static void printRequestStartLog(const QNetworkRequest &request, NetworkParams *params);
|
static void printRequestStartLog(const QNetworkRequest &request, NetworkParams *params);
|
||||||
|
|
||||||
static void printRequestEndLog(const QNetworkRequest &request, NetworkParams *params, QNetworkReply *&reply, const QString &response);
|
static void printRequestEndLog(const QNetworkRequest &request, NetworkParams *params,
|
||||||
|
QNetworkReply *&reply, const QString &response);
|
||||||
|
|
||||||
static QString map2String(const QMap<QString, QVariant> &map);
|
static QString map2String(const QMap<QString, QVariant> &map);
|
||||||
|
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
#include <QStandardPaths>
|
#include <QStandardPaths>
|
||||||
|
|
||||||
SettingsHelper::SettingsHelper(QObject *parent) : QObject(parent) {
|
SettingsHelper::SettingsHelper(QObject *parent) : QObject(parent) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
SettingsHelper::~SettingsHelper() = default;
|
SettingsHelper::~SettingsHelper() = default;
|
||||||
@ -13,6 +12,7 @@ void SettingsHelper::save(const QString &key, QVariant val) {
|
|||||||
m_settings->setValue(key, val);
|
m_settings->setValue(key, val);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
QVariant SettingsHelper::get(const QString &key, QVariant def) {
|
QVariant SettingsHelper::get(const QString &key, QVariant def) {
|
||||||
QVariant data = m_settings->value(key);
|
QVariant data = m_settings->value(key);
|
||||||
if (!data.isNull() && data.isValid()) {
|
if (!data.isNull() && data.isValid()) {
|
||||||
@ -25,6 +25,7 @@ void SettingsHelper::init(char *argv[]) {
|
|||||||
QString applicationPath = QString::fromStdString(argv[0]);
|
QString applicationPath = QString::fromStdString(argv[0]);
|
||||||
const QFileInfo fileInfo(applicationPath);
|
const QFileInfo fileInfo(applicationPath);
|
||||||
const QString iniFileName = fileInfo.completeBaseName() + ".ini";
|
const QString iniFileName = fileInfo.completeBaseName() + ".ini";
|
||||||
const QString iniFilePath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/" + iniFileName;
|
const QString iniFilePath =
|
||||||
|
QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/" + iniFileName;
|
||||||
m_settings.reset(new QSettings(iniFilePath, QSettings::IniFormat));
|
m_settings.reset(new QSettings(iniFilePath, QSettings::IniFormat));
|
||||||
}
|
}
|
||||||
|
@ -10,32 +10,35 @@
|
|||||||
#include "src/singleton.h"
|
#include "src/singleton.h"
|
||||||
|
|
||||||
class SettingsHelper : public QObject {
|
class SettingsHelper : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
private:
|
private:
|
||||||
explicit SettingsHelper(QObject *parent = nullptr);
|
explicit SettingsHelper(QObject *parent = nullptr);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
SINGLETON(SettingsHelper)
|
SINGLETON(SettingsHelper)
|
||||||
|
|
||||||
~SettingsHelper() override;
|
~SettingsHelper() override;
|
||||||
|
|
||||||
void init(char *argv[]);
|
void init(char *argv[]);
|
||||||
|
Q_INVOKABLE void saveDarkMode(int darkModel) {
|
||||||
Q_INVOKABLE void saveDarkMode(int darkModel) { save("darkMode", darkModel); }
|
save("darkMode", darkModel);
|
||||||
|
}
|
||||||
Q_INVOKABLE int getDarkMode() { return get("darkMode", QVariant(0)).toInt(); }
|
Q_INVOKABLE int getDarkMode() {
|
||||||
|
return get("darkMode", QVariant(0)).toInt();
|
||||||
Q_INVOKABLE void saveUseSystemAppBar(bool useSystemAppBar) { save("useSystemAppBar", useSystemAppBar); }
|
}
|
||||||
|
Q_INVOKABLE void saveUseSystemAppBar(bool useSystemAppBar) {
|
||||||
Q_INVOKABLE bool getUseSystemAppBar() { return get("useSystemAppBar", QVariant(false)).toBool(); }
|
save("useSystemAppBar", useSystemAppBar);
|
||||||
|
}
|
||||||
Q_INVOKABLE void saveLanguage(const QString &language) { save("language", language); }
|
Q_INVOKABLE bool getUseSystemAppBar() {
|
||||||
|
return get("useSystemAppBar", QVariant(false)).toBool();
|
||||||
Q_INVOKABLE QString getLanguage() { return get("language", QVariant("en_US")).toString(); }
|
}
|
||||||
|
Q_INVOKABLE void saveLanguage(const QString &language) {
|
||||||
|
save("language", language);
|
||||||
|
}
|
||||||
|
Q_INVOKABLE QString getLanguage() {
|
||||||
|
return get("language", QVariant("en_US")).toString();
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void save(const QString &key, QVariant val);
|
void save(const QString &key, QVariant val);
|
||||||
|
|
||||||
QVariant get(const QString &key, QVariant def = {});
|
QVariant get(const QString &key, QVariant def = {});
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -18,7 +18,8 @@ void TranslateHelper::init(QQmlEngine *engine) {
|
|||||||
_translator = new QTranslator(this);
|
_translator = new QTranslator(this);
|
||||||
QGuiApplication::installTranslator(_translator);
|
QGuiApplication::installTranslator(_translator);
|
||||||
QString translatorPath = QGuiApplication::applicationDirPath() + "/i18n";
|
QString translatorPath = QGuiApplication::applicationDirPath() + "/i18n";
|
||||||
if (_translator->load(QString::fromStdString("%1/example_%2.qm").arg(translatorPath, _current))) {
|
if (_translator->load(
|
||||||
|
QString::fromStdString("%1/example_%2.qm").arg(translatorPath, _current))) {
|
||||||
_engine->retranslate();
|
_engine->retranslate();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -7,20 +7,18 @@
|
|||||||
#include "src/stdafx.h"
|
#include "src/stdafx.h"
|
||||||
|
|
||||||
class TranslateHelper : public QObject {
|
class TranslateHelper : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY_AUTO(QString, current)
|
Q_PROPERTY_AUTO(QString, current)
|
||||||
Q_PROPERTY_READONLY_AUTO(QStringList, languages)
|
Q_PROPERTY_READONLY_AUTO(QStringList, languages)
|
||||||
private:
|
private:
|
||||||
[[maybe_unused]] explicit TranslateHelper(QObject *parent = nullptr);
|
[[maybe_unused]] explicit TranslateHelper(QObject *parent = nullptr);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
SINGLETON(TranslateHelper)
|
SINGLETON(TranslateHelper)
|
||||||
|
|
||||||
~TranslateHelper() override;
|
~TranslateHelper() override;
|
||||||
|
|
||||||
void init(QQmlEngine *engine);
|
void init(QQmlEngine *engine);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QQmlEngine *_engine = nullptr;
|
QQmlEngine *_engine = nullptr;
|
||||||
QTranslator *_translator = nullptr;
|
QTranslator *_translator = nullptr;
|
||||||
};
|
};
|
||||||
|
@ -1,102 +1,107 @@
|
|||||||
#include <QGuiApplication>
|
#include <QtQml/qqmlextensionplugin.h>
|
||||||
|
|
||||||
|
#include <QApplication>
|
||||||
|
#include <QDir>
|
||||||
|
#include <QLoggingCategory>
|
||||||
|
#include <QNetworkProxy>
|
||||||
|
#include <QProcess>
|
||||||
#include <QQmlApplicationEngine>
|
#include <QQmlApplicationEngine>
|
||||||
#include <QQmlContext>
|
#include <QQmlContext>
|
||||||
#include <QDir>
|
|
||||||
#include <QQuickWindow>
|
#include <QQuickWindow>
|
||||||
#include <QNetworkProxy>
|
|
||||||
#include <QSslConfiguration>
|
#include <QSslConfiguration>
|
||||||
#include <QProcess>
|
|
||||||
#include <QtQml/qqmlextensionplugin.h>
|
|
||||||
#include <QLoggingCategory>
|
|
||||||
#include "Version.h"
|
|
||||||
#include "AppInfo.h"
|
#include "AppInfo.h"
|
||||||
|
#include "Version.h"
|
||||||
#include "helper/Log.h"
|
#include "helper/Log.h"
|
||||||
#include "src/component/CircularReveal.h"
|
#include "src/component/CircularReveal.h"
|
||||||
#include "src/component/FileWatcher.h"
|
#include "src/component/FileWatcher.h"
|
||||||
#include "src/component/FpsItem.h"
|
#include "src/component/FpsItem.h"
|
||||||
#include "src/component/OpenGLItem.h"
|
#include "src/component/OpenGLItem.h"
|
||||||
#include "src/helper/SettingsHelper.h"
|
|
||||||
#include "src/helper/InitializrHelper.h"
|
#include "src/helper/InitializrHelper.h"
|
||||||
#include "src/helper/TranslateHelper.h"
|
|
||||||
#include "src/helper/Network.h"
|
#include "src/helper/Network.h"
|
||||||
|
#include "src/helper/SettingsHelper.h"
|
||||||
|
#include "src/helper/TranslateHelper.h"
|
||||||
|
|
||||||
#ifdef FLUENTUI_BUILD_STATIC_LIB
|
#ifdef FLUENTUI_BUILD_STATIC_LIB
|
||||||
#if (QT_VERSION > QT_VERSION_CHECK(6, 2, 0))
|
# if (QT_VERSION > QT_VERSION_CHECK(6, 2, 0))
|
||||||
Q_IMPORT_QML_PLUGIN(FluentUIPlugin)
|
Q_IMPORT_QML_PLUGIN(FluentUIPlugin)
|
||||||
#endif
|
# endif
|
||||||
#include <FluentUI.h>
|
# include <FluentUI.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#include "app_dmp.h"
|
# include "app_dmp.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[]) {
|
||||||
{
|
|
||||||
const char *uri = "example";
|
const char *uri = "example";
|
||||||
int major = 1;
|
int major = 1;
|
||||||
int minor = 0;
|
int minor = 0;
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
::SetUnhandledExceptionFilter(MyUnhandledExceptionFilter);
|
::SetUnhandledExceptionFilter(MyUnhandledExceptionFilter);
|
||||||
qputenv("QT_QPA_PLATFORM","windows:darkmode=2");
|
qputenv("QT_QPA_PLATFORM", "windows:darkmode=2");
|
||||||
#endif
|
#endif
|
||||||
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
||||||
qputenv("QT_QUICK_CONTROLS_STYLE","Basic");
|
qputenv("QT_QUICK_CONTROLS_STYLE", "Basic");
|
||||||
#else
|
#else
|
||||||
qputenv("QT_QUICK_CONTROLS_STYLE","Default");
|
qputenv("QT_QUICK_CONTROLS_STYLE", "Default");
|
||||||
#endif
|
#endif
|
||||||
#ifdef Q_OS_LINUX
|
#ifdef Q_OS_LINUX
|
||||||
//fix bug UOSv20 does not print logs
|
// fix bug UOSv20 does not print logs
|
||||||
qputenv("QT_LOGGING_RULES","");
|
qputenv("QT_LOGGING_RULES", "");
|
||||||
//fix bug UOSv20 v-sync does not work
|
// fix bug UOSv20 v-sync does not work
|
||||||
qputenv("QSG_RENDER_LOOP","basic");
|
qputenv("QSG_RENDER_LOOP", "basic");
|
||||||
#endif
|
#endif
|
||||||
QGuiApplication::setOrganizationName("ZhuZiChu");
|
QApplication::setOrganizationName("ZhuZiChu");
|
||||||
QGuiApplication::setOrganizationDomain("https://zhuzichu520.github.io");
|
QApplication::setOrganizationDomain("https://zhuzichu520.github.io");
|
||||||
QGuiApplication::setApplicationName("FluentUI");
|
QApplication::setApplicationName("FluentUI");
|
||||||
QGuiApplication::setApplicationDisplayName("FluentUI Example");
|
QApplication::setApplicationDisplayName("FluentUI Example");
|
||||||
QGuiApplication::setApplicationVersion(APPLICATION_VERSION);
|
QApplication::setApplicationVersion(APPLICATION_VERSION);
|
||||||
QGuiApplication::setQuitOnLastWindowClosed(false);
|
QApplication::setQuitOnLastWindowClosed(false);
|
||||||
SettingsHelper::getInstance()->init(argv);
|
SettingsHelper::getInstance()->init(argv);
|
||||||
Log::setup(argv,uri);
|
Log::setup(argv, uri);
|
||||||
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
||||||
QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL);
|
QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL);
|
||||||
#endif
|
#endif
|
||||||
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
|
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
|
||||||
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||||
QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
|
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
|
||||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
|
# if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
|
||||||
QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
|
QApplication::setHighDpiScaleFactorRoundingPolicy(
|
||||||
|
Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
#endif
|
QApplication app(argc, argv);
|
||||||
QGuiApplication app(argc, argv);
|
|
||||||
//@uri example
|
//@uri example
|
||||||
qmlRegisterType<CircularReveal>(uri, major, minor, "CircularReveal");
|
qmlRegisterType<CircularReveal>(uri, major, minor, "CircularReveal");
|
||||||
qmlRegisterType<FileWatcher>(uri, major, minor, "FileWatcher");
|
qmlRegisterType<FileWatcher>(uri, major, minor, "FileWatcher");
|
||||||
qmlRegisterType<FpsItem>(uri, major, minor, "FpsItem");
|
qmlRegisterType<FpsItem>(uri, major, minor, "FpsItem");
|
||||||
qmlRegisterType<NetworkCallable>(uri,major,minor,"NetworkCallable");
|
qmlRegisterType<NetworkCallable>(uri, major, minor, "NetworkCallable");
|
||||||
qmlRegisterType<NetworkParams>(uri,major,minor,"NetworkParams");
|
qmlRegisterType<NetworkParams>(uri, major, minor, "NetworkParams");
|
||||||
qmlRegisterType<OpenGLItem>(uri,major,minor,"OpenGLItem");
|
qmlRegisterType<OpenGLItem>(uri, major, minor, "OpenGLItem");
|
||||||
qmlRegisterUncreatableMetaObject(NetworkType::staticMetaObject, uri, major, minor, "NetworkType", "Access to enums & flags only");
|
qmlRegisterUncreatableMetaObject(NetworkType::staticMetaObject, uri, major, minor,
|
||||||
|
"NetworkType", "Access to enums & flags only");
|
||||||
|
|
||||||
QQmlApplicationEngine engine;
|
QQmlApplicationEngine engine;
|
||||||
TranslateHelper::getInstance()->init(&engine);
|
TranslateHelper::getInstance()->init(&engine);
|
||||||
engine.rootContext()->setContextProperty("AppInfo",AppInfo::getInstance());
|
engine.rootContext()->setContextProperty("AppInfo", AppInfo::getInstance());
|
||||||
engine.rootContext()->setContextProperty("SettingsHelper",SettingsHelper::getInstance());
|
engine.rootContext()->setContextProperty("SettingsHelper", SettingsHelper::getInstance());
|
||||||
engine.rootContext()->setContextProperty("InitializrHelper",InitializrHelper::getInstance());
|
engine.rootContext()->setContextProperty("InitializrHelper", InitializrHelper::getInstance());
|
||||||
engine.rootContext()->setContextProperty("TranslateHelper",TranslateHelper::getInstance());
|
engine.rootContext()->setContextProperty("TranslateHelper", TranslateHelper::getInstance());
|
||||||
engine.rootContext()->setContextProperty("Network",Network::getInstance());
|
engine.rootContext()->setContextProperty("Network", Network::getInstance());
|
||||||
#ifdef FLUENTUI_BUILD_STATIC_LIB
|
#ifdef FLUENTUI_BUILD_STATIC_LIB
|
||||||
FluentUI::getInstance()->registerTypes(&engine);
|
FluentUI::registerTypes(&engine);
|
||||||
#endif
|
#endif
|
||||||
const QUrl url(QStringLiteral("qrc:/example/qml/App.qml"));
|
const QUrl url(QStringLiteral("qrc:/example/qml/App.qml"));
|
||||||
QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
|
QObject::connect(
|
||||||
&app, [url](QObject *obj, const QUrl &objUrl) {
|
&engine, &QQmlApplicationEngine::objectCreated, &app,
|
||||||
|
[url](QObject *obj, const QUrl &objUrl) {
|
||||||
if (!obj && url == objUrl)
|
if (!obj && url == objUrl)
|
||||||
QCoreApplication::exit(-1);
|
QCoreApplication::exit(-1);
|
||||||
}, Qt::QueuedConnection);
|
},
|
||||||
|
Qt::QueuedConnection);
|
||||||
engine.load(url);
|
engine.load(url);
|
||||||
const int exec = QGuiApplication::exec();
|
const int exec = QApplication::exec();
|
||||||
if (exec == 931) {
|
if (exec == 931) {
|
||||||
QProcess::startDetached(qApp->applicationFilePath(), qApp->arguments());
|
QProcess::startDetached(qApp->applicationFilePath(), qApp->arguments());
|
||||||
}
|
}
|
||||||
|
@ -3,22 +3,23 @@
|
|||||||
/**
|
/**
|
||||||
* @brief The Singleton class
|
* @brief The Singleton class
|
||||||
*/
|
*/
|
||||||
template<typename T>
|
template <typename T>
|
||||||
class Singleton {
|
class Singleton {
|
||||||
public:
|
public:
|
||||||
static T *getInstance();
|
static T *getInstance();
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename T>
|
template <typename T>
|
||||||
T *Singleton<T>::getInstance() {
|
T *Singleton<T>::getInstance() {
|
||||||
static T *instance = new T();
|
static T *instance = new T();
|
||||||
return instance;
|
return instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define SINGLETON(Class) \
|
#define SINGLETON(Class) \
|
||||||
private: \
|
private: \
|
||||||
friend class Singleton<Class>; \
|
friend class Singleton<Class>; \
|
||||||
public: \
|
\
|
||||||
static Class* getInstance() { \
|
public: \
|
||||||
return Singleton<Class>::getInstance(); \
|
static Class *getInstance() { \
|
||||||
}
|
return Singleton<Class>::getInstance(); \
|
||||||
|
}
|
||||||
|
@ -1,50 +1,47 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define Q_PROPERTY_AUTO_P(TYPE, M) \
|
#define Q_PROPERTY_AUTO_P(TYPE, M) \
|
||||||
Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed) \
|
Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed) \
|
||||||
public: \
|
public: \
|
||||||
Q_SIGNAL void M##Changed(); \
|
Q_SIGNAL void M##Changed(); \
|
||||||
void M(TYPE in_##M) \
|
void M(TYPE in_##M) { \
|
||||||
{ \
|
_##M = in_##M; \
|
||||||
_##M = in_##M; \
|
Q_EMIT M##Changed(); \
|
||||||
Q_EMIT M##Changed(); \
|
} \
|
||||||
} \
|
TYPE M() { \
|
||||||
TYPE M() \
|
return _##M; \
|
||||||
{ \
|
} \
|
||||||
return _##M; \
|
\
|
||||||
} \
|
private: \
|
||||||
private: \
|
|
||||||
TYPE _##M;
|
TYPE _##M;
|
||||||
|
|
||||||
#define Q_PROPERTY_AUTO(TYPE, M) \
|
#define Q_PROPERTY_AUTO(TYPE, M) \
|
||||||
Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed) \
|
Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed) \
|
||||||
public: \
|
public: \
|
||||||
Q_SIGNAL void M##Changed(); \
|
Q_SIGNAL void M##Changed(); \
|
||||||
void M(const TYPE& in_##M) \
|
void M(const TYPE &in_##M) { \
|
||||||
{ \
|
_##M = in_##M; \
|
||||||
_##M = in_##M; \
|
Q_EMIT M##Changed(); \
|
||||||
Q_EMIT M##Changed(); \
|
} \
|
||||||
} \
|
TYPE M() { \
|
||||||
TYPE M() \
|
return _##M; \
|
||||||
{ \
|
} \
|
||||||
return _##M; \
|
\
|
||||||
} \
|
private: \
|
||||||
private: \
|
|
||||||
TYPE _##M;
|
TYPE _##M;
|
||||||
|
|
||||||
|
|
||||||
#define Q_PROPERTY_READONLY_AUTO(TYPE, M) \
|
#define Q_PROPERTY_READONLY_AUTO(TYPE, M) \
|
||||||
Q_PROPERTY(TYPE M READ M NOTIFY M##Changed FINAL) \
|
Q_PROPERTY(TYPE M READ M NOTIFY M##Changed FINAL) \
|
||||||
public: \
|
public: \
|
||||||
Q_SIGNAL void M##Changed(); \
|
Q_SIGNAL void M##Changed(); \
|
||||||
void M(const TYPE& in_##M) \
|
void M(const TYPE &in_##M) { \
|
||||||
{ \
|
_##M = in_##M; \
|
||||||
_##M = in_##M; \
|
Q_EMIT M##Changed(); \
|
||||||
Q_EMIT M##Changed(); \
|
} \
|
||||||
} \
|
TYPE M() { \
|
||||||
TYPE M() \
|
return _##M; \
|
||||||
{ \
|
} \
|
||||||
return _##M; \
|
\
|
||||||
} \
|
private: \
|
||||||
private: \
|
|
||||||
TYPE _##M;
|
TYPE _##M;
|
||||||
|
@ -11,9 +11,16 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/.cmake/)
|
|||||||
#配置通用编译
|
#配置通用编译
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
if (QT_VERSION VERSION_GREATER_EQUAL "6.3")
|
||||||
|
qt_standard_project_setup()
|
||||||
|
else ()
|
||||||
|
set(CMAKE_AUTOMOC ON)
|
||||||
|
set(CMAKE_AUTORCC ON)
|
||||||
|
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||||
|
endif ()
|
||||||
|
|
||||||
#设置版本号
|
#设置版本号
|
||||||
add_definitions(-DFLUENTUI_VERSION=1,7,5,0)
|
add_definitions(-DFLUENTUI_VERSION=1,7,7,0)
|
||||||
|
|
||||||
if (FLUENTUI_BUILD_STATIC_LIB)
|
if (FLUENTUI_BUILD_STATIC_LIB)
|
||||||
add_definitions(-DFLUENTUI_BUILD_STATIC_LIB)
|
add_definitions(-DFLUENTUI_BUILD_STATIC_LIB)
|
||||||
@ -23,8 +30,8 @@ endif ()
|
|||||||
option(FLUENTUI_BUILD_STATIC_LIB "Build static library." OFF)
|
option(FLUENTUI_BUILD_STATIC_LIB "Build static library." OFF)
|
||||||
|
|
||||||
#导入Qt相关依赖包
|
#导入Qt相关依赖包
|
||||||
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick Qml)
|
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick Qml Widgets PrintSupport)
|
||||||
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick)
|
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick Widgets PrintSupport)
|
||||||
|
|
||||||
set(QT_SDK_DIR "${Qt${QT_VERSION_MAJOR}_DIR}/../../..")
|
set(QT_SDK_DIR "${Qt${QT_VERSION_MAJOR}_DIR}/../../..")
|
||||||
cmake_path(SET QT_SDK_DIR NORMALIZE ${QT_SDK_DIR})
|
cmake_path(SET QT_SDK_DIR NORMALIZE ${QT_SDK_DIR})
|
||||||
@ -35,14 +42,6 @@ if (NOT FLUENTUI_QML_PLUGIN_DIRECTORY)
|
|||||||
set(FLUENTUI_QML_PLUGIN_DIRECTORY ${QT_SDK_DIR}/qml/FluentUI)
|
set(FLUENTUI_QML_PLUGIN_DIRECTORY ${QT_SDK_DIR}/qml/FluentUI)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (QT_VERSION VERSION_GREATER_EQUAL "6.3")
|
|
||||||
qt_standard_project_setup()
|
|
||||||
else ()
|
|
||||||
set(CMAKE_AUTOMOC ON)
|
|
||||||
set(CMAKE_AUTORCC ON)
|
|
||||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
#国际化
|
#国际化
|
||||||
find_program(QT_LUPDATE NAMES lupdate)
|
find_program(QT_LUPDATE NAMES lupdate)
|
||||||
find_program(QT_LRELEASE NAMES lrelease)
|
find_program(QT_LRELEASE NAMES lrelease)
|
||||||
@ -62,9 +61,28 @@ file(COPY ${QM_FILE_PATHS} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/Qt${QT_VERSI
|
|||||||
file(GLOB_RECURSE CPP_FILES *.cpp *.h *.cxx)
|
file(GLOB_RECURSE CPP_FILES *.cpp *.h *.cxx)
|
||||||
foreach (filepath ${CPP_FILES})
|
foreach (filepath ${CPP_FILES})
|
||||||
string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
|
string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
|
||||||
|
message(${filename})
|
||||||
list(APPEND sources_files ${filename})
|
list(APPEND sources_files ${filename})
|
||||||
endforeach (filepath)
|
endforeach (filepath)
|
||||||
|
|
||||||
|
list(REMOVE_ITEM sources_files qhotkey/qhotkey_mac.cpp qhotkey/qhotkey_win.cpp qhotkey/qhotkey_x11.cpp)
|
||||||
|
|
||||||
|
if (WIN32)
|
||||||
|
list(APPEND sources_files qhotkey/qhotkey_win.cpp)
|
||||||
|
elseif (APPLE)
|
||||||
|
list(APPEND sources_files qhotkey/qhotkey_mac.cpp)
|
||||||
|
elseif (UNIX)
|
||||||
|
list(APPEND sources_files qhotkey/qhotkey_x11.cpp)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (WIN32)
|
||||||
|
set(FLUENTUI_VERSION_RC_PATH ${CMAKE_CURRENT_BINARY_DIR}/version_${PROJECT_NAME}.rc)
|
||||||
|
configure_file(
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/.cmake/version_dll.rc.in
|
||||||
|
${FLUENTUI_VERSION_RC_PATH}
|
||||||
|
)
|
||||||
|
endif ()
|
||||||
|
|
||||||
if (QT_VERSION VERSION_GREATER_EQUAL "6.2")
|
if (QT_VERSION VERSION_GREATER_EQUAL "6.2")
|
||||||
#删除fluentuiplugin.cpp与fluentuiplugin.h,这些只要Qt5使用,Qt6不需要
|
#删除fluentuiplugin.cpp与fluentuiplugin.h,这些只要Qt5使用,Qt6不需要
|
||||||
list(REMOVE_ITEM sources_files fluentuiplugin.h fluentuiplugin.cpp)
|
list(REMOVE_ITEM sources_files fluentuiplugin.h fluentuiplugin.cpp)
|
||||||
@ -127,7 +145,7 @@ endif ()
|
|||||||
if (QT_VERSION VERSION_GREATER_EQUAL "6.2")
|
if (QT_VERSION VERSION_GREATER_EQUAL "6.2")
|
||||||
#如果是Qt6.2版本以上,则使用qt_add_library,qt_add_qml_module函数添加资源文件
|
#如果是Qt6.2版本以上,则使用qt_add_library,qt_add_qml_module函数添加资源文件
|
||||||
if (FLUENTUI_BUILD_STATIC_LIB)
|
if (FLUENTUI_BUILD_STATIC_LIB)
|
||||||
set(FLUENTUI_QML_PLUGIN_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/FluentUI)
|
set(FLUENTUI_QML_PLUGIN_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/FluentUI)
|
||||||
endif ()
|
endif ()
|
||||||
qt_add_library(${PROJECT_NAME} ${LIB_TYPE})
|
qt_add_library(${PROJECT_NAME} ${LIB_TYPE})
|
||||||
qt_add_qml_module(${PROJECT_NAME}
|
qt_add_qml_module(${PROJECT_NAME}
|
||||||
@ -166,6 +184,8 @@ target_compile_definitions(${PROJECT_NAME}
|
|||||||
#去掉mingw生成的动态库libxxx前缀lib,不去掉前缀会导致 module "FluentUI" plugin "fluentuiplugin" not found
|
#去掉mingw生成的动态库libxxx前缀lib,不去掉前缀会导致 module "FluentUI" plugin "fluentuiplugin" not found
|
||||||
if (MINGW)
|
if (MINGW)
|
||||||
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
|
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
|
||||||
|
#解决编译器报 too many sections的问题
|
||||||
|
target_compile_options(${PROJECT_NAME} PRIVATE -Wa,-mbig-obj)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
#MSVC Debug 添加后缀d,与Qt插件风格保持一致
|
#MSVC Debug 添加后缀d,与Qt插件风格保持一致
|
||||||
@ -178,7 +198,41 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
|
|||||||
Qt${QT_VERSION_MAJOR}::Core
|
Qt${QT_VERSION_MAJOR}::Core
|
||||||
Qt${QT_VERSION_MAJOR}::Quick
|
Qt${QT_VERSION_MAJOR}::Quick
|
||||||
Qt${QT_VERSION_MAJOR}::Qml
|
Qt${QT_VERSION_MAJOR}::Qml
|
||||||
|
Qt${QT_VERSION_MAJOR}::Widgets
|
||||||
|
Qt${QT_VERSION_MAJOR}::PrintSupport
|
||||||
|
)
|
||||||
|
if(APPLE)
|
||||||
|
find_library(CARBON_LIBRARY Carbon)
|
||||||
|
target_link_libraries(${PROJECT_NAME} PRIVATE ${CARBON_LIBRARY})
|
||||||
|
elseif(WIN32)
|
||||||
|
target_link_libraries(${PROJECT_NAME} PRIVATE user32)
|
||||||
|
elseif(UNIX)
|
||||||
|
if(QT_VERSION_MAJOR STREQUAL "6")
|
||||||
|
if(QT_VERSION VERSION_LESS "6.2.0")
|
||||||
|
message(FATAL_ERROR "Qt 6.2.0 or greater is required when using Qt6")
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
if(QT_VERSION_MAJOR LESS "6")
|
||||||
|
find_package(Qt5 REQUIRED COMPONENTS X11Extras)
|
||||||
|
target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::X11Extras)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
target_link_libraries(${PROJECT_NAME} PRIVATE X11)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
target_include_directories(${PROJECT_NAME} PRIVATE
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/qmlcustomplot
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if ((${QT_VERSION_MAJOR} LESS_EQUAL 6) AND (CMAKE_BUILD_TYPE MATCHES "Release"))
|
||||||
|
find_program(QML_PLUGIN_DUMP NAMES qmlplugindump)
|
||||||
|
add_custom_target(Script-Generate-QmlTypes
|
||||||
|
COMMAND ${QML_PLUGIN_DUMP} -nonrelocatable -noinstantiate FluentUI 1.0 ${CMAKE_CURRENT_BINARY_DIR} > ${CMAKE_CURRENT_SOURCE_DIR}/Qt5/imports/FluentUI/plugins.qmltypes
|
||||||
|
COMMENT "Generate qmltypes........."
|
||||||
|
SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Qt5/imports/FluentUI/plugins.qmltypes
|
||||||
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
#安装
|
#安装
|
||||||
install(DIRECTORY ${FLUENTUI_QML_PLUGIN_DIRECTORY} DESTINATION ${CMAKE_INSTALL_PREFIX}/imports)
|
install(DIRECTORY ${FLUENTUI_QML_PLUGIN_DIRECTORY} DESTINATION ${CMAKE_INSTALL_PREFIX}/imports)
|
||||||
|
60
src/Def.h
60
src/Def.h
@ -59,11 +59,7 @@ namespace FluPageType {
|
|||||||
|
|
||||||
namespace FluWindowType {
|
namespace FluWindowType {
|
||||||
Q_NAMESPACE
|
Q_NAMESPACE
|
||||||
enum LaunchMode {
|
enum LaunchMode { Standard = 0x0000, SingleTask = 0x0001, SingleInstance = 0x0002 };
|
||||||
Standard = 0x0000,
|
|
||||||
SingleTask = 0x0001,
|
|
||||||
SingleInstance = 0x0002
|
|
||||||
};
|
|
||||||
|
|
||||||
Q_ENUM_NS(LaunchMode)
|
Q_ENUM_NS(LaunchMode)
|
||||||
|
|
||||||
@ -72,11 +68,7 @@ namespace FluWindowType {
|
|||||||
|
|
||||||
namespace FluTreeViewType {
|
namespace FluTreeViewType {
|
||||||
Q_NAMESPACE
|
Q_NAMESPACE
|
||||||
enum SelectionMode {
|
enum SelectionMode { None = 0x0000, Single = 0x0001, Multiple = 0x0002 };
|
||||||
None = 0x0000,
|
|
||||||
Single = 0x0001,
|
|
||||||
Multiple = 0x0002
|
|
||||||
};
|
|
||||||
|
|
||||||
Q_ENUM_NS(SelectionMode)
|
Q_ENUM_NS(SelectionMode)
|
||||||
|
|
||||||
@ -85,12 +77,7 @@ namespace FluTreeViewType {
|
|||||||
|
|
||||||
namespace FluStatusLayoutType {
|
namespace FluStatusLayoutType {
|
||||||
Q_NAMESPACE
|
Q_NAMESPACE
|
||||||
enum StatusMode {
|
enum StatusMode { Loading = 0x0000, Empty = 0x0001, Error = 0x0002, Success = 0x0004 };
|
||||||
Loading = 0x0000,
|
|
||||||
Empty = 0x0001,
|
|
||||||
Error = 0x0002,
|
|
||||||
Success = 0x0004
|
|
||||||
};
|
|
||||||
|
|
||||||
Q_ENUM_NS(StatusMode)
|
Q_ENUM_NS(StatusMode)
|
||||||
|
|
||||||
@ -99,11 +86,7 @@ namespace FluStatusLayoutType {
|
|||||||
|
|
||||||
namespace FluContentDialogType {
|
namespace FluContentDialogType {
|
||||||
Q_NAMESPACE
|
Q_NAMESPACE
|
||||||
enum ButtonFlag {
|
enum ButtonFlag { NeutralButton = 0x0001, NegativeButton = 0x0002, PositiveButton = 0x0004 };
|
||||||
NeutralButton = 0x0001,
|
|
||||||
NegativeButton = 0x0002,
|
|
||||||
PositiveButton = 0x0004
|
|
||||||
};
|
|
||||||
|
|
||||||
Q_ENUM_NS(ButtonFlag)
|
Q_ENUM_NS(ButtonFlag)
|
||||||
|
|
||||||
@ -112,10 +95,7 @@ namespace FluContentDialogType {
|
|||||||
|
|
||||||
namespace FluTimePickerType {
|
namespace FluTimePickerType {
|
||||||
Q_NAMESPACE
|
Q_NAMESPACE
|
||||||
enum HourFormat {
|
enum HourFormat { H = 0x0000, HH = 0x0001 };
|
||||||
H = 0x0000,
|
|
||||||
HH = 0x0001
|
|
||||||
};
|
|
||||||
|
|
||||||
Q_ENUM_NS(HourFormat)
|
Q_ENUM_NS(HourFormat)
|
||||||
|
|
||||||
@ -124,11 +104,7 @@ namespace FluTimePickerType {
|
|||||||
|
|
||||||
namespace FluCalendarViewType {
|
namespace FluCalendarViewType {
|
||||||
Q_NAMESPACE
|
Q_NAMESPACE
|
||||||
enum DisplayMode {
|
enum DisplayMode { Month = 0x0000, Year = 0x0001, Decade = 0x0002 };
|
||||||
Month = 0x0000,
|
|
||||||
Year = 0x0001,
|
|
||||||
Decade = 0x0002
|
|
||||||
};
|
|
||||||
|
|
||||||
Q_ENUM_NS(DisplayMode)
|
Q_ENUM_NS(DisplayMode)
|
||||||
|
|
||||||
@ -137,19 +113,11 @@ namespace FluCalendarViewType {
|
|||||||
|
|
||||||
namespace FluTabViewType {
|
namespace FluTabViewType {
|
||||||
Q_NAMESPACE
|
Q_NAMESPACE
|
||||||
enum TabWidthBehavior {
|
enum TabWidthBehavior { Equal = 0x0000, SizeToContent = 0x0001, Compact = 0x0002 };
|
||||||
Equal = 0x0000,
|
|
||||||
SizeToContent = 0x0001,
|
|
||||||
Compact = 0x0002
|
|
||||||
};
|
|
||||||
|
|
||||||
Q_ENUM_NS(TabWidthBehavior)
|
Q_ENUM_NS(TabWidthBehavior)
|
||||||
|
|
||||||
enum CloseButtonVisibility {
|
enum CloseButtonVisibility { Never = 0x0000, Always = 0x0001, OnHover = 0x0002 };
|
||||||
Never = 0x0000,
|
|
||||||
Always = 0x0001,
|
|
||||||
OnHover = 0x0002
|
|
||||||
};
|
|
||||||
|
|
||||||
Q_ENUM_NS(CloseButtonVisibility)
|
Q_ENUM_NS(CloseButtonVisibility)
|
||||||
|
|
||||||
@ -158,19 +126,11 @@ namespace FluTabViewType {
|
|||||||
|
|
||||||
namespace FluNavigationViewType {
|
namespace FluNavigationViewType {
|
||||||
Q_NAMESPACE
|
Q_NAMESPACE
|
||||||
enum DisplayMode {
|
enum DisplayMode { Open = 0x0000, Compact = 0x0001, Minimal = 0x0002, Auto = 0x0004 };
|
||||||
Open = 0x0000,
|
|
||||||
Compact = 0x0001,
|
|
||||||
Minimal = 0x0002,
|
|
||||||
Auto = 0x0004
|
|
||||||
};
|
|
||||||
|
|
||||||
Q_ENUM_NS(DisplayMode)
|
Q_ENUM_NS(DisplayMode)
|
||||||
|
|
||||||
enum PageMode {
|
enum PageMode { Stack = 0x0000, NoStack = 0x0001 };
|
||||||
Stack = 0x0000,
|
|
||||||
NoStack = 0x0001
|
|
||||||
};
|
|
||||||
|
|
||||||
Q_ENUM_NS(PageMode)
|
Q_ENUM_NS(PageMode)
|
||||||
|
|
||||||
|
@ -9,15 +9,15 @@
|
|||||||
* @brief The FluAccentColor class
|
* @brief The FluAccentColor class
|
||||||
*/
|
*/
|
||||||
class FluAccentColor : public QObject {
|
class FluAccentColor : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
Q_PROPERTY_AUTO(QColor, darkest)
|
Q_PROPERTY_AUTO(QColor, darkest)
|
||||||
Q_PROPERTY_AUTO(QColor, darker)
|
Q_PROPERTY_AUTO(QColor, darker)
|
||||||
Q_PROPERTY_AUTO(QColor, dark)
|
Q_PROPERTY_AUTO(QColor, dark)
|
||||||
Q_PROPERTY_AUTO(QColor, normal)
|
Q_PROPERTY_AUTO(QColor, normal)
|
||||||
Q_PROPERTY_AUTO(QColor, light)
|
Q_PROPERTY_AUTO(QColor, light)
|
||||||
Q_PROPERTY_AUTO(QColor, lighter)
|
Q_PROPERTY_AUTO(QColor, lighter)
|
||||||
Q_PROPERTY_AUTO(QColor, lightest)
|
Q_PROPERTY_AUTO(QColor, lightest)
|
||||||
QML_NAMED_ELEMENT(FluAccentColor)
|
QML_NAMED_ELEMENT(FluAccentColor)
|
||||||
public:
|
public:
|
||||||
explicit FluAccentColor(QObject *parent = nullptr);
|
explicit FluAccentColor(QObject *parent = nullptr);
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
#include "FluApp.h"
|
#include "FluApp.h"
|
||||||
|
|
||||||
#include <QQmlEngine>
|
|
||||||
#include <QGuiApplication>
|
#include <QGuiApplication>
|
||||||
#include <QQuickItem>
|
#include <QQuickItem>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
@ -17,13 +16,14 @@ FluApp::FluApp(QObject *parent) : QObject{parent} {
|
|||||||
|
|
||||||
FluApp::~FluApp() = default;
|
FluApp::~FluApp() = default;
|
||||||
|
|
||||||
void FluApp::init(QObject *target, QLocale locale) {
|
void FluApp::init(QObject *launcher, QLocale locale) {
|
||||||
|
this->launcher(launcher);
|
||||||
_locale = std::move(locale);
|
_locale = std::move(locale);
|
||||||
_engine = qmlEngine(target);
|
_engine = qmlEngine(launcher);
|
||||||
_translator = new QTranslator(this);
|
_translator = new QTranslator(this);
|
||||||
QGuiApplication::installTranslator(_translator);
|
QGuiApplication::installTranslator(_translator);
|
||||||
const QStringList uiLanguages = _locale.uiLanguages();
|
const QStringList uiLanguages = _locale.uiLanguages();
|
||||||
for (const QString &name: uiLanguages) {
|
for (const QString &name : uiLanguages) {
|
||||||
const QString baseName = "fluentui_" + QLocale(name).name();
|
const QString baseName = "fluentui_" + QLocale(name).name();
|
||||||
if (_translator->load(":/qt/qml/FluentUI/i18n/" + baseName)) {
|
if (_translator->load(":/qt/qml/FluentUI/i18n/" + baseName)) {
|
||||||
_engine->retranslate();
|
_engine->retranslate();
|
||||||
@ -32,9 +32,10 @@ void FluApp::init(QObject *target, QLocale locale) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[[maybe_unused]] QJsonArray FluApp::iconDatas(const QString &keyword) {
|
[[maybe_unused]] QJsonArray FluApp::iconData(const QString &keyword) {
|
||||||
QJsonArray arr;
|
QJsonArray arr;
|
||||||
QMetaEnum enumType = Fluent_Icons::staticMetaObject.enumerator(Fluent_Icons::staticMetaObject.indexOfEnumerator("Fluent_IconType"));
|
QMetaEnum enumType = FluentIcons::staticMetaObject.enumerator(
|
||||||
|
FluentIcons::staticMetaObject.indexOfEnumerator("Type"));
|
||||||
for (int i = 0; i <= enumType.keyCount() - 1; ++i) {
|
for (int i = 0; i <= enumType.keyCount() - 1; ++i) {
|
||||||
QString name = enumType.key(i);
|
QString name = enumType.key(i);
|
||||||
int icon = enumType.value(i);
|
int icon = enumType.value(i);
|
||||||
|
20
src/FluApp.h
20
src/FluApp.h
@ -16,11 +16,11 @@
|
|||||||
* @brief The FluApp class
|
* @brief The FluApp class
|
||||||
*/
|
*/
|
||||||
class FluApp : public QObject {
|
class FluApp : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
Q_PROPERTY_AUTO(bool, useSystemAppBar)
|
||||||
Q_PROPERTY_AUTO(bool, useSystemAppBar)
|
Q_PROPERTY_AUTO(QString, windowIcon)
|
||||||
Q_PROPERTY_AUTO(QString, windowIcon)
|
Q_PROPERTY_AUTO(QLocale, locale)
|
||||||
Q_PROPERTY_AUTO(QLocale, locale)
|
Q_PROPERTY_AUTO_P(QObject *, launcher)
|
||||||
QML_NAMED_ELEMENT(FluApp)
|
QML_NAMED_ELEMENT(FluApp)
|
||||||
QML_SINGLETON
|
QML_SINGLETON
|
||||||
|
|
||||||
@ -30,13 +30,15 @@ private:
|
|||||||
~FluApp() override;
|
~FluApp() override;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
SINGLETON(FluApp)
|
SINGLETON(FluApp)
|
||||||
|
|
||||||
static FluApp *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
|
static FluApp *create(QQmlEngine *, QJSEngine *) {
|
||||||
|
return getInstance();
|
||||||
|
}
|
||||||
|
|
||||||
Q_INVOKABLE void init(QObject *target, QLocale locale = QLocale::system());
|
Q_INVOKABLE void init(QObject *launcher, QLocale locale = QLocale::system());
|
||||||
|
|
||||||
[[maybe_unused]] Q_INVOKABLE static QJsonArray iconDatas(const QString &keyword = "");
|
[[maybe_unused]] Q_INVOKABLE static QJsonArray iconData(const QString &keyword = "");
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QQmlEngine *_engine{};
|
QQmlEngine *_engine{};
|
||||||
|
@ -40,7 +40,8 @@ void FluCaptcha::paint(QPainter *painter) {
|
|||||||
for (int i = 0; i < 4; i++) {
|
for (int i = 0; i < 4; i++) {
|
||||||
pen = QPen(QColor(generaNumber(255), generaNumber(255), generaNumber(255)));
|
pen = QPen(QColor(generaNumber(255), generaNumber(255), generaNumber(255)));
|
||||||
painter->setPen(pen);
|
painter->setPen(pen);
|
||||||
painter->drawText(15 + 35 * i, 10 + generaNumber(15), 30, 40, Qt::AlignCenter, QString(_code[i]));
|
painter->drawText(15 + 35 * i, 10 + generaNumber(15), 30, 40, Qt::AlignCenter,
|
||||||
|
QString(_code[i]));
|
||||||
}
|
}
|
||||||
painter->restore();
|
painter->restore();
|
||||||
}
|
}
|
||||||
|
@ -9,10 +9,10 @@
|
|||||||
* @brief The FluCaptcha class
|
* @brief The FluCaptcha class
|
||||||
*/
|
*/
|
||||||
class FluCaptcha : public QQuickPaintedItem {
|
class FluCaptcha : public QQuickPaintedItem {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
Q_PROPERTY_AUTO(QFont, font);
|
Q_PROPERTY_AUTO(QFont, font)
|
||||||
Q_PROPERTY_AUTO(bool, ignoreCase);
|
Q_PROPERTY_AUTO(bool, ignoreCase)
|
||||||
QML_NAMED_ELEMENT(FluCaptcha)
|
QML_NAMED_ELEMENT(FluCaptcha)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
@ -11,41 +11,41 @@
|
|||||||
* @brief The FluColors class
|
* @brief The FluColors class
|
||||||
*/
|
*/
|
||||||
class FluColors : public QObject {
|
class FluColors : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
Q_PROPERTY_AUTO(QColor, Transparent);
|
Q_PROPERTY_AUTO(QColor, Transparent)
|
||||||
Q_PROPERTY_AUTO(QColor, Black);
|
Q_PROPERTY_AUTO(QColor, Black)
|
||||||
Q_PROPERTY_AUTO(QColor, White);
|
Q_PROPERTY_AUTO(QColor, White)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey10);
|
Q_PROPERTY_AUTO(QColor, Grey10)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey20);
|
Q_PROPERTY_AUTO(QColor, Grey20)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey30);
|
Q_PROPERTY_AUTO(QColor, Grey30)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey40);
|
Q_PROPERTY_AUTO(QColor, Grey40)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey50);
|
Q_PROPERTY_AUTO(QColor, Grey50)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey60);
|
Q_PROPERTY_AUTO(QColor, Grey60)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey70);
|
Q_PROPERTY_AUTO(QColor, Grey70)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey80);
|
Q_PROPERTY_AUTO(QColor, Grey80)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey90);
|
Q_PROPERTY_AUTO(QColor, Grey90)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey100);
|
Q_PROPERTY_AUTO(QColor, Grey100)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey110);
|
Q_PROPERTY_AUTO(QColor, Grey110)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey120);
|
Q_PROPERTY_AUTO(QColor, Grey120)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey130);
|
Q_PROPERTY_AUTO(QColor, Grey130)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey140);
|
Q_PROPERTY_AUTO(QColor, Grey140)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey150);
|
Q_PROPERTY_AUTO(QColor, Grey150)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey160);
|
Q_PROPERTY_AUTO(QColor, Grey160)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey170);
|
Q_PROPERTY_AUTO(QColor, Grey170)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey180);
|
Q_PROPERTY_AUTO(QColor, Grey180)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey190);
|
Q_PROPERTY_AUTO(QColor, Grey190)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey200);
|
Q_PROPERTY_AUTO(QColor, Grey200)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey210);
|
Q_PROPERTY_AUTO(QColor, Grey210)
|
||||||
Q_PROPERTY_AUTO(QColor, Grey220);
|
Q_PROPERTY_AUTO(QColor, Grey220)
|
||||||
Q_PROPERTY_AUTO_P(FluAccentColor*, Yellow);
|
Q_PROPERTY_AUTO_P(FluAccentColor *, Yellow)
|
||||||
Q_PROPERTY_AUTO_P(FluAccentColor*, Orange);
|
Q_PROPERTY_AUTO_P(FluAccentColor *, Orange)
|
||||||
Q_PROPERTY_AUTO_P(FluAccentColor*, Red);
|
Q_PROPERTY_AUTO_P(FluAccentColor *, Red)
|
||||||
Q_PROPERTY_AUTO_P(FluAccentColor*, Magenta);
|
Q_PROPERTY_AUTO_P(FluAccentColor *, Magenta)
|
||||||
Q_PROPERTY_AUTO_P(FluAccentColor*, Purple);
|
Q_PROPERTY_AUTO_P(FluAccentColor *, Purple)
|
||||||
Q_PROPERTY_AUTO_P(FluAccentColor*, Blue);
|
Q_PROPERTY_AUTO_P(FluAccentColor *, Blue)
|
||||||
Q_PROPERTY_AUTO_P(FluAccentColor*, Teal);
|
Q_PROPERTY_AUTO_P(FluAccentColor *, Teal)
|
||||||
Q_PROPERTY_AUTO_P(FluAccentColor*, Green);
|
Q_PROPERTY_AUTO_P(FluAccentColor *, Green)
|
||||||
QML_NAMED_ELEMENT(FluColors)
|
QML_NAMED_ELEMENT(FluColors)
|
||||||
QML_SINGLETON
|
QML_SINGLETON
|
||||||
|
|
||||||
@ -53,9 +53,11 @@ private:
|
|||||||
explicit FluColors(QObject *parent = nullptr);
|
explicit FluColors(QObject *parent = nullptr);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
SINGLETON(FluColors)
|
SINGLETON(FluColors)
|
||||||
|
|
||||||
[[maybe_unused]] Q_INVOKABLE FluAccentColor *createAccentColor(const QColor &primaryColor);
|
[[maybe_unused]] Q_INVOKABLE FluAccentColor *createAccentColor(const QColor &primaryColor);
|
||||||
|
|
||||||
static FluColors *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
|
static FluColors *create(QQmlEngine *, QJSEngine *) {
|
||||||
|
return getInstance();
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
@ -4,46 +4,363 @@
|
|||||||
#include <QGuiApplication>
|
#include <QGuiApplication>
|
||||||
#include <QScreen>
|
#include <QScreen>
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
|
#include <optional>
|
||||||
#include "FluTools.h"
|
#include "FluTools.h"
|
||||||
|
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
#pragma comment (lib, "user32.lib")
|
|
||||||
#pragma comment (lib, "dwmapi.lib")
|
|
||||||
|
|
||||||
#include <windows.h>
|
static DwmSetWindowAttributeFunc pDwmSetWindowAttribute = nullptr;
|
||||||
#include <windowsx.h>
|
static DwmExtendFrameIntoClientAreaFunc pDwmExtendFrameIntoClientArea = nullptr;
|
||||||
#include <dwmapi.h>
|
static DwmIsCompositionEnabledFunc pDwmIsCompositionEnabled = nullptr;
|
||||||
|
static DwmEnableBlurBehindWindowFunc pDwmEnableBlurBehindWindow = nullptr;
|
||||||
|
static SetWindowCompositionAttributeFunc pSetWindowCompositionAttribute = nullptr;
|
||||||
|
static GetDpiForWindowFunc pGetDpiForWindow = nullptr;
|
||||||
|
static GetSystemMetricsForDpiFunc pGetSystemMetricsForDpi = nullptr;
|
||||||
|
|
||||||
|
static RTL_OSVERSIONINFOW GetRealOSVersionImpl() {
|
||||||
|
HMODULE hMod = ::GetModuleHandleW(L"ntdll.dll");
|
||||||
|
using RtlGetVersionPtr = NTSTATUS(WINAPI *)(PRTL_OSVERSIONINFOW);
|
||||||
|
auto pRtlGetVersion =
|
||||||
|
reinterpret_cast<RtlGetVersionPtr>(::GetProcAddress(hMod, "RtlGetVersion"));
|
||||||
|
RTL_OSVERSIONINFOW rovi{};
|
||||||
|
rovi.dwOSVersionInfoSize = sizeof(rovi);
|
||||||
|
pRtlGetVersion(&rovi);
|
||||||
|
return rovi;
|
||||||
|
}
|
||||||
|
|
||||||
|
RTL_OSVERSIONINFOW GetRealOSVersion() {
|
||||||
|
static const auto result = GetRealOSVersionImpl();
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool isWin8OrGreater() {
|
||||||
|
RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
|
||||||
|
return (rovi.dwMajorVersion > 6) || (rovi.dwMajorVersion == 6 && rovi.dwMinorVersion >= 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool isWin8Point1OrGreater() {
|
||||||
|
RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
|
||||||
|
return (rovi.dwMajorVersion > 6) || (rovi.dwMajorVersion == 6 && rovi.dwMinorVersion >= 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool isWin10OrGreater() {
|
||||||
|
RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
|
||||||
|
return (rovi.dwMajorVersion > 10) || (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool isWin101809OrGreater() {
|
||||||
|
RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
|
||||||
|
return (rovi.dwMajorVersion > 10) ||
|
||||||
|
(rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 && rovi.dwBuildNumber >= 17763);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool isWin101903OrGreater() {
|
||||||
|
RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
|
||||||
|
return (rovi.dwMajorVersion > 10) ||
|
||||||
|
(rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 && rovi.dwBuildNumber >= 18362);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool isWin11OrGreater() {
|
||||||
|
RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
|
||||||
|
return (rovi.dwMajorVersion > 10) ||
|
||||||
|
(rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 && rovi.dwBuildNumber >= 22000);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool isWin1122H2OrGreater() {
|
||||||
|
RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
|
||||||
|
return (rovi.dwMajorVersion > 10) ||
|
||||||
|
(rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 && rovi.dwBuildNumber >= 22621);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool isWin10Only() {
|
||||||
|
return isWin10OrGreater() && !isWin11OrGreater();
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool isWin7Only() {
|
||||||
|
RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
|
||||||
|
return rovi.dwMajorVersion == 7;
|
||||||
|
}
|
||||||
|
|
||||||
static inline QByteArray qtNativeEventType() {
|
static inline QByteArray qtNativeEventType() {
|
||||||
static const auto result = "windows_generic_MSG";
|
static const auto result = "windows_generic_MSG";
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool isCompositionEnabled() {
|
static inline bool initializeFunctionPointers() {
|
||||||
typedef HRESULT (WINAPI *DwmIsCompositionEnabledPtr)(BOOL *pfEnabled);
|
HMODULE module = LoadLibraryW(L"dwmapi.dll");
|
||||||
HMODULE module = ::LoadLibraryW(L"dwmapi.dll");
|
|
||||||
if (module) {
|
if (module) {
|
||||||
BOOL composition_enabled = false;
|
if (!pDwmSetWindowAttribute) {
|
||||||
DwmIsCompositionEnabledPtr dwm_is_composition_enabled;
|
pDwmSetWindowAttribute = reinterpret_cast<DwmSetWindowAttributeFunc>(
|
||||||
dwm_is_composition_enabled = reinterpret_cast<DwmIsCompositionEnabledPtr>(::GetProcAddress(module, "DwmIsCompositionEnabled"));
|
GetProcAddress(module, "DwmSetWindowAttribute"));
|
||||||
if (dwm_is_composition_enabled) {
|
if (!pDwmSetWindowAttribute) {
|
||||||
dwm_is_composition_enabled(&composition_enabled);
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
if (!pDwmExtendFrameIntoClientArea) {
|
||||||
|
pDwmExtendFrameIntoClientArea = reinterpret_cast<DwmExtendFrameIntoClientAreaFunc>(
|
||||||
|
GetProcAddress(module, "DwmExtendFrameIntoClientArea"));
|
||||||
|
if (!pDwmExtendFrameIntoClientArea) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!pDwmIsCompositionEnabled) {
|
||||||
|
pDwmIsCompositionEnabled = reinterpret_cast<DwmIsCompositionEnabledFunc>(
|
||||||
|
::GetProcAddress(module, "DwmIsCompositionEnabled"));
|
||||||
|
if (!pDwmIsCompositionEnabled) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!pDwmEnableBlurBehindWindow) {
|
||||||
|
pDwmEnableBlurBehindWindow = reinterpret_cast<DwmEnableBlurBehindWindowFunc>(
|
||||||
|
GetProcAddress(module, "DwmEnableBlurBehindWindow"));
|
||||||
|
if (!pDwmEnableBlurBehindWindow) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
HMODULE user32 = LoadLibraryW(L"user32.dll");
|
||||||
|
if (module) {
|
||||||
|
if (!pSetWindowCompositionAttribute) {
|
||||||
|
pSetWindowCompositionAttribute = reinterpret_cast<SetWindowCompositionAttributeFunc>(
|
||||||
|
GetProcAddress(user32, "SetWindowCompositionAttribute"));
|
||||||
|
if (!pSetWindowCompositionAttribute) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!pGetDpiForWindow) {
|
||||||
|
pGetDpiForWindow =
|
||||||
|
reinterpret_cast<GetDpiForWindowFunc>(GetProcAddress(user32, "GetDpiForWindow"));
|
||||||
|
if (!pGetDpiForWindow) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!pGetSystemMetricsForDpi) {
|
||||||
|
pGetSystemMetricsForDpi = reinterpret_cast<GetSystemMetricsForDpiFunc>(
|
||||||
|
GetProcAddress(user32, "GetSystemMetricsForDpi"));
|
||||||
|
if (!pGetSystemMetricsForDpi) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool isCompositionEnabled() {
|
||||||
|
if (initializeFunctionPointers()) {
|
||||||
|
BOOL composition_enabled = false;
|
||||||
|
pDwmIsCompositionEnabled(&composition_enabled);
|
||||||
return composition_enabled;
|
return composition_enabled;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline void setShadow(HWND hwnd) {
|
||||||
|
const MARGINS shadow = {1, 0, 0, 0};
|
||||||
|
if (initializeFunctionPointers()) {
|
||||||
|
pDwmExtendFrameIntoClientArea(hwnd, &shadow);
|
||||||
|
}
|
||||||
|
if (isWin7Only()) {
|
||||||
|
SetClassLong(hwnd, GCL_STYLE, GetClassLong(hwnd, GCL_STYLE) | CS_DROPSHADOW);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool setWindowDarkMode(HWND hwnd, const BOOL enable) {
|
||||||
|
if (!initializeFunctionPointers()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return bool(pDwmSetWindowAttribute(hwnd, 20, &enable, sizeof(BOOL)));
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline std::optional<MONITORINFOEXW> getMonitorForWindow(const HWND hwnd) {
|
||||||
|
Q_ASSERT(hwnd);
|
||||||
|
if (!hwnd) {
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
const HMONITOR monitor = ::MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
|
||||||
|
if (!monitor) {
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
MONITORINFOEXW monitorInfo;
|
||||||
|
::SecureZeroMemory(&monitorInfo, sizeof(monitorInfo));
|
||||||
|
monitorInfo.cbSize = sizeof(monitorInfo);
|
||||||
|
if (::GetMonitorInfoW(monitor, &monitorInfo) == FALSE) {
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
return monitorInfo;
|
||||||
|
};
|
||||||
|
|
||||||
|
static inline bool isFullScreen(const HWND hwnd) {
|
||||||
|
RECT windowRect = {};
|
||||||
|
if (::GetWindowRect(hwnd, &windowRect) == FALSE) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
const std::optional<MONITORINFOEXW> mi = getMonitorForWindow(hwnd);
|
||||||
|
if (!mi.has_value()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
RECT rcMonitor = mi.value().rcMonitor;
|
||||||
|
return windowRect.top == rcMonitor.top && windowRect.left == rcMonitor.left &&
|
||||||
|
windowRect.right == rcMonitor.right && windowRect.bottom == rcMonitor.bottom;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool isMaximized(const HWND hwnd) {
|
||||||
|
WINDOWPLACEMENT wp;
|
||||||
|
::GetWindowPlacement(hwnd, &wp);
|
||||||
|
return wp.showCmd == SW_MAXIMIZE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline quint32 getDpiForWindow(const HWND hwnd, const bool horizontal) {
|
||||||
|
if (const UINT dpi = pGetDpiForWindow(hwnd)) {
|
||||||
|
return dpi;
|
||||||
|
}
|
||||||
|
if (const HDC hdc = ::GetDC(hwnd)) {
|
||||||
|
bool valid = false;
|
||||||
|
const int dpiX = ::GetDeviceCaps(hdc, LOGPIXELSX);
|
||||||
|
const int dpiY = ::GetDeviceCaps(hdc, LOGPIXELSY);
|
||||||
|
if ((dpiX > 0) && (dpiY > 0)) {
|
||||||
|
valid = true;
|
||||||
|
}
|
||||||
|
::ReleaseDC(hwnd, hdc);
|
||||||
|
if (valid) {
|
||||||
|
return (horizontal ? dpiX : dpiY);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 96;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline int getSystemMetrics(const HWND hwnd, const int index, const bool horizontal) {
|
||||||
|
const UINT dpi = getDpiForWindow(hwnd, horizontal);
|
||||||
|
if (const int result = pGetSystemMetricsForDpi(index, dpi); result > 0) {
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
return ::GetSystemMetrics(index);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline quint32 getResizeBorderThickness(const HWND hwnd, const bool horizontal,
|
||||||
|
const qreal devicePixelRatio) {
|
||||||
|
auto frame = horizontal ? SM_CXSIZEFRAME : SM_CYSIZEFRAME;
|
||||||
|
auto result =
|
||||||
|
getSystemMetrics(hwnd, frame, horizontal) + getSystemMetrics(hwnd, 92, horizontal);
|
||||||
|
if (result > 0) {
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
int thickness = isCompositionEnabled() ? 8 : 4;
|
||||||
|
return qRound(thickness * devicePixelRatio);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool setWindowEffect(HWND hwnd, const QString &key, const bool &enable) {
|
||||||
|
static constexpr const MARGINS extendedMargins = {-1, -1, -1, -1};
|
||||||
|
if (key == QStringLiteral("mica")) {
|
||||||
|
if (!isWin11OrGreater() || !initializeFunctionPointers()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (enable) {
|
||||||
|
pDwmExtendFrameIntoClientArea(hwnd, &extendedMargins);
|
||||||
|
if (isWin1122H2OrGreater()) {
|
||||||
|
const DWORD backdropType = _DWMSBT_MAINWINDOW;
|
||||||
|
pDwmSetWindowAttribute(hwnd, 38, &backdropType, sizeof(backdropType));
|
||||||
|
} else {
|
||||||
|
const BOOL enable = TRUE;
|
||||||
|
pDwmSetWindowAttribute(hwnd, 1029, &enable, sizeof(enable));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (isWin1122H2OrGreater()) {
|
||||||
|
const DWORD backdropType = _DWMSBT_AUTO;
|
||||||
|
pDwmSetWindowAttribute(hwnd, 38, &backdropType, sizeof(backdropType));
|
||||||
|
} else {
|
||||||
|
const BOOL enable = FALSE;
|
||||||
|
pDwmSetWindowAttribute(hwnd, 1029, &enable, sizeof(enable));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (key == QStringLiteral("mica-alt")) {
|
||||||
|
if (!isWin1122H2OrGreater() || !initializeFunctionPointers()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (enable) {
|
||||||
|
pDwmExtendFrameIntoClientArea(hwnd, &extendedMargins);
|
||||||
|
const DWORD backdropType = _DWMSBT_TABBEDWINDOW;
|
||||||
|
pDwmSetWindowAttribute(hwnd, 38, &backdropType, sizeof(backdropType));
|
||||||
|
} else {
|
||||||
|
const DWORD backdropType = _DWMSBT_AUTO;
|
||||||
|
pDwmSetWindowAttribute(hwnd, 38, &backdropType, sizeof(backdropType));
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (key == QStringLiteral("acrylic")) {
|
||||||
|
if (!isWin11OrGreater() || !initializeFunctionPointers()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (enable) {
|
||||||
|
pDwmExtendFrameIntoClientArea(hwnd, &extendedMargins);
|
||||||
|
DWORD system_backdrop_type = _DWMSBT_TRANSIENTWINDOW;
|
||||||
|
pDwmSetWindowAttribute(hwnd, 38, &system_backdrop_type, sizeof(DWORD));
|
||||||
|
} else {
|
||||||
|
const DWORD backdropType = _DWMSBT_AUTO;
|
||||||
|
pDwmSetWindowAttribute(hwnd, 38, &backdropType, sizeof(backdropType));
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (key == QStringLiteral("dwm-blur")) {
|
||||||
|
if ((isWin7Only() && !isCompositionEnabled()) || !initializeFunctionPointers()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (enable) {
|
||||||
|
if (isWin8OrGreater()) {
|
||||||
|
ACCENT_POLICY policy{};
|
||||||
|
policy.dwAccentState = ACCENT_ENABLE_BLURBEHIND;
|
||||||
|
policy.dwAccentFlags = ACCENT_NONE;
|
||||||
|
WINDOWCOMPOSITIONATTRIBDATA wcad{};
|
||||||
|
wcad.Attrib = WCA_ACCENT_POLICY;
|
||||||
|
wcad.pvData = &policy;
|
||||||
|
wcad.cbData = sizeof(policy);
|
||||||
|
pSetWindowCompositionAttribute(hwnd, &wcad);
|
||||||
|
} else {
|
||||||
|
DWM_BLURBEHIND bb{};
|
||||||
|
bb.fEnable = TRUE;
|
||||||
|
bb.dwFlags = DWM_BB_ENABLE;
|
||||||
|
pDwmEnableBlurBehindWindow(hwnd, &bb);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (isWin8OrGreater()) {
|
||||||
|
ACCENT_POLICY policy{};
|
||||||
|
policy.dwAccentState = ACCENT_DISABLED;
|
||||||
|
policy.dwAccentFlags = ACCENT_NONE;
|
||||||
|
WINDOWCOMPOSITIONATTRIBDATA wcad{};
|
||||||
|
wcad.Attrib = WCA_ACCENT_POLICY;
|
||||||
|
wcad.pvData = &policy;
|
||||||
|
wcad.cbData = sizeof(policy);
|
||||||
|
pSetWindowCompositionAttribute(hwnd, &wcad);
|
||||||
|
} else {
|
||||||
|
DWM_BLURBEHIND bb{};
|
||||||
|
bb.fEnable = FALSE;
|
||||||
|
bb.dwFlags = DWM_BB_ENABLE;
|
||||||
|
pDwmEnableBlurBehindWindow(hwnd, &bb);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
bool containsCursorToItem(QQuickItem *item) {
|
bool containsCursorToItem(QQuickItem *item) {
|
||||||
if (!item || !item->isVisible()) {
|
if (!item || !item->isVisible()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
auto point = QCursor::pos();
|
auto point = item->window()->mapFromGlobal(QCursor::pos());
|
||||||
auto rect = QRectF(item->mapToGlobal(QPoint(0, 0)), item->size());
|
auto rect = QRectF(item->mapToItem(item->window()->contentItem(), QPointF(0, 0)), item->size());
|
||||||
if (point.x() > rect.x() && point.x() < (rect.x() + rect.width()) && point.y() > rect.y() && point.y() < (rect.y() + rect.height())) {
|
if (rect.contains(point)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@ -57,6 +374,8 @@ FluFrameless::FluFrameless(QQuickItem *parent) : QQuickItem{parent} {
|
|||||||
_closeButton = nullptr;
|
_closeButton = nullptr;
|
||||||
_topmost = false;
|
_topmost = false;
|
||||||
_disabled = false;
|
_disabled = false;
|
||||||
|
_effect = "normal";
|
||||||
|
_effective = false;
|
||||||
_isWindows11OrGreater = FluTools::getInstance()->isWindows11OrGreater();
|
_isWindows11OrGreater = FluTools::getInstance()->isWindows11OrGreater();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -67,21 +386,62 @@ FluFrameless::~FluFrameless() = default;
|
|||||||
}
|
}
|
||||||
|
|
||||||
void FluFrameless::componentComplete() {
|
void FluFrameless::componentComplete() {
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
HWND hwnd = reinterpret_cast<HWND>(window()->winId());
|
||||||
|
if (isWin11OrGreater()) {
|
||||||
|
availableEffects({"mica", "mica-alt", "acrylic", "dwm-blur", "normal"});
|
||||||
|
} else {
|
||||||
|
availableEffects({"dwm-blur", "normal"});
|
||||||
|
}
|
||||||
|
if (!_effect.isEmpty() && _useSystemEffect) {
|
||||||
|
effective(setWindowEffect(hwnd, _effect, true));
|
||||||
|
if (effective()) {
|
||||||
|
_currentEffect = effect();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
connect(this, &FluFrameless::effectChanged, this, [hwnd, this] {
|
||||||
|
if (effect() == _currentEffect) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (effective()) {
|
||||||
|
setWindowEffect(hwnd, _currentEffect, false);
|
||||||
|
}
|
||||||
|
effective(setWindowEffect(hwnd, effect(), true));
|
||||||
|
if (effective()) {
|
||||||
|
_currentEffect = effect();
|
||||||
|
_useSystemEffect = true;
|
||||||
|
} else {
|
||||||
|
_effect = "normal";
|
||||||
|
_currentEffect = "normal";
|
||||||
|
_useSystemEffect = false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
connect(this, &FluFrameless::useSystemEffectChanged, this, [this] {
|
||||||
|
if (!_useSystemEffect) {
|
||||||
|
effect("normal");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
connect(this, &FluFrameless::isDarkModeChanged, this, [hwnd, this] {
|
||||||
|
if (effective() && !_currentEffect.isEmpty() && _currentEffect != "normal") {
|
||||||
|
setWindowDarkMode(hwnd, _isDarkMode);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
#endif
|
||||||
if (_disabled) {
|
if (_disabled) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int w = window()->width();
|
int w = window()->width();
|
||||||
int h = window()->height();
|
int h = window()->height();
|
||||||
_current = window()->winId();
|
_current = window()->winId();
|
||||||
window()->setFlags((window()->flags()) | Qt::CustomizeWindowHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::FramelessWindowHint);
|
#ifdef Q_OS_MACOS
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
window()->setFlag(Qt::FramelessWindowHint, true);
|
||||||
if (QQuickWindow::sceneGraphBackend() == "software") {
|
window()->setProperty("__borderWidth", 1);
|
||||||
window()->setFlag(Qt::FramelessWindowHint, false);
|
#endif
|
||||||
}
|
#ifdef Q_OS_LINUX
|
||||||
|
window()->setFlag(Qt::CustomizeWindowHint, true);
|
||||||
|
window()->setFlag(Qt::FramelessWindowHint, true);
|
||||||
|
window()->setProperty("__borderWidth", 1);
|
||||||
#endif
|
#endif
|
||||||
if (!_fixSize) {
|
|
||||||
window()->setFlag(Qt::WindowMaximizeButtonHint);
|
|
||||||
}
|
|
||||||
window()->installEventFilter(this);
|
window()->installEventFilter(this);
|
||||||
QGuiApplication::instance()->installNativeEventFilter(this);
|
QGuiApplication::instance()->installNativeEventFilter(this);
|
||||||
if (_maximizeButton) {
|
if (_maximizeButton) {
|
||||||
@ -94,37 +454,58 @@ void FluFrameless::componentComplete() {
|
|||||||
setHitTestVisible(_closeButton);
|
setHitTestVisible(_closeButton);
|
||||||
}
|
}
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
HWND hwnd = reinterpret_cast<HWND>(window()->winId());
|
# if (QT_VERSION == QT_VERSION_CHECK(6, 5, 3))
|
||||||
|
qWarning()
|
||||||
|
<< "Qt's own frameless bug, currently only exist in 6.5.3, please use other versions";
|
||||||
|
# endif
|
||||||
|
if (!hwnd) {
|
||||||
|
hwnd = reinterpret_cast<HWND>(window()->winId());
|
||||||
|
}
|
||||||
DWORD style = ::GetWindowLongPtr(hwnd, GWL_STYLE);
|
DWORD style = ::GetWindowLongPtr(hwnd, GWL_STYLE);
|
||||||
|
# if (QT_VERSION == QT_VERSION_CHECK(6, 7, 2))
|
||||||
|
style &= ~(WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU);
|
||||||
|
# endif
|
||||||
if (_fixSize) {
|
if (_fixSize) {
|
||||||
::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_THICKFRAME);
|
::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_THICKFRAME | WS_CAPTION);
|
||||||
|
;
|
||||||
for (int i = 0; i <= QGuiApplication::screens().count() - 1; ++i) {
|
for (int i = 0; i <= QGuiApplication::screens().count() - 1; ++i) {
|
||||||
connect(QGuiApplication::screens().at(i), &QScreen::logicalDotsPerInchChanged, this, [=] {
|
connect(
|
||||||
SetWindowPos(hwnd, nullptr, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_FRAMECHANGED);
|
QGuiApplication::screens().at(i), &QScreen::logicalDotsPerInchChanged, this, [=] {
|
||||||
});
|
SetWindowPos(hwnd, nullptr, 0, 0, 0, 0,
|
||||||
|
SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_FRAMECHANGED);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_MAXIMIZEBOX | WS_THICKFRAME);
|
::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_MAXIMIZEBOX | WS_THICKFRAME | WS_CAPTION);
|
||||||
}
|
}
|
||||||
SetWindowPos(hwnd, nullptr, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
|
SetWindowPos(hwnd, nullptr, 0, 0, 0, 0,
|
||||||
|
SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
|
||||||
connect(window(), &QQuickWindow::screenChanged, this, [hwnd] {
|
connect(window(), &QQuickWindow::screenChanged, this, [hwnd] {
|
||||||
::SetWindowPos(hwnd, nullptr, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED | SWP_NOOWNERZORDER);
|
::SetWindowPos(hwnd, nullptr, 0, 0, 0, 0,
|
||||||
|
SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED |
|
||||||
|
SWP_NOOWNERZORDER);
|
||||||
::RedrawWindow(hwnd, nullptr, nullptr, RDW_INVALIDATE | RDW_UPDATENOW);
|
::RedrawWindow(hwnd, nullptr, nullptr, RDW_INVALIDATE | RDW_UPDATENOW);
|
||||||
});
|
});
|
||||||
|
if (!window()->property("_hideShadow").toBool()) {
|
||||||
|
setShadow(hwnd);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
h = qRound(h + _appbar->height());
|
auto appBarHeight = _appbar->height();
|
||||||
|
h = qRound(h + appBarHeight);
|
||||||
if (_fixSize) {
|
if (_fixSize) {
|
||||||
window()->setMaximumSize(QSize(w, h));
|
window()->setMaximumSize(QSize(w, h));
|
||||||
window()->setMinimumSize(QSize(w, h));
|
window()->setMinimumSize(QSize(w, h));
|
||||||
|
} else {
|
||||||
|
window()->setMinimumHeight(window()->minimumHeight() + appBarHeight);
|
||||||
|
window()->setMaximumHeight(window()->maximumHeight() + appBarHeight);
|
||||||
}
|
}
|
||||||
window()->resize(QSize(w, h));
|
window()->resize(QSize(w, h));
|
||||||
connect(this, &FluFrameless::topmostChanged, this, [this] {
|
connect(this, &FluFrameless::topmostChanged, this, [this] { _setWindowTopmost(topmost()); });
|
||||||
_setWindowTopmost(topmost());
|
|
||||||
});
|
|
||||||
_setWindowTopmost(topmost());
|
_setWindowTopmost(topmost());
|
||||||
}
|
}
|
||||||
|
|
||||||
[[maybe_unused]] bool FluFrameless::nativeEventFilter(const QByteArray &eventType, void *message, QT_NATIVE_EVENT_RESULT_TYPE *result) {
|
[[maybe_unused]] bool FluFrameless::nativeEventFilter(const QByteArray &eventType, void *message,
|
||||||
|
QT_NATIVE_EVENT_RESULT_TYPE *result) {
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
if ((eventType != qtNativeEventType()) || !message) {
|
if ((eventType != qtNativeEventType()) || !message) {
|
||||||
return false;
|
return false;
|
||||||
@ -141,55 +522,75 @@ void FluFrameless::componentComplete() {
|
|||||||
const auto uMsg = msg->message;
|
const auto uMsg = msg->message;
|
||||||
const auto wParam = msg->wParam;
|
const auto wParam = msg->wParam;
|
||||||
const auto lParam = msg->lParam;
|
const auto lParam = msg->lParam;
|
||||||
static QPoint offsetXY;
|
|
||||||
if (uMsg == WM_WINDOWPOSCHANGING) {
|
if (uMsg == WM_WINDOWPOSCHANGING) {
|
||||||
auto *wp = reinterpret_cast<WINDOWPOS *>(lParam);
|
auto *wp = reinterpret_cast<WINDOWPOS *>(lParam);
|
||||||
if (wp != nullptr && (wp->flags & SWP_NOSIZE) == 0) {
|
if (wp != nullptr && (wp->flags & SWP_NOSIZE) == 0) {
|
||||||
wp->flags |= SWP_NOCOPYBITS;
|
wp->flags |= SWP_NOCOPYBITS;
|
||||||
*result = static_cast<QT_NATIVE_EVENT_RESULT_TYPE>(::DefWindowProcW(hwnd, uMsg, wParam, lParam));
|
*result = static_cast<QT_NATIVE_EVENT_RESULT_TYPE>(
|
||||||
|
::DefWindowProcW(hwnd, uMsg, wParam, lParam));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
} else if (uMsg == WM_NCCALCSIZE) {
|
} else if (uMsg == WM_NCCALCSIZE && wParam == TRUE) {
|
||||||
const auto clientRect = ((wParam == FALSE) ? reinterpret_cast<LPRECT>(lParam) : &(reinterpret_cast<LPNCCALCSIZE_PARAMS>(lParam))->rgrc[0]);
|
const auto clientRect =
|
||||||
const LONG originalTop = clientRect->top;
|
((wParam == FALSE) ? reinterpret_cast<LPRECT>(lParam)
|
||||||
const LONG originalLeft = clientRect->left;
|
: &(reinterpret_cast<LPNCCALCSIZE_PARAMS>(lParam))->rgrc[0]);
|
||||||
const LONG originalRight = clientRect->right;
|
bool isMax = ::isMaximized(hwnd);
|
||||||
const LONG originalBottom = clientRect->bottom;
|
bool isFull = ::isFullScreen(hwnd);
|
||||||
const LRESULT hitTestResult = ::DefWindowProcW(hwnd, WM_NCCALCSIZE, wParam, lParam);
|
if (isMax && !isFull) {
|
||||||
if ((hitTestResult != HTERROR) && (hitTestResult != HTNOWHERE)) {
|
auto ty = getResizeBorderThickness(hwnd, false, window()->devicePixelRatio());
|
||||||
*result = static_cast<QT_NATIVE_EVENT_RESULT_TYPE>(hitTestResult);
|
clientRect->top += ty;
|
||||||
return true;
|
clientRect->bottom -= ty;
|
||||||
|
auto tx = getResizeBorderThickness(hwnd, true, window()->devicePixelRatio());
|
||||||
|
clientRect->left += tx;
|
||||||
|
clientRect->right -= tx;
|
||||||
}
|
}
|
||||||
int offsetSize;
|
if (isMax || isFull) {
|
||||||
bool isMaximum = ::IsZoomed(hwnd);
|
APPBARDATA abd;
|
||||||
auto _offsetXY = QPoint(abs(clientRect->left - originalLeft), abs(clientRect->top - originalTop));
|
SecureZeroMemory(&abd, sizeof(abd));
|
||||||
if (_offsetXY.x() != 0) {
|
abd.cbSize = sizeof(abd);
|
||||||
offsetXY = _offsetXY;
|
const UINT taskbarState = ::SHAppBarMessage(ABM_GETSTATE, &abd);
|
||||||
|
if (taskbarState & ABS_AUTOHIDE) {
|
||||||
|
bool top = false, bottom = false, left = false, right = false;
|
||||||
|
int edge = -1;
|
||||||
|
APPBARDATA abd2;
|
||||||
|
SecureZeroMemory(&abd2, sizeof(abd2));
|
||||||
|
abd2.cbSize = sizeof(abd2);
|
||||||
|
abd2.hWnd = ::FindWindowW(L"Shell_TrayWnd", nullptr);
|
||||||
|
if (abd2.hWnd) {
|
||||||
|
const HMONITOR windowMonitor =
|
||||||
|
::MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
|
||||||
|
if (windowMonitor) {
|
||||||
|
const HMONITOR taskbarMonitor =
|
||||||
|
::MonitorFromWindow(abd2.hWnd, MONITOR_DEFAULTTOPRIMARY);
|
||||||
|
if (taskbarMonitor) {
|
||||||
|
if (taskbarMonitor == windowMonitor) {
|
||||||
|
::SHAppBarMessage(ABM_GETTASKBARPOS, &abd2);
|
||||||
|
edge = abd2.uEdge;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
top = (edge == ABE_TOP);
|
||||||
|
bottom = (edge == ABE_BOTTOM);
|
||||||
|
left = (edge == ABE_LEFT);
|
||||||
|
right = (edge == ABE_RIGHT);
|
||||||
|
if (top) {
|
||||||
|
clientRect->top += 1;
|
||||||
|
} else if (bottom) {
|
||||||
|
clientRect->bottom -= 1;
|
||||||
|
} else if (left) {
|
||||||
|
clientRect->left += 1;
|
||||||
|
} else if (right) {
|
||||||
|
clientRect->right -= 1;
|
||||||
|
} else {
|
||||||
|
clientRect->bottom -= 1;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
clientRect->bottom += 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (isMaximum || _isFullScreen()) {
|
*result = 0;
|
||||||
offsetSize = 0;
|
|
||||||
} else {
|
|
||||||
offsetSize = 1;
|
|
||||||
}
|
|
||||||
if (!isCompositionEnabled()) {
|
|
||||||
offsetSize = 0;
|
|
||||||
}
|
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
|
||||||
clientRect->top = originalTop + offsetSize;
|
|
||||||
clientRect->bottom = originalBottom - offsetSize;
|
|
||||||
clientRect->left = originalLeft + offsetSize;
|
|
||||||
clientRect->right = originalRight - offsetSize;
|
|
||||||
#else
|
|
||||||
if (!isMaximum) {
|
|
||||||
clientRect->top = originalTop + offsetSize;
|
|
||||||
clientRect->bottom = originalBottom - offsetSize;
|
|
||||||
clientRect->left = originalLeft + offsetSize;
|
|
||||||
clientRect->right = originalRight - offsetSize;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
_setMaximizeHovered(false);
|
|
||||||
*result = WVR_REDRAW;
|
|
||||||
return true;
|
return true;
|
||||||
} else if (uMsg == WM_NCHITTEST) {
|
} else if (uMsg == WM_NCHITTEST) {
|
||||||
if (_isWindows11OrGreater) {
|
if (_isWindows11OrGreater) {
|
||||||
@ -244,52 +645,39 @@ void FluFrameless::componentComplete() {
|
|||||||
}
|
}
|
||||||
*result = HTCLIENT;
|
*result = HTCLIENT;
|
||||||
return true;
|
return true;
|
||||||
|
} else if (uMsg == WM_NCPAINT) {
|
||||||
|
if (isCompositionEnabled() && !this->_isFullScreen()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
*result = FALSE;
|
||||||
|
return true;
|
||||||
|
} else if (uMsg == WM_NCACTIVATE) {
|
||||||
|
if (isCompositionEnabled()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
*result = true;
|
||||||
|
return true;
|
||||||
} else if (_isWindows11OrGreater && (uMsg == WM_NCLBUTTONDBLCLK || uMsg == WM_NCLBUTTONDOWN)) {
|
} else if (_isWindows11OrGreater && (uMsg == WM_NCLBUTTONDBLCLK || uMsg == WM_NCLBUTTONDOWN)) {
|
||||||
if (_hitMaximizeButton()) {
|
if (_hitMaximizeButton()) {
|
||||||
QMouseEvent event = QMouseEvent(QEvent::MouseButtonPress, QPoint(), QPoint(), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
|
QMouseEvent event = QMouseEvent(QEvent::MouseButtonPress, QPoint(), QPoint(),
|
||||||
|
Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
|
||||||
QGuiApplication::sendEvent(_maximizeButton, &event);
|
QGuiApplication::sendEvent(_maximizeButton, &event);
|
||||||
_setMaximizePressed(true);
|
_setMaximizePressed(true);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
} else if (_isWindows11OrGreater && (uMsg == WM_NCLBUTTONUP || uMsg == WM_NCRBUTTONUP)) {
|
} else if (_isWindows11OrGreater && (uMsg == WM_NCLBUTTONUP || uMsg == WM_NCRBUTTONUP)) {
|
||||||
if (_hitMaximizeButton()) {
|
if (_hitMaximizeButton()) {
|
||||||
QMouseEvent event = QMouseEvent(QEvent::MouseButtonRelease, QPoint(), QPoint(), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
|
QMouseEvent event = QMouseEvent(QEvent::MouseButtonRelease, QPoint(), QPoint(),
|
||||||
|
Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
|
||||||
QGuiApplication::sendEvent(_maximizeButton, &event);
|
QGuiApplication::sendEvent(_maximizeButton, &event);
|
||||||
_setMaximizePressed(false);
|
_setMaximizePressed(false);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
} else if (uMsg == WM_NCPAINT) {
|
|
||||||
*result = FALSE;
|
|
||||||
return true;
|
|
||||||
} else if (uMsg == WM_NCACTIVATE) {
|
|
||||||
*result = static_cast<QT_NATIVE_EVENT_RESULT_TYPE>(::DefWindowProcW(hwnd, WM_NCACTIVATE, wParam, -1));
|
|
||||||
return true;
|
|
||||||
} else if (uMsg == WM_GETMINMAXINFO) {
|
|
||||||
auto *minmaxInfo = reinterpret_cast<MINMAXINFO *>(lParam);
|
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
|
||||||
minmaxInfo->ptMaxPosition.x = 0;
|
|
||||||
minmaxInfo->ptMaxPosition.y = 0;
|
|
||||||
minmaxInfo->ptMaxSize.x = 0;
|
|
||||||
minmaxInfo->ptMaxSize.y = 0;
|
|
||||||
return false;
|
|
||||||
#else
|
|
||||||
auto pixelRatio = window()->devicePixelRatio();
|
|
||||||
auto geometry = window()->screen()->availableGeometry();
|
|
||||||
RECT rect;
|
|
||||||
SystemParametersInfo(SPI_GETWORKAREA, 0, &rect, 0);
|
|
||||||
if (!_fixSize) {
|
|
||||||
minmaxInfo->ptMinTrackSize.x = qRound(window()->minimumWidth() * pixelRatio + offsetXY.x());
|
|
||||||
minmaxInfo->ptMinTrackSize.y = qRound(window()->minimumHeight() * pixelRatio + offsetXY.y() + _appbar->height() * pixelRatio);
|
|
||||||
}
|
|
||||||
minmaxInfo->ptMaxPosition.x = rect.left - offsetXY.x();
|
|
||||||
minmaxInfo->ptMaxPosition.y = rect.top - offsetXY.x();
|
|
||||||
minmaxInfo->ptMaxSize.x = qRound(geometry.width() * pixelRatio) + offsetXY.x() * 2;
|
|
||||||
minmaxInfo->ptMaxSize.y = qRound(geometry.height() * pixelRatio) + offsetXY.y() * 2;
|
|
||||||
return true;
|
|
||||||
#endif
|
|
||||||
} else if (uMsg == WM_NCRBUTTONDOWN) {
|
} else if (uMsg == WM_NCRBUTTONDOWN) {
|
||||||
if (wParam == HTCAPTION) {
|
if (wParam == HTCAPTION) {
|
||||||
_showSystemMenu(QCursor::pos());
|
auto pos = window()->position();
|
||||||
|
auto offset = window()->mapFromGlobal(QCursor::pos());
|
||||||
|
_showSystemMenu(QPoint(pos.x() + offset.x(), pos.y() + offset.y()));
|
||||||
}
|
}
|
||||||
} else if (uMsg == WM_KEYDOWN || uMsg == WM_SYSKEYDOWN) {
|
} else if (uMsg == WM_KEYDOWN || uMsg == WM_SYSKEYDOWN) {
|
||||||
const bool altPressed = ((wParam == VK_MENU) || (::GetKeyState(VK_MENU) < 0));
|
const bool altPressed = ((wParam == VK_MENU) || (::GetKeyState(VK_MENU) < 0));
|
||||||
@ -327,9 +715,17 @@ bool FluFrameless::_isFullScreen() {
|
|||||||
|
|
||||||
void FluFrameless::_showSystemMenu(QPoint point) {
|
void FluFrameless::_showSystemMenu(QPoint point) {
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
|
QScreen *screen = window()->screen();
|
||||||
|
if (!screen) {
|
||||||
|
screen = QGuiApplication::primaryScreen();
|
||||||
|
}
|
||||||
|
if (!screen) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const QPoint origin = screen->geometry().topLeft();
|
||||||
|
auto nativePos =
|
||||||
|
QPointF(QPointF(point - origin) * window()->devicePixelRatio()).toPoint() + origin;
|
||||||
HWND hwnd = reinterpret_cast<HWND>(window()->winId());
|
HWND hwnd = reinterpret_cast<HWND>(window()->winId());
|
||||||
DWORD style = ::GetWindowLongPtr(hwnd, GWL_STYLE);
|
|
||||||
::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_SYSMENU);
|
|
||||||
auto hMenu = ::GetSystemMenu(hwnd, FALSE);
|
auto hMenu = ::GetSystemMenu(hwnd, FALSE);
|
||||||
if (_isMaximized() || _isFullScreen()) {
|
if (_isMaximized() || _isFullScreen()) {
|
||||||
::EnableMenuItem(hMenu, SC_MOVE, MFS_DISABLED);
|
::EnableMenuItem(hMenu, SC_MOVE, MFS_DISABLED);
|
||||||
@ -345,12 +741,13 @@ void FluFrameless::_showSystemMenu(QPoint point) {
|
|||||||
::EnableMenuItem(hMenu, SC_SIZE, MFS_DISABLED);
|
::EnableMenuItem(hMenu, SC_SIZE, MFS_DISABLED);
|
||||||
::EnableMenuItem(hMenu, SC_MAXIMIZE, MFS_DISABLED);
|
::EnableMenuItem(hMenu, SC_MAXIMIZE, MFS_DISABLED);
|
||||||
}
|
}
|
||||||
const int result = ::TrackPopupMenu(hMenu, (TPM_RETURNCMD | (QGuiApplication::isRightToLeft() ? TPM_RIGHTALIGN : TPM_LEFTALIGN)), qRound(point.x() * window()->devicePixelRatio()),
|
const int result = ::TrackPopupMenu(
|
||||||
qRound(point.y() * window()->devicePixelRatio()), 0, hwnd, nullptr);
|
hMenu,
|
||||||
if (result != FALSE) {
|
(TPM_RETURNCMD | (QGuiApplication::isRightToLeft() ? TPM_RIGHTALIGN : TPM_LEFTALIGN)),
|
||||||
|
nativePos.x(), nativePos.y(), 0, hwnd, nullptr);
|
||||||
|
if (result) {
|
||||||
::PostMessageW(hwnd, WM_SYSCOMMAND, result, 0);
|
::PostMessageW(hwnd, WM_SYSCOMMAND, result, 0);
|
||||||
}
|
}
|
||||||
::SetWindowLongPtr(hwnd, GWL_STYLE, style & ~WS_SYSMENU);
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -375,11 +772,15 @@ bool FluFrameless::_hitMaximizeButton() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void FluFrameless::_setMaximizePressed(bool val) {
|
void FluFrameless::_setMaximizePressed(bool val) {
|
||||||
_maximizeButton->setProperty("down", val);
|
if (_maximizeButton) {
|
||||||
|
_maximizeButton->setProperty("down", val);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void FluFrameless::_setMaximizeHovered(bool val) {
|
void FluFrameless::_setMaximizeHovered(bool val) {
|
||||||
_maximizeButton->setProperty("hover", val);
|
if (_maximizeButton) {
|
||||||
|
_maximizeButton->setProperty("hover", val);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void FluFrameless::_updateCursor(int edges) {
|
void FluFrameless::_updateCursor(int edges) {
|
||||||
@ -449,79 +850,80 @@ void FluFrameless::_setWindowTopmost(bool topmost) {
|
|||||||
::SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
|
::SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
window()->setFlag(Qt::WindowStaysOnTopHint,topmost);
|
window()->setFlag(Qt::WindowStaysOnTopHint, topmost);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
bool FluFrameless::eventFilter(QObject *obj, QEvent *ev) {
|
bool FluFrameless::eventFilter(QObject *obj, QEvent *ev) {
|
||||||
#ifndef Q_OS_WIN
|
#ifndef Q_OS_WIN
|
||||||
switch (ev->type()) {
|
switch (ev->type()) {
|
||||||
case QEvent::MouseButtonPress:
|
case QEvent::MouseButtonPress:
|
||||||
if(_edges!=0){
|
if (_edges != 0) {
|
||||||
QMouseEvent *event = static_cast<QMouseEvent*>(ev);
|
QMouseEvent *event = static_cast<QMouseEvent *>(ev);
|
||||||
if(event->button() == Qt::LeftButton){
|
if (event->button() == Qt::LeftButton) {
|
||||||
_updateCursor(_edges);
|
_updateCursor(_edges);
|
||||||
window()->startSystemResize(Qt::Edges(_edges));
|
window()->startSystemResize(Qt::Edges(_edges));
|
||||||
}
|
}
|
||||||
}else{
|
} else {
|
||||||
if(_hitAppBar()){
|
if (_hitAppBar()) {
|
||||||
qint64 clickTimer = QDateTime::currentMSecsSinceEpoch();
|
qint64 clickTimer = QDateTime::currentMSecsSinceEpoch();
|
||||||
qint64 offset = clickTimer - this->_clickTimer;
|
qint64 offset = clickTimer - this->_clickTimer;
|
||||||
this->_clickTimer = clickTimer;
|
this->_clickTimer = clickTimer;
|
||||||
if(offset<300){
|
if (offset < 300) {
|
||||||
if(_isMaximized()){
|
if (_isMaximized()) {
|
||||||
showNormal();
|
showNormal();
|
||||||
}else{
|
} else {
|
||||||
showMaximized();
|
showMaximized();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
window()->startSystemMove();
|
||||||
}
|
}
|
||||||
}else{
|
|
||||||
window()->startSystemMove();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
break;
|
|
||||||
case QEvent::MouseButtonRelease:
|
|
||||||
_edges = 0;
|
|
||||||
break;
|
|
||||||
case QEvent::MouseMove: {
|
|
||||||
if(_isMaximized() || _isFullScreen()){
|
|
||||||
break;
|
break;
|
||||||
}
|
case QEvent::MouseButtonRelease:
|
||||||
if(_fixSize){
|
_edges = 0;
|
||||||
break;
|
break;
|
||||||
}
|
case QEvent::MouseMove: {
|
||||||
QMouseEvent *event = static_cast<QMouseEvent*>(ev);
|
if (_isMaximized() || _isFullScreen()) {
|
||||||
QPoint p =
|
break;
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
|
|
||||||
event->pos();
|
|
||||||
#else
|
|
||||||
event->position().toPoint();
|
|
||||||
#endif
|
|
||||||
if(p.x() >= _margins && p.x() <= (window()->width() - _margins) && p.y() >= _margins && p.y() <= (window()->height() - _margins)){
|
|
||||||
if(_edges != 0){
|
|
||||||
_edges = 0;
|
|
||||||
_updateCursor(_edges);
|
|
||||||
}
|
}
|
||||||
|
if (_fixSize) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
QMouseEvent *event = static_cast<QMouseEvent *>(ev);
|
||||||
|
QPoint p =
|
||||||
|
# if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||||
|
event->pos();
|
||||||
|
# else
|
||||||
|
event->position().toPoint();
|
||||||
|
# endif
|
||||||
|
if (p.x() >= _margins && p.x() <= (window()->width() - _margins) && p.y() >= _margins &&
|
||||||
|
p.y() <= (window()->height() - _margins)) {
|
||||||
|
if (_edges != 0) {
|
||||||
|
_edges = 0;
|
||||||
|
_updateCursor(_edges);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
_edges = 0;
|
||||||
|
if (p.x() < _margins) {
|
||||||
|
_edges |= Qt::LeftEdge;
|
||||||
|
}
|
||||||
|
if (p.x() > (window()->width() - _margins)) {
|
||||||
|
_edges |= Qt::RightEdge;
|
||||||
|
}
|
||||||
|
if (p.y() < _margins) {
|
||||||
|
_edges |= Qt::TopEdge;
|
||||||
|
}
|
||||||
|
if (p.y() > (window()->height() - _margins)) {
|
||||||
|
_edges |= Qt::BottomEdge;
|
||||||
|
}
|
||||||
|
_updateCursor(_edges);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
_edges = 0;
|
default:
|
||||||
if ( p.x() < _margins ) {
|
break;
|
||||||
_edges |= Qt::LeftEdge;
|
|
||||||
}
|
|
||||||
if ( p.x() > (window()->width() - _margins) ) {
|
|
||||||
_edges |= Qt::RightEdge;
|
|
||||||
}
|
|
||||||
if ( p.y() < _margins ) {
|
|
||||||
_edges |= Qt::TopEdge;
|
|
||||||
}
|
|
||||||
if ( p.y() > (window()->height() - _margins) ) {
|
|
||||||
_edges |= Qt::BottomEdge;
|
|
||||||
}
|
|
||||||
_updateCursor(_edges);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
return QObject::eventFilter(obj, ev);
|
return QObject::eventFilter(obj, ev);
|
||||||
|
@ -6,6 +6,102 @@
|
|||||||
#include <QQmlProperty>
|
#include <QQmlProperty>
|
||||||
#include "stdafx.h"
|
#include "stdafx.h"
|
||||||
|
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
|
||||||
|
# pragma comment(lib, "user32.lib")
|
||||||
|
# pragma comment(lib, "dwmapi.lib")
|
||||||
|
|
||||||
|
# include <windows.h>
|
||||||
|
# include <windowsx.h>
|
||||||
|
# include <dwmapi.h>
|
||||||
|
enum _DWM_SYSTEMBACKDROP_TYPE {
|
||||||
|
_DWMSBT_AUTO, // [Default] Let DWM automatically decide the system-drawn backdrop for this
|
||||||
|
// window.
|
||||||
|
_DWMSBT_NONE, // [Disable] Do not draw any system backdrop.
|
||||||
|
_DWMSBT_MAINWINDOW, // [Mica] Draw the backdrop material effect corresponding to a
|
||||||
|
// long-lived window.
|
||||||
|
_DWMSBT_TRANSIENTWINDOW, // [Acrylic] Draw the backdrop material effect corresponding to a
|
||||||
|
// transient window.
|
||||||
|
_DWMSBT_TABBEDWINDOW, // [Mica Alt] Draw the backdrop material effect corresponding to a
|
||||||
|
// window with a tabbed title bar.
|
||||||
|
};
|
||||||
|
enum WINDOWCOMPOSITIONATTRIB {
|
||||||
|
WCA_UNDEFINED = 0,
|
||||||
|
WCA_NCRENDERING_ENABLED = 1,
|
||||||
|
WCA_NCRENDERING_POLICY = 2,
|
||||||
|
WCA_TRANSITIONS_FORCEDISABLED = 3,
|
||||||
|
WCA_ALLOW_NCPAINT = 4,
|
||||||
|
WCA_CAPTION_BUTTON_BOUNDS = 5,
|
||||||
|
WCA_NONCLIENT_RTL_LAYOUT = 6,
|
||||||
|
WCA_FORCE_ICONIC_REPRESENTATION = 7,
|
||||||
|
WCA_EXTENDED_FRAME_BOUNDS = 8,
|
||||||
|
WCA_HAS_ICONIC_BITMAP = 9,
|
||||||
|
WCA_THEME_ATTRIBUTES = 10,
|
||||||
|
WCA_NCRENDERING_EXILED = 11,
|
||||||
|
WCA_NCADORNMENTINFO = 12,
|
||||||
|
WCA_EXCLUDED_FROM_LIVEPREVIEW = 13,
|
||||||
|
WCA_VIDEO_OVERLAY_ACTIVE = 14,
|
||||||
|
WCA_FORCE_ACTIVEWINDOW_APPEARANCE = 15,
|
||||||
|
WCA_DISALLOW_PEEK = 16,
|
||||||
|
WCA_CLOAK = 17,
|
||||||
|
WCA_CLOAKED = 18,
|
||||||
|
WCA_ACCENT_POLICY = 19,
|
||||||
|
WCA_FREEZE_REPRESENTATION = 20,
|
||||||
|
WCA_EVER_UNCLOAKED = 21,
|
||||||
|
WCA_VISUAL_OWNER = 22,
|
||||||
|
WCA_HOLOGRAPHIC = 23,
|
||||||
|
WCA_EXCLUDED_FROM_DDA = 24,
|
||||||
|
WCA_PASSIVEUPDATEMODE = 25,
|
||||||
|
WCA_USEDARKMODECOLORS = 26,
|
||||||
|
WCA_CORNER_STYLE = 27,
|
||||||
|
WCA_PART_COLOR = 28,
|
||||||
|
WCA_DISABLE_MOVESIZE_FEEDBACK = 29,
|
||||||
|
WCA_LAST = 30
|
||||||
|
};
|
||||||
|
|
||||||
|
enum ACCENT_STATE {
|
||||||
|
ACCENT_DISABLED = 0,
|
||||||
|
ACCENT_ENABLE_GRADIENT = 1,
|
||||||
|
ACCENT_ENABLE_TRANSPARENTGRADIENT = 2,
|
||||||
|
ACCENT_ENABLE_BLURBEHIND = 3, // Traditional DWM blur
|
||||||
|
ACCENT_ENABLE_ACRYLICBLURBEHIND = 4, // RS4 1803
|
||||||
|
ACCENT_ENABLE_HOST_BACKDROP = 5, // RS5 1809
|
||||||
|
ACCENT_INVALID_STATE = 6 // Using this value will remove the window background
|
||||||
|
};
|
||||||
|
|
||||||
|
enum ACCENT_FLAG {
|
||||||
|
ACCENT_NONE = 0,
|
||||||
|
ACCENT_ENABLE_ACRYLIC = 1,
|
||||||
|
ACCENT_ENABLE_ACRYLIC_WITH_LUMINOSITY = 482
|
||||||
|
};
|
||||||
|
|
||||||
|
struct ACCENT_POLICY {
|
||||||
|
DWORD dwAccentState;
|
||||||
|
DWORD dwAccentFlags;
|
||||||
|
DWORD dwGradientColor; // #AABBGGRR
|
||||||
|
DWORD dwAnimationId;
|
||||||
|
};
|
||||||
|
using PACCENT_POLICY = ACCENT_POLICY *;
|
||||||
|
struct WINDOWCOMPOSITIONATTRIBDATA {
|
||||||
|
WINDOWCOMPOSITIONATTRIB Attrib;
|
||||||
|
PVOID pvData;
|
||||||
|
SIZE_T cbData;
|
||||||
|
};
|
||||||
|
using PWINDOWCOMPOSITIONATTRIBDATA = WINDOWCOMPOSITIONATTRIBDATA *;
|
||||||
|
|
||||||
|
typedef HRESULT(WINAPI *DwmSetWindowAttributeFunc)(HWND hwnd, DWORD dwAttribute,
|
||||||
|
LPCVOID pvAttribute, DWORD cbAttribute);
|
||||||
|
typedef HRESULT(WINAPI *DwmExtendFrameIntoClientAreaFunc)(HWND hwnd, const MARGINS *pMarInset);
|
||||||
|
typedef HRESULT(WINAPI *DwmIsCompositionEnabledFunc)(BOOL *pfEnabled);
|
||||||
|
typedef HRESULT(WINAPI *DwmEnableBlurBehindWindowFunc)(HWND hWnd,
|
||||||
|
const DWM_BLURBEHIND *pBlurBehind);
|
||||||
|
typedef BOOL(WINAPI *SetWindowCompositionAttributeFunc)(HWND hwnd,
|
||||||
|
const WINDOWCOMPOSITIONATTRIBDATA *);
|
||||||
|
typedef UINT(WINAPI *GetDpiForWindowFunc)(HWND hWnd);
|
||||||
|
typedef int(WINAPI *GetSystemMetricsForDpiFunc)(int nIndex, UINT dpi);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
||||||
using QT_NATIVE_EVENT_RESULT_TYPE = qintptr;
|
using QT_NATIVE_EVENT_RESULT_TYPE = qintptr;
|
||||||
using QT_ENTER_EVENT_TYPE = QEnterEvent;
|
using QT_ENTER_EVENT_TYPE = QEnterEvent;
|
||||||
@ -14,16 +110,20 @@ using QT_NATIVE_EVENT_RESULT_TYPE = long;
|
|||||||
using QT_ENTER_EVENT_TYPE = QEvent;
|
using QT_ENTER_EVENT_TYPE = QEvent;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
class FluFrameless : public QQuickItem, QAbstractNativeEventFilter {
|
class FluFrameless : public QQuickItem, QAbstractNativeEventFilter {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY_AUTO_P(QQuickItem*, appbar)
|
Q_PROPERTY_AUTO_P(QQuickItem *, appbar)
|
||||||
Q_PROPERTY_AUTO_P(QQuickItem*, maximizeButton)
|
Q_PROPERTY_AUTO_P(QQuickItem *, maximizeButton)
|
||||||
Q_PROPERTY_AUTO_P(QQuickItem*, minimizedButton)
|
Q_PROPERTY_AUTO_P(QQuickItem *, minimizedButton)
|
||||||
Q_PROPERTY_AUTO_P(QQuickItem*, closeButton)
|
Q_PROPERTY_AUTO_P(QQuickItem *, closeButton)
|
||||||
Q_PROPERTY_AUTO(bool, topmost)
|
Q_PROPERTY_AUTO(bool, topmost)
|
||||||
Q_PROPERTY_AUTO(bool, disabled)
|
Q_PROPERTY_AUTO(bool, disabled)
|
||||||
Q_PROPERTY_AUTO(bool, fixSize)
|
Q_PROPERTY_AUTO(bool, fixSize)
|
||||||
|
Q_PROPERTY_AUTO(QString, effect)
|
||||||
|
Q_PROPERTY_READONLY_AUTO(bool, effective)
|
||||||
|
Q_PROPERTY_READONLY_AUTO(QStringList, availableEffects)
|
||||||
|
Q_PROPERTY_AUTO(bool, isDarkMode)
|
||||||
|
Q_PROPERTY_AUTO(bool, useSystemEffect)
|
||||||
QML_NAMED_ELEMENT(FluFrameless)
|
QML_NAMED_ELEMENT(FluFrameless)
|
||||||
public:
|
public:
|
||||||
explicit FluFrameless(QQuickItem *parent = nullptr);
|
explicit FluFrameless(QQuickItem *parent = nullptr);
|
||||||
@ -32,7 +132,8 @@ public:
|
|||||||
|
|
||||||
void componentComplete() override;
|
void componentComplete() override;
|
||||||
|
|
||||||
[[maybe_unused]] bool nativeEventFilter(const QByteArray &eventType, void *message, QT_NATIVE_EVENT_RESULT_TYPE *result) override;
|
[[maybe_unused]] bool nativeEventFilter(const QByteArray &eventType, void *message,
|
||||||
|
QT_NATIVE_EVENT_RESULT_TYPE *result) override;
|
||||||
|
|
||||||
[[maybe_unused]] Q_INVOKABLE void showFullScreen();
|
[[maybe_unused]] Q_INVOKABLE void showFullScreen();
|
||||||
|
|
||||||
@ -68,6 +169,7 @@ private:
|
|||||||
|
|
||||||
void _setMaximizeHovered(bool val);
|
void _setMaximizeHovered(bool val);
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
quint64 _current = 0;
|
quint64 _current = 0;
|
||||||
int _edges = 0;
|
int _edges = 0;
|
||||||
@ -75,4 +177,5 @@ private:
|
|||||||
quint64 _clickTimer = 0;
|
quint64 _clickTimer = 0;
|
||||||
bool _isWindows11OrGreater = false;
|
bool _isWindows11OrGreater = false;
|
||||||
QList<QPointer<QQuickItem>> _hitTestList;
|
QList<QPointer<QQuickItem>> _hitTestList;
|
||||||
|
QString _currentEffect;
|
||||||
};
|
};
|
||||||
|
27
src/FluHotkey.cpp
Normal file
27
src/FluHotkey.cpp
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
#include "FluHotkey.h"
|
||||||
|
|
||||||
|
#include "QGuiApplication"
|
||||||
|
|
||||||
|
|
||||||
|
FluHotkey::FluHotkey(QObject *parent) : QObject{parent} {
|
||||||
|
_sequence = "";
|
||||||
|
_isRegistered = false;
|
||||||
|
connect(this, &FluHotkey::sequenceChanged, this, [=] {
|
||||||
|
if (_hotkey) {
|
||||||
|
delete _hotkey;
|
||||||
|
_hotkey = nullptr;
|
||||||
|
}
|
||||||
|
_hotkey = new QHotkey(QKeySequence(_sequence), true, qApp);
|
||||||
|
this->isRegistered(_hotkey->isRegistered());
|
||||||
|
QObject::connect(_hotkey, &QHotkey::activated, qApp, [=]() { Q_EMIT this->activated(); });
|
||||||
|
QObject::connect(_hotkey, &QHotkey::registeredChanged, qApp,
|
||||||
|
[=]() { this->isRegistered(_hotkey->isRegistered()); });
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
FluHotkey::~FluHotkey() {
|
||||||
|
if (_hotkey) {
|
||||||
|
delete _hotkey;
|
||||||
|
_hotkey = nullptr;
|
||||||
|
}
|
||||||
|
}
|
25
src/FluHotkey.h
Normal file
25
src/FluHotkey.h
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
#ifndef FLUHOTKEY_H
|
||||||
|
#define FLUHOTKEY_H
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
#include <QQuickItem>
|
||||||
|
#include "qhotkey/qhotkey.h"
|
||||||
|
#include "stdafx.h"
|
||||||
|
|
||||||
|
class FluHotkey : public QObject {
|
||||||
|
|
||||||
|
Q_OBJECT
|
||||||
|
Q_PROPERTY_AUTO(QString, sequence)
|
||||||
|
Q_PROPERTY_AUTO(QString, name)
|
||||||
|
Q_PROPERTY_READONLY_AUTO(bool, isRegistered)
|
||||||
|
QML_NAMED_ELEMENT(FluHotkey)
|
||||||
|
public:
|
||||||
|
explicit FluHotkey(QObject *parent = nullptr);
|
||||||
|
~FluHotkey();
|
||||||
|
Q_SIGNAL void activated();
|
||||||
|
|
||||||
|
private:
|
||||||
|
QHotkey *_hotkey = nullptr;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // FLUHOTKEY_H
|
@ -9,15 +9,15 @@
|
|||||||
* @brief The FluQrCodeItem class
|
* @brief The FluQrCodeItem class
|
||||||
*/
|
*/
|
||||||
class FluQrCodeItem : public QQuickPaintedItem {
|
class FluQrCodeItem : public QQuickPaintedItem {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
Q_PROPERTY_AUTO(QString, text)
|
Q_PROPERTY_AUTO(QString, text)
|
||||||
Q_PROPERTY_AUTO(QColor, color)
|
Q_PROPERTY_AUTO(QColor, color)
|
||||||
Q_PROPERTY_AUTO(QColor, bgColor)
|
Q_PROPERTY_AUTO(QColor, bgColor)
|
||||||
Q_PROPERTY_AUTO(int, size);
|
Q_PROPERTY_AUTO(int, size)
|
||||||
QML_NAMED_ELEMENT(FluQrCodeItem)
|
QML_NAMED_ELEMENT(FluQrCodeItem)
|
||||||
public:
|
public:
|
||||||
explicit FluQrCodeItem(QQuickItem *parent = nullptr);
|
explicit FluQrCodeItem(QQuickItem *parent = nullptr);
|
||||||
|
|
||||||
void paint(QPainter *painter) override;
|
void paint(QPainter *painter) override;
|
||||||
};
|
};
|
||||||
|
@ -8,6 +8,7 @@ FluRectangle::FluRectangle(QQuickItem *parent) : QQuickPaintedItem(parent) {
|
|||||||
connect(this, &FluRectangle::radiusChanged, this, [=] { update(); });
|
connect(this, &FluRectangle::radiusChanged, this, [=] { update(); });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void FluRectangle::paint(QPainter *painter) {
|
void FluRectangle::paint(QPainter *painter) {
|
||||||
painter->save();
|
painter->save();
|
||||||
painter->setRenderHint(QPainter::Antialiasing);
|
painter->setRenderHint(QPainter::Antialiasing);
|
||||||
@ -15,13 +16,19 @@ void FluRectangle::paint(QPainter *painter) {
|
|||||||
QRectF rect = boundingRect();
|
QRectF rect = boundingRect();
|
||||||
path.moveTo(rect.bottomRight() - QPointF(0, _radius[2]));
|
path.moveTo(rect.bottomRight() - QPointF(0, _radius[2]));
|
||||||
path.lineTo(rect.topRight() + QPointF(0, _radius[1]));
|
path.lineTo(rect.topRight() + QPointF(0, _radius[1]));
|
||||||
path.arcTo(QRectF(QPointF(rect.topRight() - QPointF(_radius[1] * 2, 0)), QSize(_radius[1] * 2, _radius[1] * 2)), 0, 90);
|
path.arcTo(QRectF(QPointF(rect.topRight() - QPointF(_radius[1] * 2, 0)),
|
||||||
|
QSize(_radius[1] * 2, _radius[1] * 2)),
|
||||||
|
0, 90);
|
||||||
path.lineTo(rect.topLeft() + QPointF(_radius[0], 0));
|
path.lineTo(rect.topLeft() + QPointF(_radius[0], 0));
|
||||||
path.arcTo(QRectF(QPointF(rect.topLeft()), QSize(_radius[0] * 2, _radius[0] * 2)), 90, 90);
|
path.arcTo(QRectF(QPointF(rect.topLeft()), QSize(_radius[0] * 2, _radius[0] * 2)), 90, 90);
|
||||||
path.lineTo(rect.bottomLeft() - QPointF(0, _radius[3]));
|
path.lineTo(rect.bottomLeft() - QPointF(0, _radius[3]));
|
||||||
path.arcTo(QRectF(QPointF(rect.bottomLeft() - QPointF(0, _radius[3] * 2)), QSize(_radius[3] * 2, _radius[3] * 2)), 180, 90);
|
path.arcTo(QRectF(QPointF(rect.bottomLeft() - QPointF(0, _radius[3] * 2)),
|
||||||
|
QSize(_radius[3] * 2, _radius[3] * 2)),
|
||||||
|
180, 90);
|
||||||
path.lineTo(rect.bottomRight() - QPointF(_radius[2], 0));
|
path.lineTo(rect.bottomRight() - QPointF(_radius[2], 0));
|
||||||
path.arcTo(QRectF(QPointF(rect.bottomRight() - QPointF(_radius[2] * 2, _radius[2] * 2)), QSize(_radius[2] * 2, _radius[2] * 2)), 270, 90);
|
path.arcTo(QRectF(QPointF(rect.bottomRight() - QPointF(_radius[2] * 2, _radius[2] * 2)),
|
||||||
|
QSize(_radius[2] * 2, _radius[2] * 2)),
|
||||||
|
270, 90);
|
||||||
painter->fillPath(path, _color);
|
painter->fillPath(path, _color);
|
||||||
painter->restore();
|
painter->restore();
|
||||||
}
|
}
|
||||||
|
@ -9,12 +9,12 @@
|
|||||||
* @brief The FluRectangle class
|
* @brief The FluRectangle class
|
||||||
*/
|
*/
|
||||||
class FluRectangle : public QQuickPaintedItem {
|
class FluRectangle : public QQuickPaintedItem {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY_AUTO(QColor, color)
|
Q_PROPERTY_AUTO(QColor, color)
|
||||||
Q_PROPERTY_AUTO(QList<int>, radius)
|
Q_PROPERTY_AUTO(QList<int>, radius)
|
||||||
QML_NAMED_ELEMENT(FluRectangle)
|
QML_NAMED_ELEMENT(FluRectangle)
|
||||||
public:
|
public:
|
||||||
explicit FluRectangle(QQuickItem *parent = nullptr);
|
explicit FluRectangle(QQuickItem *parent = nullptr);
|
||||||
|
|
||||||
void paint(QPainter *painter) override;
|
void paint(QPainter *painter) override;
|
||||||
};
|
};
|
||||||
|
63
src/FluTableModel.cpp
Normal file
63
src/FluTableModel.cpp
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
#include "FluTableModel.h"
|
||||||
|
|
||||||
|
FluTableModel::FluTableModel(QObject *parent) : QAbstractTableModel{parent} {
|
||||||
|
}
|
||||||
|
|
||||||
|
int FluTableModel::rowCount(const QModelIndex &parent) const {
|
||||||
|
return _rows.count();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int FluTableModel::columnCount(const QModelIndex &parent) const {
|
||||||
|
return this->_columnSource.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
QVariant FluTableModel::data(const QModelIndex &index, int role) const {
|
||||||
|
switch (role) {
|
||||||
|
case FluTableModel::RowModel:
|
||||||
|
return QVariant::fromValue(_rows.at(index.row()));
|
||||||
|
case FluTableModel::ColumnModel:
|
||||||
|
return QVariant::fromValue(_columnSource.at(index.column()));
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
QHash<int, QByteArray> FluTableModel::roleNames() const {
|
||||||
|
return {
|
||||||
|
{FluTableModel::RowModel, "rowModel" },
|
||||||
|
{FluTableModel::ColumnModel, "columnModel"}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
void FluTableModel::clear() {
|
||||||
|
beginResetModel();
|
||||||
|
this->_rows.clear();
|
||||||
|
endResetModel();
|
||||||
|
}
|
||||||
|
|
||||||
|
QVariant FluTableModel::getRow(int rowIndex) {
|
||||||
|
return _rows.at(rowIndex);
|
||||||
|
}
|
||||||
|
|
||||||
|
void FluTableModel::setRow(int rowIndex, QVariant row) {
|
||||||
|
_rows.replace(rowIndex, row.toMap());
|
||||||
|
Q_EMIT dataChanged(index(rowIndex, 0), index(rowIndex, columnCount() - 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
void FluTableModel::insertRow(int rowIndex, QVariant row) {
|
||||||
|
beginInsertRows(QModelIndex(), rowIndex, rowIndex);
|
||||||
|
_rows.insert(rowIndex, row.toMap());
|
||||||
|
endInsertRows();
|
||||||
|
}
|
||||||
|
|
||||||
|
void FluTableModel::removeRow(int rowIndex, int rows) {
|
||||||
|
beginRemoveRows(QModelIndex(), rowIndex, rowIndex + rows - 1);
|
||||||
|
_rows = _rows.mid(0, rowIndex) + _rows.mid(rowIndex + rows);
|
||||||
|
endRemoveRows();
|
||||||
|
}
|
||||||
|
|
||||||
|
void FluTableModel::appendRow(QVariant row) {
|
||||||
|
insertRow(rowCount(), row);
|
||||||
|
}
|
44
src/FluTableModel.h
Normal file
44
src/FluTableModel.h
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
#ifndef FLUTABLEMODEL_H
|
||||||
|
#define FLUTABLEMODEL_H
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
#include <QAbstractItemModel>
|
||||||
|
#include <QtQml/qqml.h>
|
||||||
|
#include "stdafx.h"
|
||||||
|
|
||||||
|
class FluTableModel : public QAbstractTableModel {
|
||||||
|
Q_OBJECT
|
||||||
|
Q_PROPERTY_AUTO(QList<QVariantMap>, columnSource)
|
||||||
|
Q_PROPERTY_AUTO(QList<QVariantMap>, rows)
|
||||||
|
Q_PROPERTY(int rowCount READ rowCount CONSTANT)
|
||||||
|
QML_NAMED_ELEMENT(FluTableModel)
|
||||||
|
public:
|
||||||
|
enum TableModelRoles { RowModel = 0x0101, ColumnModel = 0x0102 };
|
||||||
|
|
||||||
|
|
||||||
|
explicit FluTableModel(QObject *parent = nullptr);
|
||||||
|
|
||||||
|
[[nodiscard]] int rowCount(const QModelIndex &parent = {}) const override;
|
||||||
|
|
||||||
|
[[nodiscard]] int columnCount(const QModelIndex &parent = {}) const override;
|
||||||
|
|
||||||
|
[[nodiscard]] QVariant data(const QModelIndex &index,
|
||||||
|
int role = Qt::DisplayRole) const override;
|
||||||
|
|
||||||
|
[[nodiscard]] QHash<int, QByteArray> roleNames() const override;
|
||||||
|
|
||||||
|
Q_INVOKABLE void clear();
|
||||||
|
|
||||||
|
Q_INVOKABLE QVariant getRow(int rowIndex);
|
||||||
|
|
||||||
|
Q_INVOKABLE void setRow(int rowIndex, QVariant row);
|
||||||
|
|
||||||
|
Q_INVOKABLE void insertRow(int rowIndex, QVariant row);
|
||||||
|
|
||||||
|
Q_INVOKABLE void removeRow(int rowIndex, int rows = 1);
|
||||||
|
|
||||||
|
Q_INVOKABLE void appendRow(QVariant row);
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif // FLUTABLEMODEL_H
|
@ -2,14 +2,14 @@
|
|||||||
|
|
||||||
#include <QJSValueList>
|
#include <QJSValueList>
|
||||||
|
|
||||||
FluTableSortProxyModel::FluTableSortProxyModel(QSortFilterProxyModel *parent) : QSortFilterProxyModel{parent} {
|
FluTableSortProxyModel::FluTableSortProxyModel(QSortFilterProxyModel *parent)
|
||||||
_model = nullptr;
|
: QSortFilterProxyModel{parent} {
|
||||||
connect(this, &FluTableSortProxyModel::modelChanged, this, [=] {
|
connect(this, &FluTableSortProxyModel::modelChanged, this,
|
||||||
setSourceModel(this->model());
|
[=] { setSourceModel(this->model().value<QAbstractTableModel *>()); });
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool FluTableSortProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const {
|
bool FluTableSortProxyModel::filterAcceptsRow(int source_row,
|
||||||
|
const QModelIndex &source_parent) const {
|
||||||
QJSValue filter = _filter;
|
QJSValue filter = _filter;
|
||||||
if (filter.isUndefined()) {
|
if (filter.isUndefined()) {
|
||||||
return true;
|
return true;
|
||||||
@ -19,11 +19,13 @@ bool FluTableSortProxyModel::filterAcceptsRow(int source_row, const QModelIndex
|
|||||||
return filter.call(data).toBool();
|
return filter.call(data).toBool();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool FluTableSortProxyModel::filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const {
|
bool FluTableSortProxyModel::filterAcceptsColumn(int source_column,
|
||||||
|
const QModelIndex &source_parent) const {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool FluTableSortProxyModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const {
|
bool FluTableSortProxyModel::lessThan(const QModelIndex &source_left,
|
||||||
|
const QModelIndex &source_right) const {
|
||||||
QJSValue comparator = _comparator;
|
QJSValue comparator = _comparator;
|
||||||
if (comparator.isUndefined()) {
|
if (comparator.isUndefined()) {
|
||||||
return true;
|
return true;
|
||||||
@ -59,15 +61,25 @@ bool FluTableSortProxyModel::lessThan(const QModelIndex &source_left, const QMod
|
|||||||
|
|
||||||
[[maybe_unused]] QVariant FluTableSortProxyModel::getRow(int rowIndex) {
|
[[maybe_unused]] QVariant FluTableSortProxyModel::getRow(int rowIndex) {
|
||||||
QVariant result;
|
QVariant result;
|
||||||
QMetaObject::invokeMethod(_model, "getRow", Q_RETURN_ARG(QVariant, result), Q_ARG(int, mapToSource(index(rowIndex, 0)).row()));
|
QMetaObject::invokeMethod(_model.value<QAbstractTableModel *>(), "getRow",
|
||||||
|
Q_RETURN_ARG(QVariant, result),
|
||||||
|
Q_ARG(int, mapToSource(index(rowIndex, 0)).row()));
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[maybe_unused]] void FluTableSortProxyModel::setRow(int rowIndex, const QVariant &val) {
|
[[maybe_unused]] void FluTableSortProxyModel::setRow(int rowIndex, const QVariant &val) {
|
||||||
QMetaObject::invokeMethod(_model, "setRow", Q_ARG(int, mapToSource(index(rowIndex, 0)).row()), Q_ARG(QVariant, val));
|
QMetaObject::invokeMethod(_model.value<QAbstractTableModel *>(), "setRow",
|
||||||
|
Q_ARG(int, mapToSource(index(rowIndex, 0)).row()),
|
||||||
|
Q_ARG(QVariant, val));
|
||||||
|
}
|
||||||
|
|
||||||
|
[[maybe_unused]] void FluTableSortProxyModel::insertRow(int rowIndex, const QVariant &val) {
|
||||||
|
QMetaObject::invokeMethod(_model.value<QAbstractTableModel *>(), "insertRow",
|
||||||
|
Q_ARG(int, mapToSource(index(rowIndex, 0)).row()),
|
||||||
|
Q_ARG(QVariant, val));
|
||||||
}
|
}
|
||||||
|
|
||||||
[[maybe_unused]] void FluTableSortProxyModel::removeRow(int rowIndex, int rows) {
|
[[maybe_unused]] void FluTableSortProxyModel::removeRow(int rowIndex, int rows) {
|
||||||
QMetaObject::invokeMethod(_model, "removeRow", Q_ARG(int, mapToSource(index(rowIndex, 0)).row()), Q_ARG(int, rows));
|
QMetaObject::invokeMethod(_model.value<QAbstractTableModel *>(), "removeRow",
|
||||||
|
Q_ARG(int, mapToSource(index(rowIndex, 0)).row()), Q_ARG(int, rows));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -7,8 +7,8 @@
|
|||||||
#include "stdafx.h"
|
#include "stdafx.h"
|
||||||
|
|
||||||
class FluTableSortProxyModel : public QSortFilterProxyModel {
|
class FluTableSortProxyModel : public QSortFilterProxyModel {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY_AUTO_P(QAbstractTableModel*, model)
|
Q_PROPERTY_AUTO_P(QVariant, model)
|
||||||
QML_NAMED_ELEMENT(FluTableSortProxyModel)
|
QML_NAMED_ELEMENT(FluTableSortProxyModel)
|
||||||
public:
|
public:
|
||||||
explicit FluTableSortProxyModel(QSortFilterProxyModel *parent = nullptr);
|
explicit FluTableSortProxyModel(QSortFilterProxyModel *parent = nullptr);
|
||||||
@ -23,6 +23,8 @@ public:
|
|||||||
|
|
||||||
[[maybe_unused]] Q_INVOKABLE void setRow(int rowIndex, const QVariant &val);
|
[[maybe_unused]] Q_INVOKABLE void setRow(int rowIndex, const QVariant &val);
|
||||||
|
|
||||||
|
[[maybe_unused]] Q_INVOKABLE void insertRow(int rowIndex, const QVariant &val);
|
||||||
|
|
||||||
[[maybe_unused]] Q_INVOKABLE void removeRow(int rowIndex, int rows);
|
[[maybe_unused]] Q_INVOKABLE void removeRow(int rowIndex, int rows);
|
||||||
|
|
||||||
[[maybe_unused]] Q_INVOKABLE void setComparator(const QJSValue &comparator);
|
[[maybe_unused]] Q_INVOKABLE void setComparator(const QJSValue &comparator);
|
||||||
|
@ -10,16 +10,17 @@
|
|||||||
* @brief The FluTextStyle class
|
* @brief The FluTextStyle class
|
||||||
*/
|
*/
|
||||||
class FluTextStyle : public QObject {
|
class FluTextStyle : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Q_PROPERTY_AUTO(QString, family)
|
Q_PROPERTY_AUTO(QString, family)
|
||||||
Q_PROPERTY_AUTO(QFont, Caption);
|
Q_PROPERTY_AUTO(QFont, Caption)
|
||||||
Q_PROPERTY_AUTO(QFont, Body);
|
Q_PROPERTY_AUTO(QFont, Body)
|
||||||
Q_PROPERTY_AUTO(QFont, BodyStrong);
|
Q_PROPERTY_AUTO(QFont, BodyStrong)
|
||||||
Q_PROPERTY_AUTO(QFont, Subtitle);
|
Q_PROPERTY_AUTO(QFont, Subtitle)
|
||||||
Q_PROPERTY_AUTO(QFont, Title);
|
Q_PROPERTY_AUTO(QFont, Title)
|
||||||
Q_PROPERTY_AUTO(QFont, TitleLarge);
|
Q_PROPERTY_AUTO(QFont, TitleLarge)
|
||||||
Q_PROPERTY_AUTO(QFont, Display);
|
Q_PROPERTY_AUTO(QFont, Display)
|
||||||
QML_NAMED_ELEMENT(FluTextStyle)
|
QML_NAMED_ELEMENT(FluTextStyle)
|
||||||
QML_SINGLETON
|
QML_SINGLETON
|
||||||
|
|
||||||
@ -27,7 +28,9 @@ private:
|
|||||||
explicit FluTextStyle(QObject *parent = nullptr);
|
explicit FluTextStyle(QObject *parent = nullptr);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
SINGLETON(FluTextStyle)
|
SINGLETON(FluTextStyle)
|
||||||
|
|
||||||
static FluTextStyle *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
|
static FluTextStyle *create(QQmlEngine *, QJSEngine *) {
|
||||||
|
return getInstance();
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
@ -24,15 +24,13 @@ FluTheme::FluTheme(QObject *parent) : QObject{parent} {
|
|||||||
_blurBehindWindowEnabled = false;
|
_blurBehindWindowEnabled = false;
|
||||||
QGuiApplication::instance()->installEventFilter(this);
|
QGuiApplication::instance()->installEventFilter(this);
|
||||||
refreshColors();
|
refreshColors();
|
||||||
connect(this, &FluTheme::darkModeChanged, this, [=] {
|
connect(this, &FluTheme::darkModeChanged, this, [=] { Q_EMIT darkChanged(); });
|
||||||
Q_EMIT darkChanged();
|
|
||||||
});
|
|
||||||
connect(this, &FluTheme::darkChanged, this, [=] { refreshColors(); });
|
connect(this, &FluTheme::darkChanged, this, [=] { refreshColors(); });
|
||||||
connect(this, &FluTheme::accentColorChanged, this, [=] { refreshColors(); });
|
connect(this, &FluTheme::accentColorChanged, this, [=] { refreshColors(); });
|
||||||
connect(&_watcher, &QFileSystemWatcher::fileChanged, this, [=](const QString &path) {
|
connect(&_watcher, &QFileSystemWatcher::fileChanged, this,
|
||||||
Q_EMIT desktopImagePathChanged();
|
[=](const QString &path) { Q_EMIT desktopImagePathChanged(); });
|
||||||
});
|
connect(this, &FluTheme::blurBehindWindowEnabledChanged, this,
|
||||||
connect(this, &FluTheme::blurBehindWindowEnabledChanged, this, [=] { checkUpdateDesktopImage(); });
|
[=] { checkUpdateDesktopImage(); });
|
||||||
startTimer(1000);
|
startTimer(1000);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -47,11 +45,16 @@ void FluTheme::refreshColors() {
|
|||||||
fontSecondaryColor(isDark ? QColor(222, 222, 222, 255) : QColor(102, 102, 102, 255));
|
fontSecondaryColor(isDark ? QColor(222, 222, 222, 255) : QColor(102, 102, 102, 255));
|
||||||
fontTertiaryColor(isDark ? QColor(200, 200, 200, 255) : QColor(153, 153, 153, 255));
|
fontTertiaryColor(isDark ? QColor(200, 200, 200, 255) : QColor(153, 153, 153, 255));
|
||||||
itemNormalColor(isDark ? QColor(255, 255, 255, 0) : QColor(0, 0, 0, 0));
|
itemNormalColor(isDark ? QColor(255, 255, 255, 0) : QColor(0, 0, 0, 0));
|
||||||
frameColor(isDark ? QColor(56, 56, 56, qRound(255 * 0.8)) : QColor(243, 243, 243, qRound(255 * 0.8)));
|
frameColor(isDark ? QColor(56, 56, 56, qRound(255 * 0.8))
|
||||||
frameActiveColor(isDark ? QColor(48, 48, 48, qRound(255 * 0.8)) : QColor(255, 255, 255, qRound(255 * 0.8)));
|
: QColor(243, 243, 243, qRound(255 * 0.8)));
|
||||||
itemHoverColor(isDark ? QColor(255, 255, 255, qRound(255 * 0.06)) : QColor(0, 0, 0, qRound(255 * 0.03)));
|
frameActiveColor(isDark ? QColor(48, 48, 48, qRound(255 * 0.8))
|
||||||
itemPressColor(isDark ? QColor(255, 255, 255, qRound(255 * 0.09)) : QColor(0, 0, 0, qRound(255 * 0.06)));
|
: QColor(255, 255, 255, qRound(255 * 0.8)));
|
||||||
itemCheckColor(isDark ? QColor(255, 255, 255, qRound(255 * 0.12)) : QColor(0, 0, 0, qRound(255 * 0.09)));
|
itemHoverColor(isDark ? QColor(255, 255, 255, qRound(255 * 0.06))
|
||||||
|
: QColor(0, 0, 0, qRound(255 * 0.03)));
|
||||||
|
itemPressColor(isDark ? QColor(255, 255, 255, qRound(255 * 0.09))
|
||||||
|
: QColor(0, 0, 0, qRound(255 * 0.06)));
|
||||||
|
itemCheckColor(isDark ? QColor(255, 255, 255, qRound(255 * 0.12))
|
||||||
|
: QColor(0, 0, 0, qRound(255 * 0.09)));
|
||||||
}
|
}
|
||||||
|
|
||||||
bool FluTheme::eventFilter(QObject *, QEvent *event) {
|
bool FluTheme::eventFilter(QObject *, QEvent *event) {
|
||||||
|
@ -16,28 +16,28 @@
|
|||||||
* @brief The FluTheme class
|
* @brief The FluTheme class
|
||||||
*/
|
*/
|
||||||
class FluTheme : public QObject {
|
class FluTheme : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY(bool dark READ dark NOTIFY darkChanged)
|
Q_PROPERTY(bool dark READ dark NOTIFY darkChanged)
|
||||||
Q_PROPERTY_AUTO_P(FluAccentColor*, accentColor);
|
Q_PROPERTY_AUTO_P(FluAccentColor *, accentColor)
|
||||||
Q_PROPERTY_AUTO(QColor, primaryColor);
|
Q_PROPERTY_AUTO(QColor, primaryColor)
|
||||||
Q_PROPERTY_AUTO(QColor, backgroundColor);
|
Q_PROPERTY_AUTO(QColor, backgroundColor)
|
||||||
Q_PROPERTY_AUTO(QColor, dividerColor);
|
Q_PROPERTY_AUTO(QColor, dividerColor)
|
||||||
Q_PROPERTY_AUTO(QColor, windowBackgroundColor);
|
Q_PROPERTY_AUTO(QColor, windowBackgroundColor)
|
||||||
Q_PROPERTY_AUTO(QColor, windowActiveBackgroundColor);
|
Q_PROPERTY_AUTO(QColor, windowActiveBackgroundColor)
|
||||||
Q_PROPERTY_AUTO(QColor, fontPrimaryColor);
|
Q_PROPERTY_AUTO(QColor, fontPrimaryColor)
|
||||||
Q_PROPERTY_AUTO(QColor, fontSecondaryColor);
|
Q_PROPERTY_AUTO(QColor, fontSecondaryColor)
|
||||||
Q_PROPERTY_AUTO(QColor, fontTertiaryColor);
|
Q_PROPERTY_AUTO(QColor, fontTertiaryColor)
|
||||||
Q_PROPERTY_AUTO(QColor, itemNormalColor);
|
Q_PROPERTY_AUTO(QColor, itemNormalColor)
|
||||||
Q_PROPERTY_AUTO(QColor, frameColor);
|
Q_PROPERTY_AUTO(QColor, frameColor)
|
||||||
Q_PROPERTY_AUTO(QColor, frameActiveColor);
|
Q_PROPERTY_AUTO(QColor, frameActiveColor)
|
||||||
Q_PROPERTY_AUTO(QColor, itemHoverColor);
|
Q_PROPERTY_AUTO(QColor, itemHoverColor)
|
||||||
Q_PROPERTY_AUTO(QColor, itemPressColor);
|
Q_PROPERTY_AUTO(QColor, itemPressColor)
|
||||||
Q_PROPERTY_AUTO(QColor, itemCheckColor);
|
Q_PROPERTY_AUTO(QColor, itemCheckColor)
|
||||||
Q_PROPERTY_AUTO(QString, desktopImagePath);
|
Q_PROPERTY_AUTO(QString, desktopImagePath)
|
||||||
Q_PROPERTY_AUTO(int, darkMode);
|
Q_PROPERTY_AUTO(int, darkMode)
|
||||||
Q_PROPERTY_AUTO(bool, nativeText);
|
Q_PROPERTY_AUTO(bool, nativeText)
|
||||||
Q_PROPERTY_AUTO(bool, animationEnabled);
|
Q_PROPERTY_AUTO(bool, animationEnabled)
|
||||||
Q_PROPERTY_AUTO(bool, blurBehindWindowEnabled);
|
Q_PROPERTY_AUTO(bool, blurBehindWindowEnabled)
|
||||||
QML_NAMED_ELEMENT(FluTheme)
|
QML_NAMED_ELEMENT(FluTheme)
|
||||||
QML_SINGLETON
|
QML_SINGLETON
|
||||||
|
|
||||||
@ -49,17 +49,18 @@ private:
|
|||||||
void refreshColors();
|
void refreshColors();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
void timerEvent(QTimerEvent *event) override;
|
void timerEvent(QTimerEvent *event) override;
|
||||||
|
|
||||||
void checkUpdateDesktopImage();
|
void checkUpdateDesktopImage();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
SINGLETON(FluTheme)
|
SINGLETON(FluTheme)
|
||||||
|
|
||||||
Q_SIGNAL void darkChanged();
|
Q_SIGNAL void darkChanged();
|
||||||
|
|
||||||
static FluTheme *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
|
static FluTheme *create(QQmlEngine *, QJSEngine *) {
|
||||||
|
return getInstance();
|
||||||
|
}
|
||||||
|
|
||||||
bool dark() const;
|
bool dark() const;
|
||||||
|
|
||||||
@ -67,4 +68,4 @@ private:
|
|||||||
bool _systemDark;
|
bool _systemDark;
|
||||||
QFileSystemWatcher _watcher;
|
QFileSystemWatcher _watcher;
|
||||||
QMutex _mutex;
|
QMutex _mutex;
|
||||||
};
|
};
|
||||||
|
@ -17,15 +17,14 @@
|
|||||||
#include <QSettings>
|
#include <QSettings>
|
||||||
|
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
#pragma comment (lib, "user32.lib")
|
# pragma comment(lib, "user32.lib")
|
||||||
|
|
||||||
#include <windows.h>
|
# include <windows.h>
|
||||||
#include <windowsx.h>
|
# include <windowsx.h>
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
FluTools::FluTools(QObject *parent) : QObject{parent} {
|
FluTools::FluTools(QObject *parent) : QObject{parent} {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void FluTools::clipText(const QString &text) {
|
void FluTools::clipText(const QString &text) {
|
||||||
@ -164,11 +163,12 @@ void FluTools::showFileInFolder(const QString &path) {
|
|||||||
#if defined(Q_OS_LINUX)
|
#if defined(Q_OS_LINUX)
|
||||||
QFileInfo fileInfo(path);
|
QFileInfo fileInfo(path);
|
||||||
auto process = "xdg-open";
|
auto process = "xdg-open";
|
||||||
auto arguments = { fileInfo.absoluteDir().absolutePath() };
|
auto arguments = {fileInfo.absoluteDir().absolutePath()};
|
||||||
QProcess::startDetached(process, arguments);
|
QProcess::startDetached(process, arguments);
|
||||||
#endif
|
#endif
|
||||||
#if defined(Q_OS_MACOS)
|
#if defined(Q_OS_MACOS)
|
||||||
QProcess::execute("/usr/bin/osascript", {"-e", "tell application \"Finder\" to reveal POSIX file \"" + path + "\""});
|
QProcess::execute("/usr/bin/osascript",
|
||||||
|
{"-e", "tell application \"Finder\" to reveal POSIX file \"" + path + "\""});
|
||||||
QProcess::execute("/usr/bin/osascript", {"-e", "tell application \"Finder\" to activate"});
|
QProcess::execute("/usr/bin/osascript", {"-e", "tell application \"Finder\" to activate"});
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@ -206,7 +206,9 @@ int FluTools::cursorScreenIndex() {
|
|||||||
|
|
||||||
int FluTools::windowBuildNumber() {
|
int FluTools::windowBuildNumber() {
|
||||||
#if defined(Q_OS_WIN)
|
#if defined(Q_OS_WIN)
|
||||||
QSettings regKey{QString::fromUtf8(R"(HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion)"), QSettings::NativeFormat};
|
QSettings regKey{
|
||||||
|
QString::fromUtf8(R"(HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion)"),
|
||||||
|
QSettings::NativeFormat};
|
||||||
if (regKey.contains(QString::fromUtf8("CurrentBuildNumber"))) {
|
if (regKey.contains(QString::fromUtf8("CurrentBuildNumber"))) {
|
||||||
auto buildNumber = regKey.value(QString::fromUtf8("CurrentBuildNumber")).toInt();
|
auto buildNumber = regKey.value(QString::fromUtf8("CurrentBuildNumber")).toInt();
|
||||||
return buildNumber;
|
return buildNumber;
|
||||||
@ -280,7 +282,22 @@ QString FluTools::getWallpaperFilePath() {
|
|||||||
auto path = result.mid(startIndex + 7, result.length() - startIndex - 8);
|
auto path = result.mid(startIndex + 7, result.length() - startIndex - 8);
|
||||||
return path;
|
return path;
|
||||||
}
|
}
|
||||||
|
} else if (type == "ubuntu") {
|
||||||
|
QProcess process;
|
||||||
|
QStringList args;
|
||||||
|
args << "get";
|
||||||
|
args << "org.gnome.desktop.background";
|
||||||
|
args << "picture-uri";
|
||||||
|
process.start("gsettings", args);
|
||||||
|
process.waitForFinished();
|
||||||
|
QByteArray result = process.readAllStandardOutput().trimmed();
|
||||||
|
result = result.mid(1, result.length() - 2);
|
||||||
|
if (result.startsWith("file:///")) {
|
||||||
|
auto path = result.mid(7);
|
||||||
|
return path;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
return {};
|
||||||
#elif defined(Q_OS_MACOS)
|
#elif defined(Q_OS_MACOS)
|
||||||
QProcess process;
|
QProcess process;
|
||||||
QStringList args;
|
QStringList args;
|
||||||
@ -289,7 +306,7 @@ QString FluTools::getWallpaperFilePath() {
|
|||||||
process.start("osascript", args);
|
process.start("osascript", args);
|
||||||
process.waitForFinished();
|
process.waitForFinished();
|
||||||
QByteArray result = process.readAllStandardOutput().trimmed();
|
QByteArray result = process.readAllStandardOutput().trimmed();
|
||||||
if(result.isEmpty()){
|
if (result.isEmpty()) {
|
||||||
return "/System/Library/CoreServices/DefaultDesktop.heic";
|
return "/System/Library/CoreServices/DefaultDesktop.heic";
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
@ -313,5 +330,7 @@ QColor FluTools::imageMainColor(const QImage &image, double bright) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return QColor(int(bright * r / t) > 255 ? 255 : int(bright * r / t), int(bright * g / t) > 255 ? 255 : int(bright * g / t), int(bright * b / t) > 255 ? 255 : int(bright * b / t));
|
return QColor(int(bright * r / t) > 255 ? 255 : int(bright * r / t),
|
||||||
|
int(bright * g / t) > 255 ? 255 : int(bright * g / t),
|
||||||
|
int(bright * b / t) > 255 ? 255 : int(bright * b / t));
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
* @brief The FluTools class
|
* @brief The FluTools class
|
||||||
*/
|
*/
|
||||||
class FluTools : public QObject {
|
class FluTools : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
QML_NAMED_ELEMENT(FluTools)
|
QML_NAMED_ELEMENT(FluTools)
|
||||||
QML_SINGLETON
|
QML_SINGLETON
|
||||||
|
|
||||||
@ -19,9 +19,11 @@ private:
|
|||||||
explicit FluTools(QObject *parent = nullptr);
|
explicit FluTools(QObject *parent = nullptr);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
SINGLETON(FluTools)
|
SINGLETON(FluTools)
|
||||||
|
|
||||||
static FluTools *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
|
static FluTools *create(QQmlEngine *, QJSEngine *) {
|
||||||
|
return getInstance();
|
||||||
|
}
|
||||||
|
|
||||||
Q_INVOKABLE int qtMajor();
|
Q_INVOKABLE int qtMajor();
|
||||||
|
|
||||||
@ -95,5 +97,5 @@ SINGLETON(FluTools)
|
|||||||
|
|
||||||
Q_INVOKABLE QString getWallpaperFilePath();
|
Q_INVOKABLE QString getWallpaperFilePath();
|
||||||
|
|
||||||
Q_INVOKABLE QColor imageMainColor(const QImage& image, double bright = 1);
|
Q_INVOKABLE QColor imageMainColor(const QImage &image, double bright = 1);
|
||||||
};
|
};
|
||||||
|
@ -1,25 +1,14 @@
|
|||||||
#include "FluTreeModel.h"
|
#include "FluTreeModel.h"
|
||||||
|
|
||||||
#include <QMetaEnum>
|
#include <QMetaEnum>
|
||||||
#include <utility>
|
|
||||||
|
|
||||||
FluTreeNode::FluTreeNode(QObject *parent) : QObject{parent} {
|
FluTreeNode::FluTreeNode(QObject *parent) : QObject{parent} {
|
||||||
}
|
}
|
||||||
|
|
||||||
FluTreeModel::FluTreeModel(QObject *parent) : QAbstractItemModel{parent} {
|
FluTreeModel::FluTreeModel(QObject *parent) : QAbstractTableModel{parent} {
|
||||||
_dataSourceSize = 0;
|
_dataSourceSize = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
QModelIndex FluTreeModel::parent(const QModelIndex &child) const {
|
|
||||||
return {};
|
|
||||||
}
|
|
||||||
|
|
||||||
QModelIndex FluTreeModel::index(int row, int column, const QModelIndex &parent) const {
|
|
||||||
if (!hasIndex(row, column, parent) || parent.isValid())
|
|
||||||
return {};
|
|
||||||
return createIndex(row, column, _rows.at(row));
|
|
||||||
}
|
|
||||||
|
|
||||||
int FluTreeModel::rowCount(const QModelIndex &parent) const {
|
int FluTreeModel::rowCount(const QModelIndex &parent) const {
|
||||||
return _rows.count();
|
return _rows.count();
|
||||||
}
|
}
|
||||||
@ -42,8 +31,8 @@ QVariant FluTreeModel::data(const QModelIndex &index, int role) const {
|
|||||||
|
|
||||||
QHash<int, QByteArray> FluTreeModel::roleNames() const {
|
QHash<int, QByteArray> FluTreeModel::roleNames() const {
|
||||||
return {
|
return {
|
||||||
{TreeModelRoles::RowModel, "rowModel"},
|
{TreeModelRoles::RowModel, "rowModel" },
|
||||||
{TreeModelRoles::ColumnModel, "columnModel"}
|
{TreeModelRoles::ColumnModel, "columnModel"}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -101,9 +90,9 @@ void FluTreeModel::checkRow(int row, bool checked) {
|
|||||||
QList<FluTreeNode *> children = item->_children;
|
QList<FluTreeNode *> children = item->_children;
|
||||||
if (!children.isEmpty()) {
|
if (!children.isEmpty()) {
|
||||||
std::reverse(children.begin(), children.end());
|
std::reverse(children.begin(), children.end());
|
||||||
foreach (auto c, children) {
|
foreach (auto c, children) {
|
||||||
stack.append(c);
|
stack.append(c);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -113,13 +102,12 @@ void FluTreeModel::checkRow(int row, bool checked) {
|
|||||||
itemData->_checked = checked;
|
itemData->_checked = checked;
|
||||||
}
|
}
|
||||||
Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0));
|
Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void FluTreeModel::setDataSource(QList<QMap<QString, QVariant>> data) {
|
void FluTreeModel::setDataSource(QList<QMap<QString, QVariant>> data) {
|
||||||
_dataSource.clear();
|
_dataSource.clear();
|
||||||
if (_root) {
|
if (_root) {
|
||||||
delete _root;
|
_root->deleteLater();
|
||||||
_root = nullptr;
|
_root = nullptr;
|
||||||
}
|
}
|
||||||
_root = new FluTreeNode(this);
|
_root = new FluTreeNode(this);
|
||||||
@ -127,7 +115,7 @@ void FluTreeModel::setDataSource(QList<QMap<QString, QVariant>> data) {
|
|||||||
while (data.count() > 0) {
|
while (data.count() > 0) {
|
||||||
auto item = data.at(data.count() - 1);
|
auto item = data.at(data.count() - 1);
|
||||||
data.pop_back();
|
data.pop_back();
|
||||||
auto *node = new FluTreeNode(this);
|
auto *node = new FluTreeNode(_root);
|
||||||
node->_depth = item.value("__depth").toInt();
|
node->_depth = item.value("__depth").toInt();
|
||||||
node->_parent = item.value("__parent").value<FluTreeNode *>();
|
node->_parent = item.value("__parent").value<FluTreeNode *>();
|
||||||
node->_data = item;
|
node->_data = item;
|
||||||
@ -138,6 +126,7 @@ void FluTreeModel::setDataSource(QList<QMap<QString, QVariant>> data) {
|
|||||||
node->_parent = _root;
|
node->_parent = _root;
|
||||||
_root->_children.append(node);
|
_root->_children.append(node);
|
||||||
}
|
}
|
||||||
|
node->_checked = item.value("checked").toBool();
|
||||||
_dataSource.append(node);
|
_dataSource.append(node);
|
||||||
if (item.contains("children")) {
|
if (item.contains("children")) {
|
||||||
QList<QVariant> children = item.value("children").toList();
|
QList<QVariant> children = item.value("children").toList();
|
||||||
@ -195,9 +184,9 @@ void FluTreeModel::expand(int row) {
|
|||||||
QList<FluTreeNode *> children = item->_children;
|
QList<FluTreeNode *> children = item->_children;
|
||||||
if (!children.isEmpty()) {
|
if (!children.isEmpty()) {
|
||||||
std::reverse(children.begin(), children.end());
|
std::reverse(children.begin(), children.end());
|
||||||
foreach (auto c, children) {
|
foreach (auto c, children) {
|
||||||
stack.append(c);
|
stack.append(c);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
insertRows(row + 1, insertData);
|
insertRows(row + 1, insertData);
|
||||||
@ -234,9 +223,9 @@ void FluTreeModel::allExpand() {
|
|||||||
QList<FluTreeNode *> children = item->_children;
|
QList<FluTreeNode *> children = item->_children;
|
||||||
if (!children.isEmpty()) {
|
if (!children.isEmpty()) {
|
||||||
std::reverse(children.begin(), children.end());
|
std::reverse(children.begin(), children.end());
|
||||||
foreach (auto c, children) {
|
foreach (auto c, children) {
|
||||||
stack.append(c);
|
stack.append(c);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_rows = data;
|
_rows = data;
|
||||||
@ -256,16 +245,16 @@ void FluTreeModel::allCollapse() {
|
|||||||
QList<FluTreeNode *> children = item->_children;
|
QList<FluTreeNode *> children = item->_children;
|
||||||
if (!children.isEmpty()) {
|
if (!children.isEmpty()) {
|
||||||
std::reverse(children.begin(), children.end());
|
std::reverse(children.begin(), children.end());
|
||||||
foreach (auto c, children) {
|
foreach (auto c, children) {
|
||||||
stack.append(c);
|
stack.append(c);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_rows = _root->_children;
|
_rows = _root->_children;
|
||||||
endResetModel();
|
endResetModel();
|
||||||
}
|
}
|
||||||
|
|
||||||
QVariant FluTreeModel::selectionModel(){
|
QVariant FluTreeModel::selectionModel() {
|
||||||
QList<FluTreeNode *> data;
|
QList<FluTreeNode *> data;
|
||||||
foreach (auto item, _dataSource) {
|
foreach (auto item, _dataSource) {
|
||||||
if (item->checked()) {
|
if (item->checked()) {
|
||||||
|
@ -7,11 +7,12 @@
|
|||||||
#include <QtQml/qqml.h>
|
#include <QtQml/qqml.h>
|
||||||
#include "stdafx.h"
|
#include "stdafx.h"
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief The FluTreeNode class
|
* @brief The FluTreeNode class
|
||||||
*/
|
*/
|
||||||
class FluTreeNode : public QObject {
|
class FluTreeNode : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY(QVariantMap data READ data CONSTANT)
|
Q_PROPERTY(QVariantMap data READ data CONSTANT)
|
||||||
Q_PROPERTY(int depth READ depth CONSTANT)
|
Q_PROPERTY(int depth READ depth CONSTANT)
|
||||||
Q_PROPERTY(bool isExpanded READ isExpanded CONSTANT)
|
Q_PROPERTY(bool isExpanded READ isExpanded CONSTANT)
|
||||||
@ -19,13 +20,21 @@ Q_OBJECT
|
|||||||
public:
|
public:
|
||||||
explicit FluTreeNode(QObject *parent = nullptr);
|
explicit FluTreeNode(QObject *parent = nullptr);
|
||||||
|
|
||||||
[[nodiscard]] Q_INVOKABLE int depth() const { return _depth; };
|
[[nodiscard]] Q_INVOKABLE int depth() const {
|
||||||
|
return _depth;
|
||||||
|
};
|
||||||
|
|
||||||
[[nodiscard]] Q_INVOKABLE bool isExpanded() const { return _isExpanded; };
|
[[nodiscard]] Q_INVOKABLE bool isExpanded() const {
|
||||||
|
return _isExpanded;
|
||||||
|
};
|
||||||
|
|
||||||
[[nodiscard]] Q_INVOKABLE QVariantMap data() const { return _data; };
|
[[nodiscard]] Q_INVOKABLE QVariantMap data() const {
|
||||||
|
return _data;
|
||||||
|
};
|
||||||
|
|
||||||
[[nodiscard]] Q_INVOKABLE bool hasChildren() const { return !_children.isEmpty(); };
|
[[nodiscard]] Q_INVOKABLE bool hasChildren() const {
|
||||||
|
return !_children.isEmpty();
|
||||||
|
};
|
||||||
|
|
||||||
Q_INVOKABLE bool hasNextNodeByIndex(int index) {
|
Q_INVOKABLE bool hasNextNodeByIndex(int index) {
|
||||||
FluTreeNode *p = this;
|
FluTreeNode *p = this;
|
||||||
@ -50,7 +59,7 @@ public:
|
|||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
};
|
};
|
||||||
|
|
||||||
Q_INVOKABLE bool hideLineFooter() {
|
Q_INVOKABLE bool hideLineFooter() {
|
||||||
if (_parent) {
|
if (_parent) {
|
||||||
auto childIndex = _parent->_children.indexOf(this);
|
auto childIndex = _parent->_children.indexOf(this);
|
||||||
@ -86,17 +95,13 @@ public:
|
|||||||
FluTreeNode *_parent = nullptr;
|
FluTreeNode *_parent = nullptr;
|
||||||
};
|
};
|
||||||
|
|
||||||
class FluTreeModel : public QAbstractItemModel {
|
class FluTreeModel : public QAbstractTableModel {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY_AUTO(int, dataSourceSize)
|
Q_PROPERTY_AUTO(int, dataSourceSize)
|
||||||
Q_PROPERTY_AUTO(QList<QVariantMap>, columnSource)
|
Q_PROPERTY_AUTO(QList<QVariantMap>, columnSource)
|
||||||
QML_NAMED_ELEMENT(FluTreeModel)
|
QML_NAMED_ELEMENT(FluTreeModel)
|
||||||
QML_ADDED_IN_MINOR_VERSION(1)
|
|
||||||
public:
|
public:
|
||||||
enum TreeModelRoles {
|
enum TreeModelRoles { RowModel = 0x0101, ColumnModel = 0x0102 };
|
||||||
RowModel = 0x0101,
|
|
||||||
ColumnModel = 0x0102
|
|
||||||
};
|
|
||||||
|
|
||||||
explicit FluTreeModel(QObject *parent = nullptr);
|
explicit FluTreeModel(QObject *parent = nullptr);
|
||||||
|
|
||||||
@ -104,14 +109,11 @@ public:
|
|||||||
|
|
||||||
[[nodiscard]] int columnCount(const QModelIndex &parent = {}) const override;
|
[[nodiscard]] int columnCount(const QModelIndex &parent = {}) const override;
|
||||||
|
|
||||||
[[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
[[nodiscard]] QVariant data(const QModelIndex &index,
|
||||||
|
int role = Qt::DisplayRole) const override;
|
||||||
|
|
||||||
[[nodiscard]] QHash<int, QByteArray> roleNames() const override;
|
[[nodiscard]] QHash<int, QByteArray> roleNames() const override;
|
||||||
|
|
||||||
[[nodiscard]] QModelIndex parent(const QModelIndex &child) const override;
|
|
||||||
|
|
||||||
[[nodiscard]] QModelIndex index(int row, int column, const QModelIndex &parent = {}) const override;
|
|
||||||
|
|
||||||
Q_INVOKABLE void removeRows(int row, int count);
|
Q_INVOKABLE void removeRows(int row, int count);
|
||||||
|
|
||||||
Q_INVOKABLE void insertRows(int row, const QList<FluTreeNode *> &data);
|
Q_INVOKABLE void insertRows(int row, const QList<FluTreeNode *> &data);
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user