Mentalflow
/
RibbonUI
mirror of https://github.com/mentalfl0w/RibbonUI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Mentalflow:744ef5673d9c59cd05193887b2b724d6ef8574c3
Branches Tags
Mentalflow:main
Mentalflow:v1.1.1
Mentalflow:v1.1.0
Mentalflow:v1.0.4
Mentalflow:v1.0.3
Mentalflow:v1.0.2
Mentalflow:v1.0.1
Mentalflow:v1.0.0.0
..
compare: Mentalflow:2afc633bdbaf7da717b470bf629d5eeddedf9737
Branches Tags
Mentalflow:main
Mentalflow:v1.1.1
Mentalflow:v1.1.0
Mentalflow:v1.0.4
Mentalflow:v1.0.3
Mentalflow:v1.0.2
Mentalflow:v1.0.1
Mentalflow:v1.0.0.0

4 Commits
744ef5673d ... 2afc633bdb

Author SHA1 Message Date
Mentalflow 2afc633bdb
RibbonSplashScreenContent: Improve color. 2025-05-22 16:24:26 +08:00
Mentalflow 6bcf8f9e16
RibbonBusyRing: Add reverseColor property. 2025-05-22 16:22:09 +08:00
Mentalflow 39fb76484e
RibbonBusyBar: Add color property. 2025-05-22 16:20:55 +08:00
Mentalflow 5c0bca76e8
RibbonBackStageView: Use a workaroud to tackle page load issue. 2025-05-22 15:44:07 +08:00
8 changed files with 62 additions and 18 deletions
Show Stats Expand all files Collapse all files

5
lib_source/qml/Qt5/RibbonBackStageView.qml
View File

