From dee3147509aa5e4e37d8c05d3812498a053ecd39 Mon Sep 17 00:00:00 2001
From: jared <jared2020@163.com>
Date: Sat, 11 Jul 2020 00:37:07 +0800
Subject: [PATCH] update trans

---
 .../TaoQuickShow/Qml/Page/Biz/CompCard.qml    |  2 +-
 .../TaoQuickShow/Qml/Page/ContentPage.qml     |  4 +-
 examples/TaoQuickShow/Src/TaoView.cpp         |  2 +-
 examples/TaoQuickShow/Trans/language_zh.json  | 45 +++++++++++++++++--
 4 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/examples/TaoQuickShow/Qml/Page/Biz/CompCard.qml b/examples/TaoQuickShow/Qml/Page/Biz/CompCard.qml
index 1d53c5b..84f2cfa 100644
--- a/examples/TaoQuickShow/Qml/Page/Biz/CompCard.qml
+++ b/examples/TaoQuickShow/Qml/Page/Biz/CompCard.qml
@@ -50,7 +50,7 @@ Rectangle {
     ToolTip {
         id: tip
         delay: 800
-        text: String("Component Name: %1, Count: %2").arg(name).arg(count)
+        text: trans.trans(String("Component Name: %1, Count: %2")).arg(trans.trans(name)).arg(count) + trans.transString
         visible: area.containsMouse
     }
     MouseArea {
diff --git a/examples/TaoQuickShow/Qml/Page/ContentPage.qml b/examples/TaoQuickShow/Qml/Page/ContentPage.qml
index a819599..87928af 100644
--- a/examples/TaoQuickShow/Qml/Page/ContentPage.qml
+++ b/examples/TaoQuickShow/Qml/Page/ContentPage.qml
@@ -13,7 +13,7 @@ Background {
             top: parent.top
             topMargin: 60
         }
-        text: "Component List"
+        text: trans.trans("Component List") + trans.transString
     }
     GridView {
         id: gridView
@@ -30,7 +30,7 @@ Background {
             height: 100
             CompCard {
                 anchors.centerIn: parent
-                name: modelData.name
+                name: trans.trans(modelData.name) + trans.transString
                 count: modelData.count
                 icon: modelData.icon
                 onClicked: {
diff --git a/examples/TaoQuickShow/Src/TaoView.cpp b/examples/TaoQuickShow/Src/TaoView.cpp
index f0fbed6..f903dfe 100644
--- a/examples/TaoQuickShow/Src/TaoView.cpp
+++ b/examples/TaoQuickShow/Src/TaoView.cpp
@@ -23,7 +23,7 @@ const LONG border_width = 6;
 TaoView::TaoView(QWindow* parent)
     : QQuickView(parent)
 {
-    setFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
+    setFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowMinMaxButtonsHint);
     setResizeMode(SizeRootObjectToView);
     setColor(QColor(Qt::transparent));
     resize(1440, 900);
diff --git a/examples/TaoQuickShow/Trans/language_zh.json b/examples/TaoQuickShow/Trans/language_zh.json
index 466483e..ccef9e6 100644
--- a/examples/TaoQuickShow/Trans/language_zh.json
+++ b/examples/TaoQuickShow/Trans/language_zh.json
@@ -181,10 +181,7 @@
             "key": "Menu",
             "value": "菜单"
         },
-        {
-            "key": "Green",
-            "value": " 清爽绿"
-        },
+
         {
             "key": "QRcode",
             "value": "二维码"
@@ -213,6 +210,10 @@
             "key": "Cool",
             "value": "酷炫组件"
         },
+        {
+            "key": "Green",
+            "value": " 清爽绿"
+        },
         {
             "key": "Pink",
             "value": "淑女粉"
@@ -388,6 +389,42 @@
         {
             "key": "FadeInOut",
             "value": "淡入淡出"
+        },
+        {
+            "key": "Component List",
+            "value":"组件列表"
+        },
+        {
+            "key": "Animation",
+            "value":"动画"
+        },
+        {
+            "key": "BaseComponent",
+            "value":"基础组件"
+        },
+        {
+            "key": "Buttons",
+            "value":"按钮"
+        },
+        {
+            "key": "Effect",
+            "value":"效果"
+        },
+        {
+            "key": "PageSwitch",
+            "value":"页面切换"
+        },
+        {
+            "key": "ShaderEffect",
+            "value":"着色器特效"
+        },
+        {
+            "key": "Shape",
+            "value":"图元"
+        },
+        {
+            "key": "Component Name: %1, Count: %2",
+            "value":"组件名称: %1, 数量: %2"
         }
 
     ]