Merge branch 'main' into zshell-img-tools

Config/BarConfig.qml

@@ -59,6 +59,8 @@ JsonObject {
 	}
 	property int rounding: 8
 	property int smoothing: 32
+	property Tray tray: Tray {
+	}
 
 	component Popouts: JsonObject {
 		property bool activeWindow: true
@@ -69,4 +71,7 @@ JsonObject {
 		property bool tray: true
 		property bool upower: true
 	}
+	component Tray: JsonObject {
+		property int trayIconSize: 24
+	}
 }

Config/Config.qml

@@ -100,6 +100,9 @@ Singleton {
 			border: barConfig.border,
 			smoothing: barConfig.smoothing,
 			height: barConfig.height,
+			tray: {
+				trayIconSize: barConfig.tray.trayIconSize
+			},
 			popouts: {
 				tray: barConfig.popouts.tray,
 				audio: barConfig.popouts.audio,

Config/General.qml

@@ -27,7 +27,7 @@ JsonObject {
 			{
 				perc: 20,
 				name: qsTr("Low battery"),
-				message: qsTr("Battery at %1%").arg(Battery.currentPerc * 100),
+				message: qsTr("Battery is low"),
 				icon: "battery_android_frame_2"
 			},
 		]