@ -442,9 +442,14 @@ Popup {
Repeater{ Repeater{
model: control.pageModel model: control.pageModel
Loader { Loader {
required property var modelData
active: SwipeView.isCurrentItem || SwipeView.isNextItem || SwipeView.isPreviousItem active: SwipeView.isCurrentItem || SwipeView.isNextItem || SwipeView.isPreviousItem
source: typeof(modelData.sourceUrl) !== 'undefined' && modelData.sourceUrl !== ""? modelData.sourceUrl : "" source: typeof(modelData.sourceUrl) !== 'undefined' && modelData.sourceUrl !== ""? modelData.sourceUrl : ""
sourceComponent: typeof(control.pageModel[modelData.globalIndex].sourceComponent) !== 'undefined' && typeof(modelData.sourceUrl) === 'undefined' ? control.pageModel[modelData.globalIndex].sourceComponent : undefined sourceComponent: typeof(control.pageModel[modelData.globalIndex].sourceComponent) !== 'undefined' && typeof(modelData.sourceUrl) === 'undefined' ? control.pageModel[modelData.globalIndex].sourceComponent : undefined
Component.onCompleted: {
content_view.currentIndex = modelData.globalIndex
content_view.currentIndex = 0
}
onLoaded: { onLoaded: {
if (typeof(modelData.sourceArgs) === 'undefined') if (typeof(modelData.sourceArgs) === 'undefined')
return return

3
lib_source/qml/Qt5/RibbonBusyBar.qml
View File

@ -12,6 +12,7 @@ BusyIndicator {
implicitContentHeight + topPadding + bottomPadding) implicitContentHeight + topPadding + bottomPadding)
padding: 2 padding: 2
property color color: RibbonTheme.isDarkMode ? "white" : "black"
property real barWidth: 200 property real barWidth: 200
property real barHeight: 4 property real barHeight: 4
property real indicatorWidth: 4 property real indicatorWidth: 4
@ -44,7 +45,7 @@ BusyIndicator {
delegate: Rectangle { delegate: Rectangle {
width: indicatorWidth width: indicatorWidth
height: indicatorHeight height: indicatorHeight
color: RibbonTheme.isDarkMode ? "white" : "black" color: control.color
x: -(index + 1) * indicatorWidth x: -(index + 1) * indicatorWidth
y: (barHeight.height / 2 - height / 2) y: (barHeight.height / 2 - height / 2)
radius: Math.min(width,height)/2 radius: Math.min(width,height)/2

7
lib_source/qml/Qt5/RibbonBusyRing.qml
View File

@ -18,6 +18,7 @@ BusyIndicator {
property real default_saturation: 0 property real default_saturation: 0
property int animationDuration: RibbonTheme.modernStyle ? 4000 : 1000 property int animationDuration: RibbonTheme.modernStyle ? 4000 : 1000
property bool clockwise: true property bool clockwise: true
property bool reverseColor: false
onAnimationDurationChanged: { onAnimationDurationChanged: {
running = !running running = !running
@ -52,7 +53,11 @@ BusyIndicator {
width: radiusWidth width: radiusWidth
height: ringWidth height: ringWidth
property real item_saturation: (index + item.dynamic_index) % lineNumber * private_property.saturation + default_saturation property real item_saturation: (index + item.dynamic_index) % lineNumber * private_property.saturation + default_saturation
color: Qt.hsla(0, 0, RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? 1 : 0 : item_saturation, 1) color: Qt.hsla(0, 0,
RibbonTheme.modernStyle ?
(control.reverseColor ? (RibbonTheme.isDarkMode ? 0 : 1) : (RibbonTheme.isDarkMode ? 1 : 0)) :
(control.reverseColor ? 1 - item_saturation : item_saturation),
1)
rotation: index * private_property.angle rotation: index * private_property.angle
x: (parent.width / 2) - (radiusLength - ringWidth) * Math.sin(rotation/180 * Math.PI) x: (parent.width / 2) - (radiusLength - ringWidth) * Math.sin(rotation/180 * Math.PI)
y: (parent.height / 2 - height / 2) + (radiusLength - ringWidth) * Math.cos(rotation/180 * Math.PI) y: (parent.height / 2 - height / 2) + (radiusLength - ringWidth) * Math.cos(rotation/180 * Math.PI)

25
lib_source/qml/Qt5/RibbonSplashScreenContent.qml
View File

@ -4,7 +4,7 @@ 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
RibbonRectangle { Rectangle {
id: control id: control
property var dealWithLog: showLog property var dealWithLog: showLog
@ -15,7 +15,14 @@ RibbonRectangle {
color: { color: {
if (Window.window.blurBehindWindow) { if (Window.window.blurBehindWindow) {
return "transparent" if(RibbonTheme.modernStyle)
return "transparent"
else{
if(RibbonTheme.isDarkMode)
return "#282828"
else
return "#2C59B7"
}
} }
if (RibbonTheme.isDarkMode) { if (RibbonTheme.isDarkMode) {
return '#2C2B29' return '#2C2B29'
@ -24,7 +31,7 @@ RibbonRectangle {
} }
implicitHeight: Math.max(250, btn_layout.height + title_layout.height + log_text.height + btn_layout.anchors.topMargin * 2) implicitHeight: Math.max(250, btn_layout.height + title_layout.height + log_text.height + btn_layout.anchors.topMargin * 2)
implicitWidth: Math.max(450, title_layout.width + btn_layout.anchors.topMargin * 2) implicitWidth: Math.max(450, title_layout.width + btn_layout.anchors.topMargin * 2)
radius: 20 radius: Qt.platform.os === 'windows' ? RibbonUI.isWin11 ? 7 : 0 : 10
Behavior on color { Behavior on color {
ColorAnimation { ColorAnimation {
@ -45,12 +52,14 @@ RibbonRectangle {
leftMargin: Qt.platform.os === 'osx' ? anchors.topMargin : undefined leftMargin: Qt.platform.os === 'osx' ? anchors.topMargin : undefined
} }
RibbonButton{ RibbonButton{
textColor: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
showBg: false showBg: false
showHoveredBg: false showHoveredBg: false
iconSource: RibbonIcons.Subtract iconSource: RibbonIcons.Subtract
onClicked: Window.window.visibility = Window.Minimized onClicked: Window.window.visibility = Window.Minimized
} }
RibbonButton{ RibbonButton{
textColor: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
showBg: false showBg: false
showHoveredBg: false showHoveredBg: false
iconSource: RibbonIcons.Dismiss iconSource: RibbonIcons.Dismiss
@ -83,7 +92,7 @@ RibbonRectangle {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
font.pixelSize: 16 font.pixelSize: 16
color: RibbonTheme.isDarkMode ? "white" : "black" color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
visible: text visible: text
Behavior on color { Behavior on color {
@ -104,7 +113,8 @@ RibbonRectangle {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
font.pixelSize: 50 font.pixelSize: 50
color: RibbonTheme.isDarkMode ? "white" : "black" font.bold: true
color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
visible: text visible: text
Behavior on color { Behavior on color {
@ -120,7 +130,7 @@ RibbonRectangle {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
font.pixelSize: 15 font.pixelSize: 15
color: RibbonTheme.isDarkMode ? "white" : "black" color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
visible: text visible: text
Behavior on color { Behavior on color {
@ -133,6 +143,7 @@ RibbonRectangle {
RibbonBusyBar{ RibbonBusyBar{
Layout.topMargin: btn_layout.anchors.topMargin - title_layout.spacing Layout.topMargin: btn_layout.anchors.topMargin - title_layout.spacing
running: true running: true
color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
barWidth: control.width - btn_layout.anchors.topMargin * 4 barWidth: control.width - btn_layout.anchors.topMargin * 4
} }
} }
@ -148,7 +159,7 @@ RibbonRectangle {
text: qsTr("Loading...") text: qsTr("Loading...")
font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
font.pixelSize: 10 font.pixelSize: 10
color: RibbonTheme.isDarkMode ? "white" : "black" color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
visible: text visible: text
Behavior on color { Behavior on color {

5
lib_source/qml/Qt6/RibbonBackStageView.qml
View File

@ -442,9 +442,14 @@ Popup {
Repeater{ Repeater{
model: control.pageModel model: control.pageModel
Loader { Loader {
required property var modelData
active: SwipeView.isCurrentItem || SwipeView.isNextItem || SwipeView.isPreviousItem active: SwipeView.isCurrentItem || SwipeView.isNextItem || SwipeView.isPreviousItem
source: typeof(modelData.sourceUrl) !== 'undefined' && modelData.sourceUrl !== ""? modelData.sourceUrl : "" source: typeof(modelData.sourceUrl) !== 'undefined' && modelData.sourceUrl !== ""? modelData.sourceUrl : ""
sourceComponent: typeof(control.pageModel[modelData.globalIndex].sourceComponent) !== 'undefined' && typeof(modelData.sourceUrl) === 'undefined' ? control.pageModel[modelData.globalIndex].sourceComponent : undefined sourceComponent: typeof(control.pageModel[modelData.globalIndex].sourceComponent) !== 'undefined' && typeof(modelData.sourceUrl) === 'undefined' ? control.pageModel[modelData.globalIndex].sourceComponent : undefined
Component.onCompleted: {
content_view.currentIndex = modelData.globalIndex
content_view.currentIndex = 0
}
onLoaded: { onLoaded: {
if (typeof(modelData.sourceArgs) === 'undefined') if (typeof(modelData.sourceArgs) === 'undefined')
return return

3
lib_source/qml/Qt6/RibbonBusyBar.qml
View File

@ -12,6 +12,7 @@ BusyIndicator {
implicitContentHeight + topPadding + bottomPadding) implicitContentHeight + topPadding + bottomPadding)
padding: 2 padding: 2
property color color: RibbonTheme.isDarkMode ? "white" : "black"
property real barWidth: 200 property real barWidth: 200
property real barHeight: 4 property real barHeight: 4
property real indicatorWidth: 4 property real indicatorWidth: 4
@ -44,7 +45,7 @@ BusyIndicator {
delegate: Rectangle { delegate: Rectangle {
width: indicatorWidth width: indicatorWidth
height: indicatorHeight height: indicatorHeight
color: RibbonTheme.isDarkMode ? "white" : "black" color: control.color
x: -(index + 1) * indicatorWidth x: -(index + 1) * indicatorWidth
y: (barHeight.height / 2 - height / 2) y: (barHeight.height / 2 - height / 2)
radius: Math.min(width,height)/2 radius: Math.min(width,height)/2

7
lib_source/qml/Qt6/RibbonBusyRing.qml
View File

@ -18,6 +18,7 @@ BusyIndicator {
property real default_saturation: 0 property real default_saturation: 0
property int animationDuration: RibbonTheme.modernStyle ? 4000 : 1000 property int animationDuration: RibbonTheme.modernStyle ? 4000 : 1000
property bool clockwise: true property bool clockwise: true
property bool reverseColor: false
onAnimationDurationChanged: { onAnimationDurationChanged: {
running = !running running = !running
@ -52,7 +53,11 @@ BusyIndicator {
width: radiusWidth width: radiusWidth
height: ringWidth height: ringWidth
property real item_saturation: (index + item.dynamic_index) % lineNumber * private_property.saturation + default_saturation property real item_saturation: (index + item.dynamic_index) % lineNumber * private_property.saturation + default_saturation
color: Qt.hsla(0, 0, RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? 1 : 0 : item_saturation, 1) color: Qt.hsla(0, 0,
RibbonTheme.modernStyle ?
(control.reverseColor ? (RibbonTheme.isDarkMode ? 0 : 1) : (RibbonTheme.isDarkMode ? 1 : 0)) :
(control.reverseColor ? 1 - item_saturation : item_saturation),
1)
rotation: index * private_property.angle rotation: index * private_property.angle
x: (parent.width / 2) - (radiusLength - ringWidth) * Math.sin(rotation/180 * Math.PI) x: (parent.width / 2) - (radiusLength - ringWidth) * Math.sin(rotation/180 * Math.PI)
y: (parent.height / 2 - height / 2) + (radiusLength - ringWidth) * Math.cos(rotation/180 * Math.PI) y: (parent.height / 2 - height / 2) + (radiusLength - ringWidth) * Math.cos(rotation/180 * Math.PI)

25
lib_source/qml/Qt6/RibbonSplashScreenContent.qml
View File

@ -4,7 +4,7 @@ import QtQuick.Layouts
import QtQuick.Controls import QtQuick.Controls
import QtQuick.Window import QtQuick.Window
RibbonRectangle { Rectangle {
id: control id: control
property var dealWithLog: showLog property var dealWithLog: showLog
@ -15,7 +15,14 @@ RibbonRectangle {
color: { color: {
if (Window.window.blurBehindWindow) { if (Window.window.blurBehindWindow) {
return "transparent" if(RibbonTheme.modernStyle)
return "transparent"
else{
if(RibbonTheme.isDarkMode)
return "#282828"
else
return "#2C59B7"
}
} }
if (RibbonTheme.isDarkMode) { if (RibbonTheme.isDarkMode) {
return '#2C2B29' return '#2C2B29'
@ -24,7 +31,7 @@ RibbonRectangle {
} }
implicitHeight: Math.max(250, btn_layout.height + title_layout.height + log_text.height + btn_layout.anchors.topMargin * 2) implicitHeight: Math.max(250, btn_layout.height + title_layout.height + log_text.height + btn_layout.anchors.topMargin * 2)
implicitWidth: Math.max(450, title_layout.width + btn_layout.anchors.topMargin * 2) implicitWidth: Math.max(450, title_layout.width + btn_layout.anchors.topMargin * 2)
radius: 20 radius: Qt.platform.os === 'windows' ? RibbonUI.isWin11 ? 7 : 0 : 10
Behavior on color { Behavior on color {
ColorAnimation { ColorAnimation {
@ -45,12 +52,14 @@ RibbonRectangle {
leftMargin: Qt.platform.os === 'osx' ? anchors.topMargin : undefined leftMargin: Qt.platform.os === 'osx' ? anchors.topMargin : undefined
} }
RibbonButton{ RibbonButton{
textColor: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
showBg: false showBg: false
showHoveredBg: false showHoveredBg: false
iconSource: RibbonIcons.Subtract iconSource: RibbonIcons.Subtract
onClicked: Window.window.visibility = Window.Minimized onClicked: Window.window.visibility = Window.Minimized
} }
RibbonButton{ RibbonButton{
textColor: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
showBg: false showBg: false
showHoveredBg: false showHoveredBg: false
iconSource: RibbonIcons.Dismiss iconSource: RibbonIcons.Dismiss
@ -83,7 +92,7 @@ RibbonRectangle {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
font.pixelSize: 16 font.pixelSize: 16
color: RibbonTheme.isDarkMode ? "white" : "black" color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
visible: text visible: text
Behavior on color { Behavior on color {
@ -104,7 +113,8 @@ RibbonRectangle {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
font.pixelSize: 50 font.pixelSize: 50
color: RibbonTheme.isDarkMode ? "white" : "black" font.bold: true
color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
visible: text visible: text
Behavior on color { Behavior on color {
@ -120,7 +130,7 @@ RibbonRectangle {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
font.pixelSize: 15 font.pixelSize: 15
color: RibbonTheme.isDarkMode ? "white" : "black" color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
visible: text visible: text
Behavior on color { Behavior on color {
@ -133,6 +143,7 @@ RibbonRectangle {
RibbonBusyBar{ RibbonBusyBar{
Layout.topMargin: btn_layout.anchors.topMargin - title_layout.spacing Layout.topMargin: btn_layout.anchors.topMargin - title_layout.spacing
running: true running: true
color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
barWidth: control.width - btn_layout.anchors.topMargin * 4 barWidth: control.width - btn_layout.anchors.topMargin * 4
} }
} }
@ -148,7 +159,7 @@ RibbonRectangle {
text: qsTr("Loading...") text: qsTr("Loading...")
font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI"
font.pixelSize: 10 font.pixelSize: 10
color: RibbonTheme.isDarkMode ? "white" : "black" color: RibbonTheme.modernStyle ? RibbonTheme.isDarkMode ? "white" : "black" : "white"
renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering
visible: text visible: text
Behavior on color { Behavior on color {