3rdparty: Adapt to latest.

This commit is contained in:
Mentalflow 2025-05-01 01:03:23 +08:00
parent b4f3b9b5d5
commit 3cc6ff6c27
Signed by: Mentalflow
GPG Key ID: 5AE68D4401A2EE71
52 changed files with 74 additions and 51 deletions

@ -1 +1 @@
Subproject commit 3a08138e9c84ee5f3f6d1fb3b368f974c68e4fdd Subproject commit c48c7db067399d2373b3a4f7b8dd3865170e3c77

2
3rdparty/qwindowkit vendored

@ -1 +1 @@
Subproject commit 5706ba3d99f6a147499d6a122959ed865e447470 Subproject commit 153e1f4f2fb711f5ec7072e0e49346fc76901cc3

View File

@ -23,6 +23,9 @@
- [2.3.2 不显示抓握指示器文本的开关](#232-不显示抓握指示器文本的开关) - [2.3.2 不显示抓握指示器文本的开关](#232-不显示抓握指示器文本的开关)
- [2.3.2.1 代码](#2321-代码) - [2.3.2.1 代码](#2321-代码)
- [2.3.2.2 代码预览](#2322-代码预览) - [2.3.2.2 代码预览](#2322-代码预览)
- [3.RibbonPushButton](#3ribbonpushbutton)
- [3.1 概述](#31-概述)
- [3.2 属性](#32-属性)
## 1.RibbonButton ## 1.RibbonButton
### 1.1 概述 ### 1.1 概述
@ -204,3 +207,21 @@ RibbonSwitchButton{
</div> </div>
<p align="center">RibbonSwitchButton Without Grabber Text</p> <p align="center">RibbonSwitchButton Without Grabber Text</p>
</div> </div>
## 3.RibbonPushButton
### 3.1 概述
+ 父类Item
+ 展示:
<div align="center">
<div align="center">
<img src="../pictures/RibbonSwitchButton/RSB-light.png" alt="RibbonSwitchButton Light Style" style="width:30%; height:auto;">
<img src="../pictures/RibbonSwitchButton/RSB-dark.png" alt="RibbonSwitchButton Dark Style" style="width:30%; height:auto;">
</div>
<p align="center">RibbonSwitchButton Light/Dark Style</p>
</div>
### 3.2 属性
<!-- | `` | `` | |-->
| 名称 | 说明 | 示例图片 |
|:----:|:----:|:----:|

View File

@ -83,6 +83,8 @@ endforeach(qmlfile)
if(QT_VERSION VERSION_LESS 6.0) if(QT_VERSION VERSION_LESS 6.0)
include(Qt5QMLPlugin) include(Qt5QMLPlugin)
set(__qml_plugin_depend_module "QWindowKit") set(__qml_plugin_depend_module "QWindowKit")
set(__qml_plugin_depend_module_version 1.0)
set(__qml_plugin_depend_module_fake "QWindowKit")
endif() endif()
# Define the RibbonUI library # Define the RibbonUI library

View File

@ -1,5 +1,5 @@
import QtQuick 2.15 import QtQuick 2.15
import RibbonUI 1.0 import RibbonUI 1.1
Item { Item {
id: control id: control

View File

@ -1,5 +1,5 @@
import QtQuick 2.15 import QtQuick 2.15
import RibbonUI 1.0 import RibbonUI 1.1
RibbonObject { RibbonObject {
id: control id: control

View File

@ -1,5 +1,5 @@
import QtQuick 2.15 import QtQuick 2.15
import RibbonUI 1.0 import RibbonUI 1.1
Item { Item {
id: control id: control

View File

@ -2,7 +2,7 @@ import QtQuick 2.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
Popup { Popup {
id: control id: control

View File

@ -1,6 +1,6 @@
import QtQuick 2.15 import QtQuick 2.15
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import RibbonUI 1.0 import RibbonUI 1.1
RibbonRectangle { RibbonRectangle {
id: control id: control

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import RibbonUI 1.0 import RibbonUI 1.1
Item { Item {
id: root id: root

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import RibbonUI 1.0 import RibbonUI 1.1
BusyIndicator { BusyIndicator {
id: control id: control

View File

@ -1,6 +1,6 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import RibbonUI 1.0 import RibbonUI 1.1
BusyIndicator { BusyIndicator {
id: control id: control

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
Button { Button {
id: root id: root

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
Button { Button {
id: control id: control

View File

@ -2,7 +2,7 @@ import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
ComboBox { ComboBox {
id: control id: control

View File

@ -1,5 +1,5 @@
import QtQuick 2.15 import QtQuick 2.15
import RibbonUI 1.0 import RibbonUI 1.1
Text { Text {
property int iconSource property int iconSource

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
TextField{ TextField{
id: control id: control

View File

@ -2,7 +2,7 @@ import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import RibbonUI 1.0 import RibbonUI 1.1
Menu { Menu {
id:control id:control

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
MenuItem { MenuItem {
id: control id: control

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
MenuSeparator { MenuSeparator {
id: control id: control

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
Rectangle{ Rectangle{
id: bubble id: bubble

View File

@ -2,7 +2,7 @@ import QtQuick 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import RibbonUI 1.0 import RibbonUI 1.1
Rectangle { Rectangle {
id: control id: control

View File

@ -2,7 +2,7 @@ import QtQuick 2.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import RibbonUI 1.0 import RibbonUI 1.1
RibbonBlur { RibbonBlur {
id: control id: control

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
RibbonView{ RibbonView{
id: view id: view

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
PageIndicator { PageIndicator {
id: control id: control

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
RibbonView { RibbonView {
id: control id: control

View File

@ -2,7 +2,7 @@ import QtQuick 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import RibbonUI 1.0 import RibbonUI 1.1
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
Popup { Popup {

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
RibbonPopup { RibbonPopup {
id: control id: control

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import RibbonUI 1.0 import RibbonUI 1.1
Item{ Item{
id: control id: control

View File

@ -1,5 +1,5 @@
import QtQuick 2.15 import QtQuick 2.15
import RibbonUI 1.0 import RibbonUI 1.1
RibbonProgressBar { RibbonProgressBar {
id: control id: control

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
Item { Item {
id: root id: root

View File

@ -1,6 +1,6 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import RibbonUI 1.0 import RibbonUI 1.1
RadioButton { RadioButton {
id: control id: control

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
ScrollBar { ScrollBar {
id: control id: control

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
ScrollIndicator { ScrollIndicator {
id: control id: control

View File

@ -1,6 +1,6 @@
import QtQuick 2.15 import QtQuick 2.15
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import RibbonUI 1.0 import RibbonUI 1.1
DropShadow { DropShadow {
property real shadowOpacity: 0.2 property real shadowOpacity: 0.2

View File

@ -2,7 +2,7 @@ import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import RibbonUI 1.0 import RibbonUI 1.1
Item { Item {
id: control id: control

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
SpinBox { SpinBox {
id: control id: control

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
Button { Button {
id: control id: control

View File

@ -3,7 +3,7 @@ import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import RibbonUI 1.0 import RibbonUI 1.1
Item{ Item{
id: root id: root

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
TabButton { TabButton {
id: control id: control

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
Item { Item {
id:control id:control

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
Item { Item {
property string title property string title

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
TextEdit { TextEdit {
id: control id: control

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
RibbonMenu{ RibbonMenu{
property var inputItem property var inputItem

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
Item{ Item{
id: control id: control

View File

@ -2,7 +2,7 @@ import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import RibbonUI 1.0 import RibbonUI 1.1
Item { Item {
id: control id: control

View File

@ -2,7 +2,7 @@ import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import RibbonUI 1.0 import RibbonUI 1.1
ToolTip { ToolTip {
id: control id: control

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
Popup { Popup {

View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import RibbonUI 1.0 import RibbonUI 1.1
Item { Item {
id:control id:control

View File

@ -1,5 +1,5 @@
import QtQuick 2.15 import QtQuick 2.15
import RibbonUI 1.0 import RibbonUI 1.1
RibbonObject { RibbonObject {
id: control id: control

View File

@ -3,7 +3,7 @@ import QtQuick.Controls 2.15
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import RibbonUI 1.0 import RibbonUI 1.1
Item { Item {
id: root id: root

View File

@ -1,5 +1,5 @@
import QtQuick 2.15 import QtQuick 2.15
import RibbonUI 1.0 import RibbonUI 1.1
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QWindowKit 1.0 import QWindowKit 1.0