From 6e870bfdbbee4b855532d355b920ff97aee58244 Mon Sep 17 00:00:00 2001 From: Mentalflow <312902918@qq.com> Date: Thu, 29 May 2025 21:01:15 +0800 Subject: [PATCH] RibbonTabBar, RibbonTabButton: Fix translation bug on Qt 6. --- lib_source/qml/Qt5/RibbonTabBar.qml | 2 +- lib_source/qml/Qt5/RibbonTabButton.qml | 2 +- lib_source/qml/Qt6/RibbonTabBar.qml | 2 +- lib_source/qml/Qt6/RibbonTabButton.qml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib_source/qml/Qt5/RibbonTabBar.qml b/lib_source/qml/Qt5/RibbonTabBar.qml index 669c3f4..3f427fe 100644 --- a/lib_source/qml/Qt5/RibbonTabBar.qml +++ b/lib_source/qml/Qt5/RibbonTabBar.qml @@ -225,7 +225,7 @@ Item{ { let item = stack.contentData[i] if(item instanceof RibbonTabPage){ - let btn = ribbonTabButton.createObject(bar,{text:qsTranslate("RibbonTabBar", item.title),index:sign}) + let btn = ribbonTabButton.createObject(bar,{text:item.title,index:sign}) item.titleChanged.connect(function(){btn.text=item.title}) if (sign===0) { diff --git a/lib_source/qml/Qt5/RibbonTabButton.qml b/lib_source/qml/Qt5/RibbonTabButton.qml index bb6dbd5..929e031 100644 --- a/lib_source/qml/Qt5/RibbonTabButton.qml +++ b/lib_source/qml/Qt5/RibbonTabButton.qml @@ -21,7 +21,7 @@ TabButton { Text { id :btn_text - text: control.text + text: qsTranslate("RibbonTabBar",control.text) font{ family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" pixelSize: 13 diff --git a/lib_source/qml/Qt6/RibbonTabBar.qml b/lib_source/qml/Qt6/RibbonTabBar.qml index b88b62a..2322910 100644 --- a/lib_source/qml/Qt6/RibbonTabBar.qml +++ b/lib_source/qml/Qt6/RibbonTabBar.qml @@ -225,7 +225,7 @@ Item{ { let item = stack.contentData[i] if(item instanceof RibbonTabPage){ - let btn = ribbonTabButton.createObject(bar,{text:qsTranslate("RibbonTabBar", item.title),index:sign}) + let btn = ribbonTabButton.createObject(bar,{text:item.title,index:sign}) item.titleChanged.connect(function(){btn.text=item.title}) if (sign===0) { diff --git a/lib_source/qml/Qt6/RibbonTabButton.qml b/lib_source/qml/Qt6/RibbonTabButton.qml index cee4af8..b293112 100644 --- a/lib_source/qml/Qt6/RibbonTabButton.qml +++ b/lib_source/qml/Qt6/RibbonTabButton.qml @@ -21,7 +21,7 @@ TabButton { Text { id :btn_text - text: control.text + text: qsTranslate("RibbonTabBar",control.text) font{ family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" pixelSize: 13