aiden
/
settings
mirror of https://github.com/cutefishos/settings
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

SideBar: add category

Browse Source
pull/11/head
rekols 5 years ago
parent 902e089072
commit d5ad272633
3 changed files with 132 additions and 56 deletions
Show Stats Download Patch File Download Diff File

56
src/qml/SideBar.qml
Unescape Escape View File

@ -48,25 +48,12 @@ Item {
ListModel { ListModel {
id: 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 { ListElement {
title: qsTr("Network") title: qsTr("Network")
name: "network" name: "network"
page: "qrc:/qml/Network/Main.qml" page: "qrc:/qml/Network/Main.qml"
iconSource: "network.svg" iconSource: "network.svg"
category: qsTr("Network and connection")
} }
// ListElement { // ListElement {
@ -76,11 +63,20 @@ Item {
// iconSource: "bluetooth.svg" // iconSource: "bluetooth.svg"
// } // }
ListElement {
title: qsTr("Display")
name: "display"
page: "qrc:/qml/Display/Main.qml"
iconSource: "display.svg"
category: qsTr("Display and appearance")
}
ListElement { ListElement {
title: qsTr("Appearance") title: qsTr("Appearance")
name: "appearance" name: "appearance"
page: "qrc:/qml/Appearance/Main.qml" page: "qrc:/qml/Appearance/Main.qml"
iconSource: "appearance.svg" iconSource: "appearance.svg"
category: qsTr("Display and appearance")
} }
ListElement { ListElement {
@ -88,6 +84,7 @@ Item {
name: "background" name: "background"
page: "qrc:/qml/Wallpaper/Main.qml" page: "qrc:/qml/Wallpaper/Main.qml"
iconSource: "wallpaper.svg" iconSource: "wallpaper.svg"
category: qsTr("Display and appearance")
} }
ListElement { ListElement {
@ -95,6 +92,15 @@ Item {
name: "dock" name: "dock"
page: "qrc:/qml/Dock/Main.qml" page: "qrc:/qml/Dock/Main.qml"
iconSource: "dock.svg" 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 { ListElement {
@ -102,6 +108,7 @@ Item {
name: "language" name: "language"
page: "qrc:/qml/LanguagePage.qml" page: "qrc:/qml/LanguagePage.qml"
iconSource: "language.svg" iconSource: "language.svg"
category: qsTr("System")
} }
ListElement { ListElement {
@ -109,6 +116,7 @@ Item {
name: "battery" name: "battery"
page: "qrc:/qml/Battery/Main.qml" page: "qrc:/qml/Battery/Main.qml"
iconSource: "battery.svg" iconSource: "battery.svg"
category: qsTr("System")
} }
// ListElement { // ListElement {
@ -123,6 +131,7 @@ Item {
name: "about" name: "about"
page: "qrc:/qml/About/Main.qml" page: "qrc:/qml/About/Main.qml"
iconSource: "about.svg" iconSource: "about.svg"
category: qsTr("System")
} }
} }
@ -136,7 +145,7 @@ Item {
clip: true clip: true
model: listModel model: listModel
spacing: FishUI.Units.smallSpacing * 1.5 spacing: FishUI.Units.smallSpacing
leftMargin: FishUI.Units.largeSpacing leftMargin: FishUI.Units.largeSpacing
rightMargin: FishUI.Units.largeSpacing rightMargin: FishUI.Units.largeSpacing
topMargin: FishUI.Units.largeSpacing topMargin: FishUI.Units.largeSpacing
@ -152,6 +161,21 @@ Item {
smooth: true 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 { delegate: Item {
id: item id: item
width: ListView.view.width - ListView.view.leftMargin - ListView.view.rightMargin width: ListView.view.width - ListView.view.leftMargin - ListView.view.rightMargin
@ -182,7 +206,7 @@ Item {
RowLayout { RowLayout {
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: FishUI.Units.largeSpacing anchors.leftMargin: FishUI.Units.largeSpacing
spacing: FishUI.Units.largeSpacing spacing: FishUI.Units.smallSpacing * 1.5
Image { Image {
id: icon id: icon

66
translations/en_US.ts
Unescape Escape View File

@ -76,32 +76,32 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/About/Main.qml" line="72"/> <location filename="../src/qml/About/Main.qml" line="80"/>
<source>System Version</source> <source>System Version</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/About/Main.qml" line="77"/> <location filename="../src/qml/About/Main.qml" line="85"/>
<source>System Type</source> <source>System Type</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/About/Main.qml" line="82"/> <location filename="../src/qml/About/Main.qml" line="90"/>
<source>Kernel Version</source> <source>Kernel Version</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/About/Main.qml" line="87"/> <location filename="../src/qml/About/Main.qml" line="95"/>
<source>Processor</source> <source>Processor</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/About/Main.qml" line="92"/> <location filename="../src/qml/About/Main.qml" line="100"/>
<source>RAM</source> <source>RAM</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/About/Main.qml" line="97"/> <location filename="../src/qml/About/Main.qml" line="105"/>
<source>Internal Storage</source> <source>Internal Storage</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -270,17 +270,17 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/Display/Main.qml" line="226"/> <location filename="../src/qml/Display/Main.qml" line="230"/>
<source>Enabled</source> <source>Enabled</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/Display/Main.qml" line="257"/> <location filename="../src/qml/Display/Main.qml" line="261"/>
<source>Scale</source> <source>Scale</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<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> <source>Need to log in again to take effect</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -320,7 +320,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/Network/Main.qml" line="148"/> <location filename="../src/qml/Network/Main.qml" line="144"/>
<source>Wired</source> <source>Wired</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -341,6 +341,11 @@
</message> </message>
<message> <message>
<location filename="../src/qml/Power/Main.qml" line="59"/> <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> <source>Performance</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -378,47 +383,68 @@
<context> <context>
<name>SideBar</name> <name>SideBar</name>
<message> <message>
<location filename="../src/qml/SideBar.qml" line="52"/> <location filename="../src/qml/SideBar.qml" line="99"/>
<source>User</source> <source>User</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/SideBar.qml" line="59"/> <location filename="../src/qml/SideBar.qml" line="67"/>
<source>Display</source> <source>Display</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/SideBar.qml" line="66"/> <location filename="../src/qml/SideBar.qml" line="52"/>
<source>Network</source> <source>Network</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/SideBar.qml" line="80"/> <location filename="../src/qml/SideBar.qml" line="56"/>
<source>Appearance</source> <source>Network and connection</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<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="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> <source>Background</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/SideBar.qml" line="94"/> <location filename="../src/qml/SideBar.qml" line="91"/>
<source>Dock</source> <source>Dock</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<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> <source>Language</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/SideBar.qml" line="108"/> <location filename="../src/qml/SideBar.qml" line="115"/>
<source>Battery</source> <source>Battery</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/qml/SideBar.qml" line="122"/> <location filename="../src/qml/SideBar.qml" line="130"/>
<source>About</source> <source>About</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -467,7 +493,7 @@
<context> <context>
<name>WifiView</name> <name>WifiView</name>
<message> <message>
<location filename="../src/qml/Network/WifiView.qml" line="34"/> <location filename="../src/qml/Network/WifiView.qml" line="35"/>
<source>WLAN</source> <source>WLAN</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

66
translations/zh_CN.ts
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save