Improve interface display

5 years ago · 5771c1e977
parent aa5aeba140
commit 5771c1e977
14 changed files with 285 additions and 266 deletions
--- a/src/about.cpp
+++ b/src/about.cpp
@ -29,23 +29,23 @@ static QString formatByteSize(double size, int precision)

    switch (unit) {
    case 0:
-        return QObject::tr("%1 B").arg(numString);
+        return QString("%1 B").arg(numString);
    case 1:
-        return QObject::tr("%1 KB").arg(numString);
+        return QString("%1 KB").arg(numString);
    case 2:
-        return QObject::tr("%1 MB").arg(numString);
+        return QString("%1 MB").arg(numString);
    case 3:
-        return QObject::tr("%1 GB").arg(numString);
+        return QString("%1 GB").arg(numString);
    case 4:
-        return QObject::tr("%1 TB").arg(numString);
+        return QString("%1 TB").arg(numString);
    case 5:
-        return QObject::tr("%1 PB").arg(numString);
+        return QString("%1 PB").arg(numString);
    case 6:
-        return QObject::tr("%1 EB").arg(numString);
+        return QString("%1 EB").arg(numString);
    case 7:
-        return QObject::tr("%1 ZB").arg(numString);
+        return QString("%1 ZB").arg(numString);
    case 8:
-        return QObject::tr("%1 YB").arg(numString);
+        return QString("%1 YB").arg(numString);
    default:
        return QString();
    }
--- a/src/images/dark_mode.svg
+++ b/src/images/dark_mode.svg
@ -12,7 +12,7 @@
   viewBox="0 0 16.933333 16.933334"
   version="1.1"
   id="svg8"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07, custom)"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
   sodipodi:docname="dark_mode.svg">
  <defs
     id="defs2" />
@ -32,9 +32,9 @@
     showgrid="false"
     units="px"
     inkscape:window-width="2160"
-     inkscape:window-height="1312"
+     inkscape:window-height="1229"
     inkscape:window-x="0"
-     inkscape:window-y="30"
+     inkscape:window-y="42"
     inkscape:window-maximized="1" />
  <metadata
     id="metadata5">
@ -53,7 +53,7 @@
     inkscape:groupmode="layer"
     id="layer1">
    <rect
-       style="opacity:1;fill:#353535;fill-opacity:1;stroke-width:0.264583"
+       style="opacity:1;fill:#262626;fill-opacity:1;stroke-width:0.264583"
       id="background"
       width="16.933334"
       height="16.933332"
--- a/src/images/dock_bottom.svg
+++ b/src/images/dock_bottom.svg
@ -5,6 +5,7 @@
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="64"
@ -12,7 +13,7 @@
   version="1.1"
   id="svg26"
   sodipodi:docname="dock_bottom.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
  <metadata
     id="metadata30">
    <rdf:RDF>
@ -35,46 +36,56 @@
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="2160"
-     inkscape:window-height="1312"
+     inkscape:window-height="1229"
     id="namedview28"
     showgrid="false"
-     inkscape:zoom="11.484375"
-     inkscape:cx="32"
-     inkscape:cy="31.82585"
+     inkscape:zoom="4.0603397"
+     inkscape:cx="100.63024"
+     inkscape:cy="64.143145"
     inkscape:window-x="0"
-     inkscape:window-y="30"
+     inkscape:window-y="42"
     inkscape:window-maximized="1"
     inkscape:current-layer="svg26"
     inkscape:document-rotation="0" />
  <defs
     id="defs12">
    <linearGradient
-       id="linearGradient862-3"
-       x1="7.9373"
-       x2="7.9373"
-       y1="15.081"
-       y2="1.852"
-       gradientTransform="matrix(4.3193889,0,0,4.3193889,-4.5712655,-4.5353812)"
-       gradientUnits="userSpaceOnUse">
+       inkscape:collect="always"
+       xlink:href="#SVGID_1_"
+       id="linearGradient865"
+       x1="32.959263"
+       y1="-0.12682357"
+       x2="31.932585"
+       y2="64.589439"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-64,-64)" />
+    <linearGradient
+       id="SVGID_1_"
+       gradientUnits="userSpaceOnUse"
+       x1="-26.875"
+       y1="559.505"
+       x2="-26.875"
+       y2="622.40997"
+       gradientTransform="matrix(0.15793544,0,0,-0.29099568,77.648598,191.546)">
      <stop
-         stop-color="#427fff"
         offset="0"
-         id="stop7" />
+         style="stop-color:#006DF0"
+         id="stop2-3" />
      <stop
-         stop-color="#59e3ff"
         offset="1"
