From 7d3b1d022b9a3dda9949b706263338cd1687a624 Mon Sep 17 00:00:00 2001
From: reionwong <reionwong@gmail.com>
Date: Wed, 17 Nov 2021 00:22:16 +0800
Subject: [PATCH] Update power

---
 src/qml/Power/Main.qml | 47 ++++++----------------------------
 translations/en_US.ts  | 56 ++++++++++------------------------------
 translations/zh_CN.ts  | 58 ++++++++++--------------------------------
 3 files changed, 35 insertions(+), 126 deletions(-)

diff --git a/src/qml/Power/Main.qml b/src/qml/Power/Main.qml
index f69e777..2f6ae35 100644
--- a/src/qml/Power/Main.qml
+++ b/src/qml/Power/Main.qml
@@ -50,7 +50,7 @@ ItemPage {
             return 3
         case 30 * 60:
             return 4
-        case -1:
+        case 10000000:
             return 5
         }
     }
@@ -109,6 +109,8 @@ ItemPage {
 
                 GridLayout {
                     columns: 2
+                    rowSpacing: FishUI.Units.largeSpacing
+                    Layout.bottomMargin: FishUI.Units.largeSpacing
 
                     Label {
                         text: qsTr("Turn off screen")
@@ -147,53 +149,20 @@ ItemPage {
                                 power.idleTime = 30 * 60
                                 break
                             case 5:
-                                power.idleTime = -1
+                                power.idleTime = 10000000
                                 break
                             }
                         }
                     }
 
                     Label {
-                        text: qsTr("Hibernate")
+                        text: qsTr("Hibernate after screen is turned off")
                         Layout.fillWidth: true
                     }
 
-                    ComboBox {
-                        model: ListModel {
-                            ListElement { text: qsTr("2 Minutes") }
-                            ListElement { text: qsTr("5 Minutes") }
-                            ListElement { text: qsTr("10 Minutes") }
-                            ListElement { text: qsTr("15 Minutes") }
-                            ListElement { text: qsTr("30 Minutes") }
-                            ListElement { text: qsTr("Never") }
-                        }
-
-                        Component.onCompleted: {
-                            currentIndex = timeoutToIndex(power.hibernateTime)
-                        }
-
-                        onActivated: {
-                            switch (currentIndex) {
-                            case 0:
-                                power.hibernateTime = 2 * 60
-                                break
-                            case 1:
-                                power.hibernateTime = 5 * 60
-                                break
-                            case 2:
-                                power.hibernateTime = 10 * 60
-                                break
-                            case 3:
-                                power.hibernateTime = 15 * 60
-                                break
-                            case 4:
-                                power.hibernateTime = 30 * 60
-                                break
-                            case 5:
-                                power.hibernateTime = -1
-                                break
-                            }
-                        }
+                    Switch {
+                        Layout.fillHeight: true
+                        Layout.alignment: Qt.AlignRight
                     }
                 }
             }
diff --git a/translations/en_US.ts b/translations/en_US.ts
index fbba3b8..54dcfe9 100644
--- a/translations/en_US.ts
+++ b/translations/en_US.ts
@@ -370,93 +370,63 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="48"/>
+        <location filename="../src/qml/Power/Main.qml" line="69"/>
         <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="57"/>
+        <location filename="../src/qml/Power/Main.qml" line="78"/>
         <source>Power Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="70"/>
+        <location filename="../src/qml/Power/Main.qml" line="91"/>
         <source>Performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="83"/>
+        <location filename="../src/qml/Power/Main.qml" line="104"/>
         <source>Performance mode: CPU and GPU frequencies will be increased, while power consumption and heat generation will be increased.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="90"/>
-        <source>Plugged In</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qml/Power/Main.qml" line="98"/>
-        <location filename="../src/qml/Power/Main.qml" line="143"/>
+        <location filename="../src/qml/Power/Main.qml" line="113"/>
         <source>Turn off screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="104"/>
-        <location filename="../src/qml/Power/Main.qml" line="120"/>
-        <location filename="../src/qml/Power/Main.qml" line="149"/>
-        <location filename="../src/qml/Power/Main.qml" line="165"/>
+        <location filename="../src/qml/Power/Main.qml" line="119"/>
         <source>2 Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="105"/>
-        <location filename="../src/qml/Power/Main.qml" line="121"/>
-        <location filename="../src/qml/Power/Main.qml" line="150"/>
-        <location filename="../src/qml/Power/Main.qml" line="166"/>
+        <location filename="../src/qml/Power/Main.qml" line="120"/>
         <source>5 Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="106"/>
-        <location filename="../src/qml/Power/Main.qml" line="122"/>
-        <location filename="../src/qml/Power/Main.qml" line="151"/>
-        <location filename="../src/qml/Power/Main.qml" line="167"/>
+        <location filename="../src/qml/Power/Main.qml" line="121"/>
         <source>10 Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="107"/>
-        <location filename="../src/qml/Power/Main.qml" line="123"/>
-        <location filename="../src/qml/Power/Main.qml" line="152"/>
-        <location filename="../src/qml/Power/Main.qml" line="168"/>
+        <location filename="../src/qml/Power/Main.qml" line="122"/>
         <source>15 Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="108"/>
