From d3a4925a76463f99331b7c2c4092b221325d7635 Mon Sep 17 00:00:00 2001
From: reionwong <reionwong@gmail.com>
Date: Sat, 4 Sep 2021 11:16:15 +0800
Subject: [PATCH] Dock add smart hide option

---
 src/qml/Dock/Main.qml |  5 ++++-
 translations/en_US.ts | 25 +++++++++++++++----------
 translations/zh_CN.ts | 29 +++++++++++++++++++----------
 3 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/src/qml/Dock/Main.qml b/src/qml/Dock/Main.qml
index 3b0af3d..1405799 100644
--- a/src/qml/Dock/Main.qml
+++ b/src/qml/Dock/Main.qml
@@ -156,9 +156,12 @@ ItemPage {
                     }
 
                     TabButton {
-                        text: qsTr("Auto hide")
+                        text: qsTr("Always hide")
                     }
 
+                    TabButton {
+                        text: qsTr("Smart hide")
+                    }
                 }
             }
 
diff --git a/translations/en_US.ts b/translations/en_US.ts
index e958e11..a845209 100644
--- a/translations/en_US.ts
+++ b/translations/en_US.ts
@@ -137,12 +137,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/Appearance/Main.qml" line="97"/>
+        <location filename="../src/qml/Appearance/Main.qml" line="98"/>
         <source>System effects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/Appearance/Main.qml" line="117"/>
+        <location filename="../src/qml/Appearance/Main.qml" line="118"/>
         <source>Accent color</source>
         <translation type="unfinished"></translation>
     </message>
@@ -377,7 +377,12 @@
     </message>
     <message>
         <location filename="../src/qml/Dock/Main.qml" line="159"/>
-        <source>Auto hide</source>
+        <source>Always hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qml/Dock/Main.qml" line="163"/>
+        <source>Smart hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -633,10 +638,10 @@
         <location filename="../src/qml/SideBar.qml" line="137"/>
         <location filename="../src/qml/SideBar.qml" line="146"/>
         <location filename="../src/qml/SideBar.qml" line="164"/>
-        <location filename="../src/qml/SideBar.qml" line="173"/>
         <location filename="../src/qml/SideBar.qml" line="182"/>
         <location filename="../src/qml/SideBar.qml" line="191"/>
         <location filename="../src/qml/SideBar.qml" line="200"/>
+        <location filename="../src/qml/SideBar.qml" line="209"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
@@ -646,22 +651,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/SideBar.qml" line="168"/>
+        <location filename="../src/qml/SideBar.qml" line="177"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/SideBar.qml" line="177"/>
+        <location filename="../src/qml/SideBar.qml" line="186"/>
         <source>Battery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/SideBar.qml" line="186"/>
+        <location filename="../src/qml/SideBar.qml" line="195"/>
         <source>Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/SideBar.qml" line="195"/>
+        <location filename="../src/qml/SideBar.qml" line="204"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
@@ -669,12 +674,12 @@
 <context>
     <name>TimeZoneDialog</name>
     <message>
-        <location filename="../src/qml/DateTime/TimeZoneDialog.qml" line="147"/>
+        <location filename="../src/qml/DateTime/TimeZoneDialog.qml" line="160"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/DateTime/TimeZoneDialog.qml" line="152"/>
+        <location filename="../src/qml/DateTime/TimeZoneDialog.qml" line="165"/>
         <source>Set</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts
index 2e7060c..a1c7788 100644
--- a/translations/zh_CN.ts
+++ b/translations/zh_CN.ts
@@ -137,12 +137,12 @@
         <translation>在深色模式下调暗壁纸</translation>
     </message>
     <message>
-        <location filename="../src/qml/Appearance/Main.qml" line="97"/>
+        <location filename="../src/qml/Appearance/Main.qml" line="98"/>
         <source>System effects</source>
         <translation>系统特效</translation>
     </message>
     <message>
-        <location filename="../src/qml/Appearance/Main.qml" line="117"/>
+        <location filename="../src/qml/Appearance/Main.qml" line="118"/>
         <source>Accent color</source>
         <translation>强调色</translation>
     </message>
@@ -377,8 +377,17 @@
     </message>
     <message>
         <location filename="../src/qml/Dock/Main.qml" line="159"/>
+        <source>Always hide</source>
+        <translation>总是隐藏</translation>
+    </message>
+    <message>
+        <location filename="../src/qml/Dock/Main.qml" line="163"/>
+        <source>Smart hide</source>
+        <translation>智能隐藏</translation>
+    </message>
+    <message>
         <source>Auto hide</source>
-        <translation>自动隐藏</translation>
+        <translation type="vanished">自动隐藏</translation>
     </message>
     <message>
         <location filename="../src/qml/Power/Main.qml" line="31"/>
@@ -633,10 +642,10 @@
         <location filename="../src/qml/SideBar.qml" line="137"/>
         <location filename="../src/qml/SideBar.qml" line="146"/>
         <location filename="../src/qml/SideBar.qml" line="164"/>
-        <location filename="../src/qml/SideBar.qml" line="173"/>
         <location filename="../src/qml/SideBar.qml" line="182"/>
         <location filename="../src/qml/SideBar.qml" line="191"/>
         <location filename="../src/qml/SideBar.qml" line="200"/>
+        <location filename="../src/qml/SideBar.qml" line="209"/>
         <source>System</source>
         <translation>系统</translation>
     </message>
@@ -646,22 +655,22 @@
         <translation>日期和时间</translation>
     </message>
     <message>
-        <location filename="../src/qml/SideBar.qml" line="168"/>
+        <location filename="../src/qml/SideBar.qml" line="177"/>
         <source>Language</source>
         <translation>语言</translation>
     </message>
     <message>
-        <location filename="../src/qml/SideBar.qml" line="177"/>
+        <location filename="../src/qml/SideBar.qml" line="186"/>
         <source>Battery</source>
         <translation>电池</translation>
     </message>
     <message>
-        <location filename="../src/qml/SideBar.qml" line="186"/>
+        <location filename="../src/qml/SideBar.qml" line="195"/>
         <source>Power</source>
         <translation>电源</translation>
     </message>
     <message>
-        <location filename="../src/qml/SideBar.qml" line="195"/>
+        <location filename="../src/qml/SideBar.qml" line="204"/>
         <source>About</source>
         <translation>关于</translation>
     </message>
@@ -669,12 +678,12 @@
 <context>
     <name>TimeZoneDialog</name>
     <message>
-        <location filename="../src/qml/DateTime/TimeZoneDialog.qml" line="147"/>
+        <location filename="../src/qml/DateTime/TimeZoneDialog.qml" line="160"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../src/qml/DateTime/TimeZoneDialog.qml" line="152"/>
+        <location filename="../src/qml/DateTime/TimeZoneDialog.qml" line="165"/>
         <source>Set</source>
         <translation>设置</translation>
     </message>