zoriya/noctalia-shell
1
0
Fork 0
mirror of https://github.com/zoriya/noctalia-shell.git synced 2026-08-15 18:43:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: fix warnings and error due to old PR

Browse Source
This commit is contained in:
ItsLemmy
2025-10-20 19:04:38 -04:00
parent ef75723cc0
commit eba1ace2f0
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Bar/Calendar/CalendarPanel.qml
+5 -5
View File
@@ -562,10 +562,10 @@ NPanel {
// Event indicator dots
Row {
visible: parent.parent.parent.parent.parent.hasEventsOnDate(model.year, model.month, model.day)
spacing: 2 * scaling
spacing: 2
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: parent.bottom
anchors.bottomMargin: Style.marginXS * scaling
anchors.bottomMargin: Style.marginXS
readonly property int currentYear: model.year
readonly property int currentMonth: model.month
@@ -576,9 +576,9 @@ NPanel {
model: parent.parent.parent.parent.parent.parent.getEventsForDate(parent.currentYear, parent.currentMonth, parent.currentDay)
Rectangle {
width: 4 * scaling
height: 4 * scaling
radius: 2 * scaling
width: 4
height: width
radius: width / 2
color: parent.parent.parent.parent.parent.parent.getEventColor(modelData, model.today)
}
}
Services/CalendarService.qml
+16 -16
View File
@@ -48,7 +48,7 @@ Singleton {
}
Component.onCompleted: {
Logger.log("Calendar", "Service initialized")
Logger.i("Calendar", "Service initialized")
loadFromCache()
checkAvailability()
}
@@ -68,16 +68,16 @@ Singleton {
function loadFromCache() {
if (cacheAdapter.cachedEvents && cacheAdapter.cachedEvents.length > 0) {
root.events = cacheAdapter.cachedEvents
Logger.log("Calendar", `Loaded ${cacheAdapter.cachedEvents.length} cached event(s)`)
Logger.i("Calendar", `Loaded ${cacheAdapter.cachedEvents.length} cached event(s)`)
}
if (cacheAdapter.cachedCalendars && cacheAdapter.cachedCalendars.length > 0) {
root.calendars = cacheAdapter.cachedCalendars
Logger.log("Calendar", `Loaded ${cacheAdapter.cachedCalendars.length} cached calendar(s)`)
Logger.i("Calendar", `Loaded ${cacheAdapter.cachedCalendars.length} cached calendar(s)`)
}
if (cacheAdapter.lastUpdate) {
Logger.log("Calendar", `Cache last updated: ${cacheAdapter.lastUpdate}`)
Logger.i("Calendar", `Cache last updated: ${cacheAdapter.lastUpdate}`)
}
}
@@ -114,7 +114,7 @@ Singleton {
loadEventsProcess.endTime = Math.floor(endDate.getTime() / 1000)
loadEventsProcess.running = true
Logger.log("Calendar", `Loading events (${daysBehind} days behind, ${daysAhead} days ahead): ${startDate.toLocaleDateString()} to ${endDate.toLocaleDateString()}`)
Logger.i("Calendar", `Loading events (${daysBehind} days behind, ${daysAhead} days ahead): ${startDate.toLocaleDateString()} to ${endDate.toLocaleDateString()}`)
}
// Helper to format date/time
@@ -135,10 +135,10 @@ Singleton {
root.available = result === "available"
if (root.available) {
Logger.log("Calendar", "EDS libraries available")
Logger.i("Calendar", "EDS libraries available")
loadCalendars()
} else {
Logger.warn("Calendar", "EDS libraries not available: " + result)
Logger.w("Calendar", "EDS libraries not available: " + result)
root.lastError = "Evolution Data Server libraries not installed"
}
}
@@ -147,7 +147,7 @@ Singleton {
stderr: StdioCollector {
onStreamFinished: {
if (text.trim()) {
Logger.warn("Calendar", "Availability check error: " + text)
Logger.w("Calendar", "Availability check error: " + text)
root.available = false
root.lastError = "Failed to check library availability"
}
@@ -169,7 +169,7 @@ Singleton {
cacheAdapter.cachedCalendars = result
saveCache()
Logger.log("Calendar", `Found ${result.length} calendar(s)`)
Logger.i("Calendar", `Found ${result.length} calendar(s)`)
// Auto-load events after discovering calendars
// Only load if we have calendars and no cached events
@@ -180,7 +180,7 @@ Singleton {
loadEvents()
}
} catch (e) {
Logger.warn("Calendar", "Failed to parse calendars: " + e)
Logger.w("Calendar", "Failed to parse calendars: " + e)
root.lastError = "Failed to parse calendar list"
}
}
@@ -189,7 +189,7 @@ Singleton {
stderr: StdioCollector {
onStreamFinished: {
if (text.trim()) {
Logger.warn("Calendar", "List calendars error: " + text)
Logger.w("Calendar", "List calendars error: " + text)
root.lastError = text.trim()
}
}
@@ -216,15 +216,15 @@ Singleton {
cacheAdapter.lastUpdate = new Date().toISOString()
saveCache()
Logger.log("Calendar", `Loaded ${result.length} event(s)`)
Logger.i("Calendar", `Loaded ${result.length} event(s)`)
} catch (e) {
Logger.warn("Calendar", "Failed to parse events: " + e)
Logger.w("Calendar", "Failed to parse events: " + e)
root.lastError = "Failed to parse events"
// Fall back to cached events if available
if (cacheAdapter.cachedEvents.length > 0) {
root.events = cacheAdapter.cachedEvents
Logger.log("Calendar", "Using cached events")
Logger.i("Calendar", "Using cached events")
}
}
}
@@ -235,13 +235,13 @@ Singleton {
root.loading = false
if (text.trim()) {
Logger.warn("Calendar", "Load events error: " + text)
Logger.w("Calendar", "Load events error: " + text)
root.lastError = text.trim()
// Fall back to cached events if available
if (cacheAdapter.cachedEvents.length > 0) {
root.events = cacheAdapter.cachedEvents
Logger.log("Calendar", "Using cached events due to error")
Logger.i("Calendar", "Using cached events due to error")
}
}
}