mirror of
https://github.com/zoriya/noctalia-shell.git
synced 2026-08-15 18:43:59 +00:00
Merge pull request #543 from lonerOrz/feature/calendar-event-toggle
feat: Add toggle to enable or disable calendar event display
This commit is contained in:
@@ -626,6 +626,10 @@
|
||||
"week-numbers": {
|
||||
"label": "Wochennummern anzeigen",
|
||||
"description": "Zeigt die Kalender Wochen an (z.B. Woche 38)"
|
||||
},
|
||||
"show-events": {
|
||||
"label": "Kalenderereignisse anzeigen",
|
||||
"description": "Ereignisse im Kalenderpanel anzeigen."
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -626,6 +626,10 @@
|
||||
"week-numbers": {
|
||||
"label": "Show week numbers",
|
||||
"description": "Displays the week of the year (e.g., Week 38) in the calendar."
|
||||
},
|
||||
"show-events": {
|
||||
"label": "Show calendar events",
|
||||
"description": "Display events in the calendar panel."
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -626,6 +626,10 @@
|
||||
"week-numbers": {
|
||||
"label": "Mostrar números de semana",
|
||||
"description": "Muestra la semana del año (ej., Semana 38) en el calendario."
|
||||
},
|
||||
"show-events": {
|
||||
"label": "Mostrar eventos del calendario",
|
||||
"description": "Mostrar eventos en el panel del calendario."
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -626,6 +626,10 @@
|
||||
"week-numbers": {
|
||||
"label": "Afficher les numéros de semaine",
|
||||
"description": "Affiche la semaine de l'année (ex: Semaine 38) dans le calendrier."
|
||||
},
|
||||
"show-events": {
|
||||
"label": "Afficher les événements du calendrier",
|
||||
"description": "Afficher les événements dans le panneau du calendrier."
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -588,6 +588,10 @@
|
||||
"week-numbers": {
|
||||
"label": "Mostrar números da semana",
|
||||
"description": "Exibe a semana do ano (ex., Semana 38) no calendário."
|
||||
},
|
||||
"show-events": {
|
||||
"label": "Mostrar eventos do calendário",
|
||||
"description": "Exibir eventos no painel do calendário."
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -626,6 +626,10 @@
|
||||
"week-numbers": {
|
||||
"label": "显示周数",
|
||||
"description": "在日历中显示一年中的第几周(例如:第 38 周)。"
|
||||
},
|
||||
"show-events": {
|
||||
"label": "显示日历事件",
|
||||
"description": "在日历面板中显示事件。"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -74,7 +74,8 @@
|
||||
"weatherEnabled": true,
|
||||
"useFahrenheit": false,
|
||||
"use12hourFormat": false,
|
||||
"showWeekNumberInCalendar": false
|
||||
"showWeekNumberInCalendar": false,
|
||||
"showCalendarEvents": true
|
||||
},
|
||||
"screenRecorder": {
|
||||
"directory": "",
|
||||
|
||||
@@ -202,6 +202,7 @@ Singleton {
|
||||
property bool useFahrenheit: false
|
||||
property bool use12hourFormat: false
|
||||
property bool showWeekNumberInCalendar: false
|
||||
property bool showCalendarEvents: true
|
||||
}
|
||||
|
||||
// screen recorder
|
||||
|
||||
@@ -561,7 +561,7 @@ NPanel {
|
||||
|
||||
// Event indicator dots
|
||||
Row {
|
||||
visible: parent.parent.parent.parent.parent.hasEventsOnDate(model.year, model.month, model.day)
|
||||
visible: Settings.data.location.showCalendarEvents && parent.parent.parent.parent.parent.hasEventsOnDate(model.year, model.month, model.day)
|
||||
spacing: 2
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.bottom: parent.bottom
|
||||
@@ -587,6 +587,7 @@ NPanel {
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
enabled: Settings.data.location.showCalendarEvents
|
||||
|
||||
onEntered: {
|
||||
const events = parent.parent.parent.parent.parent.getEventsForDate(model.year, model.month, model.day)
|
||||
|
||||
@@ -117,6 +117,13 @@ ColumnLayout {
|
||||
checked: Settings.data.location.showWeekNumberInCalendar
|
||||
onToggled: checked => Settings.data.location.showWeekNumberInCalendar = checked
|
||||
}
|
||||
|
||||
NToggle {
|
||||
label: I18n.tr("settings.location.date-time.show-events.label")
|
||||
description: I18n.tr("settings.location.date-time.show-events.description")
|
||||
checked: Settings.data.location.showCalendarEvents
|
||||
onToggled: checked => Settings.data.location.showCalendarEvents = checked
|
||||
}
|
||||
}
|
||||
|
||||
NDivider {
|
||||
|
||||
@@ -92,7 +92,11 @@ Singleton {
|
||||
|
||||
// Core functions
|
||||
function checkAvailability() {
|
||||
availabilityCheckProcess.running = true
|
||||
if (Settings.data.location.showCalendarEvents) {
|
||||
availabilityCheckProcess.running = true
|
||||
} else {
|
||||
root.available = false
|
||||
}
|
||||
}
|
||||
|
||||
function loadCalendars() {
|
||||
@@ -100,6 +104,11 @@ Singleton {
|
||||
}
|
||||
|
||||
function loadEvents(daysAhead = 31, daysBehind = 14) {
|
||||
if (!Settings.data.location.showCalendarEvents) {
|
||||
root.loading = false
|
||||
root.events = []
|
||||
return
|
||||
}
|
||||
if (loading)
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user