never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Weather: change how default city is set

Browse source
This commit is contained in:
Ly-sec 2025-09-03 13:50:16 +02:00
parent c6e56d4264
commit 40b57c2df0
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Commons/Settings.qml
View file

@ -25,6 +25,7 @@ Singleton {
property string defaultAvatar: Quickshell.env("HOME") + "/.face"
property string defaultWallpapersDirectory: Quickshell.env("HOME") + "/Pictures/Wallpapers"
property string defaultVideosDirectory: Quickshell.env("HOME") + "/Videos"
property string defaultLocation: "Tokyo"
// Used to access via Settings.data.xxx.yyy
readonly property alias data: adapter
@ -157,7 +158,7 @@ Singleton {
// location
property JsonObject location: JsonObject {
property string name: "Tokyo"
property string name: defaultLocation
property bool useFahrenheit: false
property bool reverseDayMonth: false
property bool use12HourClock: false

7
Modules/SettingsPanel/Tabs/TimeWeatherTab.qml
View file

@ -16,11 +16,16 @@ ColumnLayout {
NTextInput {
label: "Location name"
description: "Choose a known location near you."
text: Settings.data.location.name || "Tokyo"
text: Settings.data.location.name || Settings.defaultLocation
placeholderText: "Enter the location name"
onEditingFinished: {
// Verify the location has really changed to avoid extra resets
var newLocation = text.trim()
// If empty, set to default location
if (newLocation === "") {
newLocation = Settings.defaultLocation
text = Settings.defaultLocation // Update the input field to show the default
}
if (newLocation != Settings.data.location.name) {
Settings.data.location.name = newLocation
LocationService.resetWeather()

4
Modules/SidePanel/Cards/WeatherCard.qml
View file

@ -37,10 +37,8 @@ NBox {
spacing: Style.marginXXS * scaling
NText {
text: {
// Use the location name or fallback to default if empty
const locationName = Settings.data.location.name || "Tokyo"
// Ensure the name is not too long if one had to specify the country
const chunks = locationName.split(",")
const chunks = Settings.data.location.name.split(",")
return chunks[0]
}
font.pointSize: Style.fontSizeL * scaling

10
Services/LocationService.qml
View file

@ -136,17 +136,13 @@ Singleton {
Logger.log("Location", "Location changed from", adapter.name, "to", Settings.data.location.name)
}
// Ensure we always have a location name, fallback to default if empty
const locationName = Settings.data.location.name && Settings.data.location.name.trim(
) !== "" ? Settings.data.location.name : "Tokyo"
if ((adapter.latitude === "") || (adapter.longitude === "") || locationChanged) {
_geocodeLocation(locationName, function (latitude, longitude, name, country) {
Logger.log("Location", "Geocoded", locationName, "to:", latitude, "/", longitude)
_geocodeLocation(Settings.data.location.name, function (latitude, longitude, name, country) {
Logger.log("Location", "Geocoded", Settings.data.location.name, "to:", latitude, "/", longitude)
// Save location name
adapter.name = locationName
adapter.name = Settings.data.location.name
// Save GPS coordinates
adapter.latitude = latitude.toString()