From 3cc6ff6c2711358617e44951fb77229e1a0c371c Mon Sep 17 00:00:00 2001 From: Mentalflow <312902918@qq.com> Date: Thu, 1 May 2025 01:03:23 +0800 Subject: [PATCH] 3rdparty: Adapt to latest. --- 3rdparty/Qt5QMLPlugin | 2 +- 3rdparty/qwindowkit | 2 +- documents/api/buttons(zh-cn).md | 23 ++++++++++++++++++- lib_source/CMakeLists.txt | 2 ++ lib_source/qml/Qt5/RibbonBackStageGroup.qml | 2 +- .../qml/Qt5/RibbonBackStageMenuItem.qml | 2 +- lib_source/qml/Qt5/RibbonBackStagePage.qml | 2 +- lib_source/qml/Qt5/RibbonBackStageView.qml | 2 +- lib_source/qml/Qt5/RibbonBlur.qml | 2 +- lib_source/qml/Qt5/RibbonBottomBar.qml | 2 +- lib_source/qml/Qt5/RibbonBusyBar.qml | 2 +- lib_source/qml/Qt5/RibbonBusyRing.qml | 2 +- lib_source/qml/Qt5/RibbonButton.qml | 2 +- lib_source/qml/Qt5/RibbonCheckBox.qml | 2 +- lib_source/qml/Qt5/RibbonComboBox.qml | 2 +- lib_source/qml/Qt5/RibbonIcon.qml | 2 +- lib_source/qml/Qt5/RibbonLineEdit.qml | 2 +- lib_source/qml/Qt5/RibbonMenu.qml | 2 +- lib_source/qml/Qt5/RibbonMenuItem.qml | 2 +- lib_source/qml/Qt5/RibbonMenuSeparator.qml | 2 +- lib_source/qml/Qt5/RibbonMessage.qml | 2 +- lib_source/qml/Qt5/RibbonMessageBar.qml | 2 +- lib_source/qml/Qt5/RibbonMessageBarGroup.qml | 2 +- lib_source/qml/Qt5/RibbonMessageListView.qml | 2 +- lib_source/qml/Qt5/RibbonPageIndicator.qml | 2 +- lib_source/qml/Qt5/RibbonPaperView.qml | 2 +- lib_source/qml/Qt5/RibbonPopup.qml | 2 +- lib_source/qml/Qt5/RibbonPopupDialog.qml | 2 +- lib_source/qml/Qt5/RibbonProgressBar.qml | 2 +- lib_source/qml/Qt5/RibbonProgressRing.qml | 2 +- lib_source/qml/Qt5/RibbonPushButton.qml | 2 +- lib_source/qml/Qt5/RibbonRadioButton.qml | 2 +- lib_source/qml/Qt5/RibbonScrollBar.qml | 2 +- lib_source/qml/Qt5/RibbonScrollIndicator.qml | 2 +- lib_source/qml/Qt5/RibbonShadow.qml | 2 +- lib_source/qml/Qt5/RibbonSlider.qml | 2 +- lib_source/qml/Qt5/RibbonSpinBox.qml | 2 +- lib_source/qml/Qt5/RibbonSwitchButton.qml | 2 +- lib_source/qml/Qt5/RibbonTabBar.qml | 2 +- lib_source/qml/Qt5/RibbonTabButton.qml | 2 +- lib_source/qml/Qt5/RibbonTabGroup.qml | 2 +- lib_source/qml/Qt5/RibbonTabPage.qml | 2 +- lib_source/qml/Qt5/RibbonText.qml | 2 +- lib_source/qml/Qt5/RibbonTextBoxMenu.qml | 2 +- lib_source/qml/Qt5/RibbonTextEdit.qml | 2 +- lib_source/qml/Qt5/RibbonTitleBar.qml | 2 +- lib_source/qml/Qt5/RibbonToolTip.qml | 2 +- lib_source/qml/Qt5/RibbonTour.qml | 2 +- lib_source/qml/Qt5/RibbonTourContent.qml | 2 +- lib_source/qml/Qt5/RibbonTourItem.qml | 2 +- lib_source/qml/Qt5/RibbonView.qml | 2 +- lib_source/qml/Qt5/RibbonWindow.qml | 2 +- 52 files changed, 74 insertions(+), 51 deletions(-) diff --git a/3rdparty/Qt5QMLPlugin b/3rdparty/Qt5QMLPlugin index 3a08138..c48c7db 160000 --- a/3rdparty/Qt5QMLPlugin +++ b/3rdparty/Qt5QMLPlugin @@ -1 +1 @@ -Subproject commit 3a08138e9c84ee5f3f6d1fb3b368f974c68e4fdd +Subproject commit c48c7db067399d2373b3a4f7b8dd3865170e3c77 diff --git a/3rdparty/qwindowkit b/3rdparty/qwindowkit index 5706ba3..153e1f4 160000 --- a/3rdparty/qwindowkit +++ b/3rdparty/qwindowkit @@ -1 +1 @@ -Subproject commit 5706ba3d99f6a147499d6a122959ed865e447470 +Subproject commit 153e1f4f2fb711f5ec7072e0e49346fc76901cc3 diff --git a/documents/api/buttons(zh-cn).md b/documents/api/buttons(zh-cn).md index 00315b8..58b8590 100644 --- a/documents/api/buttons(zh-cn).md +++ b/documents/api/buttons(zh-cn).md @@ -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{ RibbonSwitchButton With Grabber Text

RibbonSwitchButton Without Grabber Text

- \ No newline at end of file + + +## 3.RibbonPushButton +### 3.1 概述 ++ 父类：Item ++ 展示： +
+
+ RibbonSwitchButton Light Style + RibbonSwitchButton Dark Style +
+

RibbonSwitchButton Light/Dark Style

+
+ +### 3.2 属性 + +| 名称 | 说明 | 示例图片 | +|:----:|:----:|:----:| + diff --git a/lib_source/CMakeLists.txt b/lib_source/CMakeLists.txt index dd5393b..10e8545 100644 --- a/lib_source/CMakeLists.txt +++ b/lib_source/CMakeLists.txt @@ -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 diff --git a/lib_source/qml/Qt5/RibbonBackStageGroup.qml b/lib_source/qml/Qt5/RibbonBackStageGroup.qml index 8777765..0fa3be1 100644 --- a/lib_source/qml/Qt5/RibbonBackStageGroup.qml +++ b/lib_source/qml/Qt5/RibbonBackStageGroup.qml @@ -1,5 +1,5 @@ import QtQuick 2.15 -import RibbonUI 1.0 +import RibbonUI 1.1 Item { id: control diff --git a/lib_source/qml/Qt5/RibbonBackStageMenuItem.qml b/lib_source/qml/Qt5/RibbonBackStageMenuItem.qml index b4ac76f..b4411fa 100644 --- a/lib_source/qml/Qt5/RibbonBackStageMenuItem.qml +++ b/lib_source/qml/Qt5/RibbonBackStageMenuItem.qml @@ -1,5 +1,5 @@ import QtQuick 2.15 -import RibbonUI 1.0 +import RibbonUI 1.1 RibbonObject { id: control diff --git a/lib_source/qml/Qt5/RibbonBackStagePage.qml b/lib_source/qml/Qt5/RibbonBackStagePage.qml index 319b7d8..42f62bf 100644 --- a/lib_source/qml/Qt5/RibbonBackStagePage.qml +++ b/lib_source/qml/Qt5/RibbonBackStagePage.qml @@ -1,5 +1,5 @@ import QtQuick 2.15 -import RibbonUI 1.0 +import RibbonUI 1.1 Item { id: control diff --git a/lib_source/qml/Qt5/RibbonBackStageView.qml b/lib_source/qml/Qt5/RibbonBackStageView.qml index c74e62a..54cc7e2 100644 --- a/lib_source/qml/Qt5/RibbonBackStageView.qml +++ b/lib_source/qml/Qt5/RibbonBackStageView.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonBlur.qml b/lib_source/qml/Qt5/RibbonBlur.qml index 7c7e5c9..a513533 100644 --- a/lib_source/qml/Qt5/RibbonBlur.qml +++ b/lib_source/qml/Qt5/RibbonBlur.qml @@ -1,6 +1,6 @@ import QtQuick 2.15 import QtGraphicalEffects 1.0 -import RibbonUI 1.0 +import RibbonUI 1.1 RibbonRectangle { id: control diff --git a/lib_source/qml/Qt5/RibbonBottomBar.qml b/lib_source/qml/Qt5/RibbonBottomBar.qml index 9c933e2..033fc24 100644 --- a/lib_source/qml/Qt5/RibbonBottomBar.qml +++ b/lib_source/qml/Qt5/RibbonBottomBar.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonBusyBar.qml b/lib_source/qml/Qt5/RibbonBusyBar.qml index 1f62703..1d632ed 100644 --- a/lib_source/qml/Qt5/RibbonBusyBar.qml +++ b/lib_source/qml/Qt5/RibbonBusyBar.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonBusyRing.qml b/lib_source/qml/Qt5/RibbonBusyRing.qml index dca8a81..1b72504 100644 --- a/lib_source/qml/Qt5/RibbonBusyRing.qml +++ b/lib_source/qml/Qt5/RibbonBusyRing.qml @@ -1,6 +1,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import RibbonUI 1.0 +import RibbonUI 1.1 BusyIndicator { id: control diff --git a/lib_source/qml/Qt5/RibbonButton.qml b/lib_source/qml/Qt5/RibbonButton.qml index 17cffa6..52c9c71 100644 --- a/lib_source/qml/Qt5/RibbonButton.qml +++ b/lib_source/qml/Qt5/RibbonButton.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonCheckBox.qml b/lib_source/qml/Qt5/RibbonCheckBox.qml index 58390a0..7cc3a60 100644 --- a/lib_source/qml/Qt5/RibbonCheckBox.qml +++ b/lib_source/qml/Qt5/RibbonCheckBox.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonComboBox.qml b/lib_source/qml/Qt5/RibbonComboBox.qml index 9291c76..a596e43 100644 --- a/lib_source/qml/Qt5/RibbonComboBox.qml +++ b/lib_source/qml/Qt5/RibbonComboBox.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonIcon.qml b/lib_source/qml/Qt5/RibbonIcon.qml index f8efc2d..28d0ebf 100644 --- a/lib_source/qml/Qt5/RibbonIcon.qml +++ b/lib_source/qml/Qt5/RibbonIcon.qml @@ -1,5 +1,5 @@ import QtQuick 2.15 -import RibbonUI 1.0 +import RibbonUI 1.1 Text { property int iconSource diff --git a/lib_source/qml/Qt5/RibbonLineEdit.qml b/lib_source/qml/Qt5/RibbonLineEdit.qml index 0fa773b..980c061 100644 --- a/lib_source/qml/Qt5/RibbonLineEdit.qml +++ b/lib_source/qml/Qt5/RibbonLineEdit.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonMenu.qml b/lib_source/qml/Qt5/RibbonMenu.qml index d3d6203..07748c8 100644 --- a/lib_source/qml/Qt5/RibbonMenu.qml +++ b/lib_source/qml/Qt5/RibbonMenu.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonMenuItem.qml b/lib_source/qml/Qt5/RibbonMenuItem.qml index 478d432..27950c3 100644 --- a/lib_source/qml/Qt5/RibbonMenuItem.qml +++ b/lib_source/qml/Qt5/RibbonMenuItem.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonMenuSeparator.qml b/lib_source/qml/Qt5/RibbonMenuSeparator.qml index c1b6a48..bf4ccff 100644 --- a/lib_source/qml/Qt5/RibbonMenuSeparator.qml +++ b/lib_source/qml/Qt5/RibbonMenuSeparator.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonMessage.qml b/lib_source/qml/Qt5/RibbonMessage.qml index ab2dece..34e79a2 100644 --- a/lib_source/qml/Qt5/RibbonMessage.qml +++ b/lib_source/qml/Qt5/RibbonMessage.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonMessageBar.qml b/lib_source/qml/Qt5/RibbonMessageBar.qml index e4d0682..889e55d 100644 --- a/lib_source/qml/Qt5/RibbonMessageBar.qml +++ b/lib_source/qml/Qt5/RibbonMessageBar.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonMessageBarGroup.qml b/lib_source/qml/Qt5/RibbonMessageBarGroup.qml index 88633ef..8a4e0bf 100644 --- a/lib_source/qml/Qt5/RibbonMessageBarGroup.qml +++ b/lib_source/qml/Qt5/RibbonMessageBarGroup.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonMessageListView.qml b/lib_source/qml/Qt5/RibbonMessageListView.qml index 327daec..e740f11 100644 --- a/lib_source/qml/Qt5/RibbonMessageListView.qml +++ b/lib_source/qml/Qt5/RibbonMessageListView.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonPageIndicator.qml b/lib_source/qml/Qt5/RibbonPageIndicator.qml index fd6fd34..3885dd4 100644 --- a/lib_source/qml/Qt5/RibbonPageIndicator.qml +++ b/lib_source/qml/Qt5/RibbonPageIndicator.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonPaperView.qml b/lib_source/qml/Qt5/RibbonPaperView.qml index 998ff46..82392e4 100644 --- a/lib_source/qml/Qt5/RibbonPaperView.qml +++ b/lib_source/qml/Qt5/RibbonPaperView.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonPopup.qml b/lib_source/qml/Qt5/RibbonPopup.qml index 773eef8..3824e9a 100644 --- a/lib_source/qml/Qt5/RibbonPopup.qml +++ b/lib_source/qml/Qt5/RibbonPopup.qml @@ -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 { diff --git a/lib_source/qml/Qt5/RibbonPopupDialog.qml b/lib_source/qml/Qt5/RibbonPopupDialog.qml index 81b221c..588d575 100644 --- a/lib_source/qml/Qt5/RibbonPopupDialog.qml +++ b/lib_source/qml/Qt5/RibbonPopupDialog.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonProgressBar.qml b/lib_source/qml/Qt5/RibbonProgressBar.qml index b5e848c..5130dd3 100644 --- a/lib_source/qml/Qt5/RibbonProgressBar.qml +++ b/lib_source/qml/Qt5/RibbonProgressBar.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonProgressRing.qml b/lib_source/qml/Qt5/RibbonProgressRing.qml index d46f6d4..b345b4d 100644 --- a/lib_source/qml/Qt5/RibbonProgressRing.qml +++ b/lib_source/qml/Qt5/RibbonProgressRing.qml @@ -1,5 +1,5 @@ import QtQuick 2.15 -import RibbonUI 1.0 +import RibbonUI 1.1 RibbonProgressBar { id: control diff --git a/lib_source/qml/Qt5/RibbonPushButton.qml b/lib_source/qml/Qt5/RibbonPushButton.qml index a7802a1..e470a3a 100644 --- a/lib_source/qml/Qt5/RibbonPushButton.qml +++ b/lib_source/qml/Qt5/RibbonPushButton.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonRadioButton.qml b/lib_source/qml/Qt5/RibbonRadioButton.qml index d06a871..0a9997a 100644 --- a/lib_source/qml/Qt5/RibbonRadioButton.qml +++ b/lib_source/qml/Qt5/RibbonRadioButton.qml @@ -1,6 +1,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import RibbonUI 1.0 +import RibbonUI 1.1 RadioButton { id: control diff --git a/lib_source/qml/Qt5/RibbonScrollBar.qml b/lib_source/qml/Qt5/RibbonScrollBar.qml index faff0de..07ff403 100644 --- a/lib_source/qml/Qt5/RibbonScrollBar.qml +++ b/lib_source/qml/Qt5/RibbonScrollBar.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonScrollIndicator.qml b/lib_source/qml/Qt5/RibbonScrollIndicator.qml index e48b314..ed41c11 100644 --- a/lib_source/qml/Qt5/RibbonScrollIndicator.qml +++ b/lib_source/qml/Qt5/RibbonScrollIndicator.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonShadow.qml b/lib_source/qml/Qt5/RibbonShadow.qml index 5d6e9c9..22cc02a 100644 --- a/lib_source/qml/Qt5/RibbonShadow.qml +++ b/lib_source/qml/Qt5/RibbonShadow.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonSlider.qml b/lib_source/qml/Qt5/RibbonSlider.qml index aaeb9cb..461de0e 100644 --- a/lib_source/qml/Qt5/RibbonSlider.qml +++ b/lib_source/qml/Qt5/RibbonSlider.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonSpinBox.qml b/lib_source/qml/Qt5/RibbonSpinBox.qml index 5c8b2be..8d7466b 100644 --- a/lib_source/qml/Qt5/RibbonSpinBox.qml +++ b/lib_source/qml/Qt5/RibbonSpinBox.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonSwitchButton.qml b/lib_source/qml/Qt5/RibbonSwitchButton.qml index ed8be93..2f3a91b 100644 --- a/lib_source/qml/Qt5/RibbonSwitchButton.qml +++ b/lib_source/qml/Qt5/RibbonSwitchButton.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonTabBar.qml b/lib_source/qml/Qt5/RibbonTabBar.qml index a2146d8..8069e11 100644 --- a/lib_source/qml/Qt5/RibbonTabBar.qml +++ b/lib_source/qml/Qt5/RibbonTabBar.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonTabButton.qml b/lib_source/qml/Qt5/RibbonTabButton.qml index 367b5f7..bb6dbd5 100644 --- a/lib_source/qml/Qt5/RibbonTabButton.qml +++ b/lib_source/qml/Qt5/RibbonTabButton.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonTabGroup.qml b/lib_source/qml/Qt5/RibbonTabGroup.qml index 4d3bdb9..1b07802 100644 --- a/lib_source/qml/Qt5/RibbonTabGroup.qml +++ b/lib_source/qml/Qt5/RibbonTabGroup.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonTabPage.qml b/lib_source/qml/Qt5/RibbonTabPage.qml index 5ebadd8..8ac242e 100644 --- a/lib_source/qml/Qt5/RibbonTabPage.qml +++ b/lib_source/qml/Qt5/RibbonTabPage.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonText.qml b/lib_source/qml/Qt5/RibbonText.qml index d041da9..0bad129 100644 --- a/lib_source/qml/Qt5/RibbonText.qml +++ b/lib_source/qml/Qt5/RibbonText.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonTextBoxMenu.qml b/lib_source/qml/Qt5/RibbonTextBoxMenu.qml index 172d276..d9f8698 100644 --- a/lib_source/qml/Qt5/RibbonTextBoxMenu.qml +++ b/lib_source/qml/Qt5/RibbonTextBoxMenu.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonTextEdit.qml b/lib_source/qml/Qt5/RibbonTextEdit.qml index 435783b..bb0cfbe 100644 --- a/lib_source/qml/Qt5/RibbonTextEdit.qml +++ b/lib_source/qml/Qt5/RibbonTextEdit.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonTitleBar.qml b/lib_source/qml/Qt5/RibbonTitleBar.qml index 37de611..d4ec96a 100644 --- a/lib_source/qml/Qt5/RibbonTitleBar.qml +++ b/lib_source/qml/Qt5/RibbonTitleBar.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonToolTip.qml b/lib_source/qml/Qt5/RibbonToolTip.qml index 8f505f7..00105cc 100644 --- a/lib_source/qml/Qt5/RibbonToolTip.qml +++ b/lib_source/qml/Qt5/RibbonToolTip.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonTour.qml b/lib_source/qml/Qt5/RibbonTour.qml index 3e0a9cf..90ea53d 100644 --- a/lib_source/qml/Qt5/RibbonTour.qml +++ b/lib_source/qml/Qt5/RibbonTour.qml @@ -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 { diff --git a/lib_source/qml/Qt5/RibbonTourContent.qml b/lib_source/qml/Qt5/RibbonTourContent.qml index 6bf8778..e36d266 100644 --- a/lib_source/qml/Qt5/RibbonTourContent.qml +++ b/lib_source/qml/Qt5/RibbonTourContent.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonTourItem.qml b/lib_source/qml/Qt5/RibbonTourItem.qml index 17ecbc4..df947b0 100644 --- a/lib_source/qml/Qt5/RibbonTourItem.qml +++ b/lib_source/qml/Qt5/RibbonTourItem.qml @@ -1,5 +1,5 @@ import QtQuick 2.15 -import RibbonUI 1.0 +import RibbonUI 1.1 RibbonObject { id: control diff --git a/lib_source/qml/Qt5/RibbonView.qml b/lib_source/qml/Qt5/RibbonView.qml index d00b98c..b27ba84 100644 --- a/lib_source/qml/Qt5/RibbonView.qml +++ b/lib_source/qml/Qt5/RibbonView.qml @@ -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 diff --git a/lib_source/qml/Qt5/RibbonWindow.qml b/lib_source/qml/Qt5/RibbonWindow.qml index f4390f1..5f4c99b 100644 --- a/lib_source/qml/Qt5/RibbonWindow.qml +++ b/lib_source/qml/Qt5/RibbonWindow.qml @@ -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