From a746bc268450d35a0931ea06ffd89294b6b4bb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Sun, 28 Apr 2024 21:05:43 +0800 Subject: [PATCH] update --- example/example_en_US.ts | 12 ++++-------- example/example_zh_CN.ts | 10 +++++----- example/qml/page/T_Icons.qml | 15 +++------------ example/qml/page/T_Timeline.qml | 1 - .../imports/FluentUI/Controls/FluTableView.qml | 2 +- .../imports/FluentUI/Controls/FluTableView.qml | 2 +- 6 files changed, 14 insertions(+), 28 deletions(-) diff --git a/example/example_en_US.ts b/example/example_en_US.ts index 4ac68c4d..1d9f801f 100644 --- a/example/example_en_US.ts +++ b/example/example_en_US.ts @@ -1292,6 +1292,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han. RadioButton Group + RadioButton Group111111111111111111111111 @@ -1331,12 +1332,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han. - - Search - - - - + You Copied @@ -2203,12 +2199,12 @@ Some contents... - + Append - + clear diff --git a/example/example_zh_CN.ts b/example/example_zh_CN.ts index 5880157d..fb141605 100644 --- a/example/example_zh_CN.ts +++ b/example/example_zh_CN.ts @@ -1378,6 +1378,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han. RadioButton Group + RadioButton Group111111111111111111111111 单选框分组 @@ -1417,12 +1418,11 @@ My only desire is to be permitted to drive out the traitors and restore the Han. 请输入关键字 - Search - 搜索 + 搜索 - + You Copied 您复制 @@ -2345,12 +2345,12 @@ Some contents... 时间轴 - + Append 追加 - + clear 清空 diff --git a/example/qml/page/T_Icons.qml b/example/qml/page/T_Icons.qml index 8cf6a584..cb078ce5 100644 --- a/example/qml/page/T_Icons.qml +++ b/example/qml/page/T_Icons.qml @@ -14,17 +14,8 @@ FluContentPage { anchors{ top: parent.top } - } - - FluFilledButton{ - text: qsTr("Search") - anchors{ - left: text_box.right - verticalCenter: text_box.verticalCenter - leftMargin: 14 - } - onClicked: { - grid_view.model = FluApp.iconDatas(text_box.text) + onTextChanged: { + grid_view.model = FluApp.iconData(text_box.text) } } GridView{ @@ -33,7 +24,7 @@ FluContentPage { cellHeight: 110 clip: true boundsBehavior: GridView.StopAtBounds - model: FluApp.iconDatas() + model: FluApp.iconData() ScrollBar.vertical: FluScrollBar {} anchors{ topMargin: 10 diff --git a/example/qml/page/T_Timeline.qml b/example/qml/page/T_Timeline.qml index 49800109..d69f0feb 100644 --- a/example/qml/page/T_Timeline.qml +++ b/example/qml/page/T_Timeline.qml @@ -44,7 +44,6 @@ FluScrollablePage{ wrapMode: Text.WrapAnywhere horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft text: modelData.text - font.bold: true linkColor: FluTheme.dark ? FluColors.Teal.lighter : FluColors.Teal.dark onLinkActivated: (link)=> { diff --git a/src/Qt5/imports/FluentUI/Controls/FluTableView.qml b/src/Qt5/imports/FluentUI/Controls/FluTableView.qml index 9385d810..2f19e373 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluTableView.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluTableView.qml @@ -253,7 +253,7 @@ Rectangle { if(d.rowHoverIndex === row || item_table_mouse.isRowSelected){ return FluTheme.dark ? Qt.rgba(1,1,1,0.06) : Qt.rgba(0,0,0,0.06) } - return (row%2!==0) ? control.color : (FluTheme.dark ? Qt.rgba(1,1,1,0.015) : Qt.rgba(0,0,0,0.015)) + return (row%2!==0) ? control.color : (FluTheme.dark ? Qt.rgba(1,1,1,0.03) : Qt.rgba(0,0,0,0.03)) } MouseArea{ anchors.fill: parent diff --git a/src/Qt6/imports/FluentUI/Controls/FluTableView.qml b/src/Qt6/imports/FluentUI/Controls/FluTableView.qml index 0a56ac94..2872fd71 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluTableView.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluTableView.qml @@ -253,7 +253,7 @@ Rectangle { if(d.rowHoverIndex === row || item_table_mouse.isRowSelected){ return FluTheme.dark ? Qt.rgba(1,1,1,0.06) : Qt.rgba(0,0,0,0.06) } - return (row%2!==0) ? control.color : (FluTheme.dark ? Qt.rgba(1,1,1,0.015) : Qt.rgba(0,0,0,0.015)) + return (row%2!==0) ? control.color : (FluTheme.dark ? Qt.rgba(1,1,1,0.03) : Qt.rgba(0,0,0,0.03)) } MouseArea{ anchors.fill: parent