Resolve conflicting merge issues

2025-07-01 05:20:41 +03:00
parent a18791ef16
commit c17db4bfb1
4 changed files with 38 additions and 201 deletions
@@ -122,6 +122,18 @@ Singleton {
                    property bool alwaysShowNumbers: false
                    property int showNumberDelay: 300 // milliseconds
                }
+                property JsonObject weather: JsonObject {
+                    property bool show: true
+                    // gps based location
+                    property bool enableGPS: true
+                    // use if 'enableGPS' is false
+                    property string city: "Istanbul"
+                    // use uscs units
+                    // by default use metric (SI) units
+                    property bool useUSCS: false
+                    // in minutes
+                    property int fetchInterval: 10
+                }
            }

            property JsonObject battery: JsonObject {