Display acticity window icon

qml/StandardItem.qml

@@ -45,6 +45,8 @@ Item {
 
     Rectangle {
         anchors.fill: parent
+        anchors.topMargin: 1
+        anchors.bottomMargin: 1
         radius: FishUI.Theme.smallRadius
 
         color: {

qml/main.qml

@@ -1,6 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
 import QtQuick.Controls 2.12
+import QtQuick.Window 2.12
 
 import Cutefish.StatusBar 1.0
 import Cutefish.NetworkManagement 1.0 as NM
@@ -9,7 +10,7 @@ import FishUI 1.0 as FishUI
 Item {
     id: rootItem
 
-    property int iconSize: 16
+    property int iconSize: 16 * Screen.devicePixelRatio
 
     Rectangle {
         id: background
@@ -60,20 +61,21 @@ Item {
                 anchors.rightMargin: FishUI.Units.smallSpacing
                 spacing: FishUI.Units.largeSpacing
 
-//                Image {
+                Image {
-//                    id: acticityIcon
+                    id: acticityIcon
-//                    width: 16
+                    width: 16
-//                    height: 16
+                    height: 16
-//                    sourceSize: Qt.size(width, height)
+                    sourceSize: Qt.size(width, height)
-//                    source: acticity.icon ? "image://icontheme/" + acticity.icon : ""
+                    source: acticity.icon ? "image://icontheme/" + acticity.icon : ""
-//                    visible: status === Image.Ready
+                    visible: status === Image.Ready
-//                    asynchronous: true
+                    asynchronous: true
-//                }
+                }
 
                 Label {
                     id: acticityLabel
                     text: acticity.title
                     visible: text
+                    Layout.fillHeight: true
                 }
             }
         }

translations/zh_CN.ts

@@ -4,32 +4,40 @@
 <context>
     <name>ControlDialog</name>
     <message>
-        <location filename="../qml/ControlDialog.qml" line="178"/>
+        <location filename="../qml/ControlDialog.qml" line="168"/>
         <source>Wi-Fi</source>
         <translation>无线网络</translation>
     </message>
     <message>
-        <location filename="../qml/ControlDialog.qml" line="181"/>
+        <location filename="../qml/ControlDialog.qml" line="171"/>
-        <location filename="../qml/ControlDialog.qml" line="204"/>
+        <location filename="../qml/ControlDialog.qml" line="194"/>
         <source>On</source>
         <translation>打开</translation>
     </message>
     <message>
-        <location filename="../qml/ControlDialog.qml" line="181"/>
+        <location filename="../qml/ControlDialog.qml" line="171"/>
-        <location filename="../qml/ControlDialog.qml" line="193"/>
+        <location filename="../qml/ControlDialog.qml" line="183"/>
-        <location filename="../qml/ControlDialog.qml" line="204"/>
+        <location filename="../qml/ControlDialog.qml" line="194"/>
         <source>Off</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="../qml/ControlDialog.qml" line="192"/>
+        <location filename="../qml/ControlDialog.qml" line="182"/>
         <source>Bluetooth</source>
         <translation>蓝牙</translation>
     </message>
     <message>
-        <location filename="../qml/ControlDialog.qml" line="203"/>
+        <location filename="../qml/ControlDialog.qml" line="193"/>
         <source>Dark Mode</source>
         <translation>深色模式</translation>
     </message>
 </context>
+<context>
+    <name>main</name>
+    <message>
+        <location filename="../qml/main.qml" line="39"/>
+        <source>Close</source>
+        <translation>关闭</translation>
+    </message>
+</context>
 </TS>