-         id="stop9" />
+         style="stop-color:#00E7F0"
+         id="stop4-6" />
    </linearGradient>
  </defs>
  <rect
-     x="0"
-     y="0"
+     x="-64"
+     y="-64"
     width="64"
     height="64"
-     fill="url(#linearGradient862-3)"
     stroke-width="4.31939"
     id="rect16"
-     style="opacity:1;fill:url(#linearGradient862-3)" />
+     style="opacity:1;fill:url(#linearGradient865);fill-opacity:1"
+     transform="scale(-1)" />
  <rect
     x="-53.999172"
     y="-60.000095"
@ -116,4 +127,10 @@
       ry="0.52916002"
       id="rect42" />
  </g>
+  <g
+     id="g24"
+     transform="matrix(0.04008656,0,0,0.24050243,-60.019498,-46.152335)">
+    <g
+       id="g22" />
+  </g>
 </svg>
--- a/src/images/dock_left.svg
+++ b/src/images/dock_left.svg
@ -5,6 +5,7 @@
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="64"
@ -12,7 +13,7 @@
   version="1.1"
   id="svg26"
   sodipodi:docname="dock_left.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
  <metadata
     id="metadata30">
    <rdf:RDF>
@ -35,46 +36,56 @@
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="2160"
-     inkscape:window-height="1312"
+     inkscape:window-height="1229"
     id="namedview28"
     showgrid="false"
     inkscape:zoom="11.484375"
     inkscape:cx="32"
-     inkscape:cy="32.17415"
+     inkscape:cy="31.129252"
     inkscape:window-x="0"
-     inkscape:window-y="30"
+     inkscape:window-y="42"
     inkscape:window-maximized="1"
     inkscape:current-layer="svg26"
     inkscape:document-rotation="0" />
  <defs
     id="defs12">
    <linearGradient
-       id="linearGradient862-3"
-       x1="7.9373"
-       x2="7.9373"
-       y1="15.081"
-       y2="1.852"
-       gradientTransform="matrix(4.3193889,0,0,4.3193889,-4.5712655,-4.5353812)"
-       gradientUnits="userSpaceOnUse">
+       inkscape:collect="always"
+       xlink:href="#SVGID_1_"
+       id="linearGradient865"
+       x1="0"
+       y1="32"
+       x2="64"
+       y2="32"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-64)" />
+    <linearGradient
+       id="SVGID_1_"
+       gradientUnits="userSpaceOnUse"
+       x1="-26.875"
+       y1="559.505"
+       x2="-26.875"
+       y2="622.40997"
+       gradientTransform="matrix(0.15793544,0,0,-0.29099568,77.648598,191.546)">
      <stop
-         stop-color="#427fff"
         offset="0"
-         id="stop7" />
+         style="stop-color:#006DF0"
+         id="stop2-3" />
      <stop
-         stop-color="#59e3ff"
         offset="1"
-         id="stop9" />
+         style="stop-color:#00E7F0"
+         id="stop4-6" />
    </linearGradient>
  </defs>
  <rect
-     x="0"
+     x="-64"
     y="0"
     width="64"
     height="64"
-     fill="url(#linearGradient862-3)"
     stroke-width="4.31939"
     id="rect16"
-     style="opacity:1;fill:url(#linearGradient862-3)" />
+     style="opacity:1;fill:url(#linearGradient865);fill-opacity:1"
+     transform="rotate(-90)" />
  <rect
     x="10.000828"
     y="-20.000095"
--- a/src/images/dock_right.svg
+++ b/src/images/dock_right.svg
@ -5,6 +5,7 @@
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="64"
@ -12,7 +13,7 @@
   version="1.1"
   id="svg26"
   sodipodi:docname="dock_right.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
  <metadata
     id="metadata30">
    <rdf:RDF>
@ -35,46 +36,56 @@
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="2160"
-     inkscape:window-height="1307"
+     inkscape:window-height="1229"
     id="namedview28"
     showgrid="false"
     inkscape:zoom="11.484375"
     inkscape:cx="32"
     inkscape:cy="32.17415"
     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="42"
     inkscape:window-maximized="1"
     inkscape:current-layer="svg26"
     inkscape:document-rotation="0" />
  <defs
     id="defs12">
    <linearGradient
-       id="linearGradient862-3"
-       x1="7.9373"
-       x2="7.9373"
-       y1="15.081"
-       y2="1.852"
-       gradientTransform="matrix(4.3193889,0,0,4.3193889,-4.5712655,-4.5353812)"
-       gradientUnits="userSpaceOnUse">
+       id="SVGID_1_"
+       gradientUnits="userSpaceOnUse"
+       x1="-26.875"
+       y1="559.505"
+       x2="-26.875"
+       y2="622.40997"
+       gradientTransform="matrix(0.15793544,0,0,-0.29099568,77.648598,191.546)">
      <stop
