diff --git a/example/example_en_US.ts b/example/example_en_US.ts index a8e7872e..2e1c76fd 100644 --- a/example/example_en_US.ts +++ b/example/example_en_US.ts @@ -831,9 +831,25 @@ Updated content: T_Acrylic + Acrylic + + + tintColor: + + + + + tintOpacity: + + + + + blurRadius: + + T_Badge @@ -863,11 +879,22 @@ Updated content: BreadcurmbBar + + + Item_%1 + Item_'%1' + + Reset sample + + + Item_ + + T_BubbleChart @@ -1062,6 +1089,11 @@ Updated content: Please enter a verification code + + + verify + + The verification code is correct @@ -1158,6 +1190,62 @@ Updated content: ComboBox + + + editable=false + + + + + + + + Banana + + + + + + + + Apple + + + + + + + + Coconut + + + + + disabled=true + + + + + editable=true + + + + + FluComboBox{ + editable: true + model: ListModel { + id: model + ListElement { text: "%1" } + ListElement { text: "%2" } + ListElement { text: "%3" } + } + onAccepted: { + if (find(editText) === -1) + model.append({text: editText}) + } +} + + T_CustomPlot @@ -1492,11 +1580,21 @@ My only desire is to be permitted to drive out the traitors and restore the Han. This is an InfoBar in the Warning Style + + + Error + + This is an InfoBar in the Error Style + + + Success + + This is an InfoBar in the Success Style @@ -1528,7 +1626,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han. - show '%1 + show '%1' @@ -1538,11 +1636,34 @@ My only desire is to be permitted to drive out the traitors and restore the Han. This is an '%1' + + + + info1 + + + + + + info2 + + + + + + info3 + + clear all info + + + Loading + + T_LineChart @@ -1817,6 +1938,31 @@ My only desire is to be permitted to drive out the traitors and restore the Han. QRCode + + + text: + + + + + color: + + + + + bgColor: + + + + + margins: + + + + + size: + + T_RadarChart @@ -2058,6 +2204,37 @@ Some contents... SplitLayout + + + orientation: + + + + + + Horizontal + + + + + Vertical + + + + + Page 1 + + + + + Page 2 + + + + + Page 3 + + T_StaggeredLayout @@ -2074,6 +2251,27 @@ Some contents... StatusLayout + + + + Loading + + + + + Empty + + + + + Error + + + + + Success + + T_TabView @@ -2087,6 +2285,48 @@ Some contents... Document + + + Tab Width Behavior: + + + + + + Equal + + + + + SizeToContent + + + + + Compact + + + + + Tab Close Button Visibility: + + + + + + Always + + + + + Never + + + + + OnHover + + T_TableView @@ -2295,6 +2535,12 @@ Some contents... Rounded Window + + + + dwm-blur + + window tintOpacity @@ -2387,6 +2633,27 @@ Some contents... clear + + + mode: + + + + + Left + + + + + Right + + + + + + Alternate + + T_ToggleSwitch @@ -2514,22 +2781,57 @@ Some contents... - + + cellHeight: + + + + + depthPadding: + + + + + showLine + + + + + checkable + + + + + all expand + + + + + all collapse + + + + + print selection model + + + + Title - + Name - + Avatar - + Address @@ -2541,6 +2843,41 @@ Some contents... Typography + + + Display + + + + + Title Large + + + + + Title + + + + + Subtitle + + + + + Body Strong + + + + + Body + + + + + Caption + + T_Watermark @@ -2549,5 +2886,45 @@ Some contents... Watermark + + + text: + + + + + textSize: + + + + + gapX: + + + + + gapY: + + + + + offsetX: + + + + + offsetY: + + + + + rotate: + + + + + textColor: + + diff --git a/example/example_zh_CN.ts b/example/example_zh_CN.ts index a7983ef8..fe147afa 100644 --- a/example/example_zh_CN.ts +++ b/example/example_zh_CN.ts @@ -124,7 +124,7 @@ Hotkey - + 热键 @@ -839,9 +839,25 @@ Updated content: T_Acrylic + Acrylic 亚克力 + + + tintColor: + 前景色: + + + + tintOpacity: + 透明度: + + + + blurRadius: + 模糊半径: + T_Awesome @@ -890,11 +906,21 @@ Updated content: BreadcurmbBar 面包屑 + + + Item_%1 + 项目_%1 + Reset sample 重置 + + + Item_ + + T_BubbleChart @@ -981,7 +1007,7 @@ Updated content: IconOnly - + 仅图标 @@ -991,7 +1017,7 @@ Updated content: TextOnly - + 仅文字 @@ -1001,7 +1027,7 @@ Updated content: TextBesideIcon - + 文字加图标 @@ -1011,7 +1037,7 @@ Updated content: TextUnderIcon - + 文字位于图标下方 @@ -1026,37 +1052,37 @@ Updated content: Menu_1 - + 菜单_1 Menu_2 - + 菜单_2 Menu_3 - + 菜单_3 Menu_4 - + 菜单_4 Radio Button_1 - + 单选按钮_1 Radio Button_2 - + 单选按钮_1 Radio Button_3 - + 单选按钮_3 @@ -1089,6 +1115,11 @@ Updated content: Please enter a verification code 请输入验证码 + + + verify + 验证 + The verification code is correct @@ -1123,7 +1154,7 @@ Updated content: A 2-state CheckBox - + 两状态复选框 @@ -1144,12 +1175,12 @@ Updated content: A 3-state CheckBox - + 三状态复选框 Three State - + 三状态 @@ -1217,6 +1248,74 @@ Updated content: ComboBox 组合框 + + + editable=false + 可编辑=false + + + + + + + Banana + 香蕉 + + + + + + + Apple + 苹果 + + + + + + + Coconut + 椰子 + + + + disabled=true + 不使能=true + + + + editable=true + 可编辑=true + + + + FluComboBox{ + editable: true + model: ListModel { + id: model + ListElement { text: "%1" } + ListElement { text: "%2" } + ListElement { text: "%3" } + } + onAccepted: { + if (find(editText) === -1) + model.append({text: editText}) + } +} + FluComboBox{ + editable: true + model: ListModel { + id: model + ListElement { text: "%1" } + ListElement { text: "%2" } + ListElement { text: "%3" } + } + onAccepted: { + if (find(editText) === -1) + model.append({text: editText}) + } + } + T_CustomPlot @@ -1533,7 +1632,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han. The latest FluentUI Pro controls and styles for your applications. - + 最新的 FluentUI 控件和样式 @@ -1600,7 +1699,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han. Info - + 信息 @@ -1611,18 +1710,28 @@ My only desire is to be permitted to drive out the traitors and restore the Han. Warning - + 警告 This is an InfoBar in the Warning Style 这是一个Warning样式的信息栏 + + + Error + 错误 + This is an InfoBar in the Error Style 这是一个Error样式的信息栏 + + + Success + 成功 + This is an InfoBar in the Success Style @@ -1641,33 +1750,56 @@ My only desire is to be permitted to drive out the traitors and restore the Han. Manually close the info message box - + 手动关闭信息栏 close '%1' - + 关闭 '%1' - show '%1 - + show '%1' + 显示 '%1' This is an '%1' - + 这是 '%1' + + + + + info1 + 信息1 + + + + + info2 + 信息2 + + + + + info3 + 信息3 clear all info - + 清除全部信息栏 + + + + Loading + 正在加载 Loading... @@ -1957,6 +2089,31 @@ My only desire is to be permitted to drive out the traitors and restore the Han. QRCode 二维码 + + + text: + 文本: + + + + color: + 前景色: + + + + bgColor: + 背景色: + + + + margins: + 边距: + + + + size: + 尺寸: + T_RadarChart @@ -1996,21 +2153,21 @@ My only desire is to be permitted to drive out the traitors and restore the Han. Radio Button_1 - + 单选按钮_1 Radio Button_2 - + 单选按钮_1 Radio Button_3 - + 单选按钮_3 @@ -2224,6 +2381,37 @@ Some contents... SplitLayout 拆分布局 + + + orientation: + 方向: + + + + + Horizontal + 水平 + + + + Vertical + 垂直 + + + + Page 1 + 页面 1 + + + + Page 2 + 页面 2 + + + + Page 3 + 页面 3 + T_StaggeredLayout @@ -2240,13 +2428,30 @@ Some contents... StatusLayout 状态布局 + + + + Loading + 正在加载 + + + + Error + 错误 + + + + Success + 成功 + Loading... 正在加载... + Empty - 空空如也 + 空空如也 The page went wrong... @@ -2269,6 +2474,48 @@ Some contents... Document 文档 + + + Tab Width Behavior: + 选项卡宽度: + + + + + Equal + 相同宽度 + + + + SizeToContent + 由内容 + + + + Compact + 紧凑 + + + + Tab Close Button Visibility: + 选项卡关闭按钮可见性: + + + + + Always + 可见 + + + + Never + 不可见 + + + + OnHover + 鼠标悬浮显示 + T_TableView @@ -2477,6 +2724,12 @@ Some contents... Rounded Window 亚克力背景 + + + + dwm-blur + 毛玻璃模糊 + window tintOpacity @@ -2569,6 +2822,27 @@ Some contents... clear 清空 + + + mode: + 模式: + + + + Left + + + + + Right + + + + + + Alternate + 交替 + T_ToggleSwitch @@ -2716,22 +2990,57 @@ Some contents... 共计选中%1条数据 - + Title 标题 - + Address 地址 - + Avatar 头像 - + + cellHeight: + 单元格高度 + + + + depthPadding: + 填充深度 + + + + showLine + 显示竖线 + + + + checkable + 可勾选 + + + + all expand + 全部展开 + + + + all collapse + 全部折叠 + + + + print selection model + 打印选择项的模型 + + + Name 名称 @@ -2743,6 +3052,41 @@ Some contents... Typography 字体 + + + Display + 显示 + + + + Title Large + 大标题 + + + + Title + 标题 + + + + Subtitle + 副标题 + + + + Body Strong + 多内容 + + + + Body + 内容 + + + + Caption + 标题 + T_Watermark @@ -2751,5 +3095,45 @@ Some contents... Watermark 水印 + + + text: + 文本: + + + + textSize: + 文字大小: + + + + gapX: + 水平间距: + + + + gapY: + 垂直间距: + + + + offsetX: + 水平偏移: + + + + offsetY: + 垂直偏移: + + + + rotate: + 旋转角度: + + + + textColor: + 水印颜色: + diff --git a/example/qml/page/T_Acrylic.qml b/example/qml/page/T_Acrylic.qml index 441c37f1..867ba97c 100644 --- a/example/qml/page/T_Acrylic.qml +++ b/example/qml/page/T_Acrylic.qml @@ -12,7 +12,7 @@ FluScrollablePage{ RowLayout{ spacing: 10 FluText{ - text:"tintColor:" + text: qsTr("tintColor:") Layout.alignment: Qt.AlignVCenter } FluColorPicker{ @@ -22,7 +22,7 @@ FluScrollablePage{ RowLayout{ spacing: 10 FluText{ - text:"tintOpacity:" + text: qsTr("tintOpacity:") Layout.alignment: Qt.AlignVCenter } FluSlider{ @@ -33,7 +33,7 @@ FluScrollablePage{ RowLayout{ spacing: 10 FluText{ - text:"blurRadius:" + text: qsTr("blurRadius:") Layout.alignment: Qt.AlignVCenter } FluSlider{ @@ -69,7 +69,7 @@ FluScrollablePage{ y:(image.height-height)/2 FluText { anchors.centerIn: parent - text: "Acrylic" + text: qsTr("Acrylic") color: "#FFFFFF" font: FluTextStyle.Subtitle } diff --git a/example/qml/page/T_BreadcrumbBar.qml b/example/qml/page/T_BreadcrumbBar.qml index 54c3d459..b68a7982 100644 --- a/example/qml/page/T_BreadcrumbBar.qml +++ b/example/qml/page/T_BreadcrumbBar.qml @@ -12,7 +12,7 @@ FluScrollablePage{ Component.onCompleted: { var items = [] for(var i=0;i<10;i++){ - items.push({title:"Item_"+(i+1)}) + items.push({title: qsTr("Item_%1").arg(i+1)}) } breadcrumb_1.items = items breadcrumb_2.items = items @@ -51,7 +51,7 @@ FluScrollablePage{ onClicked:{ var items = [] for(var i=0;i<10;i++){ - items.push({title:"Item_"+(i+1)}) + items.push({title: qsTr("Item_")+(i+1)}) } breadcrumb_2.items = items } diff --git a/example/qml/page/T_Captcha.qml b/example/qml/page/T_Captcha.qml index 6054b21e..073a1139 100644 --- a/example/qml/page/T_Captcha.qml +++ b/example/qml/page/T_Captcha.qml @@ -45,7 +45,7 @@ FluScrollablePage{ Layout.preferredWidth: 240 } FluButton{ - text:"verify" + text: qsTr("verify") onClicked: { var success = captcha.verify(text_box.text) if(success){ diff --git a/example/qml/page/T_ComboBox.qml b/example/qml/page/T_ComboBox.qml index c6009786..d3bf0259 100644 --- a/example/qml/page/T_ComboBox.qml +++ b/example/qml/page/T_ComboBox.qml @@ -17,15 +17,15 @@ FluScrollablePage{ spacing: 5 anchors.verticalCenter: parent.verticalCenter FluText{ - text: "editable=false" + text: qsTr("editable=false") x:10 } FluComboBox { model: ListModel { id: model_1 - ListElement { text: "Banana" } - ListElement { text: "Apple" } - ListElement { text: "Coconut" } + ListElement { text: qsTr("Banana") } + ListElement { text: qsTr("Apple") } + ListElement { text: qsTr("Coconut") } } } } @@ -40,16 +40,16 @@ FluScrollablePage{ spacing: 5 anchors.verticalCenter: parent.verticalCenter FluText{ - text: "disabled=true" + text: qsTr("disabled=true") x:10 } FluComboBox { disabled: true model: ListModel { id: model_2 - ListElement { text: "Banana" } - ListElement { text: "Apple" } - ListElement { text: "Coconut" } + ListElement { text: qsTr("Banana") } + ListElement { text: qsTr("Apple") } + ListElement { text: qsTr("Coconut") } } } } @@ -64,16 +64,16 @@ FluScrollablePage{ spacing: 5 anchors.verticalCenter: parent.verticalCenter FluText{ - text: "editable=true" + text: qsTr("editable=true") x:5 } FluComboBox { editable: true model: ListModel { id: model_3 - ListElement { text: "Banana" } - ListElement { text: "Apple" } - ListElement { text: "Coconut" } + ListElement { text: qsTr("Banana") } + ListElement { text: qsTr("Apple") } + ListElement { text: qsTr("Coconut") } } onAccepted: { if (find(editText) === -1) @@ -85,19 +85,21 @@ FluScrollablePage{ CodeExpander{ Layout.fillWidth: true Layout.topMargin: -6 - code:'FluComboBox{ + code:qsTr('FluComboBox{ editable: true model: ListModel { id: model - ListElement { text: "Banana" } - ListElement { text: "Apple" } - ListElement { text: "Coconut" } + ListElement { text: "%1" } + ListElement { text: "%2" } + ListElement { text: "%3" } } onAccepted: { if (find(editText) === -1) model.append({text: editText}) } -}' +}').arg(qsTr("Banana")) + .arg(qsTr("Apple")) + .arg(qsTr("Coconut")) } } diff --git a/example/qml/page/T_InfoBar.qml b/example/qml/page/T_InfoBar.qml index 733be7df..7b430fdb 100644 --- a/example/qml/page/T_InfoBar.qml +++ b/example/qml/page/T_InfoBar.qml @@ -36,13 +36,13 @@ FluScrollablePage{ } } FluButton{ - text:"Error" + text: qsTr("Error") onClicked: { showError(qsTr("This is an InfoBar in the Error Style")) } } FluButton{ - text:"Success" + text: qsTr("Success") onClicked: { showSuccess(qsTr("This is an InfoBar in the Success Style")) } @@ -61,34 +61,34 @@ FluScrollablePage{ Row{ spacing: 5 FluButton{ - text: (info1 ? qsTr("close '%1'") : qsTr("show '%1")).arg("info1") + text: (info1 ? qsTr("close '%1'") : qsTr("show '%1'")).arg(qsTr("info1")) onClicked: { if(info1) { info1.close() return } - info1 = showInfo(qsTr("This is an '%1'").arg("info1"), 0) + info1 = showInfo(qsTr("This is an '%1'").arg(qsTr("info1")), 0) info1.close() } } FluButton{ - text: (info2 ? qsTr("close '%1'") : qsTr("show '%1")).arg("info2") + text: (info2 ? qsTr("close '%1'") : qsTr("show '%1'")).arg(qsTr("info2")) onClicked: { if(info2) { info2.close() return } - info2 = showInfo(qsTr("This is an '%1'").arg("info2"), 0) + info2 = showInfo(qsTr("This is an '%1'").arg(qsTr("info2")), 0) } } FluButton{ - text: (info3 ? qsTr("close '%1'") : qsTr("show '%1")).arg("info3") + text: (info3 ? qsTr("close '%1'") : qsTr("show '%1'")).arg(qsTr("info3")) onClicked: { if(info3) { info3.close() return } - info3 = showInfo(qsTr("This is an '%1'").arg("info3"), 0) + info3 = showInfo(qsTr("This is an '%1'").arg(qsTr("info3")), 0) } } FluButton{ @@ -100,7 +100,7 @@ FluScrollablePage{ } FluButton{ - text:"Loading" + text: qsTr("Loading") onClicked: { showLoading() } diff --git a/example/qml/page/T_QRCode.qml b/example/qml/page/T_QRCode.qml index 0e257c50..a4b1e9a4 100644 --- a/example/qml/page/T_QRCode.qml +++ b/example/qml/page/T_QRCode.qml @@ -24,7 +24,7 @@ FluScrollablePage{ spacing: 10 Layout.topMargin: 20 FluText{ - text:"text:" + text: qsTr("text:") Layout.alignment: Qt.AlignVCenter } FluTextBox{ @@ -38,7 +38,7 @@ FluScrollablePage{ spacing: 10 Layout.topMargin: 10 FluText{ - text:"color:" + text: qsTr("color:") Layout.alignment: Qt.AlignVCenter } FluColorPicker{ @@ -51,7 +51,7 @@ FluScrollablePage{ spacing: 10 Layout.topMargin: 10 FluText{ - text:"bgColor:" + text: qsTr("bgColor:") Layout.alignment: Qt.AlignVCenter } FluColorPicker{ @@ -63,7 +63,7 @@ FluScrollablePage{ RowLayout{ spacing: 10 FluText{ - text:"margins:" + text: qsTr("margins:") Layout.alignment: Qt.AlignVCenter } FluSlider{ @@ -77,7 +77,7 @@ FluScrollablePage{ RowLayout{ spacing: 10 FluText{ - text:"size:" + text: qsTr("size:") Layout.alignment: Qt.AlignVCenter } FluSlider{ diff --git a/example/qml/page/T_SplitLayout.qml b/example/qml/page/T_SplitLayout.qml index a7f52cae..25e01825 100644 --- a/example/qml/page/T_SplitLayout.qml +++ b/example/qml/page/T_SplitLayout.qml @@ -15,21 +15,21 @@ FluContentPage{ top: parent.top } FluText{ - text:"orientation:" + text: qsTr("orientation:") } FluDropDownButton{ id:btn_orientation Layout.preferredWidth: 120 - text:"Horizontal" + text: qsTr("Horizontal") FluMenuItem{ - text:"Horizontal" + text: qsTr("Horizontal") onClicked: { btn_orientation.text = text split_layout.orientation = Qt.Horizontal } } FluMenuItem{ - text:"Vertical" + text: qsTr("Vertical") onClicked: { btn_orientation.text = text split_layout.orientation = Qt.Vertical @@ -54,7 +54,7 @@ FluContentPage{ SplitView.maximumWidth: 400 SplitView.maximumHeight: 400 FluText { - text: "Page 1" + text: qsTr("Page 1") anchors.centerIn: parent } } @@ -66,7 +66,7 @@ FluContentPage{ SplitView.fillWidth: true SplitView.fillHeight: true FluText { - text: "Page 2" + text: qsTr("Page 2") anchors.centerIn: parent } } @@ -75,7 +75,7 @@ FluContentPage{ implicitWidth: 200 implicitHeight: 200 FluText { - text: "Page 3" + text: qsTr("Page 3") anchors.centerIn: parent } } diff --git a/example/qml/page/T_StatusLayout.qml b/example/qml/page/T_StatusLayout.qml index 0ee85c81..29ce01ec 100644 --- a/example/qml/page/T_StatusLayout.qml +++ b/example/qml/page/T_StatusLayout.qml @@ -19,30 +19,30 @@ FluScrollablePage{ FluDropDownButton{ id:btn_status_mode Layout.preferredWidth: 140 - text:"Loading" + text: qsTr("Loading") FluMenuItem{ - text:"Loading" + text: qsTr("Loading") onClicked: { btn_status_mode.text = text status_view.statusMode = FluStatusLayoutType.Loading } } FluMenuItem{ - text:"Empty" + text: qsTr("Empty") onClicked: { btn_status_mode.text = text status_view.statusMode = FluStatusLayoutType.Empty } } FluMenuItem{ - text:"Error" + text: qsTr("Error") onClicked: { btn_status_mode.text = text status_view.statusMode = FluStatusLayoutType.Error } } FluMenuItem{ - text:"Success" + text: qsTr("Success") onClicked: { btn_status_mode.text = text status_view.statusMode = FluStatusLayoutType.Success diff --git a/example/qml/page/T_TabView.qml b/example/qml/page/T_TabView.qml index 998a4a2d..404eb012 100644 --- a/example/qml/page/T_TabView.qml +++ b/example/qml/page/T_TabView.qml @@ -35,52 +35,58 @@ FluScrollablePage{ padding: 10 RowLayout{ spacing: 14 + FluCopyableText{ + text: qsTr("Tab Width Behavior:") + } FluDropDownButton{ id:btn_tab_width_behavior Layout.preferredWidth: 140 - text:"Equal" + text: qsTr("Equal") FluMenuItem{ - text:"Equal" + text: qsTr("Equal") onClicked: { btn_tab_width_behavior.text = text tab_view.tabWidthBehavior = FluTabViewType.Equal } } FluMenuItem{ - text:"SizeToContent" + text: qsTr("SizeToContent") onClicked: { btn_tab_width_behavior.text = text tab_view.tabWidthBehavior = FluTabViewType.SizeToContent } } FluMenuItem{ - text:"Compact" + text: qsTr("Compact") onClicked: { btn_tab_width_behavior.text = text tab_view.tabWidthBehavior = FluTabViewType.Compact } } } + FluCopyableText{ + text: qsTr("Tab Close Button Visibility:") + } FluDropDownButton{ id:btn_close_button_visibility - text:"Always" + text: qsTr("Always") Layout.preferredWidth: 120 FluMenuItem{ - text:"Never" + text: qsTr("Never") onClicked: { btn_close_button_visibility.text = text tab_view.closeButtonVisibility = FluTabViewType.Never } } FluMenuItem{ - text:"Always" + text: qsTr("Always") onClicked: { btn_close_button_visibility.text = text tab_view.closeButtonVisibility = FluTabViewType.Always } } FluMenuItem{ - text:"OnHover" + text: qsTr("OnHover") onClicked: { btn_close_button_visibility.text = text tab_view.closeButtonVisibility = FluTabViewType.OnHover diff --git a/example/qml/page/T_Theme.qml b/example/qml/page/T_Theme.qml index 8576750c..3120545e 100644 --- a/example/qml/page/T_Theme.qml +++ b/example/qml/page/T_Theme.qml @@ -154,12 +154,12 @@ FluScrollablePage{ } } FluText{ - visible: FluTheme.blurBehindWindowEnabled || window.effect === "dwm-blur" + visible: FluTheme.blurBehindWindowEnabled || window.effect === qsTr("dwm-blur") text: qsTr("window tintOpacity") Layout.topMargin: 20 } FluSlider{ - visible: FluTheme.blurBehindWindowEnabled || window.effect === "dwm-blur" + visible: FluTheme.blurBehindWindowEnabled || window.effect === qsTr("dwm-blur") Layout.topMargin: 5 to:1 stepSize:0.1 diff --git a/example/qml/page/T_Timeline.qml b/example/qml/page/T_Timeline.qml index d69f0feb..90ae2801 100644 --- a/example/qml/page/T_Timeline.qml +++ b/example/qml/page/T_Timeline.qml @@ -127,28 +127,28 @@ FluScrollablePage{ RowLayout{ Layout.topMargin: 10 FluText{ - text:"mode:" + text: qsTr("mode:") } FluDropDownButton{ id: btn_mode Layout.preferredWidth: 100 - text: "Alternate" + text: qsTr("Alternate") FluMenuItem{ - text: "Left" + text: qsTr("Left") onClicked: { btn_mode.text = text time_line.mode = FluTimelineType.Left } } FluMenuItem{ - text: "Right" + text: qsTr("Right") onClicked: { btn_mode.text = text time_line.mode = FluTimelineType.Right } } FluMenuItem{ - text: "Alternate" + text: qsTr("Alternate") onClicked: { btn_mode.text = text time_line.mode = FluTimelineType.Alternate diff --git a/example/qml/page/T_TreeView.qml b/example/qml/page/T_TreeView.qml index 928677de..31e8fb83 100644 --- a/example/qml/page/T_TreeView.qml +++ b/example/qml/page/T_TreeView.qml @@ -9,7 +9,6 @@ FluContentPage { title: qsTr("TreeView") - function treeData(){ const names = ["孙悟空", "猪八戒", "沙和尚", "唐僧","白骨夫人","金角大王","熊山君","黄风怪","银角大王"] function getRandomName(){ @@ -90,7 +89,7 @@ FluContentPage { RowLayout{ spacing: 10 FluText{ - text: "cellHeight:" + text: qsTr("cellHeight:") Layout.alignment: Qt.AlignVCenter } FluSlider{ @@ -103,7 +102,7 @@ FluContentPage { RowLayout{ spacing: 10 FluText{ - text: "depthPadding:" + text: qsTr("depthPadding:") Layout.alignment: Qt.AlignVCenter } FluSlider{ @@ -119,12 +118,12 @@ FluContentPage { anchors.verticalCenter: parent.verticalCenter FluToggleSwitch{ id: switch_showline - text:"showLine" + text: qsTr("showLine") checked: false } FluToggleSwitch{ id: switch_checkable - text:"checkable" + text: qsTr("checkable") checked: false } } @@ -132,20 +131,20 @@ FluContentPage { spacing: 8 anchors.verticalCenter: parent.verticalCenter FluButton{ - text: "all expand" + text: qsTr("all expand") onClicked: { tree_view.allExpand() } } FluButton{ - text: "all collapse" + text: qsTr("all collapse") onClicked: { tree_view.allCollapse() } } } FluButton{ - text: "print selection model" + text: qsTr("print selection model") onClicked: { var printData = [] var data = tree_view.selectionModel(); diff --git a/example/qml/page/T_Typography.qml b/example/qml/page/T_Typography.qml index 0260c7d9..7eb9ea6d 100644 --- a/example/qml/page/T_Typography.qml +++ b/example/qml/page/T_Typography.qml @@ -24,43 +24,43 @@ FluContentPage { transformOrigin: Item.TopLeft FluText{ id:text_Display - text:"Display" + text: qsTr("Display") padding: 0 font: FluTextStyle.Display } FluText{ id:text_TitleLarge - text:"Title Large" + text: qsTr("Title Large") padding: 0 font: FluTextStyle.TitleLarge } FluText{ id:text_Title - text:"Title" + text: qsTr("Title") padding: 0 font: FluTextStyle.Title } FluText{ id:text_Subtitle - text:"Subtitle" + text: qsTr("Subtitle") padding: 0 font: FluTextStyle.Subtitle } FluText{ id:text_BodyStrong - text:"Body Strong" + text: qsTr("Body Strong") padding: 0 font: FluTextStyle.BodyStrong } FluText{ id:text_Body - text:"Body" + text: qsTr("Body") padding: 0 font: FluTextStyle.Body } FluText{ id:text_Caption - text:"Caption" + text: qsTr("Caption") padding: 0 font: FluTextStyle.Caption } diff --git a/example/qml/page/T_Watermark.qml b/example/qml/page/T_Watermark.qml index 278bd513..9090ee49 100644 --- a/example/qml/page/T_Watermark.qml +++ b/example/qml/page/T_Watermark.qml @@ -22,7 +22,7 @@ FluContentPage{ spacing: 10 Layout.topMargin: 14 FluText{ - text: "text:" + text: qsTr("text:") Layout.alignment: Qt.AlignVCenter } FluTextBox{ @@ -35,7 +35,7 @@ FluContentPage{ RowLayout{ spacing: 10 FluText{ - text: "textSize:" + text: qsTr("textSize:") Layout.alignment: Qt.AlignVCenter } FluSlider{ @@ -48,7 +48,7 @@ FluContentPage{ RowLayout{ spacing: 10 FluText{ - text: "gapX:" + text: qsTr("gapX:") Layout.alignment: Qt.AlignVCenter } FluSlider{ @@ -59,7 +59,7 @@ FluContentPage{ RowLayout{ spacing: 10 FluText{ - text: "gapY:" + text: qsTr("gapY:") Layout.alignment: Qt.AlignVCenter } FluSlider{ @@ -70,7 +70,7 @@ FluContentPage{ RowLayout{ spacing: 10 FluText{ - text: "offsetX:" + text: qsTr("offsetX:") Layout.alignment: Qt.AlignVCenter } FluSlider{ @@ -81,7 +81,7 @@ FluContentPage{ RowLayout{ spacing: 10 FluText{ - text: "offsetY:" + text: qsTr("offsetY:") Layout.alignment: Qt.AlignVCenter } FluSlider{ @@ -92,7 +92,7 @@ FluContentPage{ RowLayout{ spacing: 10 FluText{ - text: "rotate:" + text: qsTr("rotate:") Layout.alignment: Qt.AlignVCenter } FluSlider{ @@ -105,7 +105,7 @@ FluContentPage{ RowLayout{ spacing: 10 FluText{ - text: "textColor:" + text: qsTr("textColor:") Layout.alignment: Qt.AlignVCenter } FluColorPicker{