From f8dee135a1dcd0d1d0e3e380a5a7b4e3b6084d7f 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 22:40:41 +0800 Subject: [PATCH] update --- example/example_en_US.ts | 40 +++++++++---------- example/example_zh_CN.ts | 40 +++++++++---------- .../FluentUI/Controls/FluWindowDialog.qml | 3 +- .../FluentUI/Controls/FluWindowDialog.qml | 3 +- src/fluentuiplugin_en_US.ts | 6 +-- src/fluentuiplugin_zh_CN.ts | 4 +- 6 files changed, 47 insertions(+), 49 deletions(-) diff --git a/example/example_en_US.ts b/example/example_en_US.ts index c18c9508..a354efb0 100644 --- a/example/example_en_US.ts +++ b/example/example_en_US.ts @@ -47,39 +47,39 @@ FluentInitalizrWindow - + - + FluentUI Initalizr - - + + Name - - + + Create In - - + + Browse - - + + Cancel - - + + Create @@ -1594,26 +1594,26 @@ My only desire is to be permitted to drive out the traitors and restore the Han. T_Home - - + + FluentUI GitHub - - + + The latest FluentUI controls and styles for your applications. - - + + FluentUI Initalizr - - + + FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options. diff --git a/example/example_zh_CN.ts b/example/example_zh_CN.ts index 6a9d088f..4f8ebdb6 100644 --- a/example/example_zh_CN.ts +++ b/example/example_zh_CN.ts @@ -47,39 +47,39 @@ FluentInitalizrWindow - + - + FluentUI Initalizr FluentUI脚手架 - - + + Name 名称 - - + + Create In 创建路径 - - + + Browse 浏览 - - + + Cancel 取消 - - + + Create 创建 @@ -1606,26 +1606,26 @@ My only desire is to be permitted to drive out the traitors and restore the Han. T_Home - - + + FluentUI GitHub FluentUI GitHub - - + + The latest FluentUI controls and styles for your applications. 最新的 FluentUI 控件和样式 - - + + FluentUI Initalizr FluentUI脚手架 - - + + FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options. FluentUI 脚手架是一个快速创建项目工具，可帮助您创建和自定义具有各种选项的 Fluent UI 项目 diff --git a/src/Qt5/imports/FluentUI/Controls/FluWindowDialog.qml b/src/Qt5/imports/FluentUI/Controls/FluWindowDialog.qml index 78f54bda..582774ec 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluWindowDialog.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluWindowDialog.qml @@ -21,7 +21,8 @@ FluWindow { } } closeListener: function(event){ - event.accepted = true + visible = false + event.accepted = false } function showDialog(){ var x = transientParent.x + (transientParent.width - width)/2 diff --git a/src/Qt6/imports/FluentUI/Controls/FluWindowDialog.qml b/src/Qt6/imports/FluentUI/Controls/FluWindowDialog.qml index a5f03a7c..60a40d21 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluWindowDialog.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluWindowDialog.qml @@ -21,7 +21,8 @@ FluWindow { } } closeListener: function(event){ - event.accepted = true + visible = false + event.accepted = false } function showDialog(){ var x = transientParent.x + (transientParent.width - width)/2 diff --git a/src/fluentuiplugin_en_US.ts b/src/fluentuiplugin_en_US.ts index c35a5e09..e1e02854 100644 --- a/src/fluentuiplugin_en_US.ts +++ b/src/fluentuiplugin_en_US.ts @@ -64,11 +64,7 @@ FluCalendarPicker - - Please select a date - - - + Pick a date diff --git a/src/fluentuiplugin_zh_CN.ts b/src/fluentuiplugin_zh_CN.ts index 5cd91207..a216b0d1 100644 --- a/src/fluentuiplugin_zh_CN.ts +++ b/src/fluentuiplugin_zh_CN.ts @@ -64,11 +64,11 @@ FluCalendarPicker - Please select a date - 请选择日期 + 请选择日期 + Pick a date 选择日期