mirror of
https://github.com/zhuzichu520/FluentUI.git
synced 2025-07-03 16:45:24 +08:00
Compare commits
27 Commits
012f30c979
...
1.7.7
| Author | SHA1 | Date | |
|---|---|---|---|
| 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 |
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 ]
|
||||
69
README.md
69
README.md
@ -1,23 +1,21 @@
|
||||
<div align=center>
|
||||
<img width=64 src="doc/preview/fluent_design.svg">
|
||||
</div>
|
||||
<img width=64 src="doc/preview/fluent_design.svg">
|
||||
|
||||
<h1 align="center">
|
||||
QML FluentUI
|
||||
</h1>
|
||||
<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>。
|
||||
</p>
|
||||
# QML FluentUI
|
||||
|
||||
A Fluent Design component library for Qt QML, You need PySide6 [PySide6-FluentUI-QML](https://github.com/zhuzichu520/PySide6-FluentUI-QML).
|
||||
|
||||
</div>
|
||||
|
||||
![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>
|
||||
<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-badge]: https://github.com/zhuzichu520/FluentUI/workflows/Windows/badge.svg "Windows"
|
||||
@ -31,7 +29,6 @@ English | <a href="README_zh_CN.md">简体中文</a>
|
||||
[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"
|
||||
|
||||
|
||||
<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.
|
||||
</p>
|
||||
@ -50,17 +47,17 @@ Use [Qt Online Installers](https://download.qt.io/archive/online_installers/) to
|
||||
|
||||
+ run `example` program.
|
||||
|
||||
or
|
||||
or
|
||||
|
||||
+ Clone the repository.
|
||||
|
||||
```SHELL
|
||||
```bash
|
||||
git clone --recursive https://github.com/zhuzichu520/FluentUI.git
|
||||
```
|
||||
|
||||
+ Build
|
||||
|
||||
```
|
||||
```bash
|
||||
git clone --recursive https://github.com/zhuzichu520/FluentUI.git
|
||||
cd FluentUI
|
||||
mkdir build
|
||||
@ -79,38 +76,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.
|
||||
|
||||
|
||||
## 📑 Documentations
|
||||
|
||||
(Work in progress...🚀)
|
||||
|
||||
## Supported components
|
||||
|
||||
|Catalog|Detail|Notes / Demos|
|
||||
|:----:|:----:|:----:|
|
||||
|FluApp|The initial entry of the program|Router supported(SPA)|
|
||||
|FluWindow|Frameless Window|*This only works on windows|
|
||||
|FluAppBar|Title bar on top of the window|Drag, minimize, maximize and close are supported.|
|
||||
|FluText|Common text||
|
||||
|FluButton|Common button| |
|
||||
|FluFilledButton|Filled button||
|
||||
|FluTextButton|Text button||
|
||||
|FluToggleButton|Toggle buttons||
|
||||
|FluIcon|Common icon||
|
||||
|FluRadioButton|radio button||
|
||||
|FluTextBox|Single-line input box||
|
||||
|FluMultiLineTextBox|Multi-lines input area||
|
||||
|FluToggleSwitch|toggle switch||
|
||||
|
||||
| Catalog | Detail | Notes / Demos |
|
||||
| :-----------------: | :------------------------------: | :-------------------------------------------------: |
|
||||
| FluApp | The initial entry of the program | Router supported(SPA) |
|
||||
| FluWindow | Frameless Window | *This only works on windows |
|
||||
| FluAppBar | Title bar on top of the window | Drag, minimize, maximize and close are supported. |
|
||||
| FluText | Common text | |
|
||||
| FluButton | Common button |  |
|
||||
| FluFilledButton | Filled button |  |
|
||||
| FluTextButton | Text button |  |
|
||||
| FluToggleButton | Toggle buttons |  |
|
||||
| FluIcon | Common icon |  |
|
||||
| FluRadioButton | radio button |  |
|
||||
| FluTextBox | Single-line input box |  |
|
||||
| FluMultiLineTextBox | Multi-lines input area |  |
|
||||
| FluToggleSwitch | toggle switch |  |
|
||||
|
||||
View more [`here`](doc/md/all_components.md)!
|
||||
|
||||
|
||||
## Reference
|
||||
|
||||
+ [**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)
|
||||
|
||||
|
||||
## License
|
||||
|
||||
This FluentUI library currently licensed under [MIT License](./License)
|
||||
@ -120,4 +114,5 @@ This FluentUI library currently licensed under [MIT License](./License)
|
||||
[](https://star-history.com/#zhuzichu520/FluentUI&Date)
|
||||
|
||||
## ⚡ 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)。
|
||||
|
||||
## 编译状态
|
||||
| [Windows][win-link]| [Ubuntu][ubuntu-link]|[MacOS][macos-link]|
|
||||
|---------------|---------------|-----------------|
|
||||
| ![win-badge] | ![ubuntu-badge] | ![macos-badge] |
|
||||
</div>
|
||||
|
||||
![win-badge] ![ubuntu-badge] ![macos-badge] ![release-badge] ![download-badge] ![download-latest]
|
||||
|
||||
<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-badge]: https://github.com/zhuzichu520/FluentUI/workflows/Windows/badge.svg "Windows"
|
||||
|
||||
[ubuntu-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AUbuntu "UbuntuAction"
|
||||
[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-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-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-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"
|
||||
|
||||
<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 程序了！查看文档了解更多详情。
|
||||
|
||||
## 📑 文档
|
||||
|
||||
(正在进行中...🚀)
|
||||
|
||||
## 支持的组件
|
||||
|
||||
|目录|说明|备注|
|
||||
|----|----|----|
|
||||
|FluApp|初始化入口|支持路由跳转|
|
||||
|FluWindow|无边框窗口|解决windows拖动闪烁问题|
|
||||
|FluAppBar|窗口顶部标题栏|支持拖动窗口，最小化、最大化、关闭窗口|
|
||||
|FluText|Text文本||
|
||||
|FluButton|按钮||
|
||||
|FluFilledButton|实心按钮||
|
||||
|FluIconButton|图标按钮||
|
||||
|FluTextButton|文本按钮||
|
||||
|FluIcon|图标||
|
||||
|FluRadioButton|单选按钮||
|
||||
|FluTextBox|单行输入框||
|
||||
|FluMultiLineTextBox|多行输入框||
|
||||
|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||
|
||||
| 目录 | 详情 | 备注 / Demos |
|
||||
| :-----------------: | :--------------: | :-------------------------------------------------: |
|
||||
| FluApp | 程序初始入口 | 支持路由（SPA） |
|
||||
| FluWindow | 无框窗口 | *仅适用于 Windows |
|
||||
| FluAppBar | 窗口顶部的标题栏 | 支持拖动、最小化、最大化和关闭。 |
|
||||
| FluText | 通用文本 | |
|
||||
| FluButton | 通用按钮 |  |
|
||||
| FluFilledButton | Filled 按钮 |  |
|
||||
| FluTextButton | 文本按钮 |  |
|
||||
| FluToggleButton | 切换按钮 |  |
|
||||
| FluIcon | 通用图标 |  |
|
||||
| FluRadioButton | 单选框 |  |
|
||||
| FluTextBox | 单行输入框 |  |
|
||||
| FluMultiLineTextBox | 多行输入框 |  |
|
||||
| FluToggleSwitch | 开关 |  |
|
||||
|
||||
# 部分效果预览
|
||||
在 [`这里`](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
|
||||
|
||||
|
||||
|
||||
@ -344,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
|
||||
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
|
||||
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>.
|
||||
|
||||
|
||||
@ -73,11 +73,7 @@ if (WIN32)
|
||||
)
|
||||
endif ()
|
||||
|
||||
#加快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})
|
||||
list(APPEND sources_files ${PROJECT_NAME}.qrc)
|
||||
|
||||
#添加可执行文件
|
||||
if (WIN32)
|
||||
|
||||
@ -210,6 +210,9 @@
|
||||
<file>qml/page/T_OpenGL.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 prefix="/"/>
|
||||
</RCC>
|
||||
|
||||
@ -143,22 +143,22 @@
|
||||
<context>
|
||||
<name>InitializrHelper</name>
|
||||
<message>
|
||||
<location filename="src/helper/InitializrHelper.cpp" line="69"/>
|
||||
<location filename="src/helper/InitializrHelper.cpp" line="70"/>
|
||||
<source>The name cannot be empty</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="src/helper/InitializrHelper.cpp" line="73"/>
|
||||
<location filename="src/helper/InitializrHelper.cpp" line="74"/>
|
||||
<source>The creation path cannot be empty</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="src/helper/InitializrHelper.cpp" line="78"/>
|
||||
<location filename="src/helper/InitializrHelper.cpp" line="79"/>
|
||||
<source>The path does not exist</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="src/helper/InitializrHelper.cpp" line="84"/>
|
||||
<location filename="src/helper/InitializrHelper.cpp" line="85"/>
|
||||
<source>%1 folder already exists</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
@ -175,6 +175,11 @@
|
||||
<source>Settings</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsFooter.qml" line="34"/>
|
||||
<source>FluentUI Pro</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ItemsOriginal</name>
|
||||
@ -536,41 +541,46 @@
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="436"/>
|
||||
<source>QRCode</source>
|
||||
<source>QCustomPlot</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="442"/>
|
||||
<source>Tour</source>
|
||||
<source>QRCode</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="448"/>
|
||||
<source>Timeline</source>
|
||||
<source>Tour</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="454"/>
|
||||
<source>Captcha</source>
|
||||
<source>Timeline</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="460"/>
|
||||
<source>Captcha</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="466"/>
|
||||
<source>Network</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="467"/>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="473"/>
|
||||
<source>Remote Loader</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="481"/>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="487"/>
|
||||
<source>Hot Loader</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="487"/>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="493"/>
|
||||
<source>Test Crash</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
@ -602,104 +612,104 @@
|
||||
<context>
|
||||
<name>MainWindow</name>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="87"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="95"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="86"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="94"/>
|
||||
<source>Quit</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="88"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="87"/>
|
||||
<source>Are you sure you want to exit the program?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="89"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="88"/>
|
||||
<source>Minimize</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="92"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="91"/>
|
||||
<source>Friendly Reminder</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="92"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="91"/>
|
||||
<source>FluentUI is hidden from the tray, click on the tray to activate the window again</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="96"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="340"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="95"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="339"/>
|
||||
<source>Cancel</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="107"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="106"/>
|
||||
<source>Open in Separate Window</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="204"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="203"/>
|
||||
<source>Click Time</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="214"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="213"/>
|
||||
<source>Search</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="305"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="304"/>
|
||||
<source>Finish</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="306"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="305"/>
|
||||
<source>Next</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="307"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="306"/>
|
||||
<source>Previous</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="311"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="310"/>
|
||||
<source>Dark Mode</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="311"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="310"/>
|
||||
<source>Here you can switch to night mode.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="313"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="312"/>
|
||||
<source>Hide Easter eggs</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="313"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="312"/>
|
||||
<source>Try a few more clicks!!</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="337"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="336"/>
|
||||
<source>Upgrade Tips</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="338"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="337"/>
|
||||
<source>FluentUI is currently up to date </source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="338"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="337"/>
|
||||
<source> -- The current app version</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="338"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="337"/>
|
||||
<source>
|
||||
Now go and download the new version？
|
||||
|
||||
@ -708,17 +718,17 @@ Updated content:
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="341"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="340"/>
|
||||
<source>OK</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="368"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="367"/>
|
||||
<source>The current version is already the latest</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="375"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="374"/>
|
||||
<source>The network is abnormal</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
@ -1149,6 +1159,14 @@ Updated content:
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>T_CustomPlot</name>
|
||||
<message>
|
||||
<location filename="qml/page/T_CustomPlot.qml" line="10"/>
|
||||
<source>QCustomPlot</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>T_DatePicker</name>
|
||||
<message>
|
||||
@ -1360,22 +1378,32 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
|
||||
<context>
|
||||
<name>T_Home</name>
|
||||
<message>
|
||||
<location filename="qml/page/T_Home.qml" line="19"/>
|
||||
<location filename="qml/page/T_Home.qml" line="28"/>
|
||||
<source>FluentUI GitHub</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Home.qml" line="20"/>
|
||||
<location filename="qml/page/T_Home.qml" line="29"/>
|
||||
<source>The latest FluentUI controls and styles for your applications.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Home.qml" line="28"/>
|
||||
<location filename="qml/page/T_Home.qml" line="19"/>
|
||||
<source>FluentUI Pro</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Home.qml" line="20"/>
|
||||
<source>The latest FluentUI Pro controls and styles for your applications.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Home.qml" line="37"/>
|
||||
<source>FluentUI Initializr</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Home.qml" line="29"/>
|
||||
<location filename="qml/page/T_Home.qml" line="38"/>
|
||||
<source>FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
||||
@ -143,22 +143,22 @@
|
||||
<context>
|
||||
<name>InitializrHelper</name>
|
||||
<message>
|
||||
<location filename="src/helper/InitializrHelper.cpp" line="69"/>
|
||||
<location filename="src/helper/InitializrHelper.cpp" line="70"/>
|
||||
<source>The name cannot be empty</source>
|
||||
<translation type="unfinished">名称不能为空</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="src/helper/InitializrHelper.cpp" line="73"/>
|
||||
<location filename="src/helper/InitializrHelper.cpp" line="74"/>
|
||||
<source>The creation path cannot be empty</source>
|
||||
<translation type="unfinished">创建路径不能为空</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="src/helper/InitializrHelper.cpp" line="78"/>
|
||||
<location filename="src/helper/InitializrHelper.cpp" line="79"/>
|
||||
<source>The path does not exist</source>
|
||||
<translation type="unfinished">路径不存在</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="src/helper/InitializrHelper.cpp" line="84"/>
|
||||
<location filename="src/helper/InitializrHelper.cpp" line="85"/>
|
||||
<source>%1 folder already exists</source>
|
||||
<translation type="unfinished">%1 文件夹已经存在</translation>
|
||||
</message>
|
||||
@ -175,6 +175,11 @@
|
||||
<source>Settings</source>
|
||||
<translation type="unfinished">设置</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsFooter.qml" line="34"/>
|
||||
<source>FluentUI Pro</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ItemsOriginal</name>
|
||||
@ -536,36 +541,41 @@
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="436"/>
|
||||
<source>QCustomPlot</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="442"/>
|
||||
<source>QRCode</source>
|
||||
<translation type="unfinished">二维码</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="442"/>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="448"/>
|
||||
<source>Tour</source>
|
||||
<translation type="unfinished">游览</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="448"/>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="454"/>
|
||||
<source>Timeline</source>
|
||||
<translation type="unfinished">时间轴</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="454"/>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="460"/>
|
||||
<source>Captcha</source>
|
||||
<translation type="unfinished">验证码</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="460"/>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="466"/>
|
||||
<source>Network</source>
|
||||
<translation type="unfinished">网络</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="467"/>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="473"/>
|
||||
<source>Remote Loader</source>
|
||||
<translation type="unfinished">远程加载</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="481"/>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="487"/>
|
||||
<source>Hot Loader</source>
|
||||
<translation type="unfinished">热加载</translation>
|
||||
</message>
|
||||
@ -574,7 +584,7 @@
|
||||
<translation type="obsolete">3D</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="487"/>
|
||||
<location filename="qml/global/ItemsOriginal.qml" line="493"/>
|
||||
<source>Test Crash</source>
|
||||
<translation type="unfinished">测试崩溃</translation>
|
||||
</message>
|
||||
@ -606,104 +616,104 @@
|
||||
<context>
|
||||
<name>MainWindow</name>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="311"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="310"/>
|
||||
<source>Dark Mode</source>
|
||||
<translation type="unfinished">夜间模式</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="87"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="95"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="86"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="94"/>
|
||||
<source>Quit</source>
|
||||
<translation type="unfinished">退出</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="88"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="87"/>
|
||||
<source>Are you sure you want to exit the program?</source>
|
||||
<translation type="unfinished">您确定要退出程序吗</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="89"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="88"/>
|
||||
<source>Minimize</source>
|
||||
<translation type="unfinished">最小化</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="92"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="91"/>
|
||||
<source>Friendly Reminder</source>
|
||||
<translation type="unfinished">友情提示</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="92"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="91"/>
|
||||
<source>FluentUI is hidden from the tray, click on the tray to activate the window again</source>
|
||||
<translation type="unfinished">FluentUI 在托盘中处于隐藏状态，单击托盘以再次激活窗口</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="96"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="340"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="95"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="339"/>
|
||||
<source>Cancel</source>
|
||||
<translation type="unfinished">取消</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="107"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="106"/>
|
||||
<source>Open in Separate Window</source>
|
||||
<translation type="unfinished">在独立窗口中打开</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="204"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="203"/>
|
||||
<source>Click Time</source>
|
||||
<translation type="unfinished">点击次数</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="214"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="213"/>
|
||||
<source>Search</source>
|
||||
<translation type="unfinished">搜索</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="305"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="304"/>
|
||||
<source>Finish</source>
|
||||
<translation type="unfinished">完成</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="306"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="305"/>
|
||||
<source>Next</source>
|
||||
<translation type="unfinished">下一步</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="307"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="306"/>
|
||||
<source>Previous</source>
|
||||
<translation type="unfinished">上一步</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="311"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="310"/>
|
||||
<source>Here you can switch to night mode.</source>
|
||||
<translation type="unfinished">在这里，您可以切换到夜间模式。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="313"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="312"/>
|
||||
<source>Hide Easter eggs</source>
|
||||
<translation type="unfinished">隐藏彩蛋</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="313"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="312"/>
|
||||
<source>Try a few more clicks!!</source>
|
||||
<translation type="unfinished">再试几下！！</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="337"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="336"/>
|
||||
<source>Upgrade Tips</source>
|
||||
<translation type="unfinished">升级提示</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="338"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="337"/>
|
||||
<source>FluentUI is currently up to date </source>
|
||||
<translation type="unfinished">FluentUI 目前最新版本 </translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="338"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="337"/>
|
||||
<source> -- The current app version</source>
|
||||
<translation type="unfinished"> -- 当前应用版本</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="338"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="337"/>
|
||||
<source>
|
||||
Now go and download the new version？
|
||||
|
||||
@ -716,17 +726,17 @@ Updated content:
|
||||
</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="341"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="340"/>
|
||||
<source>OK</source>
|
||||
<translation type="unfinished">确定</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="368"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="367"/>
|
||||
<source>The current version is already the latest</source>
|
||||
<translation type="unfinished">当前版本已经是最新版本</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/window/MainWindow.qml" line="375"/>
|
||||
<location filename="qml/window/MainWindow.qml" line="374"/>
|
||||
<source>The network is abnormal</source>
|
||||
<translation type="unfinished">网络异常</translation>
|
||||
</message>
|
||||
@ -1208,6 +1218,46 @@ Updated content:
|
||||
<translation type="unfinished">组合框</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>T_CustomPlot</name>
|
||||
<message>
|
||||
<source>MultiWindow</source>
|
||||
<translation type="obsolete">多窗口</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><font color='red'>Standard</font> mode window，a new window is created every time</source>
|
||||
<translation type="obsolete"><font color='red'>Standard</font> 模式窗口，每次都会创建新窗口</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Create Window</source>
|
||||
<translation type="obsolete">创建窗口</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><font color='red'>SingleTask</font> mode window，If a window exists, this activates the window</source>
|
||||
<translation type="obsolete"><font color='red'>SingleTask</font> 模式窗口，如果窗口存在，这激活该窗口</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><font color='red'>SingleInstance</font> mode window，If the window exists, destroy the window and create a new window</source>
|
||||
<translation type="obsolete"><font color='red'>SingleInstance</font> 模式窗口，如果窗口存在，则销毁窗口，然后新建窗口</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Create the window without carrying any parameters</source>
|
||||
<translation type="obsolete">创建一个窗口，不携带任何参数</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Create a window with the parameter username: zhuzichu</source>
|
||||
<translation type="obsolete">创建一个窗口，并携带参数用户名：zhuzichu</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Login Window Returned Password - ></source>
|
||||
<translation type="obsolete">登录窗口返回过来的密码 - ></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_CustomPlot.qml" line="10"/>
|
||||
<source>QCustomPlot</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>T_DatePicker</name>
|
||||
<message>
|
||||
@ -1446,22 +1496,32 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
|
||||
<context>
|
||||
<name>T_Home</name>
|
||||
<message>
|
||||
<location filename="qml/page/T_Home.qml" line="19"/>
|
||||
<location filename="qml/page/T_Home.qml" line="28"/>
|
||||
<source>FluentUI GitHub</source>
|
||||
<translation type="unfinished">FluentUI GitHub</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Home.qml" line="20"/>
|
||||
<location filename="qml/page/T_Home.qml" line="29"/>
|
||||
<source>The latest FluentUI controls and styles for your applications.</source>
|
||||
<translation type="unfinished">最新的 FluentUI 控件和样式</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Home.qml" line="28"/>
|
||||
<location filename="qml/page/T_Home.qml" line="19"/>
|
||||
<source>FluentUI Pro</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Home.qml" line="20"/>
|
||||
<source>The latest FluentUI Pro controls and styles for your applications.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Home.qml" line="37"/>
|
||||
<source>FluentUI Initializr</source>
|
||||
<translation type="unfinished">FluentUI脚手架</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Home.qml" line="29"/>
|
||||
<location filename="qml/page/T_Home.qml" line="38"/>
|
||||
<source>FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options.</source>
|
||||
<translation type="unfinished">FluentUI 脚手架是一个快速创建项目工具，可帮助您创建和自定义具有各种选项的 Fluent UI 项目</translation>
|
||||
</message>
|
||||
|
||||
@ -16,7 +16,7 @@ FluExpander{
|
||||
id:content
|
||||
width:parent.width
|
||||
text:highlightQmlCode(code)
|
||||
textFormat: FluMultilineTextBox.RichText
|
||||
textFormat: FluCopyableText.RichText
|
||||
padding: 10
|
||||
topPadding: 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"
|
||||
onTap: { navigationView.push(url) }
|
||||
}
|
||||
FluPaneItem{
|
||||
title: qsTr("QCustomPlot")
|
||||
menuDelegate: paneItemMenu
|
||||
url: "qrc:/example/qml/page/T_CustomPlot.qml"
|
||||
onTap: { navigationView.push(url) }
|
||||
}
|
||||
FluPaneItem{
|
||||
title: qsTr("QRCode")
|
||||
menuDelegate: paneItemMenu
|
||||
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
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)'
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -14,6 +14,15 @@ FluScrollablePage{
|
||||
|
||||
ListModel{
|
||||
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{
|
||||
icon: "qrc:/example/res/image/ic_home_github.png"
|
||||
title: qsTr("FluentUI GitHub")
|
||||
|
||||
@ -20,7 +20,6 @@ FluWindow {
|
||||
launchMode: FluWindowType.SingleTask
|
||||
fitsAppBarWindows: true
|
||||
appBar: FluAppBar {
|
||||
width: window.width
|
||||
height: 30
|
||||
showDark: true
|
||||
darkClickListener:(button)=>handleDarkChanged(button)
|
||||
@ -235,7 +234,7 @@ FluWindow {
|
||||
id: com_reveal
|
||||
CircularReveal{
|
||||
id: reveal
|
||||
target: window.contentItem
|
||||
target: window.containerItem()
|
||||
anchors.fill: parent
|
||||
onAnimationFinished:{
|
||||
//动画结束后释放资源
|
||||
@ -264,7 +263,7 @@ FluWindow {
|
||||
return
|
||||
}
|
||||
loader_reveal.sourceComponent = com_reveal
|
||||
var target = window.contentItem
|
||||
var target = window.containerItem()
|
||||
var pos = button.mapToItem(target,0,0)
|
||||
var mouseX = pos.x
|
||||
var mouseY = pos.y
|
||||
|
||||
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}
|
||||
)
|
||||
|
||||
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
|
||||
main.cpp
|
||||
${QRC_RESOURCES}
|
||||
qml.qrc
|
||||
)
|
||||
|
||||
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
#include <QGuiApplication>
|
||||
#include "Version.h"
|
||||
|
||||
AppInfo::AppInfo(QObject *parent)
|
||||
: QObject{parent} {
|
||||
AppInfo::AppInfo(QObject *parent) : QObject{parent} {
|
||||
version(APPLICATION_VERSION);
|
||||
}
|
||||
|
||||
|
||||
[[maybe_unused]] void AppInfo::testCrash() {
|
||||
auto *crash = reinterpret_cast<volatile int *>(0);
|
||||
*crash = 0;
|
||||
|
||||
@ -2,17 +2,17 @@
|
||||
|
||||
#include <QObject>
|
||||
#include <QQmlApplicationEngine>
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "singleton.h"
|
||||
#include "stdafx.h"
|
||||
|
||||
class AppInfo : public QObject {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO(QString, version)
|
||||
private:
|
||||
explicit AppInfo(QObject *parent = nullptr);
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO(QString, version)
|
||||
private:
|
||||
explicit AppInfo(QObject *parent = nullptr);
|
||||
|
||||
public:
|
||||
SINGLETON(AppInfo)
|
||||
|
||||
[[maybe_unused]] Q_INVOKABLE void testCrash();
|
||||
public:
|
||||
SINGLETON(AppInfo)
|
||||
[[maybe_unused]] Q_INVOKABLE void testCrash();
|
||||
};
|
||||
|
||||
@ -11,21 +11,28 @@
|
||||
|
||||
#pragma comment(lib, "Dbghelp.lib")
|
||||
|
||||
static void
|
||||
miniDumpWriteDump(HANDLE hProcess, DWORD ProcessId, HANDLE hFile, CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam, 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);
|
||||
static void miniDumpWriteDump(HANDLE hProcess, DWORD ProcessId, HANDLE hFile,
|
||||
CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
|
||||
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");
|
||||
if (module) {
|
||||
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) {
|
||||
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)
|
||||
return FALSE;
|
||||
|
||||
@ -42,8 +49,7 @@ BOOL CALLBACK MyMiniDumpCallback(PVOID, const PMINIDUMP_CALLBACK_INPUT input, PM
|
||||
output->ModuleWriteFlags &= ~ModuleWriteModule;
|
||||
}
|
||||
ret = TRUE;
|
||||
}
|
||||
break;
|
||||
} break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@ -51,7 +57,9 @@ BOOL CALLBACK MyMiniDumpCallback(PVOID, const PMINIDUMP_CALLBACK_INPUT input, PM
|
||||
}
|
||||
|
||||
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;
|
||||
info.ThreadId = ::GetCurrentThreadId();
|
||||
info.ExceptionPointers = exp;
|
||||
@ -64,8 +72,10 @@ void WriteDump(EXCEPTION_POINTERS *exp, const std::wstring &path) {
|
||||
}
|
||||
|
||||
LONG WINAPI MyUnhandledExceptionFilter(EXCEPTION_POINTERS *exp) {
|
||||
const QString dumpFileName = QString("%1_%2.dmp").arg("crash", QDateTime::currentDateTime().toString("yyyyMMdd_hhmmss"));
|
||||
const QString dumpDirPath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/dmp";
|
||||
const QString dumpFileName =
|
||||
QString("%1_%2.dmp").arg("crash", QDateTime::currentDateTime().toString("yyyyMMdd_hhmmss"));
|
||||
const QString dumpDirPath =
|
||||
QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/dmp";
|
||||
const QDir dumpDir(dumpDirPath);
|
||||
if (!dumpDir.exists()) {
|
||||
dumpDir.mkpath(dumpDirPath);
|
||||
@ -76,4 +86,4 @@ LONG WINAPI MyUnhandledExceptionFilter(EXCEPTION_POINTERS *exp) {
|
||||
arguments << "-crashed=" + dumpFilePath;
|
||||
QProcess::startDetached(QGuiApplication::applicationFilePath(), arguments);
|
||||
return EXCEPTION_EXECUTE_HANDLER;
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,9 +15,7 @@ CircularReveal::CircularReveal(QQuickItem *parent) : QQuickPaintedItem(parent) {
|
||||
setVisible(false);
|
||||
Q_EMIT animationFinished();
|
||||
});
|
||||
connect(this, &CircularReveal::radiusChanged, this, [=]() {
|
||||
update();
|
||||
});
|
||||
connect(this, &CircularReveal::radiusChanged, this, [=]() { update(); });
|
||||
}
|
||||
|
||||
void CircularReveal::paint(QPainter *painter) {
|
||||
@ -36,7 +34,8 @@ void CircularReveal::paint(QPainter *painter) {
|
||||
_anim->setEndValue(radius);
|
||||
_center = center;
|
||||
_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() {
|
||||
|
||||
@ -7,20 +7,15 @@
|
||||
#include "src/stdafx.h"
|
||||
|
||||
class CircularReveal : public QQuickPaintedItem {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO_P(QQuickItem*, target)
|
||||
Q_PROPERTY_AUTO(int, radius)
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO_P(QQuickItem *, target)
|
||||
Q_PROPERTY_AUTO(int, radius)
|
||||
public:
|
||||
explicit CircularReveal(QQuickItem *parent = nullptr);
|
||||
|
||||
void paint(QPainter *painter) override;
|
||||
|
||||
[[maybe_unused]] Q_INVOKABLE void start(int w, int h, const QPoint ¢er, int radius);
|
||||
|
||||
Q_SIGNAL void imageChanged();
|
||||
|
||||
Q_SIGNAL void animationFinished();
|
||||
|
||||
Q_SLOT void handleGrabResult();
|
||||
|
||||
private:
|
||||
|
||||
@ -6,11 +6,10 @@
|
||||
#include "src/stdafx.h"
|
||||
|
||||
class FileWatcher : public QObject {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO(QString, path);
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO(QString, path)
|
||||
public:
|
||||
explicit FileWatcher(QObject *parent = nullptr);
|
||||
|
||||
Q_SIGNAL void fileChanged();
|
||||
|
||||
private:
|
||||
|
||||
@ -12,7 +12,9 @@ FpsItem::FpsItem() {
|
||||
});
|
||||
connect(this, &QQuickItem::windowChanged, this, [this] {
|
||||
if (window()) {
|
||||
connect(window(), &QQuickWindow::afterRendering, this, [this] { _frameCount++; }, Qt::DirectConnection);
|
||||
connect(
|
||||
window(), &QQuickWindow::afterRendering, this, [this] { _frameCount++; },
|
||||
Qt::DirectConnection);
|
||||
}
|
||||
});
|
||||
timer->start(1000);
|
||||
|
||||
@ -4,12 +4,11 @@
|
||||
#include "src/stdafx.h"
|
||||
|
||||
class FpsItem : public QQuickItem {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO(int, fps)
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO(int, fps)
|
||||
public:
|
||||
FpsItem();
|
||||
|
||||
private:
|
||||
int _frameCount = 0;
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
@ -7,11 +7,8 @@
|
||||
class FBORenderer : public QQuickFramebufferObject::Renderer, protected QOpenGLFunctions {
|
||||
public:
|
||||
explicit FBORenderer(const OpenGLItem *item);
|
||||
|
||||
void render() override;
|
||||
|
||||
QOpenGLFramebufferObject *createFramebufferObject(const QSize &size) override;
|
||||
|
||||
QOpenGLShaderProgram program;
|
||||
const OpenGLItem *item = nullptr;
|
||||
};
|
||||
@ -19,22 +16,22 @@ public:
|
||||
FBORenderer::FBORenderer(const OpenGLItem *item) {
|
||||
this->item = item;
|
||||
initializeOpenGLFunctions();
|
||||
program.addCacheableShaderFromSourceCode(QOpenGLShader::Vertex,
|
||||
"attribute highp vec4 vertices;"
|
||||
"varying highp vec2 coords;"
|
||||
"void main() {"
|
||||
" gl_Position = vertices;"
|
||||
" coords = vertices.xy;"
|
||||
"}");
|
||||
program.addCacheableShaderFromSourceCode(QOpenGLShader::Fragment,
|
||||
"uniform lowp float t;"
|
||||
"varying highp vec2 coords;"
|
||||
"void main() {"
|
||||
" lowp float i = 1. - (pow(abs(coords.x), 4.) + pow(abs(coords.y), 4.));"
|
||||
" i = smoothstep(t - 0.8, t + 0.8, i);"
|
||||
" i = floor(i * 20.) / 20.;"
|
||||
" gl_FragColor = vec4(coords * .5 + .5, i, i);"
|
||||
"}");
|
||||
program.addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, "attribute highp vec4 vertices;"
|
||||
"varying highp vec2 coords;"
|
||||
"void main() {"
|
||||
" gl_Position = vertices;"
|
||||
" coords = vertices.xy;"
|
||||
"}");
|
||||
program.addCacheableShaderFromSourceCode(
|
||||
QOpenGLShader::Fragment,
|
||||
"uniform lowp float t;"
|
||||
"varying highp vec2 coords;"
|
||||
"void main() {"
|
||||
" lowp float i = 1. - (pow(abs(coords.x), 4.) + pow(abs(coords.y), 4.));"
|
||||
" i = smoothstep(t - 0.8, t + 0.8, i);"
|
||||
" i = floor(i * 20.) / 20.;"
|
||||
" gl_FragColor = vec4(coords * .5 + .5, i, i);"
|
||||
"}");
|
||||
|
||||
program.bindAttributeLocation("vertices", 0);
|
||||
program.link();
|
||||
@ -54,16 +51,11 @@ void FBORenderer::render() {
|
||||
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
||||
program.bind();
|
||||
program.enableAttributeArray(0);
|
||||
float values[] = {
|
||||
-1, -1,
|
||||
1, -1,
|
||||
-1, 1,
|
||||
1, 1
|
||||
};
|
||||
float values[] = {-1, -1, 1, -1, -1, 1, 1, 1};
|
||||
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
||||
program.setAttributeArray(0, GL_FLOAT, values, 2);
|
||||
program.setUniformValue("t", (float) item->t());
|
||||
glViewport(0, 0, qRound(item->width()*pixelRatio), qRound(item->height()*pixelRatio));
|
||||
glViewport(0, 0, qRound(item->width() * pixelRatio), qRound(item->height() * pixelRatio));
|
||||
glDisable(GL_DEPTH_TEST);
|
||||
glEnable(GL_BLEND);
|
||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
|
||||
|
||||
@ -7,21 +7,17 @@
|
||||
class FBORenderer;
|
||||
|
||||
class OpenGLItem : public QQuickFramebufferObject, protected QOpenGLFunctions {
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(qreal t READ t WRITE setT NOTIFY tChanged)
|
||||
public:
|
||||
explicit OpenGLItem(QQuickItem *parent = nullptr);
|
||||
|
||||
[[nodiscard]] QQuickFramebufferObject::Renderer *createRenderer() const override;
|
||||
|
||||
void timerEvent(QTimerEvent *) override;
|
||||
|
||||
[[nodiscard]] qreal t() const { return m_t; }
|
||||
|
||||
[[nodiscard]] qreal t() const {
|
||||
return m_t;
|
||||
}
|
||||
void setT(qreal t);
|
||||
|
||||
signals:
|
||||
|
||||
void tChanged();
|
||||
|
||||
private:
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
#include <QGuiApplication>
|
||||
|
||||
[[maybe_unused]] InitializrHelper::InitializrHelper(QObject *parent) : QObject(parent) {
|
||||
|
||||
}
|
||||
|
||||
InitializrHelper::~InitializrHelper() = default;
|
||||
|
||||
|
||||
bool InitializrHelper::copyDir(const QDir &fromDir, const QDir &toDir, bool coverIfFileExists) {
|
||||
const QDir &_formDir = fromDir;
|
||||
QDir _toDir = toDir;
|
||||
@ -17,25 +17,25 @@ bool InitializrHelper::copyDir(const QDir &fromDir, const QDir &toDir, bool cove
|
||||
return false;
|
||||
}
|
||||
QFileInfoList fileInfoList = _formDir.entryInfoList();
|
||||
foreach(QFileInfo fileInfo, fileInfoList) {
|
||||
if (fileInfo.fileName() == "." || fileInfo.fileName() == "..")
|
||||
continue;
|
||||
if (fileInfo.isDir()) {
|
||||
if (!copyDir(fileInfo.filePath(), _toDir.filePath(fileInfo.fileName()), true))
|
||||
return false;
|
||||
} else {
|
||||
if (coverIfFileExists && _toDir.exists(fileInfo.fileName())) {
|
||||
_toDir.remove(fileInfo.fileName());
|
||||
}
|
||||
if (!QFile::copy(fileInfo.filePath(), _toDir.filePath(fileInfo.fileName()))) {
|
||||
return false;
|
||||
}
|
||||
foreach (QFileInfo fileInfo, fileInfoList) {
|
||||
if (fileInfo.fileName() == "." || fileInfo.fileName() == "..")
|
||||
continue;
|
||||
if (fileInfo.isDir()) {
|
||||
if (!copyDir(fileInfo.filePath(), _toDir.filePath(fileInfo.fileName()), true))
|
||||
return false;
|
||||
} else {
|
||||
if (coverIfFileExists && _toDir.exists(fileInfo.fileName())) {
|
||||
_toDir.remove(fileInfo.fileName());
|
||||
}
|
||||
if (!QFile::copy(fileInfo.filePath(), _toDir.filePath(fileInfo.fileName()))) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
template<typename...Args>
|
||||
template <typename... Args>
|
||||
void InitializrHelper::templateToFile(const QString &source, const QString &dest, Args &&...args) {
|
||||
QFile file(source);
|
||||
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) {
|
||||
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) {
|
||||
@ -87,15 +88,21 @@ void InitializrHelper::copyFile(const QString &source, const QString &dest) {
|
||||
projectDir.mkpath(projectPath);
|
||||
QDir fluentDir(projectDir.filePath("FluentUI"));
|
||||
copyDir(QDir(QGuiApplication::applicationDirPath() + "/source"), fluentDir);
|
||||
templateToFile(":/example/res/template/CMakeLists.txt.in", projectDir.filePath("CMakeLists.txt"), name);
|
||||
templateToFile(":/example/res/template/src/CMakeLists.txt.in", projectDir.filePath("src/CMakeLists.txt"), name);
|
||||
templateToFile(":/example/res/template/src/main.cpp.in", projectDir.filePath("src/main.cpp"), 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);
|
||||
templateToFile(":/example/res/template/CMakeLists.txt.in",
|
||||
projectDir.filePath("CMakeLists.txt"), name);
|
||||
templateToFile(":/example/res/template/src/CMakeLists.txt.in",
|
||||
projectDir.filePath("src/CMakeLists.txt"), name);
|
||||
templateToFile(":/example/res/template/src/main.cpp.in", projectDir.filePath("src/main.cpp"),
|
||||
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/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/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"
|
||||
|
||||
class InitializrHelper : public QObject {
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
private:
|
||||
[[maybe_unused]] explicit InitializrHelper(QObject *parent = nullptr);
|
||||
|
||||
bool copyDir(const QDir &fromDir, const QDir &toDir, bool coverIfFileExists = true);
|
||||
|
||||
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);
|
||||
|
||||
public:
|
||||
SINGLETON(InitializrHelper)
|
||||
|
||||
SINGLETON(InitializrHelper)
|
||||
~InitializrHelper() override;
|
||||
|
||||
[[maybe_unused]] Q_INVOKABLE void generate(const QString &name, const QString &path);
|
||||
|
||||
Q_SIGNAL void error(const QString &message);
|
||||
|
||||
Q_SIGNAL void success(const QString &path);
|
||||
};
|
||||
|
||||
@ -13,11 +13,9 @@
|
||||
#include "Version.h"
|
||||
|
||||
#ifdef WIN32
|
||||
|
||||
#include <process.h>
|
||||
|
||||
# include <process.h>
|
||||
#else
|
||||
#include <unistd.h>
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
#ifndef QT_ENDL
|
||||
@ -38,19 +36,20 @@ static std::unique_ptr<QTextStream> g_logStream = nullptr;
|
||||
static int g_logLevel = 4;
|
||||
|
||||
std::map<QtMsgType, int> logLevelMap = {
|
||||
{QtFatalMsg, 0},
|
||||
{QtCriticalMsg, 1},
|
||||
{QtWarningMsg, 2},
|
||||
{QtInfoMsg, 3},
|
||||
{QtDebugMsg, 4}
|
||||
{QtFatalMsg, 0},
|
||||
{QtCriticalMsg, 1},
|
||||
{QtWarningMsg, 2},
|
||||
{QtInfoMsg, 3},
|
||||
{QtDebugMsg, 4}
|
||||
};
|
||||
|
||||
QString Log::prettyProductInfoWrapper() {
|
||||
auto productName = QSysInfo::prettyProductName();
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
|
||||
#if defined(Q_OS_MACOS)
|
||||
auto macosVersionFile = QString::fromUtf8("/System/Library/CoreServices/.SystemVersionPlatform.plist");
|
||||
auto fi = QFileInfo (macosVersionFile);
|
||||
# if defined(Q_OS_MACOS)
|
||||
auto macosVersionFile =
|
||||
QString::fromUtf8("/System/Library/CoreServices/.SystemVersionPlatform.plist");
|
||||
auto fi = QFileInfo(macosVersionFile);
|
||||
if (fi.exists() && fi.isReadable()) {
|
||||
auto plistFile = QFile(macosVersionFile);
|
||||
plistFile.open(QIODevice::ReadOnly);
|
||||
@ -69,10 +68,12 @@ QString Log::prettyProductInfoWrapper() {
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
# endif
|
||||
#endif
|
||||
#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"))) {
|
||||
auto buildNumber = regKey.value(QString::fromUtf8("CurrentBuildNumber")).toInt();
|
||||
if (buildNumber > 0) {
|
||||
@ -91,7 +92,8 @@ QString Log::prettyProductInfoWrapper() {
|
||||
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.") {
|
||||
return;
|
||||
}
|
||||
@ -132,14 +134,15 @@ static inline void messageHandler(const QtMsgType type, const QMessageLogContext
|
||||
sprintf(fn, "%s", ptrTmp + 1);
|
||||
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(
|
||||
QDateTime::currentDateTime().toString("yyyy/MM/dd hh:mm:ss.zzz"),
|
||||
levelName,
|
||||
fileAndLineLogStr,
|
||||
QString::number(reinterpret_cast<quintptr>(QThread::currentThreadId())),
|
||||
message);
|
||||
const QString finalMessage =
|
||||
QString::fromStdString("%1[%2]%3[%4]:%5")
|
||||
.arg(QDateTime::currentDateTime().toString("yyyy/MM/dd hh:mm:ss.zzz"), levelName,
|
||||
fileAndLineLogStr,
|
||||
QString::number(reinterpret_cast<quintptr>(QThread::currentThreadId())),
|
||||
message);
|
||||
if ((type == QtInfoMsg) || (type == QtDebugMsg)) {
|
||||
std::cout << qPrintable(finalMessage) << std::endl;
|
||||
} else {
|
||||
@ -151,7 +154,8 @@ static inline void messageHandler(const QtMsgType type, const QMessageLogContext
|
||||
if (!g_logFile) {
|
||||
g_logFile = std::make_unique<QFile>(g_file_path);
|
||||
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_logError = true;
|
||||
return;
|
||||
@ -179,8 +183,10 @@ void Log::setup(char *argv[], const QString &app, int level) {
|
||||
QString applicationPath = QString::fromStdString(argv[0]);
|
||||
once = true;
|
||||
g_app = app;
|
||||
const QString logFileName = QString("%1_%2.log").arg(g_app, QDateTime::currentDateTime().toString("yyyyMMdd"));
|
||||
const QString logDirPath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/log";
|
||||
const QString logFileName =
|
||||
QString("%1_%2.log").arg(g_app, QDateTime::currentDateTime().toString("yyyyMMdd"));
|
||||
const QString logDirPath =
|
||||
QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/log";
|
||||
const QDir logDir(logDirPath);
|
||||
if (!logDir.exists()) {
|
||||
logDir.mkpath(logDirPath);
|
||||
@ -195,7 +201,7 @@ void Log::setup(char *argv[], const QString &app, int level) {
|
||||
#ifdef WIN32
|
||||
qInfo() << "[ProcessId]" << QString::number(_getpid());
|
||||
#else
|
||||
qInfo()<<"[ProcessId]"<<QString::number(getpid());
|
||||
qInfo() << "[ProcessId]" << QString::number(getpid());
|
||||
#endif
|
||||
qInfo() << "[GitHashCode]" << COMMIT_HASH;
|
||||
qInfo() << "[DeviceInfo]";
|
||||
|
||||
@ -4,6 +4,5 @@
|
||||
|
||||
namespace Log {
|
||||
QString prettyProductInfoWrapper();
|
||||
|
||||
void setup(char *argv[], const QString &app, int level = 4);
|
||||
}
|
||||
}
|
||||
|
||||
@ -19,9 +19,7 @@
|
||||
#include <QGuiApplication>
|
||||
#include <utility>
|
||||
|
||||
|
||||
NetworkCallable::NetworkCallable(QObject *parent) : QObject{parent} {
|
||||
|
||||
}
|
||||
|
||||
QString NetworkParams::method2String() const {
|
||||
@ -64,12 +62,11 @@ bool NetworkParams::getOpenLog() const {
|
||||
return Network::getInstance()->openLog();
|
||||
}
|
||||
|
||||
FluDownloadParam::FluDownloadParam(QObject *parent)
|
||||
: QObject{parent} {
|
||||
FluDownloadParam::FluDownloadParam(QObject *parent) : QObject{parent} {
|
||||
}
|
||||
|
||||
FluDownloadParam::FluDownloadParam(QString destPath, bool append, QObject *parent)
|
||||
: QObject{parent} {
|
||||
: QObject{parent} {
|
||||
this->_destPath = std::move(destPath);
|
||||
this->_append = append;
|
||||
}
|
||||
@ -80,7 +77,7 @@ NetworkParams::NetworkParams(QObject *parent) : QObject{parent} {
|
||||
}
|
||||
|
||||
NetworkParams::NetworkParams(QString url, Type type, Method method, QObject *parent)
|
||||
: QObject{parent} {
|
||||
: QObject{parent} {
|
||||
this->_method = method;
|
||||
this->_url = std::move(url);
|
||||
this->_type = type;
|
||||
@ -178,12 +175,14 @@ void Network::handle(NetworkParams *params, NetworkCallable *c) {
|
||||
callable->start();
|
||||
}
|
||||
QString cacheKey = params->buildCacheKey();
|
||||
if (params->_cacheMode == NetworkType::CacheMode::FirstCacheThenRequest && cacheExists(cacheKey)) {
|
||||
if (params->_cacheMode == NetworkType::CacheMode::FirstCacheThenRequest &&
|
||||
cacheExists(cacheKey)) {
|
||||
if (!callable.isNull()) {
|
||||
callable->cache(readCache(cacheKey));
|
||||
}
|
||||
}
|
||||
if (params->_cacheMode == NetworkType::CacheMode::IfNoneCacheRequest && cacheExists(cacheKey)) {
|
||||
if (params->_cacheMode == NetworkType::CacheMode::IfNoneCacheRequest &&
|
||||
cacheExists(cacheKey)) {
|
||||
if (!callable.isNull()) {
|
||||
callable->cache(readCache(cacheKey));
|
||||
callable->finish();
|
||||
@ -194,7 +193,8 @@ void Network::handle(NetworkParams *params, NetworkCallable *c) {
|
||||
QNetworkAccessManager manager;
|
||||
manager.setTransferTimeout(params->getTimeout());
|
||||
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) {
|
||||
QUrl url(params->_url);
|
||||
addQueryParam(&url, params->_queryMap);
|
||||
@ -216,9 +216,11 @@ void Network::handle(NetworkParams *params, NetworkCallable *c) {
|
||||
QMetaObject::Connection conn_destroyed = {};
|
||||
QMetaObject::Connection conn_quit = {};
|
||||
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();
|
||||
if (conn_destroyed) {
|
||||
disconnect(conn_destroyed);
|
||||
@ -247,7 +249,8 @@ void Network::handle(NetworkParams *params, NetworkCallable *c) {
|
||||
} else {
|
||||
if (i == params->getRetry() - 1) {
|
||||
if (!callable.isNull()) {
|
||||
if (params->_cacheMode == NetworkType::CacheMode::RequestFailedReadCache && cacheExists(cacheKey)) {
|
||||
if (params->_cacheMode == NetworkType::CacheMode::RequestFailedReadCache &&
|
||||
cacheExists(cacheKey)) {
|
||||
if (!callable.isNull()) {
|
||||
callable->cache(readCache(cacheKey));
|
||||
}
|
||||
@ -332,35 +335,41 @@ void Network::handleDownload(NetworkParams *params, NetworkCallable *c) {
|
||||
reply->abort();
|
||||
}
|
||||
};
|
||||
connect(&manager, &QNetworkAccessManager::finished, &manager, [&loop](QNetworkReply *reply) { loop.quit(); });
|
||||
connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit, &manager, [&loop, reply]() { reply->abort(), loop.quit(); });
|
||||
connect(&manager, &QNetworkAccessManager::finished, &manager,
|
||||
[&loop](QNetworkReply *reply) { loop.quit(); });
|
||||
connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit, &manager,
|
||||
[&loop, reply]() { reply->abort(), loop.quit(); });
|
||||
QMetaObject::Connection conn_destroyed = {};
|
||||
QMetaObject::Connection conn_quit = {};
|
||||
if (params->_target) {
|
||||
conn_destroyed = connect(params->_target, &QObject::destroyed, &manager, abortCallable);
|
||||
}
|
||||
conn_quit = connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit, &manager, abortCallable);
|
||||
connect(reply, &QNetworkReply::readyRead, reply, [reply, seek, destFile, cacheFile, callable] {
|
||||
if (!reply || !destFile || reply->error() != QNetworkReply::NoError) {
|
||||
return;
|
||||
}
|
||||
QMap<QString, QVariant> downInfo;
|
||||
qint64 contentLength = reply->header(QNetworkRequest::ContentLengthHeader).toLongLong() + seek;
|
||||
downInfo.insert("contentLength", contentLength);
|
||||
QString eTag = reply->header(QNetworkRequest::ETagHeader).toString();
|
||||
downInfo.insert("eTag", eTag);
|
||||
destFile->write(reply->readAll());
|
||||
destFile->flush();
|
||||
downInfo.insert("fileSize", destFile->size());
|
||||
if (cacheFile->isOpen()) {
|
||||
cacheFile->resize(0);
|
||||
cacheFile->write(QJsonDocument::fromVariant(QVariant(downInfo)).toJson().toBase64());
|
||||
cacheFile->flush();
|
||||
}
|
||||
if (!callable.isNull()) {
|
||||
callable->downloadProgress(destFile->size(), contentLength);
|
||||
}
|
||||
});
|
||||
conn_quit = connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit, &manager,
|
||||
abortCallable);
|
||||
connect(reply, &QNetworkReply::readyRead, reply,
|
||||
[reply, seek, destFile, cacheFile, callable] {
|
||||
if (!reply || !destFile || reply->error() != QNetworkReply::NoError) {
|
||||
return;
|
||||
}
|
||||
QMap<QString, QVariant> downInfo;
|
||||
qint64 contentLength =
|
||||
reply->header(QNetworkRequest::ContentLengthHeader).toLongLong() + seek;
|
||||
downInfo.insert("contentLength", contentLength);
|
||||
QString eTag = reply->header(QNetworkRequest::ETagHeader).toString();
|
||||
downInfo.insert("eTag", eTag);
|
||||
destFile->write(reply->readAll());
|
||||
destFile->flush();
|
||||
downInfo.insert("fileSize", destFile->size());
|
||||
if (cacheFile->isOpen()) {
|
||||
cacheFile->resize(0);
|
||||
cacheFile->write(
|
||||
QJsonDocument::fromVariant(QVariant(downInfo)).toJson().toBase64());
|
||||
cacheFile->flush();
|
||||
}
|
||||
if (!callable.isNull()) {
|
||||
callable->downloadProgress(destFile->size(), contentLength);
|
||||
}
|
||||
});
|
||||
loop.exec();
|
||||
int httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
if (httpStatus == 200) {
|
||||
@ -430,7 +439,9 @@ QString Network::map2String(const QMap<QString, QVariant> &map) {
|
||||
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();
|
||||
switch (params->_type) {
|
||||
case NetworkParams::TYPE_FORM: {
|
||||
@ -438,13 +449,14 @@ void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest reques
|
||||
if (isFormData) {
|
||||
auto *multiPart = new QHttpMultiPart();
|
||||
multiPart->setContentType(QHttpMultiPart::FormDataType);
|
||||
for (const auto &each: params->_paramMap.toStdMap()) {
|
||||
for (const auto &each : params->_paramMap.toStdMap()) {
|
||||
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());
|
||||
multiPart->append(part);
|
||||
}
|
||||
for (const auto &each: params->_fileMap.toStdMap()) {
|
||||
for (const auto &each : params->_fileMap.toStdMap()) {
|
||||
QString filePath = each.second.toString();
|
||||
QString name = each.first;
|
||||
auto *file = new QFile(filePath);
|
||||
@ -452,21 +464,25 @@ void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest reques
|
||||
file->open(QIODevice::ReadOnly);
|
||||
file->setParent(multiPart);
|
||||
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);
|
||||
multiPart->append(part);
|
||||
}
|
||||
reply = manager->sendCustomRequest(request, verb, multiPart);
|
||||
multiPart->setParent(reply);
|
||||
connect(reply, &QNetworkReply::uploadProgress, reply, [callable](qint64 bytesSent, qint64 bytesTotal) {
|
||||
if (!callable.isNull() && bytesSent != 0 && bytesTotal != 0) {
|
||||
Q_EMIT callable->uploadProgress(bytesSent, bytesTotal);
|
||||
}
|
||||
});
|
||||
connect(reply, &QNetworkReply::uploadProgress, reply,
|
||||
[callable](qint64 bytesSent, qint64 bytesTotal) {
|
||||
if (!callable.isNull() && bytesSent != 0 && bytesTotal != 0) {
|
||||
Q_EMIT callable->uploadProgress(bytesSent, bytesTotal);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
request.setHeader(QNetworkRequest::ContentTypeHeader, QString("application/x-www-form-urlencoded"));
|
||||
request.setHeader(QNetworkRequest::ContentTypeHeader,
|
||||
QString("application/x-www-form-urlencoded"));
|
||||
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 += "&";
|
||||
}
|
||||
@ -479,9 +495,10 @@ void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest reques
|
||||
break;
|
||||
}
|
||||
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;
|
||||
for (const auto &each: params->_paramMap.toStdMap()) {
|
||||
for (const auto &each : params->_paramMap.toStdMap()) {
|
||||
json.insert(each.first, each.second.toJsonValue());
|
||||
}
|
||||
QByteArray data = QJsonDocument(json).toJson(QJsonDocument::Compact);
|
||||
@ -489,9 +506,10 @@ void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest reques
|
||||
break;
|
||||
}
|
||||
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;
|
||||
for (const auto &each: params->_paramMap.toStdMap()) {
|
||||
for (const auto &each : params->_paramMap.toStdMap()) {
|
||||
QJsonObject json;
|
||||
json.insert(each.first, each.second.toJsonValue());
|
||||
jsonArray.append(json);
|
||||
@ -501,7 +519,8 @@ void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest reques
|
||||
break;
|
||||
}
|
||||
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();
|
||||
reply = manager->sendCustomRequest(request, verb, data);
|
||||
break;
|
||||
@ -519,15 +538,20 @@ void Network::printRequestStartLog(const QNetworkRequest &request, NetworkParams
|
||||
if (!params->getOpenLog()) {
|
||||
return;
|
||||
}
|
||||
qDebug() << "<------" << qUtf8Printable(request.header(QNetworkRequest::UserAgentHeader).toString()) << "Request Start ------>";
|
||||
qDebug() << qUtf8Printable(QString::fromStdString("<%1>").arg(params->method2String())) << qUtf8Printable(params->_url);
|
||||
qDebug() << "<------"
|
||||
<< 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();
|
||||
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();
|
||||
for (const QByteArray &header: headers) {
|
||||
qDebug() << qUtf8Printable(QString::fromStdString("<Header> %1=%2").arg(header, request.rawHeader(header)));
|
||||
for (const QByteArray &header : headers) {
|
||||
qDebug() << qUtf8Printable(
|
||||
QString::fromStdString("<Header> %1=%2").arg(header, request.rawHeader(header)));
|
||||
}
|
||||
if (!params->_queryMap.isEmpty()) {
|
||||
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()) {
|
||||
return;
|
||||
}
|
||||
qDebug() << "<------" << qUtf8Printable(request.header(QNetworkRequest::UserAgentHeader).toString()) << "Request End ------>";
|
||||
qDebug() << qUtf8Printable(QString::fromStdString("<%1>").arg(params->method2String())) << qUtf8Printable(params->_url);
|
||||
qDebug() << "<------"
|
||||
<< qUtf8Printable(request.header(QNetworkRequest::UserAgentHeader).toString())
|
||||
<< "Request End ------>";
|
||||
qDebug() << qUtf8Printable(QString::fromStdString("<%1>").arg(params->method2String()))
|
||||
<< qUtf8Printable(params->_url);
|
||||
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) {
|
||||
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);
|
||||
while (iter.hasNext()) {
|
||||
iter.next();
|
||||
@ -584,7 +615,9 @@ Network::Network(QObject *parent) : QObject{parent} {
|
||||
_timeout = 5000;
|
||||
_retry = 3;
|
||||
_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) {
|
||||
@ -656,7 +689,8 @@ NetworkParams *Network::patchJsonArray(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) {
|
||||
|
||||
@ -28,7 +28,7 @@ namespace NetworkType {
|
||||
* @brief The NetworkCallable class
|
||||
*/
|
||||
class NetworkCallable : public QObject {
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
QML_NAMED_ELEMENT(NetworkCallable)
|
||||
public:
|
||||
explicit NetworkCallable(QObject *parent = nullptr);
|
||||
@ -52,7 +52,7 @@ public:
|
||||
* @brief The FluDownloadParam class
|
||||
*/
|
||||
class FluDownloadParam : public QObject {
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit FluDownloadParam(QObject *parent = nullptr);
|
||||
|
||||
@ -67,24 +67,11 @@ public:
|
||||
* @brief The NetworkParams class
|
||||
*/
|
||||
class NetworkParams : public QObject {
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
QML_NAMED_ELEMENT(NetworkParams)
|
||||
public:
|
||||
enum Method {
|
||||
METHOD_GET,
|
||||
METHOD_HEAD,
|
||||
METHOD_POST,
|
||||
METHOD_PUT,
|
||||
METHOD_PATCH,
|
||||
METHOD_DELETE
|
||||
};
|
||||
enum Type {
|
||||
TYPE_NONE,
|
||||
TYPE_FORM,
|
||||
TYPE_JSON,
|
||||
TYPE_JSONARRAY,
|
||||
TYPE_BODY
|
||||
};
|
||||
enum Method { METHOD_GET, 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);
|
||||
|
||||
@ -145,11 +132,11 @@ public:
|
||||
* @brief The Network class
|
||||
*/
|
||||
class Network : public QObject {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO(int, timeout)
|
||||
Q_PROPERTY_AUTO(int, retry)
|
||||
Q_PROPERTY_AUTO(QString, cacheDir)
|
||||
Q_PROPERTY_AUTO(bool, openLog)
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO(int, timeout)
|
||||
Q_PROPERTY_AUTO(int, retry)
|
||||
Q_PROPERTY_AUTO(QString, cacheDir)
|
||||
Q_PROPERTY_AUTO(bool, openLog)
|
||||
QML_NAMED_ELEMENT(Network)
|
||||
QML_SINGLETON
|
||||
|
||||
@ -157,9 +144,11 @@ private:
|
||||
explicit Network(QObject *parent = nullptr);
|
||||
|
||||
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);
|
||||
|
||||
@ -204,7 +193,9 @@ SINGLETON(Network)
|
||||
void handleDownload(NetworkParams *params, NetworkCallable *result);
|
||||
|
||||
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);
|
||||
|
||||
@ -222,7 +213,8 @@ private:
|
||||
|
||||
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);
|
||||
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
#include <QStandardPaths>
|
||||
|
||||
SettingsHelper::SettingsHelper(QObject *parent) : QObject(parent) {
|
||||
|
||||
}
|
||||
|
||||
SettingsHelper::~SettingsHelper() = default;
|
||||
@ -13,6 +12,7 @@ void SettingsHelper::save(const QString &key, QVariant val) {
|
||||
m_settings->setValue(key, val);
|
||||
}
|
||||
|
||||
|
||||
QVariant SettingsHelper::get(const QString &key, QVariant def) {
|
||||
QVariant data = m_settings->value(key);
|
||||
if (!data.isNull() && data.isValid()) {
|
||||
@ -25,6 +25,7 @@ void SettingsHelper::init(char *argv[]) {
|
||||
QString applicationPath = QString::fromStdString(argv[0]);
|
||||
const QFileInfo fileInfo(applicationPath);
|
||||
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));
|
||||
}
|
||||
|
||||
@ -10,32 +10,35 @@
|
||||
#include "src/singleton.h"
|
||||
|
||||
class SettingsHelper : public QObject {
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
private:
|
||||
explicit SettingsHelper(QObject *parent = nullptr);
|
||||
|
||||
public:
|
||||
SINGLETON(SettingsHelper)
|
||||
|
||||
SINGLETON(SettingsHelper)
|
||||
~SettingsHelper() override;
|
||||
|
||||
void init(char *argv[]);
|
||||
|
||||
Q_INVOKABLE void saveDarkMode(int darkModel) { save("darkMode", darkModel); }
|
||||
|
||||
Q_INVOKABLE int getDarkMode() { return get("darkMode", QVariant(0)).toInt(); }
|
||||
|
||||
Q_INVOKABLE void saveUseSystemAppBar(bool useSystemAppBar) { save("useSystemAppBar", useSystemAppBar); }
|
||||
|
||||
Q_INVOKABLE bool getUseSystemAppBar() { return get("useSystemAppBar", QVariant(false)).toBool(); }
|
||||
|
||||
Q_INVOKABLE void saveLanguage(const QString &language) { save("language", language); }
|
||||
|
||||
Q_INVOKABLE QString getLanguage() { return get("language", QVariant("en_US")).toString(); }
|
||||
Q_INVOKABLE void saveDarkMode(int darkModel) {
|
||||
save("darkMode", darkModel);
|
||||
}
|
||||
Q_INVOKABLE int getDarkMode() {
|
||||
return get("darkMode", QVariant(0)).toInt();
|
||||
}
|
||||
Q_INVOKABLE void saveUseSystemAppBar(bool useSystemAppBar) {
|
||||
save("useSystemAppBar", useSystemAppBar);
|
||||
}
|
||||
Q_INVOKABLE bool getUseSystemAppBar() {
|
||||
return get("useSystemAppBar", QVariant(false)).toBool();
|
||||
}
|
||||
Q_INVOKABLE void saveLanguage(const QString &language) {
|
||||
save("language", language);
|
||||
}
|
||||
Q_INVOKABLE QString getLanguage() {
|
||||
return get("language", QVariant("en_US")).toString();
|
||||
}
|
||||
|
||||
private:
|
||||
void save(const QString &key, QVariant val);
|
||||
|
||||
QVariant get(const QString &key, QVariant def = {});
|
||||
|
||||
private:
|
||||
|
||||
@ -18,7 +18,8 @@ void TranslateHelper::init(QQmlEngine *engine) {
|
||||
_translator = new QTranslator(this);
|
||||
QGuiApplication::installTranslator(_translator);
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,20 +7,18 @@
|
||||
#include "src/stdafx.h"
|
||||
|
||||
class TranslateHelper : public QObject {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO(QString, current)
|
||||
Q_PROPERTY_READONLY_AUTO(QStringList, languages)
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO(QString, current)
|
||||
Q_PROPERTY_READONLY_AUTO(QStringList, languages)
|
||||
private:
|
||||
[[maybe_unused]] explicit TranslateHelper(QObject *parent = nullptr);
|
||||
|
||||
public:
|
||||
SINGLETON(TranslateHelper)
|
||||
|
||||
SINGLETON(TranslateHelper)
|
||||
~TranslateHelper() override;
|
||||
|
||||
void init(QQmlEngine *engine);
|
||||
|
||||
private:
|
||||
QQmlEngine *_engine = nullptr;
|
||||
QTranslator *_translator = nullptr;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,99 +1,107 @@
|
||||
#include <QGuiApplication>
|
||||
#include <QtQml/qqmlextensionplugin.h>
|
||||
|
||||
#include <QApplication>
|
||||
#include <QDir>
|
||||
#include <QLoggingCategory>
|
||||
#include <QNetworkProxy>
|
||||
#include <QProcess>
|
||||
#include <QQmlApplicationEngine>
|
||||
#include <QQmlContext>
|
||||
#include <QDir>
|
||||
#include <QQuickWindow>
|
||||
#include <QNetworkProxy>
|
||||
#include <QSslConfiguration>
|
||||
#include <QProcess>
|
||||
#include <QtQml/qqmlextensionplugin.h>
|
||||
#include <QLoggingCategory>
|
||||
#include "Version.h"
|
||||
|
||||
#include "AppInfo.h"
|
||||
#include "Version.h"
|
||||
#include "helper/Log.h"
|
||||
#include "src/component/CircularReveal.h"
|
||||
#include "src/component/FileWatcher.h"
|
||||
#include "src/component/FpsItem.h"
|
||||
#include "src/component/OpenGLItem.h"
|
||||
#include "src/helper/SettingsHelper.h"
|
||||
#include "src/helper/InitializrHelper.h"
|
||||
#include "src/helper/TranslateHelper.h"
|
||||
#include "src/helper/Network.h"
|
||||
#include "src/helper/SettingsHelper.h"
|
||||
#include "src/helper/TranslateHelper.h"
|
||||
|
||||
#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)
|
||||
#endif
|
||||
#include <FluentUI.h>
|
||||
# endif
|
||||
# include <FluentUI.h>
|
||||
#endif
|
||||
|
||||
#ifdef WIN32
|
||||
#include "app_dmp.h"
|
||||
# include "app_dmp.h"
|
||||
#endif
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
int main(int argc, char *argv[]) {
|
||||
const char *uri = "example";
|
||||
int major = 1;
|
||||
int minor = 0;
|
||||
#ifdef WIN32
|
||||
::SetUnhandledExceptionFilter(MyUnhandledExceptionFilter);
|
||||
qputenv("QT_QPA_PLATFORM","windows:darkmode=2");
|
||||
qputenv("QT_QPA_PLATFORM", "windows:darkmode=2");
|
||||
#endif
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
||||
qputenv("QT_QUICK_CONTROLS_STYLE","Basic");
|
||||
qputenv("QT_QUICK_CONTROLS_STYLE", "Basic");
|
||||
#else
|
||||
qputenv("QT_QUICK_CONTROLS_STYLE","Default");
|
||||
qputenv("QT_QUICK_CONTROLS_STYLE", "Default");
|
||||
#endif
|
||||
#ifdef Q_OS_LINUX
|
||||
//fix bug UOSv20 does not print logs
|
||||
qputenv("QT_LOGGING_RULES","");
|
||||
//fix bug UOSv20 v-sync does not work
|
||||
qputenv("QSG_RENDER_LOOP","basic");
|
||||
// fix bug UOSv20 does not print logs
|
||||
qputenv("QT_LOGGING_RULES", "");
|
||||
// fix bug UOSv20 v-sync does not work
|
||||
qputenv("QSG_RENDER_LOOP", "basic");
|
||||
#endif
|
||||
QGuiApplication::setOrganizationName("ZhuZiChu");
|
||||
QGuiApplication::setOrganizationDomain("https://zhuzichu520.github.io");
|
||||
QGuiApplication::setApplicationName("FluentUI");
|
||||
QGuiApplication::setApplicationDisplayName("FluentUI Example");
|
||||
QGuiApplication::setApplicationVersion(APPLICATION_VERSION);
|
||||
QGuiApplication::setQuitOnLastWindowClosed(false);
|
||||
QApplication::setOrganizationName("ZhuZiChu");
|
||||
QApplication::setOrganizationDomain("https://zhuzichu520.github.io");
|
||||
QApplication::setApplicationName("FluentUI");
|
||||
QApplication::setApplicationDisplayName("FluentUI Example");
|
||||
QApplication::setApplicationVersion(APPLICATION_VERSION);
|
||||
QApplication::setQuitOnLastWindowClosed(false);
|
||||
SettingsHelper::getInstance()->init(argv);
|
||||
Log::setup(argv,uri);
|
||||
Log::setup(argv, uri);
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
||||
QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL);
|
||||
#endif
|
||||
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
|
||||
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||
QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
|
||||
QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
|
||||
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
|
||||
# if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
|
||||
QApplication::setHighDpiScaleFactorRoundingPolicy(
|
||||
Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
|
||||
# endif
|
||||
#endif
|
||||
#endif
|
||||
QGuiApplication app(argc, argv);
|
||||
QApplication app(argc, argv);
|
||||
//@uri example
|
||||
qmlRegisterType<CircularReveal>(uri, major, minor, "CircularReveal");
|
||||
qmlRegisterType<FileWatcher>(uri, major, minor, "FileWatcher");
|
||||
qmlRegisterType<FpsItem>(uri, major, minor, "FpsItem");
|
||||
qmlRegisterType<NetworkCallable>(uri,major,minor,"NetworkCallable");
|
||||
qmlRegisterType<NetworkParams>(uri,major,minor,"NetworkParams");
|
||||
qmlRegisterType<OpenGLItem>(uri,major,minor,"OpenGLItem");
|
||||
qmlRegisterUncreatableMetaObject(NetworkType::staticMetaObject, uri, major, minor, "NetworkType", "Access to enums & flags only");
|
||||
qmlRegisterType<NetworkCallable>(uri, major, minor, "NetworkCallable");
|
||||
qmlRegisterType<NetworkParams>(uri, major, minor, "NetworkParams");
|
||||
qmlRegisterType<OpenGLItem>(uri, major, minor, "OpenGLItem");
|
||||
qmlRegisterUncreatableMetaObject(NetworkType::staticMetaObject, uri, major, minor,
|
||||
"NetworkType", "Access to enums & flags only");
|
||||
|
||||
QQmlApplicationEngine engine;
|
||||
TranslateHelper::getInstance()->init(&engine);
|
||||
engine.rootContext()->setContextProperty("AppInfo",AppInfo::getInstance());
|
||||
engine.rootContext()->setContextProperty("SettingsHelper",SettingsHelper::getInstance());
|
||||
engine.rootContext()->setContextProperty("InitializrHelper",InitializrHelper::getInstance());
|
||||
engine.rootContext()->setContextProperty("TranslateHelper",TranslateHelper::getInstance());
|
||||
engine.rootContext()->setContextProperty("Network",Network::getInstance());
|
||||
engine.rootContext()->setContextProperty("AppInfo", AppInfo::getInstance());
|
||||
engine.rootContext()->setContextProperty("SettingsHelper", SettingsHelper::getInstance());
|
||||
engine.rootContext()->setContextProperty("InitializrHelper", InitializrHelper::getInstance());
|
||||
engine.rootContext()->setContextProperty("TranslateHelper", TranslateHelper::getInstance());
|
||||
engine.rootContext()->setContextProperty("Network", Network::getInstance());
|
||||
#ifdef FLUENTUI_BUILD_STATIC_LIB
|
||||
FluentUI::getInstance()->registerTypes(&engine);
|
||||
#endif
|
||||
const QUrl url(QStringLiteral("qrc:/example/qml/App.qml"));
|
||||
QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
|
||||
&app, [url](QObject *obj, const QUrl &objUrl) {
|
||||
QObject::connect(
|
||||
&engine, &QQmlApplicationEngine::objectCreated, &app,
|
||||
[url](QObject *obj, const QUrl &objUrl) {
|
||||
if (!obj && url == objUrl)
|
||||
QCoreApplication::exit(-1);
|
||||
}, Qt::QueuedConnection);
|
||||
},
|
||||
Qt::QueuedConnection);
|
||||
engine.load(url);
|
||||
const int exec = QGuiApplication::exec();
|
||||
const int exec = QApplication::exec();
|
||||
if (exec == 931) {
|
||||
QProcess::startDetached(qApp->applicationFilePath(), qApp->arguments());
|
||||
}
|
||||
|
||||
@ -3,22 +3,23 @@
|
||||
/**
|
||||
* @brief The Singleton class
|
||||
*/
|
||||
template<typename T>
|
||||
template <typename T>
|
||||
class Singleton {
|
||||
public:
|
||||
static T *getInstance();
|
||||
};
|
||||
|
||||
template<typename T>
|
||||
template <typename T>
|
||||
T *Singleton<T>::getInstance() {
|
||||
static T *instance = new T();
|
||||
return instance;
|
||||
}
|
||||
|
||||
#define SINGLETON(Class) \
|
||||
private: \
|
||||
friend class Singleton<Class>; \
|
||||
public: \
|
||||
static Class* getInstance() { \
|
||||
return Singleton<Class>::getInstance(); \
|
||||
}
|
||||
#define SINGLETON(Class) \
|
||||
private: \
|
||||
friend class Singleton<Class>; \
|
||||
\
|
||||
public: \
|
||||
static Class *getInstance() { \
|
||||
return Singleton<Class>::getInstance(); \
|
||||
}
|
||||
|
||||
@ -1,50 +1,47 @@
|
||||
#pragma once
|
||||
|
||||
#define Q_PROPERTY_AUTO_P(TYPE, M) \
|
||||
Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed) \
|
||||
public: \
|
||||
Q_SIGNAL void M##Changed(); \
|
||||
void M(TYPE in_##M) \
|
||||
{ \
|
||||
_##M = in_##M; \
|
||||
Q_EMIT M##Changed(); \
|
||||
} \
|
||||
TYPE M() \
|
||||
{ \
|
||||
return _##M; \
|
||||
} \
|
||||
private: \
|
||||
#define Q_PROPERTY_AUTO_P(TYPE, M) \
|
||||
Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed) \
|
||||
public: \
|
||||
Q_SIGNAL void M##Changed(); \
|
||||
void M(TYPE in_##M) { \
|
||||
_##M = in_##M; \
|
||||
Q_EMIT M##Changed(); \
|
||||
} \
|
||||
TYPE M() { \
|
||||
return _##M; \
|
||||
} \
|
||||
\
|
||||
private: \
|
||||
TYPE _##M;
|
||||
|
||||
#define Q_PROPERTY_AUTO(TYPE, M) \
|
||||
Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed) \
|
||||
public: \
|
||||
Q_SIGNAL void M##Changed(); \
|
||||
void M(const TYPE& in_##M) \
|
||||
{ \
|
||||
_##M = in_##M; \
|
||||
Q_EMIT M##Changed(); \
|
||||
} \
|
||||
TYPE M() \
|
||||
{ \
|
||||
return _##M; \
|
||||
} \
|
||||
private: \
|
||||
#define Q_PROPERTY_AUTO(TYPE, M) \
|
||||
Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed) \
|
||||
public: \
|
||||
Q_SIGNAL void M##Changed(); \
|
||||
void M(const TYPE &in_##M) { \
|
||||
_##M = in_##M; \
|
||||
Q_EMIT M##Changed(); \
|
||||
} \
|
||||
TYPE M() { \
|
||||
return _##M; \
|
||||
} \
|
||||
\
|
||||
private: \
|
||||
TYPE _##M;
|
||||
|
||||
|
||||
#define Q_PROPERTY_READONLY_AUTO(TYPE, M) \
|
||||
Q_PROPERTY(TYPE M READ M NOTIFY M##Changed FINAL) \
|
||||
public: \
|
||||
Q_SIGNAL void M##Changed(); \
|
||||
void M(const TYPE& in_##M) \
|
||||
{ \
|
||||
_##M = in_##M; \
|
||||
Q_EMIT M##Changed(); \
|
||||
} \
|
||||
TYPE M() \
|
||||
{ \
|
||||
return _##M; \
|
||||
} \
|
||||
private: \
|
||||
#define Q_PROPERTY_READONLY_AUTO(TYPE, M) \
|
||||
Q_PROPERTY(TYPE M READ M NOTIFY M##Changed FINAL) \
|
||||
public: \
|
||||
Q_SIGNAL void M##Changed(); \
|
||||
void M(const TYPE &in_##M) { \
|
||||
_##M = in_##M; \
|
||||
Q_EMIT M##Changed(); \
|
||||
} \
|
||||
TYPE M() { \
|
||||
return _##M; \
|
||||
} \
|
||||
\
|
||||
private: \
|
||||
TYPE _##M;
|
||||
|
||||
@ -20,7 +20,7 @@ else ()
|
||||
endif ()
|
||||
|
||||
#设置版本号
|
||||
add_definitions(-DFLUENTUI_VERSION=1,7,5,0)
|
||||
add_definitions(-DFLUENTUI_VERSION=1,7,7,0)
|
||||
|
||||
if (FLUENTUI_BUILD_STATIC_LIB)
|
||||
add_definitions(-DFLUENTUI_BUILD_STATIC_LIB)
|
||||
@ -30,8 +30,8 @@ endif ()
|
||||
option(FLUENTUI_BUILD_STATIC_LIB "Build static library." OFF)
|
||||
|
||||
#导入Qt相关依赖包
|
||||
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick Qml)
|
||||
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick)
|
||||
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick Qml Widgets PrintSupport)
|
||||
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick Widgets PrintSupport)
|
||||
|
||||
set(QT_SDK_DIR "${Qt${QT_VERSION_MAJOR}_DIR}/../../..")
|
||||
cmake_path(SET QT_SDK_DIR NORMALIZE ${QT_SDK_DIR})
|
||||
@ -184,6 +184,8 @@ target_compile_definitions(${PROJECT_NAME}
|
||||
#去掉mingw生成的动态库libxxx前缀lib，不去掉前缀会导致 module "FluentUI" plugin "fluentuiplugin" not found
|
||||
if (MINGW)
|
||||
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
|
||||
#解决编译器报 too many sections的问题
|
||||
target_compile_options(${PROJECT_NAME} PRIVATE -Wa,-mbig-obj)
|
||||
endif ()
|
||||
|
||||
#MSVC Debug 添加后缀d，与Qt插件风格保持一致
|
||||
@ -196,6 +198,8 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
|
||||
Qt${QT_VERSION_MAJOR}::Core
|
||||
Qt${QT_VERSION_MAJOR}::Quick
|
||||
Qt${QT_VERSION_MAJOR}::Qml
|
||||
Qt${QT_VERSION_MAJOR}::Widgets
|
||||
Qt${QT_VERSION_MAJOR}::PrintSupport
|
||||
)
|
||||
if(APPLE)
|
||||
find_library(CARBON_LIBRARY Carbon)
|
||||
@ -216,6 +220,10 @@ elseif(UNIX)
|
||||
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
|
||||
|
||||
60
src/Def.h
60
src/Def.h
@ -59,11 +59,7 @@ namespace FluPageType {
|
||||
|
||||
namespace FluWindowType {
|
||||
Q_NAMESPACE
|
||||
enum LaunchMode {
|
||||
Standard = 0x0000,
|
||||
SingleTask = 0x0001,
|
||||
SingleInstance = 0x0002
|
||||
};
|
||||
enum LaunchMode { Standard = 0x0000, SingleTask = 0x0001, SingleInstance = 0x0002 };
|
||||
|
||||
Q_ENUM_NS(LaunchMode)
|
||||
|
||||
@ -72,11 +68,7 @@ namespace FluWindowType {
|
||||
|
||||
namespace FluTreeViewType {
|
||||
Q_NAMESPACE
|
||||
enum SelectionMode {
|
||||
None = 0x0000,
|
||||
Single = 0x0001,
|
||||
Multiple = 0x0002
|
||||
};
|
||||
enum SelectionMode { None = 0x0000, Single = 0x0001, Multiple = 0x0002 };
|
||||
|
||||
Q_ENUM_NS(SelectionMode)
|
||||
|
||||
@ -85,12 +77,7 @@ namespace FluTreeViewType {
|
||||
|
||||
namespace FluStatusLayoutType {
|
||||
Q_NAMESPACE
|
||||
enum StatusMode {
|
||||
Loading = 0x0000,
|
||||
Empty = 0x0001,
|
||||
Error = 0x0002,
|
||||
Success = 0x0004
|
||||
};
|
||||
enum StatusMode { Loading = 0x0000, Empty = 0x0001, Error = 0x0002, Success = 0x0004 };
|
||||
|
||||
Q_ENUM_NS(StatusMode)
|
||||
|
||||
@ -99,11 +86,7 @@ namespace FluStatusLayoutType {
|
||||
|
||||
namespace FluContentDialogType {
|
||||
Q_NAMESPACE
|
||||
enum ButtonFlag {
|
||||
NeutralButton = 0x0001,
|
||||
NegativeButton = 0x0002,
|
||||
PositiveButton = 0x0004
|
||||
};
|
||||
enum ButtonFlag { NeutralButton = 0x0001, NegativeButton = 0x0002, PositiveButton = 0x0004 };
|
||||
|
||||
Q_ENUM_NS(ButtonFlag)
|
||||
|
||||
@ -112,10 +95,7 @@ namespace FluContentDialogType {
|
||||
|
||||
namespace FluTimePickerType {
|
||||
Q_NAMESPACE
|
||||
enum HourFormat {
|
||||
H = 0x0000,
|
||||
HH = 0x0001
|
||||
};
|
||||
enum HourFormat { H = 0x0000, HH = 0x0001 };
|
||||
|
||||
Q_ENUM_NS(HourFormat)
|
||||
|
||||
@ -124,11 +104,7 @@ namespace FluTimePickerType {
|
||||
|
||||
namespace FluCalendarViewType {
|
||||
Q_NAMESPACE
|
||||
enum DisplayMode {
|
||||
Month = 0x0000,
|
||||
Year = 0x0001,
|
||||
Decade = 0x0002
|
||||
};
|
||||
enum DisplayMode { Month = 0x0000, Year = 0x0001, Decade = 0x0002 };
|
||||
|
||||
Q_ENUM_NS(DisplayMode)
|
||||
|
||||
@ -137,19 +113,11 @@ namespace FluCalendarViewType {
|
||||
|
||||
namespace FluTabViewType {
|
||||
Q_NAMESPACE
|
||||
enum TabWidthBehavior {
|
||||
Equal = 0x0000,
|
||||
SizeToContent = 0x0001,
|
||||
Compact = 0x0002
|
||||
};
|
||||
enum TabWidthBehavior { Equal = 0x0000, SizeToContent = 0x0001, Compact = 0x0002 };
|
||||
|
||||
Q_ENUM_NS(TabWidthBehavior)
|
||||
|
||||
enum CloseButtonVisibility {
|
||||
Never = 0x0000,
|
||||
Always = 0x0001,
|
||||
OnHover = 0x0002
|
||||
};
|
||||
enum CloseButtonVisibility { Never = 0x0000, Always = 0x0001, OnHover = 0x0002 };
|
||||
|
||||
Q_ENUM_NS(CloseButtonVisibility)
|
||||
|
||||
@ -158,19 +126,11 @@ namespace FluTabViewType {
|
||||
|
||||
namespace FluNavigationViewType {
|
||||
Q_NAMESPACE
|
||||
enum DisplayMode {
|
||||
Open = 0x0000,
|
||||
Compact = 0x0001,
|
||||
Minimal = 0x0002,
|
||||
Auto = 0x0004
|
||||
};
|
||||
enum DisplayMode { Open = 0x0000, Compact = 0x0001, Minimal = 0x0002, Auto = 0x0004 };
|
||||
|
||||
Q_ENUM_NS(DisplayMode)
|
||||
|
||||
enum PageMode {
|
||||
Stack = 0x0000,
|
||||
NoStack = 0x0001
|
||||
};
|
||||
enum PageMode { Stack = 0x0000, NoStack = 0x0001 };
|
||||
|
||||
Q_ENUM_NS(PageMode)
|
||||
|
||||
|
||||
@ -9,15 +9,15 @@
|
||||
* @brief The FluAccentColor class
|
||||
*/
|
||||
class FluAccentColor : public QObject {
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
|
||||
Q_PROPERTY_AUTO(QColor, darkest)
|
||||
Q_PROPERTY_AUTO(QColor, darker)
|
||||
Q_PROPERTY_AUTO(QColor, dark)
|
||||
Q_PROPERTY_AUTO(QColor, normal)
|
||||
Q_PROPERTY_AUTO(QColor, light)
|
||||
Q_PROPERTY_AUTO(QColor, lighter)
|
||||
Q_PROPERTY_AUTO(QColor, lightest)
|
||||
Q_PROPERTY_AUTO(QColor, darkest)
|
||||
Q_PROPERTY_AUTO(QColor, darker)
|
||||
Q_PROPERTY_AUTO(QColor, dark)
|
||||
Q_PROPERTY_AUTO(QColor, normal)
|
||||
Q_PROPERTY_AUTO(QColor, light)
|
||||
Q_PROPERTY_AUTO(QColor, lighter)
|
||||
Q_PROPERTY_AUTO(QColor, lightest)
|
||||
QML_NAMED_ELEMENT(FluAccentColor)
|
||||
public:
|
||||
explicit FluAccentColor(QObject *parent = nullptr);
|
||||
|
||||
@ -23,7 +23,7 @@ void FluApp::init(QObject *launcher, QLocale locale) {
|
||||
_translator = new QTranslator(this);
|
||||
QGuiApplication::installTranslator(_translator);
|
||||
const QStringList uiLanguages = _locale.uiLanguages();
|
||||
for (const QString &name: uiLanguages) {
|
||||
for (const QString &name : uiLanguages) {
|
||||
const QString baseName = "fluentui_" + QLocale(name).name();
|
||||
if (_translator->load(":/qt/qml/FluentUI/i18n/" + baseName)) {
|
||||
_engine->retranslate();
|
||||
@ -34,7 +34,8 @@ void FluApp::init(QObject *launcher, QLocale locale) {
|
||||
|
||||
[[maybe_unused]] QJsonArray FluApp::iconData(const QString &keyword) {
|
||||
QJsonArray arr;
|
||||
QMetaEnum enumType = FluentIcons::staticMetaObject.enumerator(FluentIcons::staticMetaObject.indexOfEnumerator("Type"));
|
||||
QMetaEnum enumType = FluentIcons::staticMetaObject.enumerator(
|
||||
FluentIcons::staticMetaObject.indexOfEnumerator("Type"));
|
||||
for (int i = 0; i <= enumType.keyCount() - 1; ++i) {
|
||||
QString name = enumType.key(i);
|
||||
int icon = enumType.value(i);
|
||||
|
||||
17
src/FluApp.h
17
src/FluApp.h
@ -16,12 +16,11 @@
|
||||
* @brief The FluApp class
|
||||
*/
|
||||
class FluApp : public QObject {
|
||||
Q_OBJECT
|
||||
|
||||
Q_PROPERTY_AUTO(bool, useSystemAppBar)
|
||||
Q_PROPERTY_AUTO(QString, windowIcon)
|
||||
Q_PROPERTY_AUTO(QLocale, locale)
|
||||
Q_PROPERTY_AUTO_P(QObject*,launcher)
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO(bool, useSystemAppBar)
|
||||
Q_PROPERTY_AUTO(QString, windowIcon)
|
||||
Q_PROPERTY_AUTO(QLocale, locale)
|
||||
Q_PROPERTY_AUTO_P(QObject *, launcher)
|
||||
QML_NAMED_ELEMENT(FluApp)
|
||||
QML_SINGLETON
|
||||
|
||||
@ -31,9 +30,11 @@ private:
|
||||
~FluApp() override;
|
||||
|
||||
public:
|
||||
SINGLETON(FluApp)
|
||||
SINGLETON(FluApp)
|
||||
|
||||
static FluApp *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
|
||||
static FluApp *create(QQmlEngine *, QJSEngine *) {
|
||||
return getInstance();
|
||||
}
|
||||
|
||||
Q_INVOKABLE void init(QObject *launcher, QLocale locale = QLocale::system());
|
||||
|
||||
|
||||
@ -40,7 +40,8 @@ void FluCaptcha::paint(QPainter *painter) {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
pen = QPen(QColor(generaNumber(255), generaNumber(255), generaNumber(255)));
|
||||
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();
|
||||
}
|
||||
|
||||
@ -9,10 +9,10 @@
|
||||
* @brief The FluCaptcha class
|
||||
*/
|
||||
class FluCaptcha : public QQuickPaintedItem {
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
|
||||
Q_PROPERTY_AUTO(QFont, font);
|
||||
Q_PROPERTY_AUTO(bool, ignoreCase);
|
||||
Q_PROPERTY_AUTO(QFont, font)
|
||||
Q_PROPERTY_AUTO(bool, ignoreCase)
|
||||
QML_NAMED_ELEMENT(FluCaptcha)
|
||||
|
||||
public:
|
||||
|
||||
@ -11,41 +11,41 @@
|
||||
* @brief The FluColors class
|
||||
*/
|
||||
class FluColors : public QObject {
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
|
||||
Q_PROPERTY_AUTO(QColor, Transparent);
|
||||
Q_PROPERTY_AUTO(QColor, Black);
|
||||
Q_PROPERTY_AUTO(QColor, White);
|
||||
Q_PROPERTY_AUTO(QColor, Grey10);
|
||||
Q_PROPERTY_AUTO(QColor, Grey20);
|
||||
Q_PROPERTY_AUTO(QColor, Grey30);
|
||||
Q_PROPERTY_AUTO(QColor, Grey40);
|
||||
Q_PROPERTY_AUTO(QColor, Grey50);
|
||||
Q_PROPERTY_AUTO(QColor, Grey60);
|
||||
Q_PROPERTY_AUTO(QColor, Grey70);
|
||||
Q_PROPERTY_AUTO(QColor, Grey80);
|
||||
Q_PROPERTY_AUTO(QColor, Grey90);
|
||||
Q_PROPERTY_AUTO(QColor, Grey100);
|
||||
Q_PROPERTY_AUTO(QColor, Grey110);
|
||||
Q_PROPERTY_AUTO(QColor, Grey120);
|
||||
Q_PROPERTY_AUTO(QColor, Grey130);
|
||||
Q_PROPERTY_AUTO(QColor, Grey140);
|
||||
Q_PROPERTY_AUTO(QColor, Grey150);
|
||||
Q_PROPERTY_AUTO(QColor, Grey160);
|
||||
Q_PROPERTY_AUTO(QColor, Grey170);
|
||||
Q_PROPERTY_AUTO(QColor, Grey180);
|
||||
Q_PROPERTY_AUTO(QColor, Grey190);
|
||||
Q_PROPERTY_AUTO(QColor, Grey200);
|
||||
Q_PROPERTY_AUTO(QColor, Grey210);
|
||||
Q_PROPERTY_AUTO(QColor, Grey220);
|
||||
Q_PROPERTY_AUTO_P(FluAccentColor*, Yellow);
|
||||
Q_PROPERTY_AUTO_P(FluAccentColor*, Orange);
|
||||
Q_PROPERTY_AUTO_P(FluAccentColor*, Red);
|
||||
Q_PROPERTY_AUTO_P(FluAccentColor*, Magenta);
|
||||
Q_PROPERTY_AUTO_P(FluAccentColor*, Purple);
|
||||
Q_PROPERTY_AUTO_P(FluAccentColor*, Blue);
|
||||
Q_PROPERTY_AUTO_P(FluAccentColor*, Teal);
|
||||
Q_PROPERTY_AUTO_P(FluAccentColor*, Green);
|
||||
Q_PROPERTY_AUTO(QColor, Transparent)
|
||||
Q_PROPERTY_AUTO(QColor, Black)
|
||||
Q_PROPERTY_AUTO(QColor, White)
|
||||
Q_PROPERTY_AUTO(QColor, Grey10)
|
||||
Q_PROPERTY_AUTO(QColor, Grey20)
|
||||
Q_PROPERTY_AUTO(QColor, Grey30)
|
||||
Q_PROPERTY_AUTO(QColor, Grey40)
|
||||
Q_PROPERTY_AUTO(QColor, Grey50)
|
||||
Q_PROPERTY_AUTO(QColor, Grey60)
|
||||
Q_PROPERTY_AUTO(QColor, Grey70)
|
||||
Q_PROPERTY_AUTO(QColor, Grey80)
|
||||
Q_PROPERTY_AUTO(QColor, Grey90)
|
||||
Q_PROPERTY_AUTO(QColor, Grey100)
|
||||
Q_PROPERTY_AUTO(QColor, Grey110)
|
||||
Q_PROPERTY_AUTO(QColor, Grey120)
|
||||
Q_PROPERTY_AUTO(QColor, Grey130)
|
||||
Q_PROPERTY_AUTO(QColor, Grey140)
|
||||
Q_PROPERTY_AUTO(QColor, Grey150)
|
||||
Q_PROPERTY_AUTO(QColor, Grey160)
|
||||
Q_PROPERTY_AUTO(QColor, Grey170)
|
||||
Q_PROPERTY_AUTO(QColor, Grey180)
|
||||
Q_PROPERTY_AUTO(QColor, Grey190)
|
||||
Q_PROPERTY_AUTO(QColor, Grey200)
|
||||
Q_PROPERTY_AUTO(QColor, Grey210)
|
||||
Q_PROPERTY_AUTO(QColor, Grey220)
|
||||
Q_PROPERTY_AUTO_P(FluAccentColor *, Yellow)
|
||||
Q_PROPERTY_AUTO_P(FluAccentColor *, Orange)
|
||||
Q_PROPERTY_AUTO_P(FluAccentColor *, Red)
|
||||
Q_PROPERTY_AUTO_P(FluAccentColor *, Magenta)
|
||||
Q_PROPERTY_AUTO_P(FluAccentColor *, Purple)
|
||||
Q_PROPERTY_AUTO_P(FluAccentColor *, Blue)
|
||||
Q_PROPERTY_AUTO_P(FluAccentColor *, Teal)
|
||||
Q_PROPERTY_AUTO_P(FluAccentColor *, Green)
|
||||
QML_NAMED_ELEMENT(FluColors)
|
||||
QML_SINGLETON
|
||||
|
||||
@ -53,9 +53,11 @@ private:
|
||||
explicit FluColors(QObject *parent = nullptr);
|
||||
|
||||
public:
|
||||
SINGLETON(FluColors)
|
||||
SINGLETON(FluColors)
|
||||
|
||||
[[maybe_unused]] Q_INVOKABLE FluAccentColor *createAccentColor(const QColor &primaryColor);
|
||||
|
||||
static FluColors *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
|
||||
static FluColors *create(QQmlEngine *, QJSEngine *) {
|
||||
return getInstance();
|
||||
}
|
||||
};
|
||||
|
||||
@ -86,7 +86,7 @@ void FluFrameless::componentComplete() {
|
||||
int w = window()->width();
|
||||
int h = window()->height();
|
||||
_current = window()->winId();
|
||||
window()->setFlags((window()->flags()) | Qt::CustomizeWindowHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::FramelessWindowHint);
|
||||
window()->setFlags((window()->flags()) | Qt::CustomizeWindowHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint);
|
||||
if (!_fixSize) {
|
||||
window()->setFlag(Qt::WindowMaximizeButtonHint);
|
||||
}
|
||||
@ -102,17 +102,20 @@ void FluFrameless::componentComplete() {
|
||||
setHitTestVisible(_closeButton);
|
||||
}
|
||||
#ifdef Q_OS_WIN
|
||||
#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
|
||||
HWND hwnd = reinterpret_cast<HWND>(window()->winId());
|
||||
DWORD style = ::GetWindowLongPtr(hwnd, GWL_STYLE);
|
||||
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) {
|
||||
connect(QGuiApplication::screens().at(i), &QScreen::logicalDotsPerInchChanged, this, [=] {
|
||||
SetWindowPos(hwnd, nullptr, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_FRAMECHANGED);
|
||||
});
|
||||
}
|
||||
} 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);
|
||||
connect(window(), &QQuickWindow::screenChanged, this, [hwnd] {
|
||||
@ -165,20 +168,12 @@ void FluFrameless::componentComplete() {
|
||||
}
|
||||
return false;
|
||||
} else if (uMsg == WM_NCCALCSIZE && wParam == TRUE) {
|
||||
const auto clientRect = &(reinterpret_cast<LPNCCALCSIZE_PARAMS>(lParam))->rgrc[0];
|
||||
const LONG originalTop = clientRect->top;
|
||||
const LONG originalLeft = clientRect->left;
|
||||
const LONG originalBottom = clientRect->bottom;
|
||||
const LONG originalRight = clientRect->right;
|
||||
const LRESULT hitTestResult = ::DefWindowProcW(hwnd, WM_NCCALCSIZE, wParam, lParam);
|
||||
if ((hitTestResult != HTERROR) && (hitTestResult != HTNOWHERE)) {
|
||||
*result = static_cast<QT_NATIVE_EVENT_RESULT_TYPE>(hitTestResult);
|
||||
return true;
|
||||
bool isMaximum = ::IsZoomed(hwnd);
|
||||
if (isMaximum) {
|
||||
window()->setProperty("__margins",7);
|
||||
}else{
|
||||
window()->setProperty("__margins",0);
|
||||
}
|
||||
clientRect->top = originalTop;
|
||||
clientRect->bottom = originalBottom;
|
||||
clientRect->left = originalLeft;
|
||||
clientRect->right = originalRight;
|
||||
_setMaximizeHovered(false);
|
||||
*result = WVR_REDRAW;
|
||||
return true;
|
||||
@ -237,21 +232,10 @@ void FluFrameless::componentComplete() {
|
||||
return true;
|
||||
} else if (uMsg == WM_NCPAINT) {
|
||||
*result = FALSE;
|
||||
return true;
|
||||
return false;
|
||||
} else if (uMsg == WM_NCACTIVATE) {
|
||||
*result = TRUE;
|
||||
return true;
|
||||
} else if (uMsg == WM_GETMINMAXINFO) {
|
||||
auto *minmaxInfo = reinterpret_cast<MINMAXINFO *>(lParam);
|
||||
auto pixelRatio = window()->devicePixelRatio();
|
||||
auto geometry = window()->screen()->availableGeometry();
|
||||
RECT rect;
|
||||
SystemParametersInfo(SPI_GETWORKAREA, 0, &rect, 0);
|
||||
minmaxInfo->ptMaxPosition.x = rect.left;
|
||||
minmaxInfo->ptMaxPosition.y = rect.top;
|
||||
minmaxInfo->ptMaxSize.x = qRound(geometry.width() * pixelRatio);
|
||||
minmaxInfo->ptMaxSize.y = qRound(geometry.height() * pixelRatio);
|
||||
return false;
|
||||
} else if (_isWindows11OrGreater && (uMsg == WM_NCLBUTTONDBLCLK || uMsg == WM_NCLBUTTONDOWN)) {
|
||||
if (_hitMaximizeButton()) {
|
||||
QMouseEvent event = QMouseEvent(QEvent::MouseButtonPress, QPoint(), QPoint(), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
|
||||
|
||||
@ -14,16 +14,15 @@ using QT_NATIVE_EVENT_RESULT_TYPE = long;
|
||||
using QT_ENTER_EVENT_TYPE = QEvent;
|
||||
#endif
|
||||
|
||||
|
||||
class FluFrameless : public QQuickItem, QAbstractNativeEventFilter {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO_P(QQuickItem*, appbar)
|
||||
Q_PROPERTY_AUTO_P(QQuickItem*, maximizeButton)
|
||||
Q_PROPERTY_AUTO_P(QQuickItem*, minimizedButton)
|
||||
Q_PROPERTY_AUTO_P(QQuickItem*, closeButton)
|
||||
Q_PROPERTY_AUTO(bool, topmost)
|
||||
Q_PROPERTY_AUTO(bool, disabled)
|
||||
Q_PROPERTY_AUTO(bool, fixSize)
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO_P(QQuickItem *, appbar)
|
||||
Q_PROPERTY_AUTO_P(QQuickItem *, maximizeButton)
|
||||
Q_PROPERTY_AUTO_P(QQuickItem *, minimizedButton)
|
||||
Q_PROPERTY_AUTO_P(QQuickItem *, closeButton)
|
||||
Q_PROPERTY_AUTO(bool, topmost)
|
||||
Q_PROPERTY_AUTO(bool, disabled)
|
||||
Q_PROPERTY_AUTO(bool, fixSize)
|
||||
QML_NAMED_ELEMENT(FluFrameless)
|
||||
public:
|
||||
explicit FluFrameless(QQuickItem *parent = nullptr);
|
||||
@ -32,7 +31,8 @@ public:
|
||||
|
||||
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();
|
||||
|
||||
|
||||
@ -1,31 +1,26 @@
|
||||
#include "FluHotkey.h"
|
||||
|
||||
|
||||
#include "QGuiApplication"
|
||||
|
||||
FluHotkey::FluHotkey(QObject *parent)
|
||||
: QObject{parent}
|
||||
{
|
||||
|
||||
FluHotkey::FluHotkey(QObject *parent) : QObject{parent} {
|
||||
_sequence = "";
|
||||
_isRegistered = false;
|
||||
connect(this,&FluHotkey::sequenceChanged,this,[=]{
|
||||
if(_hotkey){
|
||||
delete _hotkey;
|
||||
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());
|
||||
});
|
||||
QObject::connect(_hotkey, &QHotkey::activated, qApp, [=]() { Q_EMIT this->activated(); });
|
||||
QObject::connect(_hotkey, &QHotkey::registeredChanged, qApp,
|
||||
[=]() { this->isRegistered(_hotkey->isRegistered()); });
|
||||
});
|
||||
}
|
||||
|
||||
FluHotkey::~FluHotkey(){
|
||||
if(_hotkey){
|
||||
FluHotkey::~FluHotkey() {
|
||||
if (_hotkey) {
|
||||
delete _hotkey;
|
||||
_hotkey = nullptr;
|
||||
}
|
||||
|
||||
@ -6,19 +6,20 @@
|
||||
#include "qhotkey/qhotkey.h"
|
||||
#include "stdafx.h"
|
||||
|
||||
class FluHotkey : public QObject
|
||||
{
|
||||
class FluHotkey : public QObject {
|
||||
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO(QString,sequence)
|
||||
Q_PROPERTY_AUTO(QString,name)
|
||||
Q_PROPERTY_READONLY_AUTO(bool,isRegistered)
|
||||
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;
|
||||
QHotkey *_hotkey = nullptr;
|
||||
};
|
||||
|
||||
#endif // FLUHOTKEY_H
|
||||
|
||||
@ -9,15 +9,15 @@
|
||||
* @brief The FluQrCodeItem class
|
||||
*/
|
||||
class FluQrCodeItem : public QQuickPaintedItem {
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
|
||||
Q_PROPERTY_AUTO(QString, text)
|
||||
Q_PROPERTY_AUTO(QColor, color)
|
||||
Q_PROPERTY_AUTO(QColor, bgColor)
|
||||
Q_PROPERTY_AUTO(int, size);
|
||||
Q_PROPERTY_AUTO(QString, text)
|
||||
Q_PROPERTY_AUTO(QColor, color)
|
||||
Q_PROPERTY_AUTO(QColor, bgColor)
|
||||
Q_PROPERTY_AUTO(int, size)
|
||||
QML_NAMED_ELEMENT(FluQrCodeItem)
|
||||
public:
|
||||
explicit FluQrCodeItem(QQuickItem *parent = nullptr);
|
||||
|
||||
void paint(QPainter *painter) override;
|
||||
};
|
||||
};
|
||||
|
||||
@ -8,6 +8,7 @@ FluRectangle::FluRectangle(QQuickItem *parent) : QQuickPaintedItem(parent) {
|
||||
connect(this, &FluRectangle::radiusChanged, this, [=] { update(); });
|
||||
}
|
||||
|
||||
|
||||
void FluRectangle::paint(QPainter *painter) {
|
||||
painter->save();
|
||||
painter->setRenderHint(QPainter::Antialiasing);
|
||||
@ -15,13 +16,19 @@ void FluRectangle::paint(QPainter *painter) {
|
||||
QRectF rect = boundingRect();
|
||||
path.moveTo(rect.bottomRight() - QPointF(0, _radius[2]));
|
||||
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.arcTo(QRectF(QPointF(rect.topLeft()), QSize(_radius[0] * 2, _radius[0] * 2)), 90, 90);
|
||||
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.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->restore();
|
||||
}
|
||||
|
||||
@ -9,12 +9,12 @@
|
||||
* @brief The FluRectangle class
|
||||
*/
|
||||
class FluRectangle : public QQuickPaintedItem {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO(QColor, color)
|
||||
Q_PROPERTY_AUTO(QList<int>, radius)
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO(QColor, color)
|
||||
Q_PROPERTY_AUTO(QList<int>, radius)
|
||||
QML_NAMED_ELEMENT(FluRectangle)
|
||||
public:
|
||||
explicit FluRectangle(QQuickItem *parent = nullptr);
|
||||
|
||||
void paint(QPainter *painter) override;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
#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();
|
||||
}
|
||||
@ -26,8 +26,8 @@ QVariant FluTableModel::data(const QModelIndex &index, int role) const {
|
||||
|
||||
QHash<int, QByteArray> FluTableModel::roleNames() const {
|
||||
return {
|
||||
{FluTableModel::RowModel, "rowModel"},
|
||||
{FluTableModel::ColumnModel, "columnModel"}
|
||||
{FluTableModel::RowModel, "rowModel" },
|
||||
{FluTableModel::ColumnModel, "columnModel"}
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -7,16 +7,14 @@
|
||||
#include "stdafx.h"
|
||||
|
||||
class FluTableModel : public QAbstractTableModel {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO(QList<QVariantMap>, columnSource)
|
||||
Q_PROPERTY_AUTO(QList<QVariantMap>, rows)
|
||||
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
|
||||
};
|
||||
enum TableModelRoles { RowModel = 0x0101, ColumnModel = 0x0102 };
|
||||
|
||||
|
||||
explicit FluTableModel(QObject *parent = nullptr);
|
||||
|
||||
@ -24,7 +22,8 @@ public:
|
||||
|
||||
[[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;
|
||||
|
||||
@ -39,7 +38,6 @@ public:
|
||||
Q_INVOKABLE void removeRow(int rowIndex, int rows = 1);
|
||||
|
||||
Q_INVOKABLE void appendRow(QVariant row);
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -2,13 +2,14 @@
|
||||
|
||||
#include <QJSValueList>
|
||||
|
||||
FluTableSortProxyModel::FluTableSortProxyModel(QSortFilterProxyModel *parent) : QSortFilterProxyModel{parent} {
|
||||
connect(this, &FluTableSortProxyModel::modelChanged, this, [=] {
|
||||
setSourceModel(this->model().value<QAbstractTableModel *>());
|
||||
});
|
||||
FluTableSortProxyModel::FluTableSortProxyModel(QSortFilterProxyModel *parent)
|
||||
: QSortFilterProxyModel{parent} {
|
||||
connect(this, &FluTableSortProxyModel::modelChanged, this,
|
||||
[=] { 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;
|
||||
if (filter.isUndefined()) {
|
||||
return true;
|
||||
@ -18,11 +19,13 @@ bool FluTableSortProxyModel::filterAcceptsRow(int source_row, const QModelIndex
|
||||
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;
|
||||
}
|
||||
|
||||
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;
|
||||
if (comparator.isUndefined()) {
|
||||
return true;
|
||||
@ -58,18 +61,25 @@ bool FluTableSortProxyModel::lessThan(const QModelIndex &source_left, const QMod
|
||||
|
||||
[[maybe_unused]] QVariant FluTableSortProxyModel::getRow(int rowIndex) {
|
||||
QVariant result;
|
||||
QMetaObject::invokeMethod(_model.value<QAbstractTableModel *>(), "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;
|
||||
}
|
||||
|
||||
[[maybe_unused]] void FluTableSortProxyModel::setRow(int rowIndex, const QVariant &val) {
|
||||
QMetaObject::invokeMethod(_model.value<QAbstractTableModel *>(), "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));
|
||||
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) {
|
||||
QMetaObject::invokeMethod(_model.value<QAbstractTableModel *>(), "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"
|
||||
|
||||
class FluTableSortProxyModel : public QSortFilterProxyModel {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO_P(QVariant, model)
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO_P(QVariant, model)
|
||||
QML_NAMED_ELEMENT(FluTableSortProxyModel)
|
||||
public:
|
||||
explicit FluTableSortProxyModel(QSortFilterProxyModel *parent = nullptr);
|
||||
|
||||
@ -10,16 +10,17 @@
|
||||
* @brief The FluTextStyle class
|
||||
*/
|
||||
class FluTextStyle : public QObject {
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
Q_PROPERTY_AUTO(QString, family)
|
||||
Q_PROPERTY_AUTO(QFont, Caption);
|
||||
Q_PROPERTY_AUTO(QFont, Body);
|
||||
Q_PROPERTY_AUTO(QFont, BodyStrong);
|
||||
Q_PROPERTY_AUTO(QFont, Subtitle);
|
||||
Q_PROPERTY_AUTO(QFont, Title);
|
||||
Q_PROPERTY_AUTO(QFont, TitleLarge);
|
||||
Q_PROPERTY_AUTO(QFont, Display);
|
||||
Q_PROPERTY_AUTO(QString, family)
|
||||
Q_PROPERTY_AUTO(QFont, Caption)
|
||||
Q_PROPERTY_AUTO(QFont, Body)
|
||||
Q_PROPERTY_AUTO(QFont, BodyStrong)
|
||||
Q_PROPERTY_AUTO(QFont, Subtitle)
|
||||
Q_PROPERTY_AUTO(QFont, Title)
|
||||
Q_PROPERTY_AUTO(QFont, TitleLarge)
|
||||
Q_PROPERTY_AUTO(QFont, Display)
|
||||
QML_NAMED_ELEMENT(FluTextStyle)
|
||||
QML_SINGLETON
|
||||
|
||||
@ -27,7 +28,9 @@ private:
|
||||
explicit FluTextStyle(QObject *parent = nullptr);
|
||||
|
||||
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;
|
||||
QGuiApplication::instance()->installEventFilter(this);
|
||||
refreshColors();
|
||||
connect(this, &FluTheme::darkModeChanged, this, [=] {
|
||||
Q_EMIT darkChanged();
|
||||
});
|
||||
connect(this, &FluTheme::darkModeChanged, this, [=] { Q_EMIT darkChanged(); });
|
||||
connect(this, &FluTheme::darkChanged, this, [=] { refreshColors(); });
|
||||
connect(this, &FluTheme::accentColorChanged, this, [=] { refreshColors(); });
|
||||
connect(&_watcher, &QFileSystemWatcher::fileChanged, this, [=](const QString &path) {
|
||||
Q_EMIT desktopImagePathChanged();
|
||||
});
|
||||
connect(this, &FluTheme::blurBehindWindowEnabledChanged, this, [=] { checkUpdateDesktopImage(); });
|
||||
connect(&_watcher, &QFileSystemWatcher::fileChanged, this,
|
||||
[=](const QString &path) { Q_EMIT desktopImagePathChanged(); });
|
||||
connect(this, &FluTheme::blurBehindWindowEnabledChanged, this,
|
||||
[=] { checkUpdateDesktopImage(); });
|
||||
startTimer(1000);
|
||||
}
|
||||
|
||||
@ -47,11 +45,16 @@ void FluTheme::refreshColors() {
|
||||
fontSecondaryColor(isDark ? QColor(222, 222, 222, 255) : QColor(102, 102, 102, 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));
|
||||
frameColor(isDark ? QColor(56, 56, 56, qRound(255 * 0.8)) : QColor(243, 243, 243, qRound(255 * 0.8)));
|
||||
frameActiveColor(isDark ? QColor(48, 48, 48, qRound(255 * 0.8)) : QColor(255, 255, 255, qRound(255 * 0.8)));
|
||||
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)));
|
||||
frameColor(isDark ? QColor(56, 56, 56, qRound(255 * 0.8))
|
||||
: QColor(243, 243, 243, qRound(255 * 0.8)));
|
||||
frameActiveColor(isDark ? QColor(48, 48, 48, qRound(255 * 0.8))
|
||||
: QColor(255, 255, 255, qRound(255 * 0.8)));
|
||||
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) {
|
||||
|
||||
@ -16,28 +16,28 @@
|
||||
* @brief The FluTheme class
|
||||
*/
|
||||
class FluTheme : public QObject {
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(bool dark READ dark NOTIFY darkChanged)
|
||||
Q_PROPERTY_AUTO_P(FluAccentColor*, accentColor);
|
||||
Q_PROPERTY_AUTO(QColor, primaryColor);
|
||||
Q_PROPERTY_AUTO(QColor, backgroundColor);
|
||||
Q_PROPERTY_AUTO(QColor, dividerColor);
|
||||
Q_PROPERTY_AUTO(QColor, windowBackgroundColor);
|
||||
Q_PROPERTY_AUTO(QColor, windowActiveBackgroundColor);
|
||||
Q_PROPERTY_AUTO(QColor, fontPrimaryColor);
|
||||
Q_PROPERTY_AUTO(QColor, fontSecondaryColor);
|
||||
Q_PROPERTY_AUTO(QColor, fontTertiaryColor);
|
||||
Q_PROPERTY_AUTO(QColor, itemNormalColor);
|
||||
Q_PROPERTY_AUTO(QColor, frameColor);
|
||||
Q_PROPERTY_AUTO(QColor, frameActiveColor);
|
||||
Q_PROPERTY_AUTO(QColor, itemHoverColor);
|
||||
Q_PROPERTY_AUTO(QColor, itemPressColor);
|
||||
Q_PROPERTY_AUTO(QColor, itemCheckColor);
|
||||
Q_PROPERTY_AUTO(QString, desktopImagePath);
|
||||
Q_PROPERTY_AUTO(int, darkMode);
|
||||
Q_PROPERTY_AUTO(bool, nativeText);
|
||||
Q_PROPERTY_AUTO(bool, animationEnabled);
|
||||
Q_PROPERTY_AUTO(bool, blurBehindWindowEnabled);
|
||||
Q_PROPERTY_AUTO_P(FluAccentColor *, accentColor)
|
||||
Q_PROPERTY_AUTO(QColor, primaryColor)
|
||||
Q_PROPERTY_AUTO(QColor, backgroundColor)
|
||||
Q_PROPERTY_AUTO(QColor, dividerColor)
|
||||
Q_PROPERTY_AUTO(QColor, windowBackgroundColor)
|
||||
Q_PROPERTY_AUTO(QColor, windowActiveBackgroundColor)
|
||||
Q_PROPERTY_AUTO(QColor, fontPrimaryColor)
|
||||
Q_PROPERTY_AUTO(QColor, fontSecondaryColor)
|
||||
Q_PROPERTY_AUTO(QColor, fontTertiaryColor)
|
||||
Q_PROPERTY_AUTO(QColor, itemNormalColor)
|
||||
Q_PROPERTY_AUTO(QColor, frameColor)
|
||||
Q_PROPERTY_AUTO(QColor, frameActiveColor)
|
||||
Q_PROPERTY_AUTO(QColor, itemHoverColor)
|
||||
Q_PROPERTY_AUTO(QColor, itemPressColor)
|
||||
Q_PROPERTY_AUTO(QColor, itemCheckColor)
|
||||
Q_PROPERTY_AUTO(QString, desktopImagePath)
|
||||
Q_PROPERTY_AUTO(int, darkMode)
|
||||
Q_PROPERTY_AUTO(bool, nativeText)
|
||||
Q_PROPERTY_AUTO(bool, animationEnabled)
|
||||
Q_PROPERTY_AUTO(bool, blurBehindWindowEnabled)
|
||||
QML_NAMED_ELEMENT(FluTheme)
|
||||
QML_SINGLETON
|
||||
|
||||
@ -49,17 +49,18 @@ private:
|
||||
void refreshColors();
|
||||
|
||||
protected:
|
||||
|
||||
void timerEvent(QTimerEvent *event) override;
|
||||
|
||||
void checkUpdateDesktopImage();
|
||||
|
||||
public:
|
||||
SINGLETON(FluTheme)
|
||||
SINGLETON(FluTheme)
|
||||
|
||||
Q_SIGNAL void darkChanged();
|
||||
|
||||
static FluTheme *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
|
||||
static FluTheme *create(QQmlEngine *, QJSEngine *) {
|
||||
return getInstance();
|
||||
}
|
||||
|
||||
bool dark() const;
|
||||
|
||||
@ -67,4 +68,4 @@ private:
|
||||
bool _systemDark;
|
||||
QFileSystemWatcher _watcher;
|
||||
QMutex _mutex;
|
||||
};
|
||||
};
|
||||
|
||||
@ -17,15 +17,14 @@
|
||||
#include <QSettings>
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
#pragma comment (lib, "user32.lib")
|
||||
# pragma comment(lib, "user32.lib")
|
||||
|
||||
#include <windows.h>
|
||||
#include <windowsx.h>
|
||||
# include <windows.h>
|
||||
# include <windowsx.h>
|
||||
|
||||
#endif
|
||||
|
||||
FluTools::FluTools(QObject *parent) : QObject{parent} {
|
||||
|
||||
}
|
||||
|
||||
void FluTools::clipText(const QString &text) {
|
||||
@ -164,11 +163,12 @@ void FluTools::showFileInFolder(const QString &path) {
|
||||
#if defined(Q_OS_LINUX)
|
||||
QFileInfo fileInfo(path);
|
||||
auto process = "xdg-open";
|
||||
auto arguments = { fileInfo.absoluteDir().absolutePath() };
|
||||
auto arguments = {fileInfo.absoluteDir().absolutePath()};
|
||||
QProcess::startDetached(process, arguments);
|
||||
#endif
|
||||
#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"});
|
||||
#endif
|
||||
}
|
||||
@ -206,7 +206,9 @@ int FluTools::cursorScreenIndex() {
|
||||
|
||||
int FluTools::windowBuildNumber() {
|
||||
#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"))) {
|
||||
auto buildNumber = regKey.value(QString::fromUtf8("CurrentBuildNumber")).toInt();
|
||||
return buildNumber;
|
||||
@ -289,7 +291,7 @@ QString FluTools::getWallpaperFilePath() {
|
||||
process.start("osascript", args);
|
||||
process.waitForFinished();
|
||||
QByteArray result = process.readAllStandardOutput().trimmed();
|
||||
if(result.isEmpty()){
|
||||
if (result.isEmpty()) {
|
||||
return "/System/Library/CoreServices/DefaultDesktop.heic";
|
||||
}
|
||||
return result;
|
||||
@ -313,5 +315,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
|
||||
*/
|
||||
class FluTools : public QObject {
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
QML_NAMED_ELEMENT(FluTools)
|
||||
QML_SINGLETON
|
||||
|
||||
@ -19,9 +19,11 @@ private:
|
||||
explicit FluTools(QObject *parent = nullptr);
|
||||
|
||||
public:
|
||||
SINGLETON(FluTools)
|
||||
SINGLETON(FluTools)
|
||||
|
||||
static FluTools *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
|
||||
static FluTools *create(QQmlEngine *, QJSEngine *) {
|
||||
return getInstance();
|
||||
}
|
||||
|
||||
Q_INVOKABLE int qtMajor();
|
||||
|
||||
|
||||
@ -31,8 +31,8 @@ QVariant FluTreeModel::data(const QModelIndex &index, int role) const {
|
||||
|
||||
QHash<int, QByteArray> FluTreeModel::roleNames() const {
|
||||
return {
|
||||
{TreeModelRoles::RowModel, "rowModel"},
|
||||
{TreeModelRoles::ColumnModel, "columnModel"}
|
||||
{TreeModelRoles::RowModel, "rowModel" },
|
||||
{TreeModelRoles::ColumnModel, "columnModel"}
|
||||
};
|
||||
}
|
||||
|
||||
@ -90,9 +90,9 @@ void FluTreeModel::checkRow(int row, bool checked) {
|
||||
QList<FluTreeNode *> children = item->_children;
|
||||
if (!children.isEmpty()) {
|
||||
std::reverse(children.begin(), children.end());
|
||||
foreach (auto c, children) {
|
||||
stack.append(c);
|
||||
}
|
||||
foreach (auto c, children) {
|
||||
stack.append(c);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@ -102,7 +102,6 @@ void FluTreeModel::checkRow(int row, bool checked) {
|
||||
itemData->_checked = checked;
|
||||
}
|
||||
Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0));
|
||||
|
||||
}
|
||||
|
||||
void FluTreeModel::setDataSource(QList<QMap<QString, QVariant>> data) {
|
||||
@ -184,9 +183,9 @@ void FluTreeModel::expand(int row) {
|
||||
QList<FluTreeNode *> children = item->_children;
|
||||
if (!children.isEmpty()) {
|
||||
std::reverse(children.begin(), children.end());
|
||||
foreach (auto c, children) {
|
||||
stack.append(c);
|
||||
}
|
||||
foreach (auto c, children) {
|
||||
stack.append(c);
|
||||
}
|
||||
}
|
||||
}
|
||||
insertRows(row + 1, insertData);
|
||||
@ -223,9 +222,9 @@ void FluTreeModel::allExpand() {
|
||||
QList<FluTreeNode *> children = item->_children;
|
||||
if (!children.isEmpty()) {
|
||||
std::reverse(children.begin(), children.end());
|
||||
foreach (auto c, children) {
|
||||
stack.append(c);
|
||||
}
|
||||
foreach (auto c, children) {
|
||||
stack.append(c);
|
||||
}
|
||||
}
|
||||
}
|
||||
_rows = data;
|
||||
@ -245,9 +244,9 @@ void FluTreeModel::allCollapse() {
|
||||
QList<FluTreeNode *> children = item->_children;
|
||||
if (!children.isEmpty()) {
|
||||
std::reverse(children.begin(), children.end());
|
||||
foreach (auto c, children) {
|
||||
stack.append(c);
|
||||
}
|
||||
foreach (auto c, children) {
|
||||
stack.append(c);
|
||||
}
|
||||
}
|
||||
}
|
||||
_rows = _root->_children;
|
||||
@ -256,10 +255,10 @@ void FluTreeModel::allCollapse() {
|
||||
|
||||
QVariant FluTreeModel::selectionModel() {
|
||||
QList<FluTreeNode *> data;
|
||||
foreach (auto item, _dataSource) {
|
||||
if (item->checked()) {
|
||||
data.append(item);
|
||||
}
|
||||
foreach (auto item, _dataSource) {
|
||||
if (item->checked()) {
|
||||
data.append(item);
|
||||
}
|
||||
}
|
||||
return QVariant::fromValue(data);
|
||||
}
|
||||
|
||||
@ -7,11 +7,12 @@
|
||||
#include <QtQml/qqml.h>
|
||||
#include "stdafx.h"
|
||||
|
||||
|
||||
/**
|
||||
* @brief The FluTreeNode class
|
||||
*/
|
||||
class FluTreeNode : public QObject {
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(QVariantMap data READ data CONSTANT)
|
||||
Q_PROPERTY(int depth READ depth CONSTANT)
|
||||
Q_PROPERTY(bool isExpanded READ isExpanded CONSTANT)
|
||||
@ -19,13 +20,21 @@ Q_OBJECT
|
||||
public:
|
||||
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) {
|
||||
FluTreeNode *p = this;
|
||||
@ -87,15 +96,12 @@ public:
|
||||
};
|
||||
|
||||
class FluTreeModel : public QAbstractTableModel {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO(int, dataSourceSize)
|
||||
Q_PROPERTY_AUTO(QList<QVariantMap>, columnSource)
|
||||
Q_OBJECT
|
||||
Q_PROPERTY_AUTO(int, dataSourceSize)
|
||||
Q_PROPERTY_AUTO(QList<QVariantMap>, columnSource)
|
||||
QML_NAMED_ELEMENT(FluTreeModel)
|
||||
public:
|
||||
enum TreeModelRoles {
|
||||
RowModel = 0x0101,
|
||||
ColumnModel = 0x0102
|
||||
};
|
||||
enum TreeModelRoles { RowModel = 0x0101, ColumnModel = 0x0102 };
|
||||
|
||||
explicit FluTreeModel(QObject *parent = nullptr);
|
||||
|
||||
@ -103,7 +109,8 @@ public:
|
||||
|
||||
[[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;
|
||||
|
||||
|
||||
@ -17,6 +17,7 @@ FluWatermark::FluWatermark(QQuickItem *parent) : QQuickPaintedItem(parent) {
|
||||
connect(this, &FluWatermark::textSizeChanged, this, [=] { update(); });
|
||||
}
|
||||
|
||||
|
||||
void FluWatermark::paint(QPainter *painter) {
|
||||
QFont font;
|
||||
font.setFamily(FluTextStyle::getInstance()->family());
|
||||
@ -37,7 +38,8 @@ void FluWatermark::paint(QPainter *painter) {
|
||||
painter->save();
|
||||
painter->translate(centerX, centerY);
|
||||
painter->rotate(_rotate);
|
||||
painter->drawText(QRectF(-fontWidth / 2.0, -fontHeight / 2.0, fontWidth, fontHeight), _text);
|
||||
painter->drawText(QRectF(-fontWidth / 2.0, -fontHeight / 2.0, fontWidth, fontHeight),
|
||||
_text);
|
||||
painter->restore();
|
||||
}
|
||||
}
|
||||
|
||||
@ -17,6 +17,11 @@
|
||||
#include "FluFrameless.h"
|
||||
#include "FluTableModel.h"
|
||||
#include "FluHotkey.h"
|
||||
#include "qmlcustomplot/TimePlot.h"
|
||||
#include "qmlcustomplot/baseplot.h"
|
||||
#include "qmlcustomplot/axis.h"
|
||||
#include "qmlcustomplot/ticker.h"
|
||||
#include "qmlcustomplot/grid.h"
|
||||
|
||||
void FluentUI::registerTypes(QQmlEngine *engine) {
|
||||
initializeEngine(engine, _uri);
|
||||
@ -40,6 +45,13 @@ void FluentUI::registerTypes(const char *uri) const {
|
||||
qmlRegisterType<FluHotkey>(uri, major, minor, "FluHotkey");
|
||||
qmlRegisterType<FluTableSortProxyModel>(uri, major, minor, "FluTableSortProxyModel");
|
||||
|
||||
qmlRegisterType<QmlQCustomPlot::TimePlot>(uri, major, minor, "TimePlot");
|
||||
qmlRegisterType<QmlQCustomPlot::BasePlot>(uri, major, minor, "BasePlot");
|
||||
|
||||
qmlRegisterUncreatableType<QmlQCustomPlot::Axis>(uri, major, minor, "Axis", "");
|
||||
qmlRegisterUncreatableType<QmlQCustomPlot::Ticker>(uri, major, minor, "Ticker", "");
|
||||
qmlRegisterUncreatableType<QmlQCustomPlot::Grid>(uri, major, minor, "PlotGrid", "");
|
||||
|
||||
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluAcrylic.qml"), uri, major, minor, "FluAcrylic");
|
||||
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluAppBar.qml"), uri, major, minor, "FluAppBar");
|
||||
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluFrame.qml"), uri, major, minor, "FluFrame");
|
||||
|
||||
@ -8,10 +8,10 @@
|
||||
* @brief The FluentUI class
|
||||
*/
|
||||
class FluentUI : public QObject {
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
SINGLETON(FluentUI)
|
||||
SINGLETON(FluentUI)
|
||||
|
||||
Q_DECL_EXPORT void registerTypes(QQmlEngine *engine);
|
||||
|
||||
@ -23,4 +23,4 @@ private:
|
||||
const int _major = 1;
|
||||
const int _minor = 0;
|
||||
const char *_uri = "FluentUI";
|
||||
};
|
||||
};
|
||||
|
||||
@ -43,12 +43,12 @@ Rectangle{
|
||||
property alias layoutStandardbuttons: layout_standard_buttons
|
||||
property var maxClickListener : function(){
|
||||
if(FluTools.isMacos()){
|
||||
if (d.win.visibility === Window.FullScreen)
|
||||
if (d.win.visibility === Window.FullScreen || d.win.visibility === Window.Maximized)
|
||||
d.win.showNormal()
|
||||
else
|
||||
d.win.showFullScreen()
|
||||
}else{
|
||||
if (d.win.visibility === Window.Maximized)
|
||||
if (d.win.visibility === Window.Maximized || d.win.visibility === Window.FullScreen)
|
||||
d.win.showNormal()
|
||||
else
|
||||
d.win.showMaximized()
|
||||
@ -93,7 +93,7 @@ Rectangle{
|
||||
}
|
||||
return false
|
||||
}
|
||||
property bool isRestore: win && Window.Maximized === win.visibility
|
||||
property bool isRestore: win && (Window.Maximized === win.visibility || Window.FullScreen === win.visibility)
|
||||
property bool resizable: win && !(win.height === win.maximumHeight && win.height === win.minimumHeight && win.width === win.maximumWidth && win.width === win.minimumWidth)
|
||||
function containsPointToItem(point,item){
|
||||
var pos = item.mapToGlobal(0,0)
|
||||
|
||||
@ -449,6 +449,7 @@ FluButton {
|
||||
delegate: Label {
|
||||
text: model.shortName
|
||||
font: dayOfWeekRow.font
|
||||
color: FluTheme.fontPrimaryColor
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
}
|
||||
|
||||
@ -26,10 +26,24 @@ TextEdit {
|
||||
anchors.fill: parent
|
||||
cursorShape: Qt.IBeamCursor
|
||||
acceptedButtons: Qt.RightButton
|
||||
onClicked: control.echoMode !== TextInput.Password && menu.popup()
|
||||
onClicked: control.echoMode !== TextInput.Password && menu_loader.popup()
|
||||
}
|
||||
FluTextBoxMenu{
|
||||
FluLoader{
|
||||
id: menu_loader
|
||||
function popup(){
|
||||
sourceComponent = menu
|
||||
}
|
||||
}
|
||||
Component{
|
||||
id:menu
|
||||
inputItem: control
|
||||
FluTextBoxMenu{
|
||||
inputItem: control
|
||||
Component.onCompleted: {
|
||||
popup()
|
||||
}
|
||||
onClosed: {
|
||||
menu_loader.sourceComponent = undefined
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -71,11 +71,25 @@ TextArea{
|
||||
if(control.readOnly && control.text === ""){
|
||||
return
|
||||
}
|
||||
menu.popup()
|
||||
menu_loader.popup()
|
||||
}
|
||||
}
|
||||
FluTextBoxMenu{
|
||||
FluLoader{
|
||||
id: menu_loader
|
||||
function popup(){
|
||||
sourceComponent = menu
|
||||
}
|
||||
}
|
||||
Component{
|
||||
id:menu
|
||||
inputItem: control
|
||||
FluTextBoxMenu{
|
||||
Component.onCompleted: {
|
||||
popup()
|
||||
}
|
||||
inputItem: control
|
||||
onClosed: {
|
||||
menu_loader.sourceComponent = undefined
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -65,8 +65,4 @@ TextField{
|
||||
rightMargin: 5
|
||||
}
|
||||
}
|
||||
FluTextBoxMenu{
|
||||
id:menu
|
||||
inputItem: control
|
||||
}
|
||||
}
|
||||
|
||||
@ -69,7 +69,7 @@ TextField{
|
||||
if(control.readOnly && control.text === ""){
|
||||
return
|
||||
}
|
||||
menu.popup()
|
||||
menu_loader.popup()
|
||||
}
|
||||
}
|
||||
RowLayout{
|
||||
@ -111,8 +111,22 @@ TextField{
|
||||
visible: control.iconSource != 0
|
||||
}
|
||||
}
|
||||
FluTextBoxMenu{
|
||||
FluLoader{
|
||||
id: menu_loader
|
||||
function popup(){
|
||||
sourceComponent = menu
|
||||
}
|
||||
}
|
||||
Component{
|
||||
id:menu
|
||||
inputItem: control
|
||||
FluTextBoxMenu{
|
||||
inputItem: control
|
||||
Component.onCompleted: {
|
||||
popup()
|
||||
}
|
||||
onClosed: {
|
||||
menu_loader.sourceComponent = undefined
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,7 +16,6 @@ Window {
|
||||
property Item appBar: FluAppBar {
|
||||
title: window.title
|
||||
height: 30
|
||||
width: window.width
|
||||
showDark: window.showDark
|
||||
showClose: window.showClose
|
||||
showMinimize: window.showMinimize
|
||||
@ -41,6 +40,7 @@ Window {
|
||||
property bool autoCenter: true
|
||||
property bool autoDestroy: true
|
||||
property bool useSystemAppBar
|
||||
property int __margins: 0
|
||||
property color resizeBorderColor: {
|
||||
if(window.active){
|
||||
return FluTheme.dark ? Qt.rgba(51/255,51/255,51/255,1) : Qt.rgba(110/255,110/255,110/255,1)
|
||||
@ -73,7 +73,7 @@ Window {
|
||||
initArgument(argument)
|
||||
if(window.autoVisible){
|
||||
if(window.autoMaximize){
|
||||
window.showMaximized()
|
||||
window.visibility = Window.Maximized
|
||||
}else{
|
||||
window.show()
|
||||
}
|
||||
@ -174,6 +174,11 @@ Window {
|
||||
id:com_app_bar
|
||||
Item{
|
||||
data: window.appBar
|
||||
Component.onCompleted: {
|
||||
window.appBar.width = Qt.binding(function(){
|
||||
return this.parent.width
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
Component{
|
||||
@ -246,53 +251,58 @@ Window {
|
||||
border.color: window.resizeBorderColor
|
||||
}
|
||||
}
|
||||
FluLoader{
|
||||
anchors.fill: parent
|
||||
sourceComponent: background
|
||||
}
|
||||
FluLoader{
|
||||
id:loader_app_bar
|
||||
anchors {
|
||||
top: parent.top
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
}
|
||||
height: {
|
||||
if(window.useSystemAppBar){
|
||||
return 0
|
||||
}
|
||||
return window.fitsAppBarWindows ? 0 : window.appBar.height
|
||||
}
|
||||
sourceComponent: window.useSystemAppBar ? undefined : com_app_bar
|
||||
}
|
||||
Item{
|
||||
id:layout_content
|
||||
anchors{
|
||||
top: loader_app_bar.bottom
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
bottom: parent.bottom
|
||||
id: layout_container
|
||||
anchors.fill: parent
|
||||
anchors.margins: window.__margins
|
||||
FluLoader{
|
||||
anchors.fill: parent
|
||||
sourceComponent: background
|
||||
}
|
||||
clip: true
|
||||
}
|
||||
FluLoader{
|
||||
property string loadingText
|
||||
property bool cancel: false
|
||||
id:loader_loading
|
||||
anchors.fill: parent
|
||||
}
|
||||
FluInfoBar{
|
||||
id:info_bar
|
||||
root: window
|
||||
}
|
||||
FluLoader{
|
||||
id:loader_border
|
||||
anchors.fill: parent
|
||||
sourceComponent: {
|
||||
if(window.useSystemAppBar || FluTools.isWin() || window.visibility === Window.Maximized || window.visibility === Window.FullScreen){
|
||||
return undefined
|
||||
FluLoader{
|
||||
id:loader_app_bar
|
||||
anchors {
|
||||
top: parent.top
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
}
|
||||
height: {
|
||||
if(window.useSystemAppBar){
|
||||
return 0
|
||||
}
|
||||
return window.fitsAppBarWindows ? 0 : window.appBar.height
|
||||
}
|
||||
sourceComponent: window.useSystemAppBar ? undefined : com_app_bar
|
||||
}
|
||||
Item{
|
||||
id: layout_content
|
||||
anchors{
|
||||
top: loader_app_bar.bottom
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
bottom: parent.bottom
|
||||
}
|
||||
clip: true
|
||||
}
|
||||
FluLoader{
|
||||
property string loadingText
|
||||
property bool cancel: false
|
||||
id:loader_loading
|
||||
anchors.fill: parent
|
||||
}
|
||||
FluInfoBar{
|
||||
id:info_bar
|
||||
root: layout_container
|
||||
}
|
||||
FluLoader{
|
||||
id:loader_border
|
||||
anchors.fill: parent
|
||||
sourceComponent: {
|
||||
if(window.useSystemAppBar || FluTools.isWin() || window.visibility === Window.Maximized || window.visibility === Window.FullScreen){
|
||||
return undefined
|
||||
}
|
||||
return com_border
|
||||
}
|
||||
return com_border
|
||||
}
|
||||
}
|
||||
function hideLoading(){
|
||||
@ -325,9 +335,6 @@ Window {
|
||||
window.minimumHeight = window.height
|
||||
}
|
||||
}
|
||||
function registerForWindowResult(path){
|
||||
return FluApp.createWindowRegister(window,path)
|
||||
}
|
||||
function setResult(data){
|
||||
if(_windowRegister){
|
||||
_windowRegister.setResult(data)
|
||||
@ -356,4 +363,7 @@ Window {
|
||||
function deleteLater(){
|
||||
FluTools.deleteLater(window)
|
||||
}
|
||||
function containerItem(){
|
||||
return layout_container
|
||||
}
|
||||
}
|
||||
|
||||
@ -43,12 +43,12 @@ Rectangle{
|
||||
property alias layoutStandardbuttons: layout_standard_buttons
|
||||
property var maxClickListener : function(){
|
||||
if(FluTools.isMacos()){
|
||||
if (d.win.visibility === Window.FullScreen)
|
||||
if (d.win.visibility === Window.FullScreen || d.win.visibility === Window.Maximized)
|
||||
d.win.showNormal()
|
||||
else
|
||||
d.win.showFullScreen()
|
||||
}else{
|
||||
if (d.win.visibility === Window.Maximized)
|
||||
if (d.win.visibility === Window.Maximized || d.win.visibility === Window.FullScreen)
|
||||
d.win.showNormal()
|
||||
else
|
||||
d.win.showMaximized()
|
||||
@ -93,7 +93,7 @@ Rectangle{
|
||||
}
|
||||
return false
|
||||
}
|
||||
property bool isRestore: win && Window.Maximized === win.visibility
|
||||
property bool isRestore: win && (Window.Maximized === win.visibility || Window.FullScreen === win.visibility)
|
||||
property bool resizable: win && !(win.height === win.maximumHeight && win.height === win.minimumHeight && win.width === win.maximumWidth && win.width === win.minimumWidth)
|
||||
function containsPointToItem(point,item){
|
||||
var pos = item.mapToGlobal(0,0)
|
||||
|
||||
@ -448,6 +448,7 @@ FluButton {
|
||||
delegate: Label {
|
||||
text: model.shortName
|
||||
font: dayOfWeekRow.font
|
||||
color: FluTheme.fontPrimaryColor
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
}
|
||||
|
||||
@ -26,10 +26,24 @@ TextEdit {
|
||||
anchors.fill: parent
|
||||
cursorShape: Qt.IBeamCursor
|
||||
acceptedButtons: Qt.RightButton
|
||||
onClicked: control.echoMode !== TextInput.Password && menu.popup()
|
||||
onClicked: control.echoMode !== TextInput.Password && menu_loader.popup()
|
||||
}
|
||||
FluTextBoxMenu{
|
||||
FluLoader{
|
||||
id: menu_loader
|
||||
function popup(){
|
||||
sourceComponent = menu
|
||||
}
|
||||
}
|
||||
Component{
|
||||
id:menu
|
||||
inputItem: control
|
||||
FluTextBoxMenu{
|
||||
inputItem: control
|
||||
Component.onCompleted: {
|
||||
popup()
|
||||
}
|
||||
onClosed: {
|
||||
menu_loader.sourceComponent = undefined
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -72,11 +72,25 @@ TextArea{
|
||||
if(control.readOnly && control.text === ""){
|
||||
return
|
||||
}
|
||||
menu.popup()
|
||||
menu_loader.popup()
|
||||
}
|
||||
}
|
||||
FluTextBoxMenu{
|
||||
FluLoader{
|
||||
id: menu_loader
|
||||
function popup(){
|
||||
sourceComponent = menu
|
||||
}
|
||||
}
|
||||
Component{
|
||||
id:menu
|
||||
inputItem: control
|
||||
FluTextBoxMenu{
|
||||
inputItem: control
|
||||
Component.onCompleted: {
|
||||
popup()
|
||||
}
|
||||
onClosed: {
|
||||
menu_loader.sourceComponent = undefined
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -66,8 +66,4 @@ TextField{
|
||||
rightMargin: 5
|
||||
}
|
||||
}
|
||||
FluTextBoxMenu{
|
||||
id:menu
|
||||
inputItem: control
|
||||
}
|
||||
}
|
||||
|
||||
@ -70,7 +70,7 @@ TextField{
|
||||
if(control.readOnly && control.text === ""){
|
||||
return
|
||||
}
|
||||
menu.popup()
|
||||
menu_loader.popup()
|
||||
}
|
||||
}
|
||||
RowLayout{
|
||||
@ -112,8 +112,22 @@ TextField{
|
||||
visible: control.iconSource != 0
|
||||
}
|
||||
}
|
||||
FluTextBoxMenu{
|
||||
FluLoader{
|
||||
id: menu_loader
|
||||
function popup(){
|
||||
sourceComponent = menu
|
||||
}
|
||||
}
|
||||
Component{
|
||||
id:menu
|
||||
inputItem: control
|
||||
FluTextBoxMenu{
|
||||
inputItem: control
|
||||
Component.onCompleted: {
|
||||
popup()
|
||||
}
|
||||
onClosed: {
|
||||
menu_loader.sourceComponent = undefined
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,7 +15,6 @@ Window {
|
||||
property Item appBar: FluAppBar {
|
||||
title: window.title
|
||||
height: 30
|
||||
width: window.width
|
||||
showDark: window.showDark
|
||||
showClose: window.showClose
|
||||
showMinimize: window.showMinimize
|
||||
@ -40,6 +39,7 @@ Window {
|
||||
property bool autoCenter: true
|
||||
property bool autoDestroy: true
|
||||
property bool useSystemAppBar
|
||||
property int __margins: 0
|
||||
property color resizeBorderColor: {
|
||||
if(window.active){
|
||||
return FluTheme.dark ? Qt.rgba(51/255,51/255,51/255,1) : Qt.rgba(110/255,110/255,110/255,1)
|
||||
@ -72,7 +72,7 @@ Window {
|
||||
initArgument(argument)
|
||||
if(window.autoVisible){
|
||||
if(window.autoMaximize){
|
||||
window.showMaximized()
|
||||
window.visibility = Window.Maximized
|
||||
}else{
|
||||
window.show()
|
||||
}
|
||||
@ -173,6 +173,11 @@ Window {
|
||||
id:com_app_bar
|
||||
Item{
|
||||
data: window.appBar
|
||||
Component.onCompleted: {
|
||||
window.appBar.width = Qt.binding(function(){
|
||||
return this.parent.width
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
Component{
|
||||
@ -245,53 +250,59 @@ Window {
|
||||
border.color: window.resizeBorderColor
|
||||
}
|
||||
}
|
||||
FluLoader{
|
||||
anchors.fill: parent
|
||||
sourceComponent: background
|
||||
}
|
||||
FluLoader{
|
||||
id:loader_app_bar
|
||||
anchors {
|
||||
top: parent.top
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
}
|
||||
height: {
|
||||
if(window.useSystemAppBar){
|
||||
return 0
|
||||
}
|
||||
return window.fitsAppBarWindows ? 0 : window.appBar.height
|
||||
}
|
||||
sourceComponent: window.useSystemAppBar ? undefined : com_app_bar
|
||||
}
|
||||
Item{
|
||||
id:layout_content
|
||||
anchors{
|
||||
top: loader_app_bar.bottom
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
bottom: parent.bottom
|
||||
id: layout_container
|
||||
anchors.fill: parent
|
||||
anchors.margins: window.__margins
|
||||
FluLoader{
|
||||
anchors.fill: parent
|
||||
sourceComponent: background
|
||||
}
|
||||
clip: true
|
||||
}
|
||||
FluLoader{
|
||||
property string loadingText
|
||||
property bool cancel: false
|
||||
id:loader_loading
|
||||
anchors.fill: parent
|
||||
}
|
||||
FluInfoBar{
|
||||
id:info_bar
|
||||
root: window
|
||||
}
|
||||
FluLoader{
|
||||
id:loader_border
|
||||
anchors.fill: parent
|
||||
sourceComponent: {
|
||||
if(window.useSystemAppBar || FluTools.isWin() || window.visibility === Window.Maximized || window.visibility === Window.FullScreen){
|
||||
return undefined
|
||||
FluLoader{
|
||||
id:loader_app_bar
|
||||
anchors {
|
||||
top: parent.top
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
}
|
||||
height: {
|
||||
if(window.useSystemAppBar){
|
||||
return 0
|
||||
}
|
||||
return window.fitsAppBarWindows ? 0 : window.appBar.height
|
||||
}
|
||||
sourceComponent: window.useSystemAppBar ? undefined : com_app_bar
|
||||
}
|
||||
Item{
|
||||
id:layout_content
|
||||
anchors{
|
||||
top: loader_app_bar.bottom
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
bottom: parent.bottom
|
||||
}
|
||||
clip: true
|
||||
}
|
||||
FluLoader{
|
||||
property string loadingText
|
||||
property bool cancel: false
|
||||
id:loader_loading
|
||||
anchors.fill: parent
|
||||
}
|
||||
FluInfoBar{
|
||||
id:info_bar
|
||||
root: layout_container
|
||||
}
|
||||
|
||||
FluLoader{
|
||||
id:loader_border
|
||||
anchors.fill: parent
|
||||
sourceComponent: {
|
||||
if(window.useSystemAppBar || FluTools.isWin() || window.visibility === Window.Maximized || window.visibility === Window.FullScreen){
|
||||
return undefined
|
||||
}
|
||||
return com_border
|
||||
}
|
||||
return com_border
|
||||
}
|
||||
}
|
||||
function hideLoading(){
|
||||
@ -352,4 +363,7 @@ Window {
|
||||
function deleteLater(){
|
||||
FluTools.deleteLater(window)
|
||||
}
|
||||
function containerItem(){
|
||||
return layout_container
|
||||
}
|
||||
}
|
||||
|
||||
@ -232,7 +232,8 @@
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="Qt6/imports/FluentUI/Controls/FluShortcutPicker.qml" line="205"/>
|
||||
<location filename="Qt5/imports/FluentUI/Controls/FluShortcutPicker.qml" line="204"/>
|
||||
<location filename="Qt6/imports/FluentUI/Controls/FluShortcutPicker.qml" line="204"/>
|
||||
<source>Conflict</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
@ -354,8 +355,8 @@
|
||||
<context>
|
||||
<name>FluWindow</name>
|
||||
<message>
|
||||
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="347"/>
|
||||
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="346"/>
|
||||
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="354"/>
|
||||
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="354"/>
|
||||
<source>Loading...</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
||||
@ -232,7 +232,8 @@
|
||||
<translation type="unfinished">重置</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="Qt6/imports/FluentUI/Controls/FluShortcutPicker.qml" line="205"/>
|
||||
<location filename="Qt5/imports/FluentUI/Controls/FluShortcutPicker.qml" line="204"/>
|
||||
<location filename="Qt6/imports/FluentUI/Controls/FluShortcutPicker.qml" line="204"/>
|
||||
<source>Conflict</source>
|
||||
<translation type="unfinished">冲突</translation>
|
||||
</message>
|
||||
@ -354,8 +355,8 @@
|
||||
<context>
|
||||
<name>FluWindow</name>
|
||||
<message>
|
||||
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="347"/>
|
||||
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="346"/>
|
||||
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="354"/>
|
||||
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="354"/>
|
||||
<source>Loading...</source>
|
||||
<translation type="unfinished">加载中...</translation>
|
||||
</message>
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
* @brief The FluentUIPlugin class
|
||||
*/
|
||||
class FluentUIPlugin : public QQmlExtensionPlugin {
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
|
||||
Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
|
||||
public:
|
||||
@ -15,4 +15,4 @@ public:
|
||||
void registerTypes(const char *uri) Q_DECL_OVERRIDE;
|
||||
|
||||
void initializeEngine(QQmlEngine *engine, const char *uri) Q_DECL_OVERRIDE;
|
||||
};
|
||||
};
|
||||
|
||||
@ -132,7 +132,7 @@ quint32 QHotkeyPrivateX11::nativeKeycode(Qt::Key keycode, bool &ok)
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)
|
||||
const QNativeInterface::QX11Application *x11Interface = qGuiApp->nativeInterface<QNativeInterface::QX11Application>();
|
||||
Display *display = x11Interface->display();
|
||||
Display *display = x11Interface ? x11Interface->display() : nullptr;
|
||||
#else
|
||||
const bool x11Interface = QX11Info::isPlatformX11();
|
||||
Display *display = QX11Info::display();
|
||||
|
||||
88
src/qmlcustomplot/TimePlot.cpp
Normal file
88
src/qmlcustomplot/TimePlot.cpp
Normal file
@ -0,0 +1,88 @@
|
||||
#include "TimePlot.h"
|
||||
#include "graph.h"
|
||||
#include "axis.h"
|
||||
#include "qcustomplot.h"
|
||||
|
||||
#include <QTimer>
|
||||
|
||||
namespace QmlQCustomPlot
|
||||
{
|
||||
|
||||
TimePlot::TimePlot(QQuickItem *parent)
|
||||
: BasePlot(parent)
|
||||
, m_timer(new QTimer(this))
|
||||
{
|
||||
xAxis()->setTickerType(Axis::Time);
|
||||
connect(m_timer, &QTimer::timeout, this, &TimePlot::onTimeOut);
|
||||
m_timer->start(5);
|
||||
startTimer(25);
|
||||
m_plotTimeRangeInMilliseconds = 60;
|
||||
}
|
||||
|
||||
TimePlot::~TimePlot()
|
||||
{
|
||||
}
|
||||
|
||||
void TimePlot::set_plotTimeRangeInMilliseconds(int value) noexcept
|
||||
{
|
||||
if(m_plotTimeRangeInMilliseconds != value) {
|
||||
m_plotTimeRangeInMilliseconds = value;
|
||||
emit plotTimeRangeInMillisecondsChanged(value);
|
||||
}
|
||||
}
|
||||
|
||||
Q_INVOKABLE void TimePlot::setTimeFormat(const QString &format) noexcept
|
||||
{
|
||||
if(xAxis()) {
|
||||
QSharedPointer<QCPAxisTickerTime> timeTicker(new QCPAxisTickerTime);
|
||||
timeTicker->setTimeFormat(format);
|
||||
xAxis()->setTicker(timeTicker);
|
||||
}
|
||||
}
|
||||
|
||||
Q_INVOKABLE void TimePlot::addCurrentTimeValue(const QString &name, double value) noexcept
|
||||
{
|
||||
auto graph = getGraph(name);
|
||||
if(graph) {
|
||||
graph->addData(m_currentTimeKey, value);
|
||||
}
|
||||
}
|
||||
|
||||
Q_INVOKABLE void TimePlot::addCurrentTimeValues(QVariantMap values) noexcept
|
||||
{
|
||||
for(auto it = values.begin(); it != values.end(); ++it) {
|
||||
addCurrentTimeValue(it.key(), it.value().toDouble());
|
||||
}
|
||||
}
|
||||
|
||||
void TimePlot::onTimeOut() noexcept
|
||||
{
|
||||
auto todayString = QDateTime::currentDateTime().toString("yyyy-MM-dd") + " 00:00:00";
|
||||
auto todayTime = QDateTime::fromString(todayString, "yyyy-MM-dd hh:mm:ss");
|
||||
m_currentTimeKey = todayTime.msecsTo(QDateTime::currentDateTime()) / 1000.0;
|
||||
if(m_currentTimeKey - m_lastClearTime > m_plotTimeRangeInMilliseconds || m_currentTimeKey < m_lastClearTime) {
|
||||
auto map = graphsMap();
|
||||
std::for_each(map.begin(), map.end(), [this](auto graph) {
|
||||
if(graph) graph->removeDataBefore(m_currentTimeKey - m_plotTimeRangeInMilliseconds);
|
||||
});
|
||||
m_lastClearTime = m_currentTimeKey;
|
||||
}
|
||||
// if(m_currentTimeKey - m_lastAddedTime > 0.002 || m_currentTimeKey < m_lastAddedTime) {
|
||||
// auto map = graphsMap();
|
||||
// std::for_each(map.begin(), map.end(), [this](auto graph) {
|
||||
// if(graph) graph->addData(m_currentTimeKey, 4.0);
|
||||
// });
|
||||
// m_lastAddedTime = m_currentTimeKey;
|
||||
// }
|
||||
if(xAxis())
|
||||
xAxis()->setRange(m_currentTimeKey - m_plotTimeRangeInMilliseconds, m_currentTimeKey);
|
||||
// QCP::MarginSide s = &static_cast<QCP::MarginSide*>((customPlot()->axisRect()->autoMargins()));
|
||||
// qDebug() << s;
|
||||
}
|
||||
|
||||
void TimePlot::timerEvent(QTimerEvent *event)
|
||||
{
|
||||
customPlot()->replot();
|
||||
}
|
||||
|
||||
} // namespace QmlQCustomPlot
|
||||
113
src/qmlcustomplot/TimePlot.h
Normal file
113
src/qmlcustomplot/TimePlot.h
Normal file
@ -0,0 +1,113 @@
|
||||
#pragma once
|
||||
|
||||
#include "baseplot.h"
|
||||
|
||||
#include <QElapsedTimer>
|
||||
|
||||
class QTimer;
|
||||
|
||||
namespace QmlQCustomPlot
|
||||
{
|
||||
|
||||
/*
|
||||
* @class TimePlot
|
||||
* @brief A class for dynamically updating the x-axis and curves with the current time in milliseconds.
|
||||
*
|
||||
* This class extends the BasePlot and provides functionalities to dynamically update
|
||||
* a plot with time values. It allows adding time values either individually or in bulk.
|
||||
* The x-axis is based on the current time of the day, displaying values within a specified time range.
|
||||
*/
|
||||
class TimePlot : public BasePlot
|
||||
{
|
||||
Q_OBJECT
|
||||
QML_ELEMENT
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(int, plotTimeRangeInMilliseconds) // Property to hold the time range for the plot display in milliseconds.
|
||||
public:
|
||||
/*
|
||||
* @brief Constructor for the TimePlot class.
|
||||
*
|
||||
* This constructor initializes the TimePlot object, setting the parent QQuickItem and
|
||||
* initializing the internal timer and elapsed time tracker.
|
||||
*
|
||||
* @param parent The parent QQuickItem, default is nullptr.
|
||||
*/
|
||||
TimePlot(QQuickItem *parent = nullptr);
|
||||
|
||||
~TimePlot();
|
||||
|
||||
/*
|
||||
* @brief Sets the time range for the plot display in milliseconds.
|
||||
*
|
||||
* This function allows the user to specify the range of time (in milliseconds) that the
|
||||
* plot should display on the x-axis. For example, setting this to 60000 will display the
|
||||
* last 60 seconds of data on the plot.
|
||||
* Default is 60 seconds
|
||||
*
|
||||
* @param value The time range in milliseconds.
|
||||
*/
|
||||
void set_plotTimeRangeInMilliseconds(int value) noexcept;
|
||||
|
||||
/*
|
||||
* @brief Sets the time format for the x-axis labels.
|
||||
*
|
||||
* This function allows the user to specify the format of the time labels on the x-axis.
|
||||
* The format should be a valid QDateTime format string, such as "hh:mm:ss" or "hh:mm:ss.zzz".
|
||||
* Default is "hh:mm:ss".
|
||||
*
|
||||
* @param format The format string for the time labels.
|
||||
*/
|
||||
Q_INVOKABLE void setTimeFormat(const QString &format) noexcept;
|
||||
|
||||
/*
|
||||
* @brief Adds a current time value to the plot.
|
||||
*
|
||||
* This function adds a single data point to the plot. The x-axis value is the current
|
||||
* elapsed time in milliseconds since the timer started, and the y-axis value is provided
|
||||
* by the user. The data point is associated with a specific series name (curve name).
|
||||
*
|
||||
* @param name The name of the data series (curve name).
|
||||
* @param value The value to be added to the plot.
|
||||
*/
|
||||
Q_INVOKABLE void addCurrentTimeValue(const QString& name, double value) noexcept;
|
||||
|
||||
/*
|
||||
* @brief Adds multiple current time values to the plot.
|
||||
*
|
||||
* This function allows adding multiple data points to the plot at once. The values are
|
||||
* provided as a QVariantMap, where each key is the name of a data series (curve name)
|
||||
* and the corresponding value is the data point to be added. The x-axis value for all
|
||||
* data points is the current elapsed time in milliseconds.
|
||||
*
|
||||
* @param values A map of series names (curve names) and their corresponding values to be added to the plot.
|
||||
*/
|
||||
Q_INVOKABLE void addCurrentTimeValues(QVariantMap values) noexcept;
|
||||
|
||||
protected:
|
||||
/*
|
||||
* @brief Function called when the timer times out.
|
||||
*
|
||||
* This function is intended to be overridden by subclasses to define custom behavior
|
||||
* when the timer expires. By default, it does nothing, but it can be used to update
|
||||
* the plot or perform other actions at regular intervals.
|
||||
*/
|
||||
virtual void onTimeOut() noexcept;
|
||||
|
||||
/*
|
||||
* @brief Handles timer events.
|
||||
*
|
||||
* This function is called automatically by the Qt framework when a timer event occurs.
|
||||
* It updates the plot by adding a new time value if necessary and handles any other
|
||||
* timer-related functionality.
|
||||
*
|
||||
* @param event The timer event containing information about the timer that triggered the event.
|
||||
*/
|
||||
void timerEvent(QTimerEvent *event) override;
|
||||
|
||||
private:
|
||||
QTimer *m_timer = nullptr; ///< Pointer to the QTimer object used to trigger regular updates.
|
||||
double m_currentTimeKey = 0; ///< Current time key (x-axis value) in seconds.
|
||||
// double m_lastAddedTime = 0; ///< Time (in milliseconds) of the last added data point.
|
||||
double m_lastClearTime = 0; ///< Time (in milliseconds) of the last clear operation.
|
||||
};
|
||||
|
||||
} // namespace QmlQCustomPlot
|
||||
132
src/qmlcustomplot/axis.cpp
Normal file
132
src/qmlcustomplot/axis.cpp
Normal file
@ -0,0 +1,132 @@
|
||||
#include "axis.h"
|
||||
#include "grid.h"
|
||||
#include "ticker.h"
|
||||
#include "qcustomplot.h"
|
||||
|
||||
#include <stdexcept>
|
||||
|
||||
namespace QmlQCustomPlot
|
||||
{
|
||||
|
||||
Axis::Axis(QObject *parent) : QObject(parent)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
Axis::Axis(QCPAxis* axis, QCustomPlot *parentPlot, QObject *parent)
|
||||
: m_parentPlot(parentPlot), m_axis(axis), QObject(parent)
|
||||
{
|
||||
if(parentPlot == nullptr || axis == nullptr)
|
||||
throw std::invalid_argument(nullptr);
|
||||
connect(parentPlot, &QCustomPlot::beforeReplot, this, &Axis::updateProperty);
|
||||
connect(axis, &QCPAxis::destroyed, this, &Axis::deleteLater);
|
||||
m_ticker = new Ticker(axis, m_parentPlot, this);
|
||||
m_grid = new Grid(axis->grid(), m_parentPlot, this);
|
||||
updateProperty();
|
||||
}
|
||||
|
||||
Axis::~Axis()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void Axis::setTickerType(TickerType type)
|
||||
{
|
||||
QSharedPointer<QCPAxisTicker> ticker;
|
||||
switch (type)
|
||||
{
|
||||
default:
|
||||
case Fixed:
|
||||
ticker = QSharedPointer<QCPAxisTicker>(new QCPAxisTickerFixed);
|
||||
break;
|
||||
case Log:
|
||||
ticker = QSharedPointer<QCPAxisTicker>(new QCPAxisTickerLog);
|
||||
break;
|
||||
case Pi:
|
||||
ticker = QSharedPointer<QCPAxisTicker>(new QCPAxisTickerPi);
|
||||
break;
|
||||
case Text:
|
||||
ticker = QSharedPointer<QCPAxisTicker>(new QCPAxisTickerText);
|
||||
break;
|
||||
case DateTime:
|
||||
ticker = QSharedPointer<QCPAxisTicker>(new QCPAxisTickerDateTime);
|
||||
break;
|
||||
case Time:
|
||||
ticker = QSharedPointer<QCPAxisTicker>(new QCPAxisTickerTime);
|
||||
break;
|
||||
}
|
||||
m_axis->setTicker(ticker);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Axis::setRange(float position, float size, Qt::AlignmentFlag align) noexcept
|
||||
{
|
||||
m_axis->setRange(position, size, align);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
Q_INVOKABLE void Axis::setRange(float lower, float upper) noexcept
|
||||
{
|
||||
m_axis->setRange(lower, upper);
|
||||
}
|
||||
|
||||
void Axis::setTicker(QSharedPointer<QCPAxisTicker> ticker) noexcept
|
||||
{
|
||||
m_axis->setTicker(ticker);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Axis::set_visible(bool value) noexcept
|
||||
{
|
||||
m_visible = m_axis->visible();
|
||||
if(m_visible == value) return;
|
||||
m_visible = value;
|
||||
m_axis->setVisible(value);
|
||||
Q_EMIT visibleChanged(m_visible);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Axis::set_label(const QString &value) noexcept
|
||||
{
|
||||
m_label = m_axis->label();
|
||||
if(m_label == value) return;
|
||||
m_label = value;
|
||||
m_axis->setLabel(value);
|
||||
Q_EMIT labelChanged(m_label);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Axis::set_upper(float value) noexcept
|
||||
{
|
||||
m_upper = m_axis->range().upper;
|
||||
if(m_upper == value) return;
|
||||
m_upper = value;
|
||||
m_axis->setRangeLower(value);
|
||||
Q_EMIT upperChanged(m_upper);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Axis::set_lower(float value) noexcept
|
||||
{
|
||||
m_lower = m_axis->range().lower;
|
||||
if(m_lower == value) return;
|
||||
m_lower = value;
|
||||
m_axis->setRangeUpper(value);
|
||||
Q_EMIT lowerChanged(m_lower);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Axis::updateProperty() noexcept
|
||||
{
|
||||
m_visible = m_axis->visible();
|
||||
m_label = m_axis->label();
|
||||
m_upper = m_axis->range().upper;
|
||||
m_lower = m_axis->range().lower;
|
||||
Q_EMIT visibleChanged(m_visible);
|
||||
Q_EMIT labelChanged(m_label);
|
||||
Q_EMIT upperChanged(m_upper);
|
||||
Q_EMIT lowerChanged(m_lower);
|
||||
}
|
||||
|
||||
} // namespace QmlQCustomPlot
|
||||
56
src/qmlcustomplot/axis.h
Normal file
56
src/qmlcustomplot/axis.h
Normal file
@ -0,0 +1,56 @@
|
||||
#pragma once
|
||||
|
||||
#include "macros.h"
|
||||
#include <QtCore/QObject>
|
||||
#include <QtQml/qqml.h>
|
||||
#include "grid.h"
|
||||
#include "ticker.h"
|
||||
|
||||
class QCPAxis;
|
||||
class QCPAxisTicker;
|
||||
class QCustomPlot;
|
||||
|
||||
|
||||
namespace QmlQCustomPlot
|
||||
{
|
||||
|
||||
class Grid;
|
||||
class Ticker;
|
||||
class Axis : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(bool , visible)
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(QString , label)
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(float , upper)
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(float , lower)
|
||||
QML_READ_CONSTANT(QmlQCustomPlot::Grid*, grid)
|
||||
QML_READ_CONSTANT(QmlQCustomPlot::Ticker*, ticker)
|
||||
QML_ELEMENT
|
||||
QML_UNCREATABLE("")
|
||||
public:
|
||||
explicit Axis(QObject *parent = nullptr);
|
||||
Axis(QCPAxis* axis, QCustomPlot *parentPlot, QObject *parent = nullptr);
|
||||
~Axis();
|
||||
|
||||
Q_ENUMS(TickerType)
|
||||
enum TickerType { Fixed, Log, Pi, Text, DateTime, Time };
|
||||
Q_INVOKABLE void setTickerType(TickerType type);
|
||||
Q_INVOKABLE void setRange(float position, float size, Qt::AlignmentFlag align) noexcept;
|
||||
Q_INVOKABLE void setRange(float lower, float upper) noexcept;
|
||||
|
||||
void setTicker(QSharedPointer<QCPAxisTicker> ticker) noexcept;
|
||||
|
||||
void set_visible(bool value) noexcept;
|
||||
void set_label(const QString &value) noexcept;
|
||||
void set_upper(float value) noexcept;
|
||||
void set_lower(float value) noexcept;
|
||||
|
||||
private:
|
||||
void updateProperty() noexcept;
|
||||
|
||||
private:
|
||||
QCustomPlot *m_parentPlot = nullptr;
|
||||
QCPAxis* m_axis = nullptr;
|
||||
};
|
||||
|
||||
} // namespace QmlQCustomPlot
|
||||
138
src/qmlcustomplot/baseplot.cpp
Normal file
138
src/qmlcustomplot/baseplot.cpp
Normal file
@ -0,0 +1,138 @@
|
||||
#include "baseplot.h"
|
||||
#include "axis.h"
|
||||
#include "graph.h"
|
||||
#include "qcustomplot.h"
|
||||
|
||||
#include <stdexcept>
|
||||
|
||||
namespace QmlQCustomPlot
|
||||
{
|
||||
|
||||
|
||||
BasePlot::BasePlot(QQuickItem *parent)
|
||||
: QQuickPaintedItem(parent)
|
||||
, m_customPlot(new QCustomPlot())
|
||||
{
|
||||
setFlag(QQuickItem::ItemHasContents, true);
|
||||
setAcceptedMouseButtons(Qt::AllButtons);
|
||||
setAcceptHoverEvents(true);
|
||||
connect(this, &QQuickPaintedItem::widthChanged, this, &BasePlot::onChartViewSizeChanged);
|
||||
connect(this, &QQuickPaintedItem::heightChanged, this, &BasePlot::onChartViewSizeChanged);
|
||||
connect(m_customPlot, &QCustomPlot::afterReplot, this, &BasePlot::onChartViewReplot, Qt::UniqueConnection);
|
||||
try {
|
||||
m_xAxis = new Axis(m_customPlot->xAxis, m_customPlot, this);
|
||||
m_x1Axis = new Axis(m_customPlot->xAxis2, m_customPlot, this);
|
||||
m_yAxis = new Axis(m_customPlot->yAxis, m_customPlot, this);
|
||||
m_y1Axis = new Axis(m_customPlot->yAxis2, m_customPlot, this);
|
||||
connect(m_xAxis, &Axis::destroyed, this, [this]{ m_xAxis = nullptr; Q_EMIT xAxisChanged(nullptr); });
|
||||
connect(m_x1Axis, &Axis::destroyed, this, [this]{ m_x1Axis = nullptr; Q_EMIT x1AxisChanged(nullptr);});
|
||||
connect(m_yAxis, &Axis::destroyed, this, [this]{ m_yAxis = nullptr; Q_EMIT yAxisChanged(nullptr); });
|
||||
connect(m_y1Axis, &Axis::destroyed, this, [this]{ m_y1Axis = nullptr; Q_EMIT y1AxisChanged(nullptr);});
|
||||
connect(m_customPlot->xAxis, SIGNAL(rangeChanged(QCPRange)), m_customPlot->xAxis2, SLOT(setRange(QCPRange)));
|
||||
connect(m_customPlot->yAxis, SIGNAL(rangeChanged(QCPRange)), m_customPlot->yAxis2, SLOT(setRange(QCPRange)));
|
||||
|
||||
}
|
||||
catch(const std::exception &e) {
|
||||
qCritical() << e.what();
|
||||
m_xAxis = nullptr;
|
||||
m_x1Axis = nullptr;
|
||||
m_yAxis = nullptr;
|
||||
m_y1Axis = nullptr;
|
||||
}
|
||||
update();
|
||||
}
|
||||
|
||||
BasePlot::~BasePlot()
|
||||
{
|
||||
delete m_customPlot;
|
||||
}
|
||||
|
||||
void BasePlot::set_backgroundColor(const QColor &value)
|
||||
{
|
||||
// m_backgroundColor = m_customPlot->background().toImage().pixelColor(0, 0);
|
||||
if(m_backgroundColor == value) return;
|
||||
m_backgroundColor = value;
|
||||
m_customPlot->setBackground(QBrush(m_backgroundColor));
|
||||
// m_customPlot->axisRect()->setBackground(QBrush(m_backgroundColor));
|
||||
emit backgroundColorChanged(m_backgroundColor);
|
||||
m_customPlot->replot();
|
||||
}
|
||||
|
||||
QVariantMap BasePlot::graphs() const
|
||||
{
|
||||
QVariantMap map;
|
||||
for(auto it = m_graphs.begin(); it != m_graphs.end(); ++it) {
|
||||
map.insert(it.key(), QVariant::fromValue(it.value()));
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
Q_INVOKABLE void BasePlot::addGraph(const QString &key)
|
||||
{
|
||||
if(m_graphs.contains(key)) return;
|
||||
|
||||
auto g = m_customPlot->addGraph();
|
||||
if(g == nullptr) return;
|
||||
g->setName(key);
|
||||
auto graph = new Graph(g, m_customPlot, this);
|
||||
m_graphs.insert(key, graph);
|
||||
emit graphsChanged();
|
||||
}
|
||||
|
||||
Q_INVOKABLE void BasePlot::removeGraph(const QString &key)
|
||||
{
|
||||
if(m_graphs.contains(key)) {
|
||||
auto graph = m_graphs.take(key);
|
||||
delete graph;
|
||||
emit graphsChanged();
|
||||
}
|
||||
}
|
||||
|
||||
Q_INVOKABLE void BasePlot::rescaleAxes(bool onlyVisiblePlottables)
|
||||
{
|
||||
m_customPlot->rescaleAxes(onlyVisiblePlottables);
|
||||
}
|
||||
|
||||
Graph *BasePlot::getGraph(const QString &key) const
|
||||
{
|
||||
if(m_graphs.contains(key)) {
|
||||
return m_graphs.value(key);
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void BasePlot::paint(QPainter *painter)
|
||||
{
|
||||
if (!painter->isActive())
|
||||
return;
|
||||
QPixmap picture( boundingRect().size().toSize() );
|
||||
QCPPainter qcpPainter( &picture );
|
||||
m_customPlot->toPainter(&qcpPainter);
|
||||
painter->drawPixmap(QPoint(), picture);
|
||||
}
|
||||
|
||||
void BasePlot::onChartViewSizeChanged()
|
||||
{
|
||||
m_customPlot->setGeometry(0, 0, (int)width(), (int)height());
|
||||
m_customPlot->setViewport(QRect(0, 0, (int)width(), (int)height()));
|
||||
m_customPlot->axisRect()->setOuterRect(QRect(0, 0, (int)width(), (int)height()));
|
||||
m_customPlot->axisRect()->setMinimumMargins (QMargins(0, 0, 0, 0));
|
||||
m_customPlot->axisRect()->setMargins(QMargins(0, 0, 0, 0));
|
||||
}
|
||||
|
||||
void BasePlot::routeMouseEvents(QMouseEvent *event)
|
||||
{
|
||||
QMouseEvent* newEvent = new QMouseEvent(event->type(), event->localPos(), event->button(), event->buttons(), event->modifiers());
|
||||
QCoreApplication::postEvent(m_customPlot, newEvent);
|
||||
}
|
||||
|
||||
void BasePlot::routeWheelEvents(QWheelEvent *event)
|
||||
{
|
||||
QWheelEvent* newEvent = new QWheelEvent(event->position(), event->globalPosition(),
|
||||
event->pixelDelta(), event->angleDelta(),
|
||||
event->buttons(), event->modifiers(),
|
||||
event->phase(), event->inverted());
|
||||
QCoreApplication::postEvent(m_customPlot, newEvent);
|
||||
}
|
||||
|
||||
} // namespace QmlQCustomPlot
|
||||
60
src/qmlcustomplot/baseplot.h
Normal file
60
src/qmlcustomplot/baseplot.h
Normal file
@ -0,0 +1,60 @@
|
||||
#pragma once
|
||||
|
||||
#include "macros.h"
|
||||
#include <QtGui/QColor>
|
||||
#include <QtCore/QVariantMap>
|
||||
#include <QtCore/QString>
|
||||
#include <QtQuick/QQuickPaintedItem>
|
||||
|
||||
class QCustomPlot;
|
||||
|
||||
namespace QmlQCustomPlot
|
||||
{
|
||||
|
||||
class Axis;
|
||||
class Graph;
|
||||
class BasePlot : public QQuickPaintedItem
|
||||
{
|
||||
Q_OBJECT
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(QColor, backgroundColor)
|
||||
QML_READ_NOTIFY_PROPERTY(QmlQCustomPlot::Axis *, xAxis)
|
||||
QML_READ_NOTIFY_PROPERTY(QmlQCustomPlot::Axis *, x1Axis)
|
||||
QML_READ_NOTIFY_PROPERTY(QmlQCustomPlot::Axis *, yAxis)
|
||||
QML_READ_NOTIFY_PROPERTY(QmlQCustomPlot::Axis *, y1Axis)
|
||||
QML_ELEMENT
|
||||
Q_PROPERTY(QVariantMap graphs READ graphs NOTIFY graphsChanged)
|
||||
public:
|
||||
BasePlot(QQuickItem *parent = nullptr);
|
||||
~BasePlot();
|
||||
|
||||
void set_backgroundColor(const QColor &value);
|
||||
QVariantMap graphs() const;
|
||||
Q_SIGNAL void graphsChanged();
|
||||
Q_INVOKABLE void addGraph(const QString &key);
|
||||
Q_INVOKABLE void removeGraph(const QString &key);
|
||||
Q_INVOKABLE void rescaleAxes(bool onlyVisiblePlottables=false);
|
||||
|
||||
void paint(QPainter *painter);
|
||||
QCustomPlot *customPlot() const { return m_customPlot; }
|
||||
const QMap<QString, Graph *> &graphsMap() const { return m_graphs; }
|
||||
Graph* getGraph(const QString &key) const;
|
||||
|
||||
protected:
|
||||
virtual void onChartViewReplot() { update(); }
|
||||
virtual void onChartViewSizeChanged();
|
||||
|
||||
virtual void hoverMoveEvent(QHoverEvent *event) override { Q_UNUSED(event) }
|
||||
virtual void mousePressEvent(QMouseEvent *event) override { routeMouseEvents(event); }
|
||||
virtual void mouseReleaseEvent(QMouseEvent *event) override { routeMouseEvents(event); }
|
||||
virtual void mouseMoveEvent(QMouseEvent *event) override { routeMouseEvents(event); }
|
||||
virtual void mouseDoubleClickEvent(QMouseEvent *event) override { routeMouseEvents(event); }
|
||||
virtual void wheelEvent(QWheelEvent *event) override { routeWheelEvents(event); }
|
||||
void routeMouseEvents(QMouseEvent *event);
|
||||
void routeWheelEvents(QWheelEvent *event);
|
||||
|
||||
private:
|
||||
QCustomPlot *m_customPlot = nullptr;
|
||||
QMap<QString, Graph *> m_graphs;
|
||||
};
|
||||
|
||||
} // namespace QmlQCustomPlot
|
||||
128
src/qmlcustomplot/graph.cpp
Normal file
128
src/qmlcustomplot/graph.cpp
Normal file
@ -0,0 +1,128 @@
|
||||
#include "graph.h"
|
||||
#include "qcustomplot.h"
|
||||
|
||||
#include <QPen>
|
||||
#include <stdexcept>
|
||||
|
||||
namespace QmlQCustomPlot
|
||||
{
|
||||
|
||||
Graph::Graph(QCPGraph* graph, QCustomPlot *parentPlot, QObject *parent)
|
||||
: m_graph(graph), m_parentPlot(parentPlot), QObject(parent)
|
||||
{
|
||||
if(parentPlot == nullptr || graph == nullptr)
|
||||
throw std::invalid_argument(nullptr);
|
||||
|
||||
connect(parentPlot, &QCustomPlot::beforeReplot, this, &Graph::updateProperty);
|
||||
updateProperty();
|
||||
}
|
||||
|
||||
Graph::~Graph()
|
||||
{
|
||||
}
|
||||
|
||||
void Graph::setData(const QVector<double> &keys, const QVector<double> &values) noexcept
|
||||
{
|
||||
m_graph->setData(keys, values);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Graph::addData(double key, double value) noexcept
|
||||
{
|
||||
m_graph->addData(key, value);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Graph::removeDataBefore(double key) noexcept
|
||||
{
|
||||
m_graph->data()->removeBefore(key);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Graph::clearData() noexcept
|
||||
{
|
||||
m_graph->data()->clear();
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Graph::set_visible(bool value) noexcept
|
||||
{
|
||||
m_visible = m_graph->visible();
|
||||
if(m_visible == value) return;
|
||||
m_visible = value;
|
||||
m_graph->setVisible(value);
|
||||
Q_EMIT visibleChanged(m_visible);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Graph::set_antialiased(bool value) noexcept
|
||||
{
|
||||
m_antialiased = m_graph->antialiased();
|
||||
if(m_antialiased == value) return;
|
||||
m_antialiased = value;
|
||||
m_graph->setAntialiased(value);
|
||||
Q_EMIT antialiasedChanged(m_antialiased);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Graph::set_name(const QString &value) noexcept
|
||||
{
|
||||
m_name = m_graph->name();
|
||||
if(m_name == value) return;
|
||||
m_name = value;
|
||||
m_graph->setName(value);
|
||||
Q_EMIT nameChanged(m_name);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Graph::set_lineStyle(LineStyle value) noexcept
|
||||
{
|
||||
m_lineStyle = static_cast<Graph::LineStyle>(m_graph->lineStyle());
|
||||
if(m_lineStyle == value) return;
|
||||
m_lineStyle = value;
|
||||
m_graph->setLineStyle(static_cast<QCPGraph::LineStyle>(value));
|
||||
Q_EMIT lineStyleChanged(m_lineStyle);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Graph::set_graphWidth(int value) noexcept
|
||||
{
|
||||
m_graphWidth = m_graph->pen().width();
|
||||
if(m_graphWidth == value) return;
|
||||
m_graphWidth = value;
|
||||
QPen pen = m_graph->pen();
|
||||
pen.setWidth(value);
|
||||
m_graph->setPen(pen);
|
||||
Q_EMIT graphWidthChanged(m_graphWidth);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Graph::set_graphColor(const QColor &value) noexcept
|
||||
{
|
||||
m_graphColor = m_graph->pen().color();
|
||||
if(m_graphColor == value) return;
|
||||
m_graphColor = value;
|
||||
QPen pen = m_graph->pen();
|
||||
pen.setColor(value);
|
||||
m_graph->setPen(pen);
|
||||
Q_EMIT graphColorChanged(m_graphColor);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Graph::updateProperty() noexcept
|
||||
{
|
||||
m_visible = m_graph->visible();
|
||||
m_antialiased = m_graph->antialiased();
|
||||
m_name = m_graph->name();
|
||||
m_lineStyle = static_cast<Graph::LineStyle>(m_graph->lineStyle());
|
||||
m_graphWidth = m_graph->pen().width();
|
||||
m_graphColor = m_graph->pen().color();
|
||||
Q_EMIT visibleChanged(m_visible);
|
||||
Q_EMIT antialiasedChanged(m_antialiased);
|
||||
Q_EMIT nameChanged(m_name);
|
||||
Q_EMIT lineStyleChanged(m_lineStyle);
|
||||
Q_EMIT graphWidthChanged(m_graphWidth);
|
||||
Q_EMIT graphColorChanged(m_graphColor);
|
||||
}
|
||||
|
||||
}
|
||||
58
src/qmlcustomplot/graph.h
Normal file
58
src/qmlcustomplot/graph.h
Normal file
@ -0,0 +1,58 @@
|
||||
#pragma once
|
||||
|
||||
#include "macros.h"
|
||||
#include <QtCore/QObject>
|
||||
#include <QtGui/QColor>
|
||||
|
||||
class QCPGraph;
|
||||
class QCustomPlot;
|
||||
|
||||
namespace QmlQCustomPlot
|
||||
{
|
||||
|
||||
class Graph : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_ENUMS(LineType)
|
||||
public:
|
||||
enum LineStyle
|
||||
{
|
||||
lsNone,
|
||||
lsLine,
|
||||
lsStepLeft,
|
||||
lsStepRight,
|
||||
lsStepCenter,
|
||||
lsImpulse
|
||||
};
|
||||
|
||||
private:
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(bool, visible)
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(bool, antialiased)
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(QString, name)
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(LineStyle, lineStyle)
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(int, graphWidth)
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(QColor, graphColor)
|
||||
public:
|
||||
Graph(QCPGraph *graph, QCustomPlot *parentPlot, QObject *parent = nullptr);
|
||||
~Graph();
|
||||
|
||||
Q_INVOKABLE void setData(const QVector<double> &keys, const QVector<double> &values) noexcept;
|
||||
Q_INVOKABLE void addData(double key, double value) noexcept;
|
||||
Q_INVOKABLE void removeDataBefore(double key) noexcept;
|
||||
Q_INVOKABLE void clearData() noexcept;
|
||||
void set_visible(bool value) noexcept;
|
||||
void set_antialiased(bool value) noexcept;
|
||||
void set_name(const QString &value) noexcept;
|
||||
void set_lineStyle(LineStyle value) noexcept;
|
||||
void set_graphWidth(int value) noexcept;
|
||||
void set_graphColor(const QColor &value) noexcept;
|
||||
|
||||
private:
|
||||
void updateProperty() noexcept;
|
||||
|
||||
private:
|
||||
QCustomPlot *m_parentPlot = nullptr;
|
||||
QCPGraph *m_graph = nullptr;
|
||||
};
|
||||
|
||||
} // namespace QmlQCustomPlot
|
||||
136
src/qmlcustomplot/grid.cpp
Normal file
136
src/qmlcustomplot/grid.cpp
Normal file
@ -0,0 +1,136 @@
|
||||
#include "grid.h"
|
||||
#include "qcustomplot.h"
|
||||
|
||||
#include <QPen>
|
||||
#include <stdexcept>
|
||||
|
||||
namespace QmlQCustomPlot
|
||||
{
|
||||
|
||||
Grid::Grid(QCPGrid* grid, QCustomPlot *parentPlot, QObject *parent)
|
||||
: m_qcpgrid(grid), m_parentPlot(parentPlot), QObject(parent)
|
||||
{
|
||||
if(parentPlot == nullptr || grid == nullptr)
|
||||
throw std::invalid_argument(nullptr);
|
||||
|
||||
connect(parentPlot, &QCustomPlot::beforeReplot, this, &Grid::updateProperty);
|
||||
updateProperty();
|
||||
}
|
||||
|
||||
Grid::~Grid()
|
||||
{
|
||||
}
|
||||
|
||||
void Grid::set_visible(bool value) noexcept
|
||||
{
|
||||
m_visible = m_qcpgrid->visible();
|
||||
if(m_visible == value) return;
|
||||
m_visible = value;
|
||||
m_qcpgrid->setVisible(value);
|
||||
Q_EMIT visibleChanged(m_visible);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Grid::set_subVisible(bool value) noexcept
|
||||
{
|
||||
m_subVisible = m_qcpgrid->subGridVisible();
|
||||
if(m_subVisible == value) return;
|
||||
m_subVisible = value;
|
||||
m_qcpgrid->setSubGridVisible(value);
|
||||
Q_EMIT subVisibleChanged(m_subVisible);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Grid::set_lineWidth(int value) noexcept
|
||||
{
|
||||
m_lineWidth = m_qcpgrid->pen().width();
|
||||
if(m_lineWidth == value) return;
|
||||
m_lineWidth = value;
|
||||
QPen pen = m_qcpgrid->pen();
|
||||
pen.setWidth(value);
|
||||
m_qcpgrid->setPen(pen);
|
||||
Q_EMIT lineWidthChanged(m_lineWidth);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Grid::set_lineColor(const QColor &value) noexcept
|
||||
{
|
||||
m_lineColor = m_qcpgrid->pen().color();
|
||||
if(m_lineColor == value) return;
|
||||
m_lineColor = value;
|
||||
QPen pen = m_qcpgrid->pen();
|
||||
pen.setColor(value);
|
||||
m_qcpgrid->setPen(pen);
|
||||
Q_EMIT lineColorChanged(m_lineColor);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Grid::set_lineType(LineType value) noexcept
|
||||
{
|
||||
m_lineType = static_cast<LineType>(m_qcpgrid->pen().style());
|
||||
if(m_lineType == value) return;
|
||||
m_lineType = value;
|
||||
QPen pen = m_qcpgrid->pen();
|
||||
pen.setStyle(static_cast<Qt::PenStyle>(value));
|
||||
m_qcpgrid->setPen(pen);
|
||||
Q_EMIT lineTypeChanged(m_lineType);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Grid::set_subLineWidth(int value) noexcept
|
||||
{
|
||||
m_subLineWidth = m_qcpgrid->subGridPen().width();
|
||||
if(m_subLineWidth == value) return;
|
||||
m_subLineWidth = value;
|
||||
QPen pen = m_qcpgrid->subGridPen();
|
||||
pen.setWidth(value);
|
||||
m_qcpgrid->setSubGridPen(pen);
|
||||
Q_EMIT subLineWidthChanged(m_subLineWidth);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Grid::set_subLineColor(const QColor &value) noexcept
|
||||
{
|
||||
m_subLineColor = m_qcpgrid->subGridPen().color();
|
||||
if(m_subLineColor == value) return;
|
||||
m_subLineColor = value;
|
||||
QPen pen = m_qcpgrid->subGridPen();
|
||||
pen.setColor(value);
|
||||
m_qcpgrid->setSubGridPen(pen);
|
||||
Q_EMIT subLineColorChanged(m_subLineColor);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Grid::set_subLineType(LineType value) noexcept
|
||||
{
|
||||
m_subLineType = static_cast<LineType>(m_qcpgrid->subGridPen().style());
|
||||
if(m_subLineType == value) return;
|
||||
m_subLineType = value;
|
||||
QPen pen = m_qcpgrid->subGridPen();
|
||||
pen.setStyle(static_cast<Qt::PenStyle>(value));
|
||||
m_qcpgrid->setSubGridPen(pen);
|
||||
Q_EMIT subLineTypeChanged(m_subLineType);
|
||||
m_parentPlot->replot();
|
||||
}
|
||||
|
||||
void Grid::updateProperty() noexcept
|
||||
{
|
||||
m_visible = m_qcpgrid->visible();
|
||||
m_subVisible = m_qcpgrid->subGridVisible();
|
||||
m_lineWidth = m_qcpgrid->pen().width();
|
||||
m_lineColor = m_qcpgrid->pen().color();
|
||||
m_lineType = static_cast<LineType>(m_qcpgrid->pen().style());
|
||||
m_subLineWidth = m_qcpgrid->subGridPen().width();
|
||||
m_subLineColor = m_qcpgrid->subGridPen().color();
|
||||
m_subLineType = static_cast<LineType>(m_qcpgrid->subGridPen().style());
|
||||
Q_EMIT visibleChanged(m_visible);
|
||||
Q_EMIT subVisibleChanged(m_subVisible);
|
||||
Q_EMIT lineWidthChanged(m_lineWidth);
|
||||
Q_EMIT lineColorChanged(m_lineColor);
|
||||
Q_EMIT lineTypeChanged(m_lineType);
|
||||
Q_EMIT subLineWidthChanged(m_subLineWidth);
|
||||
Q_EMIT subLineColorChanged(m_subLineColor);
|
||||
Q_EMIT subLineTypeChanged(m_subLineType);
|
||||
}
|
||||
|
||||
}
|
||||
61
src/qmlcustomplot/grid.h
Normal file
61
src/qmlcustomplot/grid.h
Normal file
@ -0,0 +1,61 @@
|
||||
#pragma once
|
||||
|
||||
#include "macros.h"
|
||||
#include <QtCore/QObject>
|
||||
#include <QtGui/QColor>
|
||||
#include <QtQml/qqml.h>
|
||||
|
||||
class QCPGrid;
|
||||
class QCustomPlot;
|
||||
|
||||
namespace QmlQCustomPlot
|
||||
{
|
||||
|
||||
class Grid : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_ENUMS(LineType)
|
||||
QML_NAMED_ELEMENT(PlotGrid)
|
||||
QML_UNCREATABLE("")
|
||||
public:
|
||||
enum LineType
|
||||
{
|
||||
NoPen,
|
||||
SolidLine,
|
||||
DashLine,
|
||||
DotLine,
|
||||
DashDotLine,
|
||||
DashDotDotLine
|
||||
};
|
||||
private:
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(bool, visible)
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(bool, subVisible)
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(int, lineWidth)
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(QColor, lineColor)
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(LineType, lineType)
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(int, subLineWidth)
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(QColor, subLineColor)
|
||||
QML_READ_WRITE_NOTIFY_PROPERTY(LineType, subLineType)
|
||||
public:
|
||||
|
||||
Grid(QCPGrid* grid, QCustomPlot *parentPlot, QObject *parent = nullptr);
|
||||
~Grid();
|
||||
|
||||
void set_visible(bool value) noexcept;
|
||||
void set_subVisible(bool value) noexcept;
|
||||
void set_lineWidth(int value) noexcept;
|
||||
void set_lineColor(const QColor &value) noexcept;
|
||||
void set_lineType(LineType value) noexcept;
|
||||
void set_subLineWidth(int value) noexcept;
|
||||
void set_subLineColor(const QColor &value) noexcept;
|
||||
void set_subLineType(LineType value) noexcept;
|
||||
|
||||
private:
|
||||
void updateProperty() noexcept;
|
||||
|
||||
private:
|
||||
QCustomPlot *m_parentPlot = nullptr;
|
||||
QCPGrid *m_qcpgrid = nullptr;
|
||||
};
|
||||
|
||||
} // namespace QmlQCustomPlot
|
||||
33
src/qmlcustomplot/macros.h
Normal file
33
src/qmlcustomplot/macros.h
Normal file
@ -0,0 +1,33 @@
|
||||
#pragma once
|
||||
|
||||
namespace QmlQCustomPlot
|
||||
{
|
||||
|
||||
|
||||
|
||||
#define QML_READ_WRITE_NOTIFY_PROPERTY(TYPE, NAME) \
|
||||
Q_PROPERTY(TYPE NAME READ NAME WRITE set_##NAME NOTIFY NAME##Changed) \
|
||||
public: \
|
||||
TYPE NAME() const { return m_##NAME; } \
|
||||
Q_SIGNAL void NAME##Changed(TYPE); \
|
||||
private: \
|
||||
TYPE m_##NAME {};
|
||||
|
||||
#define QML_READ_NOTIFY_PROPERTY(TYPE, NAME) \
|
||||
Q_PROPERTY(TYPE NAME READ NAME NOTIFY NAME##Changed) \
|
||||
public: \
|
||||
TYPE NAME() const { return m_##NAME; } \
|
||||
Q_SIGNAL void NAME##Changed(TYPE); \
|
||||
private: \
|
||||
TYPE m_##NAME {};
|
||||
|
||||
#define QML_READ_CONSTANT(TYPE, NAME) \
|
||||
Q_PROPERTY(TYPE NAME READ NAME CONSTANT) \
|
||||
public: \
|
||||
TYPE NAME() const { return m_##NAME; } \
|
||||
Q_SIGNAL void NAME##Changed(TYPE); \
|
||||
private: \
|
||||
TYPE m_##NAME {};
|
||||
|
||||
|
||||
} // namespace QmlQCustomPlot
|
||||
35529
src/qmlcustomplot/qcustomplot.cpp
Normal file
35529
src/qmlcustomplot/qcustomplot.cpp
Normal file
File diff suppressed because it is too large
Load Diff
7774
src/qmlcustomplot/qcustomplot.h
Normal file
7774
src/qmlcustomplot/qcustomplot.h
Normal file
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user