-         stop-color="#427fff"
         offset="0"
-         id="stop7" />
+         style="stop-color:#006DF0"
+         id="stop2-3" />
      <stop
-         stop-color="#59e3ff"
         offset="1"
-         id="stop9" />
+         style="stop-color:#00E7F0"
+         id="stop4-6" />
    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SVGID_1_"
+       id="linearGradient852"
+       gradientUnits="userSpaceOnUse"
+       x1="0"
+       y1="32"
+       x2="64"
+       y2="32"
+       gradientTransform="translate(-64.000003)" />
  </defs>
  <rect
-     x="0"
+     x="-64"
     y="0"
     width="64"
     height="64"
-     fill="url(#linearGradient862-3)"
     stroke-width="4.31939"
-     id="rect16"
-     style="opacity:1;fill:url(#linearGradient862-3)" />
+     id="background"
+     style="fill:url(#linearGradient852);fill-opacity:1"
+     transform="rotate(-90)" />
  <g
     id="g843"
     transform="translate(39.999905)">
--- a/src/images/light_mode.svg
+++ b/src/images/light_mode.svg
@ -12,7 +12,7 @@
   viewBox="0 0 16.933333 16.933334"
   version="1.1"
   id="svg8"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07, custom)"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
   sodipodi:docname="light_mode.svg">
  <defs
     id="defs2" />
@ -31,10 +31,10 @@
     inkscape:document-rotation="0"
     showgrid="false"
     units="px"
-     inkscape:window-width="2062"
-     inkscape:window-height="1410"
-     inkscape:window-x="98"
-     inkscape:window-y="30"
+     inkscape:window-width="2160"
+     inkscape:window-height="1229"
+     inkscape:window-x="0"
+     inkscape:window-y="42"
     inkscape:window-maximized="1" />
  <metadata
     id="metadata5">
@ -53,7 +53,7 @@
     inkscape:groupmode="layer"
     id="layer1">
    <rect
-       style="opacity:1;fill:#f5f5f5;fill-opacity:1;stroke-width:0.264583"
+       style="opacity:1;fill:#ebecf2;fill-opacity:1;stroke-width:0.264583"
       id="background"
       width="16.933334"
       height="16.933332"
