3rdparty: Adapt to latest.
This commit is contained in:
parent
b4f3b9b5d5
commit
3cc6ff6c27
|
@ -1 +1 @@
|
|||
Subproject commit 3a08138e9c84ee5f3f6d1fb3b368f974c68e4fdd
|
||||
Subproject commit c48c7db067399d2373b3a4f7b8dd3865170e3c77
|
|
@ -1 +1 @@
|
|||
Subproject commit 5706ba3d99f6a147499d6a122959ed865e447470
|
||||
Subproject commit 153e1f4f2fb711f5ec7072e0e49346fc76901cc3
|
|
@ -23,6 +23,9 @@
|
|||
- [2.3.2 不显示抓握指示器文本的开关](#232-不显示抓握指示器文本的开关)
|
||||
- [2.3.2.1 代码](#2321-代码)
|
||||
- [2.3.2.2 代码预览](#2322-代码预览)
|
||||
- [3.RibbonPushButton](#3ribbonpushbutton)
|
||||
- [3.1 概述](#31-概述)
|
||||
- [3.2 属性](#32-属性)
|
||||
|
||||
## 1.RibbonButton
|
||||
### 1.1 概述
|
||||
|
@ -203,4 +206,22 @@ RibbonSwitchButton{
|
|||
<img src="../pictures/RibbonSwitchButton/RSB-switchWithoutGrabberText.png" alt="RibbonSwitchButton With Grabber Text" style="width:20%; height:auto;">
|
||||
</div>
|
||||
<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 属性
|
||||
<!-- | `` | ``, | |-->
|
||||
| 名称 | 说明 | 示例图片 |
|
||||
|:----:|:----:|:----:|
|
||||
|
||||
|
|
|
@ -83,6 +83,8 @@ endforeach(qmlfile)
|
|||
if(QT_VERSION VERSION_LESS 6.0)
|
||||
include(Qt5QMLPlugin)
|
||||
set(__qml_plugin_depend_module "QWindowKit")
|
||||
set(__qml_plugin_depend_module_version 1.0)
|
||||
set(__qml_plugin_depend_module_fake "QWindowKit")
|
||||
endif()
|
||||
|
||||
# Define the RibbonUI library
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import QtQuick 2.15
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Item {
|
||||
id: control
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import QtQuick 2.15
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
RibbonObject {
|
||||
id: control
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import QtQuick 2.15
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Item {
|
||||
id: control
|
||||
|
|
|
@ -2,7 +2,7 @@ import QtQuick 2.15
|
|||
import QtQuick.Window 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Popup {
|
||||
id: control
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import QtQuick 2.15
|
||||
import QtGraphicalEffects 1.0
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
RibbonRectangle {
|
||||
id: control
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import QtQuick.Window 2.15
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Item {
|
||||
id: root
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtGraphicalEffects 1.0
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
BusyIndicator {
|
||||
id: control
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
BusyIndicator {
|
||||
id: control
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Button {
|
||||
id: root
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Button {
|
||||
id: control
|
||||
|
|
|
@ -2,7 +2,7 @@ import QtQuick 2.15
|
|||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Window 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
ComboBox {
|
||||
id: control
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import QtQuick 2.15
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Text {
|
||||
property int iconSource
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
TextField{
|
||||
id: control
|
||||
|
|
|
@ -2,7 +2,7 @@ import QtQuick 2.15
|
|||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import QtQuick.Window 2.15
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Menu {
|
||||
id:control
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
MenuItem {
|
||||
id: control
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
MenuSeparator {
|
||||
id: control
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Rectangle{
|
||||
id: bubble
|
||||
|
|
|
@ -2,7 +2,7 @@ import QtQuick 2.15
|
|||
import QtQuick.Layouts 1.11
|
||||
import QtQuick.Window 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Rectangle {
|
||||
id: control
|
||||
|
|
|
@ -2,7 +2,7 @@ import QtQuick 2.15
|
|||
import QtQuick.Window 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import QtQuick.Controls 2.15
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
RibbonBlur {
|
||||
id: control
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
RibbonView{
|
||||
id: view
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
PageIndicator {
|
||||
id: control
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
RibbonView {
|
||||
id: control
|
||||
|
|
|
@ -2,7 +2,7 @@ import QtQuick 2.15
|
|||
import QtQuick.Layouts 1.11
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Window 2.15
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
import QtGraphicalEffects 1.0
|
||||
|
||||
Popup {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
RibbonPopup {
|
||||
id: control
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtGraphicalEffects 1.0
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Item{
|
||||
id: control
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import QtQuick 2.15
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
RibbonProgressBar {
|
||||
id: control
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Item {
|
||||
id: root
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
RadioButton {
|
||||
id: control
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
ScrollBar {
|
||||
id: control
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
ScrollIndicator {
|
||||
id: control
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import QtQuick 2.15
|
||||
import QtGraphicalEffects 1.0
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
DropShadow {
|
||||
property real shadowOpacity: 0.2
|
||||
|
|
|
@ -2,7 +2,7 @@ import QtQuick 2.15
|
|||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import QtGraphicalEffects 1.0
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Item {
|
||||
id: control
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
SpinBox {
|
||||
id: control
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Button {
|
||||
id: control
|
||||
|
|
|
@ -3,7 +3,7 @@ import QtQuick.Controls 2.15
|
|||
import QtQuick.Layouts 1.11
|
||||
import QtQuick.Window 2.15
|
||||
import QtGraphicalEffects 1.0
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Item{
|
||||
id: root
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
TabButton {
|
||||
id: control
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Item {
|
||||
id:control
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Item {
|
||||
property string title
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
TextEdit {
|
||||
id: control
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
RibbonMenu{
|
||||
property var inputItem
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Item{
|
||||
id: control
|
||||
|
|
|
@ -2,7 +2,7 @@ import QtQuick 2.15
|
|||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import QtQuick.Window 2.15
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Item {
|
||||
id: control
|
||||
|
|
|
@ -2,7 +2,7 @@ import QtQuick 2.15
|
|||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import QtGraphicalEffects 1.0
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
ToolTip {
|
||||
id: control
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
import QtGraphicalEffects 1.0
|
||||
|
||||
Popup {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.11
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Item {
|
||||
id:control
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import QtQuick 2.15
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
RibbonObject {
|
||||
id: control
|
||||
|
|
|
@ -3,7 +3,7 @@ import QtQuick.Controls 2.15
|
|||
import QtQuick.Layouts 1.11
|
||||
import QtQuick.Window 2.15
|
||||
import QtGraphicalEffects 1.0
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
|
||||
Item {
|
||||
id: root
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import QtQuick 2.15
|
||||
import RibbonUI 1.0
|
||||
import RibbonUI 1.1
|
||||
import QtQuick.Window 2.15
|
||||
import QWindowKit 1.0
|
||||
|
||||
|
|
Loading…
Reference in New Issue