-        <location filename="../src/qml/Power/Main.qml" line="124"/>
-        <location filename="../src/qml/Power/Main.qml" line="153"/>
-        <location filename="../src/qml/Power/Main.qml" line="169"/>
+        <location filename="../src/qml/Power/Main.qml" line="123"/>
         <source>30 Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="109"/>
-        <location filename="../src/qml/Power/Main.qml" line="125"/>
-        <location filename="../src/qml/Power/Main.qml" line="154"/>
-        <location filename="../src/qml/Power/Main.qml" line="170"/>
+        <location filename="../src/qml/Power/Main.qml" line="124"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="114"/>
-        <location filename="../src/qml/Power/Main.qml" line="159"/>
-        <source>Hibernate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qml/Power/Main.qml" line="135"/>
-        <source>On Battery</source>
+        <location filename="../src/qml/Power/Main.qml" line="156"/>
+        <source>Hibernate after screen is turned off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts
index c0f4cdc..b05e630 100644
--- a/translations/zh_CN.ts
+++ b/translations/zh_CN.ts
@@ -370,94 +370,64 @@
         <translation>电源</translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="48"/>
+        <location filename="../src/qml/Power/Main.qml" line="69"/>
         <source>Mode</source>
         <translation>模式</translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="57"/>
+        <location filename="../src/qml/Power/Main.qml" line="78"/>
         <source>Power Save</source>
         <translation>省电模式</translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="70"/>
+        <location filename="../src/qml/Power/Main.qml" line="91"/>
         <source>Performance</source>
         <translation>性能模式</translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="83"/>
+        <location filename="../src/qml/Power/Main.qml" line="104"/>
         <source>Performance mode: CPU and GPU frequencies will be increased, while power consumption and heat generation will be increased.</source>
         <translation>性能模式: CPU和GPU频率将提升，同时耗电和发热将增加。</translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="90"/>
-        <source>Plugged In</source>
-        <translation>使用电源</translation>
-    </message>
-    <message>
-        <location filename="../src/qml/Power/Main.qml" line="98"/>
-        <location filename="../src/qml/Power/Main.qml" line="143"/>
+        <location filename="../src/qml/Power/Main.qml" line="113"/>
         <source>Turn off screen</source>
         <translation>关闭屏幕</translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="104"/>
-        <location filename="../src/qml/Power/Main.qml" line="120"/>
-        <location filename="../src/qml/Power/Main.qml" line="149"/>
-        <location filename="../src/qml/Power/Main.qml" line="165"/>
+        <location filename="../src/qml/Power/Main.qml" line="119"/>
         <source>2 Minutes</source>
         <translation>2分钟</translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="105"/>
-        <location filename="../src/qml/Power/Main.qml" line="121"/>
-        <location filename="../src/qml/Power/Main.qml" line="150"/>
-        <location filename="../src/qml/Power/Main.qml" line="166"/>
+        <location filename="../src/qml/Power/Main.qml" line="120"/>
         <source>5 Minutes</source>
         <translation>5分钟</translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="106"/>
-        <location filename="../src/qml/Power/Main.qml" line="122"/>
-        <location filename="../src/qml/Power/Main.qml" line="151"/>
-        <location filename="../src/qml/Power/Main.qml" line="167"/>
+        <location filename="../src/qml/Power/Main.qml" line="121"/>
         <source>10 Minutes</source>
         <translation>10分钟</translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="107"/>
-        <location filename="../src/qml/Power/Main.qml" line="123"/>
-        <location filename="../src/qml/Power/Main.qml" line="152"/>
-        <location filename="../src/qml/Power/Main.qml" line="168"/>
+        <location filename="../src/qml/Power/Main.qml" line="122"/>
         <source>15 Minutes</source>
         <translation>15分钟</translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="108"/>
-        <location filename="../src/qml/Power/Main.qml" line="124"/>
-        <location filename="../src/qml/Power/Main.qml" line="153"/>
-        <location filename="../src/qml/Power/Main.qml" line="169"/>
+        <location filename="../src/qml/Power/Main.qml" line="123"/>
         <source>30 Minutes</source>
         <translation>30分钟</translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="109"/>
-        <location filename="../src/qml/Power/Main.qml" line="125"/>
-        <location filename="../src/qml/Power/Main.qml" line="154"/>
-        <location filename="../src/qml/Power/Main.qml" line="170"/>
+        <location filename="../src/qml/Power/Main.qml" line="124"/>
         <source>Never</source>
         <translation>永不</translation>
     </message>
     <message>
-        <location filename="../src/qml/Power/Main.qml" line="114"/>
-        <location filename="../src/qml/Power/Main.qml" line="159"/>
-        <source>Hibernate</source>
-        <translation>休眠</translation>
-    </message>
-    <message>
-        <location filename="../src/qml/Power/Main.qml" line="135"/>
-        <source>On Battery</source>
-        <translation>使用电池</translation>
+        <location filename="../src/qml/Power/Main.qml" line="156"/>
+        <source>Hibernate after screen is turned off</source>
+        <translation>关闭屏幕后休眠</translation>
     </message>
     <message>
         <location filename="../src/qml/User/Main.qml" line="31"/>