SideBar: add category

5 years ago · d5ad272633
parent 902e089072
commit d5ad272633
3 changed files with 132 additions and 56 deletions
--- a/src/qml/SideBar.qml
+++ b/src/qml/SideBar.qml
@ -48,25 +48,12 @@ Item {
    ListModel {
        id: listModel

-        ListElement {
-            title: qsTr("User")
-            name: "accounts"
-            page: "qrc:/qml/User/Main.qml"
-            iconSource: "accounts.svg"
-        }
-
-        ListElement {
-            title: qsTr("Display")
-            name: "display"
-            page: "qrc:/qml/Display/Main.qml"
-            iconSource: "display.svg"
-        }
-
        ListElement {
            title: qsTr("Network")
            name: "network"
            page: "qrc:/qml/Network/Main.qml"
            iconSource: "network.svg"
+            category: qsTr("Network and connection")
        }

 //        ListElement {
@ -76,11 +63,20 @@ Item {
 //            iconSource: "bluetooth.svg"
 //        }

+        ListElement {
+            title: qsTr("Display")
+            name: "display"
+            page: "qrc:/qml/Display/Main.qml"
+            iconSource: "display.svg"
+            category: qsTr("Display and appearance")
+        }
+
        ListElement {
            title: qsTr("Appearance")
            name: "appearance"
            page: "qrc:/qml/Appearance/Main.qml"
            iconSource: "appearance.svg"
+            category: qsTr("Display and appearance")
        }

        ListElement {
@ -88,6 +84,7 @@ Item {
            name: "background"
            page: "qrc:/qml/Wallpaper/Main.qml"
            iconSource: "wallpaper.svg"
+            category: qsTr("Display and appearance")
        }

        ListElement {
@ -95,6 +92,15 @@ Item {
            name: "dock"
            page: "qrc:/qml/Dock/Main.qml"
            iconSource: "dock.svg"
+            category: qsTr("Display and appearance")
+        }
+
+        ListElement {
+            title: qsTr("User")
+            name: "accounts"
+            page: "qrc:/qml/User/Main.qml"
+            iconSource: "accounts.svg"
+            category: qsTr("System")
        }

        ListElement {
@ -102,6 +108,7 @@ Item {
            name: "language"
            page: "qrc:/qml/LanguagePage.qml"
            iconSource: "language.svg"
+            category: qsTr("System")
        }

        ListElement {
@ -109,6 +116,7 @@ Item {
            name: "battery"
            page: "qrc:/qml/Battery/Main.qml"
            iconSource: "battery.svg"
+            category: qsTr("System")
        }

 //        ListElement {
@ -123,6 +131,7 @@ Item {
            name: "about"
            page: "qrc:/qml/About/Main.qml"
            iconSource: "about.svg"
+            category: qsTr("System")
        }
    }

@ -136,7 +145,7 @@ Item {
            clip: true
            model: listModel

-            spacing: FishUI.Units.smallSpacing * 1.5
+            spacing: FishUI.Units.smallSpacing
            leftMargin: FishUI.Units.largeSpacing
            rightMargin: FishUI.Units.largeSpacing
            topMargin: FishUI.Units.largeSpacing
@ -152,6 +161,21 @@ Item {
                smooth: true
            }

+            section.property: "category"
+            section.delegate: Item {
+                width: ListView.view.width - ListView.view.leftMargin - ListView.view.rightMargin
+                height: FishUI.Units.fontMetrics.height + FishUI.Units.smallSpacing * 3
+
+                Text {
+                    anchors.fill: parent
+                    anchors.leftMargin: FishUI.Units.smallSpacing
+                    anchors.topMargin: FishUI.Units.smallSpacing
+                    anchors.bottomMargin: FishUI.Units.smallSpacing * 2
+                    color: FishUI.Theme.disabledTextColor
+                    text: section
+                }
+            }
+
            delegate: Item {
                id: item
                width: ListView.view.width - ListView.view.leftMargin - ListView.view.rightMargin
@ -182,7 +206,7 @@ Item {
                RowLayout {
                    anchors.fill: parent
                    anchors.leftMargin: FishUI.Units.largeSpacing
-                    spacing: FishUI.Units.largeSpacing
+                    spacing: FishUI.Units.smallSpacing * 1.5

                    Image {
                        id: icon
--- a/translations/en_US.ts
+++ b/translations/en_US.ts
@ -76,32 +76,32 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="72"/>
+        <location filename="../src/qml/About/Main.qml" line="80"/>
        <source>System Version</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="77"/>
+        <location filename="../src/qml/About/Main.qml" line="85"/>
        <source>System Type</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="82"/>
+        <location filename="../src/qml/About/Main.qml" line="90"/>
        <source>Kernel Version</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="87"/>
+        <location filename="../src/qml/About/Main.qml" line="95"/>
        <source>Processor</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="92"/>
+        <location filename="../src/qml/About/Main.qml" line="100"/>
        <source>RAM</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="97"/>
+        <location filename="../src/qml/About/Main.qml" line="105"/>
        <source>Internal Storage</source>
        <translation type="unfinished"></translation>
    </message>
@ -270,17 +270,17 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="226"/>
+        <location filename="../src/qml/Display/Main.qml" line="230"/>
        <source>Enabled</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="257"/>
+        <location filename="../src/qml/Display/Main.qml" line="261"/>
        <source>Scale</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="325"/>
+        <location filename="../src/qml/Display/Main.qml" line="329"/>
        <source>Need to log in again to take effect</source>
        <translation type="unfinished"></translation>
    </message>
@ -320,7 +320,7 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/Main.qml" line="148"/>
+        <location filename="../src/qml/Network/Main.qml" line="144"/>
        <source>Wired</source>
        <translation type="unfinished"></translation>
    </message>
@ -341,6 +341,11 @@
    </message>
    <message>
        <location filename="../src/qml/Power/Main.qml" line="59"/>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qml/Power/Main.qml" line="65"/>
        <source>Performance</source>
        <translation type="unfinished"></translation>
    </message>
@ -378,47 +383,68 @@
 <context>
    <name>SideBar</name>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="52"/>
+        <location filename="../src/qml/SideBar.qml" line="99"/>
        <source>User</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="59"/>
+        <location filename="../src/qml/SideBar.qml" line="67"/>
        <source>Display</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="66"/>
+        <location filename="../src/qml/SideBar.qml" line="52"/>
        <source>Network</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="80"/>
-        <source>Appearance</source>
+        <location filename="../src/qml/SideBar.qml" line="56"/>
+        <source>Network and connection</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
+        <location filename="../src/qml/SideBar.qml" line="71"/>
+        <location filename="../src/qml/SideBar.qml" line="79"/>
        <location filename="../src/qml/SideBar.qml" line="87"/>
+        <location filename="../src/qml/SideBar.qml" line="95"/>
+        <source>Display and appearance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qml/SideBar.qml" line="75"/>
+        <source>Appearance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qml/SideBar.qml" line="83"/>
        <source>Background</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="94"/>
+        <location filename="../src/qml/SideBar.qml" line="91"/>
        <source>Dock</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="101"/>
+        <location filename="../src/qml/SideBar.qml" line="103"/>
+        <location filename="../src/qml/SideBar.qml" line="111"/>
+        <location filename="../src/qml/SideBar.qml" line="119"/>
+        <location filename="../src/qml/SideBar.qml" line="134"/>
+        <source>System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qml/SideBar.qml" line="107"/>
        <source>Language</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="108"/>
+        <location filename="../src/qml/SideBar.qml" line="115"/>
        <source>Battery</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="122"/>
+        <location filename="../src/qml/SideBar.qml" line="130"/>
        <source>About</source>
        <translation type="unfinished"></translation>
    </message>
@ -467,7 +493,7 @@
 <context>
    <name>WifiView</name>
    <message>
-        <location filename="../src/qml/Network/WifiView.qml" line="34"/>
+        <location filename="../src/qml/Network/WifiView.qml" line="35"/>
        <source>WLAN</source>
        <translation type="unfinished"></translation>
    </message>
--- a/translations/zh_CN.ts
+++ b/translations/zh_CN.ts
@ -76,32 +76,32 @@
        <translation>关于</translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="72"/>
+        <location filename="../src/qml/About/Main.qml" line="80"/>
        <source>System Version</source>
        <translation>系统版本</translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="77"/>
+        <location filename="../src/qml/About/Main.qml" line="85"/>
        <source>System Type</source>
        <translation>系统类型</translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="82"/>
+        <location filename="../src/qml/About/Main.qml" line="90"/>
        <source>Kernel Version</source>
        <translation>内核版本</translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="87"/>
+        <location filename="../src/qml/About/Main.qml" line="95"/>
        <source>Processor</source>
        <translation>处理器</translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="92"/>
+        <location filename="../src/qml/About/Main.qml" line="100"/>
        <source>RAM</source>
        <translation>内存大小</translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="97"/>
+        <location filename="../src/qml/About/Main.qml" line="105"/>
        <source>Internal Storage</source>
        <translation>内部存储</translation>
    </message>
@ -270,17 +270,17 @@
        <translation>方向</translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="226"/>
+        <location filename="../src/qml/Display/Main.qml" line="230"/>
        <source>Enabled</source>
        <translation>已开启</translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="257"/>
+        <location filename="../src/qml/Display/Main.qml" line="261"/>
        <source>Scale</source>
        <translation>缩放</translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="325"/>
+        <location filename="../src/qml/Display/Main.qml" line="329"/>
        <source>Need to log in again to take effect</source>
        <translation>需要重新登录才能生效</translation>
    </message>
@ -320,7 +320,7 @@
        <translation>网络</translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/Main.qml" line="148"/>
+        <location filename="../src/qml/Network/Main.qml" line="144"/>
        <source>Wired</source>
        <translation>有线网络</translation>
    </message>
@ -341,6 +341,11 @@
    </message>
    <message>
        <location filename="../src/qml/Power/Main.qml" line="59"/>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qml/Power/Main.qml" line="65"/>
        <source>Performance</source>
        <translation>性能模式</translation>
    </message>
@ -378,47 +383,68 @@
 <context>
    <name>SideBar</name>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="59"/>
+        <location filename="../src/qml/SideBar.qml" line="67"/>
        <source>Display</source>
        <translation>显示</translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="66"/>
+        <location filename="../src/qml/SideBar.qml" line="52"/>
        <source>Network</source>
        <translation>网络</translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="80"/>
+        <location filename="../src/qml/SideBar.qml" line="56"/>
+        <source>Network and connection</source>
+        <translation>网络与连接</translation>
+    </message>
+    <message>
+        <location filename="../src/qml/SideBar.qml" line="71"/>
+        <location filename="../src/qml/SideBar.qml" line="79"/>
+        <location filename="../src/qml/SideBar.qml" line="87"/>
+        <location filename="../src/qml/SideBar.qml" line="95"/>
+        <source>Display and appearance</source>
+        <translation>显示与外观</translation>
+    </message>
+    <message>
+        <location filename="../src/qml/SideBar.qml" line="75"/>
        <source>Appearance</source>
        <translation>外观</translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="94"/>
+        <location filename="../src/qml/SideBar.qml" line="91"/>
        <source>Dock</source>
        <translation>程序坞</translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="52"/>
+        <location filename="../src/qml/SideBar.qml" line="99"/>
        <source>User</source>
        <translation>用户</translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="87"/>
+        <location filename="../src/qml/SideBar.qml" line="83"/>
        <source>Background</source>
        <translation>背景</translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="101"/>
+        <location filename="../src/qml/SideBar.qml" line="103"/>
+        <location filename="../src/qml/SideBar.qml" line="111"/>
+        <location filename="../src/qml/SideBar.qml" line="119"/>
+        <location filename="../src/qml/SideBar.qml" line="134"/>
+        <source>System</source>
+        <translation>系统</translation>
+    </message>
+    <message>
+        <location filename="../src/qml/SideBar.qml" line="107"/>
        <source>Language</source>
        <translation>语言</translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="108"/>
+        <location filename="../src/qml/SideBar.qml" line="115"/>
        <source>Battery</source>
        <translation>电池</translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="122"/>
+        <location filename="../src/qml/SideBar.qml" line="130"/>
        <source>About</source>
        <translation>关于</translation>
    </message>
@ -467,7 +493,7 @@
 <context>
    <name>WifiView</name>
    <message>
-        <location filename="../src/qml/Network/WifiView.qml" line="34"/>
+        <location filename="../src/qml/Network/WifiView.qml" line="35"/>
        <source>WLAN</source>
        <translation>WLAN</translation>
    </message>