Merge branch 'main' of https://github.com/caelestia-dots/shell

README.md

@@ -166,7 +166,8 @@ All configuration options are in `~/.config/caelestia/shell.json`.
     "dashboard": {
         "mediaUpdateInterval": 500,
         "visualiserBars": 45,
-        "weatherLocation": "10,10"
+        "weatherLocation": "10,10",
+        "useFahrenheit": false,
     },
     "launcher": {
         "actionPrefix": ">",

config/DashboardConfig.qml

@@ -4,6 +4,7 @@ JsonObject {
     property int mediaUpdateInterval: 500
     property int visualiserBars: 45
     property string weatherLocation: "" // A lat,long pair, e.g. "37.8267,-122.4233"
+    property bool useFahrenheit: false
 
     property JsonObject sizes: JsonObject {
         readonly property int tabIndicatorHeight: 3

modules/dashboard/dash/Weather.qml

@@ -38,7 +38,7 @@ Item {
             anchors.horizontalCenter: parent.horizontalCenter
 
             animate: true
-            text: `${Weather.temperature}°C`
+            text: Config.dashboard.useFahrenheit ? Weather.tempF : Weather.tempC
             color: Colours.palette.m3primary
             font.pointSize: Appearance.font.size.extraLarge
             font.weight: 500

modules/lock/WeatherInfo.qml

@@ -40,7 +40,7 @@ RowLayout {
             Layout.fillWidth: true
 
             animate: true
-            text: `${Weather.temperature}°C`
+            text: Config.dashboard.useFahrenheit ? Weather.tempF : Weather.tempC
             color: Colours.palette.m3primary
             horizontalAlignment: Text.AlignHCenter
             font.pointSize: Appearance.font.size.extraLarge

services/Weather.qml

@@ -11,7 +11,8 @@ Singleton {
     property string loc
     property string icon
     property string description
-    property real temperature
+    property string tempC: "0°C"
+    property string tempF: "0°F"
 
     function reload(): void {
         if (Config.dashboard.weatherLocation)
@@ -27,7 +28,8 @@ Singleton {
         const json = JSON.parse(text).current_condition[0];
         icon = Icons.getWeatherIcon(json.weatherCode);
         description = json.weatherDesc[0].value;
-        temperature = parseFloat(json.temp_C);
+        tempC = `${parseFloat(json.temp_C)}°C`;
+        tempF = `${parseFloat(json.temp_F)}°F`;
     })
 
     Component.onCompleted: reload()