From 9d5765eafeca0686a5a35403476b64aceceb81a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Fri, 15 Mar 2024 12:19:38 +0800 Subject: [PATCH] update --- example/example_en_US.ts | 16 ++++++++--- example/example_zh_CN.ts | 28 ++++++++++++------- example/qml-Qt6/page/T_InfoBar.qml | 2 +- example/qml/page/T_InfoBar.qml | 2 +- .../FluentUI/Controls/FluCalendarPicker.qml | 6 ++-- .../FluentUI/Controls/FluCalendarPicker.qml | 6 ++-- 6 files changed, 40 insertions(+), 20 deletions(-) diff --git a/example/example_en_US.ts b/example/example_en_US.ts index 67b2234b..c18c9508 100644 --- a/example/example_en_US.ts +++ b/example/example_en_US.ts @@ -102,22 +102,22 @@ InitalizrHelper - + The name cannot be empty - + The creation path cannot be empty - + The path does not exist - + %1 folder already exists @@ -1649,7 +1649,9 @@ My only desire is to be permitted to drive out the traitors and restore the Han. + + This is an InfoBar in the Info Style @@ -1683,6 +1685,12 @@ My only desire is to be permitted to drive out the traitors and restore the Han. InfoBar that needs to be turned off manually + + + + Manual shutdown is supported + + T_LineChart diff --git a/example/example_zh_CN.ts b/example/example_zh_CN.ts index f8574826..6a9d088f 100644 --- a/example/example_zh_CN.ts +++ b/example/example_zh_CN.ts @@ -102,22 +102,22 @@ InitalizrHelper - + The name cannot be empty 名称不能为空 - + The creation path cannot be empty 创建路径不能为空 - + The path does not exist 路径不存在 - + %1 folder already exists @@ -239,19 +239,19 @@ TimePicker - 时间选取器 + 时间选择器 DatePicker - 日期选取器 + 日期选择器 CalendarPicker - 日历选取器 + 日历选择器 @@ -1176,7 +1176,7 @@ Updated content: CalendarPicker - 日历选取器 + 日历选择器 @@ -1373,7 +1373,7 @@ Updated content: TimePicker - 时间选取器 + 时间选择器 @@ -1665,7 +1665,9 @@ My only desire is to be permitted to drive out the traitors and restore the Han. + + This is an InfoBar in the Info Style 这是一个Info样式的信息栏 @@ -1699,6 +1701,12 @@ My only desire is to be permitted to drive out the traitors and restore the Han. InfoBar that needs to be turned off manually 需要手动关闭的信息栏 + + + + Manual shutdown is supported + 支持手动关闭 + Loading... 加载中... @@ -2576,7 +2584,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han. TimePicker - 时间选取器 + 时间选择器 diff --git a/example/qml-Qt6/page/T_InfoBar.qml b/example/qml-Qt6/page/T_InfoBar.qml index b237cdb7..89406e2e 100644 --- a/example/qml-Qt6/page/T_InfoBar.qml +++ b/example/qml-Qt6/page/T_InfoBar.qml @@ -47,7 +47,7 @@ FluScrollablePage{ FluButton{ text: qsTr("InfoBar that needs to be turned off manually") onClicked: { - showInfo("This is an InfoBar in the Info Style",0,"Manual shutdown is supported") + showInfo(qsTr("This is an InfoBar in the Info Style"),0,qsTr("Manual shutdown is supported")) } } FluButton{ diff --git a/example/qml/page/T_InfoBar.qml b/example/qml/page/T_InfoBar.qml index 19c4c90a..bb232a16 100644 --- a/example/qml/page/T_InfoBar.qml +++ b/example/qml/page/T_InfoBar.qml @@ -47,7 +47,7 @@ FluScrollablePage{ FluButton{ text: qsTr("InfoBar that needs to be turned off manually") onClicked: { - showInfo("This is an InfoBar in the Info Style",0,"Manual shutdown is supported") + showInfo(qsTr("This is an InfoBar in the Info Style"),0,qsTr("Manual shutdown is supported")) } } FluButton{ diff --git a/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml b/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml index 21dfa1e2..e20a5164 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml @@ -10,6 +10,8 @@ Rectangle { property color hoverColor: FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1) property color normalColor: FluTheme.dark ? Qt.rgba(61/255,61/255,61/255,1) : Qt.rgba(254/255,254/255,254/255,1) property string text: qsTr("Pick a date") + property date from: new Date(1924, 0, 1) + property date to: new Date(2124, 11, 31) property var current signal accepted() id:control @@ -34,8 +36,8 @@ Rectangle { } CalendarModel { id:calender_model - from: new Date(1924, 0, 1) - to: new Date(2124, 11, 31) + from: control.from + to: control.to } Item{ id:d diff --git a/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml b/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml index 7b2d755f..dbd9d503 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml @@ -9,6 +9,8 @@ Rectangle { property color hoverColor: FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1) property color normalColor: FluTheme.dark ? Qt.rgba(61/255,61/255,61/255,1) : Qt.rgba(254/255,254/255,254/255,1) property string text: qsTr("Pick a date") + property date from: new Date(1924, 0, 1) + property date to: new Date(2124, 11, 31) property var current signal accepted() id:control @@ -33,8 +35,8 @@ Rectangle { } CalendarModel { id:calender_model - from: new Date(1924, 0, 1) - to: new Date(2124, 11, 31) + from: control.from + to: control.to } Item{ id:d