--- a/src/qml/About/Main.qml
+++ b/src/qml/About/Main.qml
@ -65,7 +65,7 @@ ItemPage {
            }

            Label {
-                text: qsTr("Built on ") + about.prettyProductName
+                text: qsTr("Built on %1").arg(about.prettyProductName)
                Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
                bottomPadding: FishUI.Units.largeSpacing * 2
                color: FishUI.Theme.disabledTextColor
@ -74,7 +74,7 @@ ItemPage {
            RoundedItem {
                StandardItem {
                    key: qsTr("System Version")
-                    value: "0.2"
+                    value: "0.3"
                }

                StandardItem {
--- a/src/qml/Display/Main.qml
+++ b/src/qml/Display/Main.qml
@ -142,14 +142,19 @@ ItemPage {
                            id: _mainLayout
                            anchors.fill: parent

-                            // Label {
-                            //     text: element.display
-                            // }
-
                            GridLayout {
                                columns: 2
                                columnSpacing: FishUI.Units.largeSpacing * 1.5
-                                rowSpacing: FishUI.Units.largeSpacing
+                                rowSpacing: FishUI.Units.largeSpacing * 1.5
+
+                                Label {
+                                    text: qsTr("Screen Name")
+                                }
+
+                                Label {
+                                    text: element.display
+                                    color: FishUI.Theme.disabledTextColor
+                                }

                                Label {
                                    text: qsTr("Resolution")
@ -202,26 +207,35 @@ ItemPage {
                                    RowLayout {
                                        id: rotationLayout
                                        anchors.fill: parent
+                                        spacing: 0

                                        RotationButton {
                                            value: 0
                                        }

+                                        Item {
+                                            Layout.fillWidth: true
+                                        }
+
                                        RotationButton {
                                            value: 90
                                        }

-                                        RotationButton {
-                                            value: 180
+                                        Item {
+                                            Layout.fillWidth: true
                                        }

                                        RotationButton {
-                                            value: 270
+                                            value: 180
                                        }

                                        Item {
                                            Layout.fillWidth: true
                                        }
+
+                                        RotationButton {
+                                            value: 270
+                                        }
                                    }
                                }

--- a/src/qml/IconCheckBox.qml
+++ b/src/qml/IconCheckBox.qml
@ -31,7 +31,7 @@ Item {
    property alias text: label.text
    property bool checked: false

-    property var iconSize: 120
+    property var iconSize: 104

    signal clicked

@ -43,72 +43,59 @@ Item {
    ColumnLayout {
        id: mainLayout
        anchors.fill: parent
+        spacing: FishUI.Units.smallSpacing

-        Rectangle {
-            id: _box
+        Image {
+            id: icon
            width: control.iconSize
            height: width
-            color: "transparent"
-            border.width: 3
-            border.color: control.checked ? FishUI.Theme.highlightColor : "transparent"
+            sourceSize: Qt.size(icon.width, icon.height)
+            opacity: 1
+
+            layer.enabled: true
+            layer.effect: OpacityMask {
+                maskSource: Item {
+                    width: icon.width
+                    height: icon.height
+
+                    Rectangle {
+                        anchors.fill: parent
+                        radius: FishUI.Theme.bigRadius
+                    }
+                }
+            }

-            Behavior on border.color {
-                ColorAnimation {
-                    duration: 125
+            Behavior on opacity {
+                NumberAnimation {
+                    duration: 100
                    easing.type: Easing.InOutCubic
                }
            }

-            radius: FishUI.Theme.bigRadius + control.iconSpacing
-            visible: true
-
-            Image {
-                id: icon
+            MouseArea {
                anchors.fill: parent
-                anchors.margins: FishUI.Units.smallSpacing
-                sourceSize: Qt.size(icon.width, icon.height)
-                opacity: 1
-
-                layer.enabled: true
-                layer.effect: OpacityMask {
-                    maskSource: Item {
-                        width: icon.width
-                        height: icon.height
-
-                        Rectangle {
-                            anchors.fill: parent
-                            radius: FishUI.Theme.bigRadius
-                        }
-                    }
-                }
+                hoverEnabled: true

-                Behavior on opacity {
-                    NumberAnimation {
-                        duration: 100
-                        easing.type: Easing.InOutCubic
-                    }
+                onEntered: function() {
+                    icon.opacity = 0.8
                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    hoverEnabled: true
-
-                    onEntered: function() {
-                        icon.opacity = 0.8
-                    }
-                    onExited: function() {
-                        icon.opacity = 1.0
-                    }
+                onExited: function() {
+                    icon.opacity = 1.0
                }
            }
        }

        Label {
            id: label
-            color: control.checked ? FishUI.Theme.highlightColor : FishUI.Theme.textColor
            visible: label.text
            Layout.alignment: Qt.AlignHCenter
        }
+
+        RadioButton {
+            checkable: false
+            checked: control.checked
+            Layout.alignment: Qt.AlignHCenter
+        }
    }

    Behavior on scale {
--- a/src/qml/LanguagePage.qml
+++ b/src/qml/LanguagePage.qml
@ -74,7 +74,7 @@ ItemPage {

                id: item
                width: ListView.view.width - ListView.view.leftMargin - ListView.view.rightMargin
-                height: 43
+                height: 36
                hoverEnabled: true
                acceptedButtons: Qt.LeftButton

--- a/src/qml/User/Main.qml
+++ b/src/qml/User/Main.qml
@ -66,12 +66,9 @@ ItemPage {
                        for (var i = 0; i < _userView.visibleChildren.length; ++i) {
                            totalHeight += _userView.visibleChildren[i].height
                        }
-                        // totalHeight += (_userView.count - 1) * _userView.spacing
                        return totalHeight
                    }

-                    property int itemHeight: 64
-
                    delegate: UserDelegateItem {
                        width: _userView.width
                    }
--- a/src/qml/User/UserDelegateItem.qml
+++ b/src/qml/User/UserDelegateItem.qml
@ -76,8 +76,8 @@ Item {

                    Image {
                        id: _userImage
-                        width: 50
-                        height: 50
+                        width: 32
+                        height: 32
                        sourceSize: Qt.size(width, height)
                        source: iconFileName ? "file:///" + iconFileName : "image://icontheme/default-user"
                        visible: status === Image.Ready
@ -105,9 +105,7 @@ Item {

                    Label {
                        Layout.alignment: Qt.AlignVCenter
-                        text: userName
-                        font.pointSize: 16
-                        bottomPadding: FishUI.Units.smallSpacing
+                        text: "<b>%1</b>".arg(userName)
                        leftPadding: FishUI.Units.largeSpacing
                    }

@ -116,8 +114,6 @@ Item {
                        text: realName
                        color: FishUI.Theme.disabledTextColor
                        visible: realName !== userName
-                        font.pointSize: 16
-                        bottomPadding: FishUI.Units.smallSpacing
                    }

                    Item {
--- a/translations/en_US.ts
+++ b/translations/en_US.ts
@ -76,32 +76,37 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="80"/>
+        <location filename="../src/qml/About/Main.qml" line="68"/>
+        <source>Built on %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qml/About/Main.qml" line="76"/>
        <source>System Version</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="85"/>
+        <location filename="../src/qml/About/Main.qml" line="81"/>
        <source>System Type</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="90"/>
+        <location filename="../src/qml/About/Main.qml" line="86"/>
        <source>Kernel Version</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="95"/>
+        <location filename="../src/qml/About/Main.qml" line="91"/>
        <source>Processor</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="100"/>
+        <location filename="../src/qml/About/Main.qml" line="96"/>
        <source>RAM</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="105"/>
+        <location filename="../src/qml/About/Main.qml" line="101"/>
        <source>Internal Storage</source>
        <translation type="unfinished"></translation>
    </message>
@ -245,42 +250,47 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="66"/>
+        <location filename="../src/qml/Display/Main.qml" line="67"/>
        <source>Brightness</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="112"/>
+        <location filename="../src/qml/Display/Main.qml" line="111"/>
        <source>Screen</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="156"/>
+        <location filename="../src/qml/Display/Main.qml" line="151"/>
+        <source>Screen Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qml/Display/Main.qml" line="160"/>
        <source>Resolution</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="175"/>
+        <location filename="../src/qml/Display/Main.qml" line="179"/>
        <source>Refresh rate</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="195"/>
+        <location filename="../src/qml/Display/Main.qml" line="199"/>
        <source>Rotation</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="230"/>
+        <location filename="../src/qml/Display/Main.qml" line="243"/>
        <source>Enabled</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="261"/>
+        <location filename="../src/qml/Display/Main.qml" line="274"/>
        <source>Scale</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="329"/>
+        <location filename="../src/qml/Display/Main.qml" line="342"/>
        <source>Need to log in again to take effect</source>
        <translation type="unfinished"></translation>
    </message>
@ -315,12 +325,6 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/Main.qml" line="32"/>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qml/Network/Main.qml" line="144"/>
        <location filename="../src/qml/Wired/Main.qml" line="32"/>
        <location filename="../src/qml/Wired/Main.qml" line="80"/>
        <source>Wired</source>
@ -357,7 +361,7 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/User/Main.qml" line="83"/>
+        <location filename="../src/qml/User/Main.qml" line="80"/>
        <source>Add user</source>
        <translation type="unfinished"></translation>
    </message>
@ -386,78 +390,84 @@
        <source>WLAN</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <location filename="../src/qml/Bluetooth/Main.qml" line="32"/>
+        <location filename="../src/qml/Bluetooth/Main.qml" line="71"/>
+        <source>Bluetooth</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>SideBar</name>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="107"/>
+        <location filename="../src/qml/SideBar.qml" line="106"/>
        <source>User</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="75"/>
+        <location filename="../src/qml/SideBar.qml" line="74"/>
        <source>Display</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="52"/>
+        <location filename="../src/qml/SideBar.qml" line="51"/>
        <source>WLAN</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="56"/>
-        <location filename="../src/qml/SideBar.qml" line="64"/>
+        <location filename="../src/qml/SideBar.qml" line="55"/>
+        <location filename="../src/qml/SideBar.qml" line="63"/>
        <source>Network and connection</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="60"/>
+        <location filename="../src/qml/SideBar.qml" line="59"/>
        <source>Wired</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="79"/>
-        <location filename="../src/qml/SideBar.qml" line="87"/>
-        <location filename="../src/qml/SideBar.qml" line="95"/>
-        <location filename="../src/qml/SideBar.qml" line="103"/>
+        <location filename="../src/qml/SideBar.qml" line="78"/>
+        <location filename="../src/qml/SideBar.qml" line="86"/>
+        <location filename="../src/qml/SideBar.qml" line="94"/>
+        <location filename="../src/qml/SideBar.qml" line="102"/>
        <source>Display and appearance</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="83"/>
+        <location filename="../src/qml/SideBar.qml" line="82"/>
        <source>Appearance</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="91"/>
+        <location filename="../src/qml/SideBar.qml" line="90"/>
        <source>Background</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="99"/>
+        <location filename="../src/qml/SideBar.qml" line="98"/>
        <source>Dock</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="111"/>
-        <location filename="../src/qml/SideBar.qml" line="119"/>
-        <location filename="../src/qml/SideBar.qml" line="127"/>
-        <location filename="../src/qml/SideBar.qml" line="142"/>
+        <location filename="../src/qml/SideBar.qml" line="110"/>
+        <location filename="../src/qml/SideBar.qml" line="118"/>
+        <location filename="../src/qml/SideBar.qml" line="126"/>
+        <location filename="../src/qml/SideBar.qml" line="141"/>
        <source>System</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="115"/>
+        <location filename="../src/qml/SideBar.qml" line="114"/>
        <source>Language</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="123"/>
+        <location filename="../src/qml/SideBar.qml" line="122"/>
        <source>Battery</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="138"/>
+        <location filename="../src/qml/SideBar.qml" line="137"/>
        <source>About</source>
        <translation type="unfinished"></translation>
    </message>
@ -465,17 +475,17 @@
 <context>
    <name>UserDelegateItem</name>
    <message>
-        <location filename="../src/qml/User/UserDelegateItem.qml" line="128"/>
+        <location filename="../src/qml/User/UserDelegateItem.qml" line="124"/>
        <source>Currently logged</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/User/UserDelegateItem.qml" line="169"/>
+        <location filename="../src/qml/User/UserDelegateItem.qml" line="165"/>
        <source>Automatic login</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/User/UserDelegateItem.qml" line="188"/>
+        <location filename="../src/qml/User/UserDelegateItem.qml" line="184"/>
        <source>Delete this user</source>
        <translation type="unfinished"></translation>
    </message>
@ -483,25 +493,21 @@
 <context>
    <name>WifiItem</name>
    <message>
-        <location filename="../src/qml/Network/WifiItem.qml" line="184"/>
        <location filename="../src/qml/WLAN/WifiItem.qml" line="184"/>
        <source>Password</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WifiItem.qml" line="204"/>
        <location filename="../src/qml/WLAN/WifiItem.qml" line="204"/>
        <source>Show password</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WifiItem.qml" line="213"/>
        <location filename="../src/qml/WLAN/WifiItem.qml" line="213"/>
        <source>Cancel</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WifiItem.qml" line="219"/>
        <location filename="../src/qml/WLAN/WifiItem.qml" line="219"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
@ -510,7 +516,6 @@
 <context>
    <name>WifiView</name>
    <message>
-        <location filename="../src/qml/Network/WifiView.qml" line="35"/>
        <location filename="../src/qml/WLAN/WifiView.qml" line="35"/>
        <source>WLAN</source>
        <translation type="unfinished"></translation>
@ -519,61 +524,51 @@
 <context>
    <name>WirelessDetailsDialog</name>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="65"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="65"/>
        <source>Auto-Join</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="81"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="81"/>
        <source>Security</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="93"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="93"/>
        <source>Signal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="105"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="105"/>
        <source>IPv4 Address</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="119"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="119"/>
        <source>IPv6 Address</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="133"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="133"/>
        <source>MAC Address</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="147"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="147"/>
        <source>Gateway</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="160"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="160"/>
        <source>DNS</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="177"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="177"/>
        <source>Close</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="183"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="183"/>
        <source>Forget this network</source>
        <translation type="unfinished"></translation>
--- a/translations/zh_CN.ts
+++ b/translations/zh_CN.ts
@ -76,32 +76,37 @@
        <translation>关于</translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="80"/>
+        <location filename="../src/qml/About/Main.qml" line="68"/>
+        <source>Built on %1</source>
+        <translation>构建在 %1 上</translation>
+    </message>
+    <message>
+        <location filename="../src/qml/About/Main.qml" line="76"/>
        <source>System Version</source>
        <translation>系统版本</translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="85"/>
+        <location filename="../src/qml/About/Main.qml" line="81"/>
        <source>System Type</source>
        <translation>系统类型</translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="90"/>
+        <location filename="../src/qml/About/Main.qml" line="86"/>
        <source>Kernel Version</source>
        <translation>内核版本</translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="95"/>
+        <location filename="../src/qml/About/Main.qml" line="91"/>
        <source>Processor</source>
        <translation>处理器</translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="100"/>
+        <location filename="../src/qml/About/Main.qml" line="96"/>
        <source>RAM</source>
        <translation>内存大小</translation>
    </message>
    <message>
-        <location filename="../src/qml/About/Main.qml" line="105"/>
+        <location filename="../src/qml/About/Main.qml" line="101"/>
        <source>Internal Storage</source>
        <translation>内部存储</translation>
    </message>
@ -245,42 +250,47 @@
        <translation>显示</translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="66"/>
+        <location filename="../src/qml/Display/Main.qml" line="67"/>
        <source>Brightness</source>
        <translation>亮度</translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="112"/>
+        <location filename="../src/qml/Display/Main.qml" line="111"/>
        <source>Screen</source>
        <translation>屏幕</translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="156"/>
+        <location filename="../src/qml/Display/Main.qml" line="151"/>
+        <source>Screen Name</source>
+        <translation>屏幕名称</translation>
+    </message>
+    <message>
+        <location filename="../src/qml/Display/Main.qml" line="160"/>
        <source>Resolution</source>
        <translation>分辨率</translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="175"/>
+        <location filename="../src/qml/Display/Main.qml" line="179"/>
        <source>Refresh rate</source>
        <translation>刷新率</translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="195"/>
+        <location filename="../src/qml/Display/Main.qml" line="199"/>
        <source>Rotation</source>
        <translation>方向</translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="230"/>
+        <location filename="../src/qml/Display/Main.qml" line="243"/>
        <source>Enabled</source>
        <translation>已开启</translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="261"/>
+        <location filename="../src/qml/Display/Main.qml" line="274"/>
        <source>Scale</source>
        <translation>缩放</translation>
    </message>
    <message>
-        <location filename="../src/qml/Display/Main.qml" line="329"/>
+        <location filename="../src/qml/Display/Main.qml" line="342"/>
        <source>Need to log in again to take effect</source>
        <translation>需要重新登录才能生效</translation>
    </message>
@ -315,12 +325,6 @@
        <translation>尺寸</translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/Main.qml" line="32"/>
-        <source>Network</source>
-        <translation>网络</translation>
-    </message>
-    <message>
-        <location filename="../src/qml/Network/Main.qml" line="144"/>
        <location filename="../src/qml/Wired/Main.qml" line="32"/>
        <location filename="../src/qml/Wired/Main.qml" line="80"/>
        <source>Wired</source>
@ -357,7 +361,7 @@
        <translation>用户</translation>
    </message>
    <message>
-        <location filename="../src/qml/User/Main.qml" line="83"/>
+        <location filename="../src/qml/User/Main.qml" line="80"/>
        <source>Add user</source>
        <translation>添加用户</translation>
    </message>
@ -386,82 +390,84 @@
        <source>WLAN</source>
        <translation>WLAN</translation>
    </message>
+    <message>
+        <location filename="../src/qml/Bluetooth/Main.qml" line="32"/>
+        <location filename="../src/qml/Bluetooth/Main.qml" line="71"/>
+        <source>Bluetooth</source>
+        <translation>蓝牙</translation>
+    </message>
 </context>
 <context>
    <name>SideBar</name>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="75"/>
+        <location filename="../src/qml/SideBar.qml" line="74"/>
        <source>Display</source>
        <translation>显示</translation>
    </message>
    <message>
-        <source>Network</source>
-        <translation type="vanished">网络</translation>
-    </message>
-    <message>
-        <location filename="../src/qml/SideBar.qml" line="56"/>
-        <location filename="../src/qml/SideBar.qml" line="64"/>
+        <location filename="../src/qml/SideBar.qml" line="55"/>
+        <location filename="../src/qml/SideBar.qml" line="63"/>
        <source>Network and connection</source>
        <translation>网络与连接</translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="79"/>
-        <location filename="../src/qml/SideBar.qml" line="87"/>
-        <location filename="../src/qml/SideBar.qml" line="95"/>
-        <location filename="../src/qml/SideBar.qml" line="103"/>
+        <location filename="../src/qml/SideBar.qml" line="78"/>
+        <location filename="../src/qml/SideBar.qml" line="86"/>
+        <location filename="../src/qml/SideBar.qml" line="94"/>
+        <location filename="../src/qml/SideBar.qml" line="102"/>
        <source>Display and appearance</source>
        <translation>显示与外观</translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="83"/>
+        <location filename="../src/qml/SideBar.qml" line="82"/>
        <source>Appearance</source>
        <translation>外观</translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="99"/>
+        <location filename="../src/qml/SideBar.qml" line="98"/>
        <source>Dock</source>
        <translation>程序坞</translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="107"/>
+        <location filename="../src/qml/SideBar.qml" line="106"/>
        <source>User</source>
        <translation>用户</translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="91"/>
+        <location filename="../src/qml/SideBar.qml" line="90"/>
        <source>Background</source>
        <translation>背景</translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="52"/>
+        <location filename="../src/qml/SideBar.qml" line="51"/>
        <source>WLAN</source>
        <translation>WLAN</translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="60"/>
+        <location filename="../src/qml/SideBar.qml" line="59"/>
        <source>Wired</source>
        <translation>有线网络</translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="111"/>
-        <location filename="../src/qml/SideBar.qml" line="119"/>
-        <location filename="../src/qml/SideBar.qml" line="127"/>
-        <location filename="../src/qml/SideBar.qml" line="142"/>
+        <location filename="../src/qml/SideBar.qml" line="110"/>
+        <location filename="../src/qml/SideBar.qml" line="118"/>
+        <location filename="../src/qml/SideBar.qml" line="126"/>
+        <location filename="../src/qml/SideBar.qml" line="141"/>
        <source>System</source>
        <translation>系统</translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="115"/>
+        <location filename="../src/qml/SideBar.qml" line="114"/>
        <source>Language</source>
        <translation>语言</translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="123"/>
+        <location filename="../src/qml/SideBar.qml" line="122"/>
        <source>Battery</source>
        <translation>电池</translation>
    </message>
    <message>
-        <location filename="../src/qml/SideBar.qml" line="138"/>
+        <location filename="../src/qml/SideBar.qml" line="137"/>
        <source>About</source>
        <translation>关于</translation>
    </message>
@ -469,17 +475,17 @@
 <context>
    <name>UserDelegateItem</name>
    <message>
-        <location filename="../src/qml/User/UserDelegateItem.qml" line="128"/>
+        <location filename="../src/qml/User/UserDelegateItem.qml" line="124"/>
        <source>Currently logged</source>
        <translation>当前登录</translation>
    </message>
    <message>
-        <location filename="../src/qml/User/UserDelegateItem.qml" line="169"/>
+        <location filename="../src/qml/User/UserDelegateItem.qml" line="165"/>
        <source>Automatic login</source>
        <translation>自动登陆</translation>
    </message>
    <message>
-        <location filename="../src/qml/User/UserDelegateItem.qml" line="188"/>
+        <location filename="../src/qml/User/UserDelegateItem.qml" line="184"/>
        <source>Delete this user</source>
        <translation>删除该用户</translation>
    </message>
@ -487,25 +493,21 @@
 <context>
    <name>WifiItem</name>
    <message>
-        <location filename="../src/qml/Network/WifiItem.qml" line="184"/>
        <location filename="../src/qml/WLAN/WifiItem.qml" line="184"/>
        <source>Password</source>
        <translation>密码</translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WifiItem.qml" line="204"/>
        <location filename="../src/qml/WLAN/WifiItem.qml" line="204"/>
        <source>Show password</source>
        <translation>显示密码</translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WifiItem.qml" line="213"/>
        <location filename="../src/qml/WLAN/WifiItem.qml" line="213"/>
        <source>Cancel</source>
        <translation>取消</translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WifiItem.qml" line="219"/>
        <location filename="../src/qml/WLAN/WifiItem.qml" line="219"/>
        <source>Connect</source>
        <translation>连接</translation>
@ -514,7 +516,6 @@
 <context>
    <name>WifiView</name>
    <message>
-        <location filename="../src/qml/Network/WifiView.qml" line="35"/>
        <location filename="../src/qml/WLAN/WifiView.qml" line="35"/>
        <source>WLAN</source>
        <translation>WLAN</translation>
@ -523,61 +524,51 @@
 <context>
    <name>WirelessDetailsDialog</name>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="65"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="65"/>
        <source>Auto-Join</source>
        <translation>自动加入网络</translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="81"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="81"/>
        <source>Security</source>
        <translation>安全性</translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="93"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="93"/>
        <source>Signal</source>
        <translation>信号</translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="105"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="105"/>
        <source>IPv4 Address</source>
        <translation>IPv4地址</translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="119"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="119"/>
        <source>IPv6 Address</source>
        <translation>IPv6地址</translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="133"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="133"/>
        <source>MAC Address</source>
        <translation>MAC地址</translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="147"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="147"/>
        <source>Gateway</source>
        <translation>路由器</translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="160"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="160"/>
        <source>DNS</source>
        <translation>DNS</translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="183"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="183"/>
        <source>Forget this network</source>
        <translation>忘记这个网络</translation>
    </message>
    <message>
-        <location filename="../src/qml/Network/WirelessDetailsDialog.qml" line="177"/>
        <location filename="../src/qml/WLAN/WirelessDetailsDialog.qml" line="177"/>
        <source>Close</source>
        <translation>关闭</translation>