Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Kalendar
Commits
c8328c6f
Commit
c8328c6f
authored
Nov 20, 2021
by
Claudio Cambra
Browse files
Deleting an event now deselects it. Fixes
#90
parent
71d4f013
Pipeline
#99399
failed with stage
in 5 minutes and 7 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/contents/ui/main.qml
View file @
c8328c6f
...
...
@@ -907,20 +907,47 @@ Kirigami.ApplicationWindow {
id
:
deleteIncidenceSheet
onAddException
:
{
if
(
incidenceInfo
.
incidenceWrapper
.
incidenceId
==
deleteIncidenceSheet
.
incidenceWrapper
.
incidenceId
&&
DateUtils
.
sameDay
(
incidenceInfo
.
incidenceData
.
startTime
,
exceptionDate
))
{
incidenceInfo
.
incidenceData
=
undefined
;
root
.
openOccurrence
=
undefined
;
}
incidenceWrapper
.
recurrenceExceptionsModel
.
addExceptionDateTime
(
exceptionDate
);
CalendarManager
.
editIncidence
(
incidenceWrapper
);
closeDialog
();
}
onAddRecurrenceEndDate
:
{
// If occurrence is past the new recurrence end date, it has ben deleted so kill instance in incidence info
if
(
incidenceInfo
.
incidenceWrapper
.
incidenceId
==
deleteIncidenceSheet
.
incidenceWrapper
.
incidenceId
&&
incidenceInfo
.
incidenceData
.
startTime
>=
endDate
)
{
incidenceInfo
.
incidenceData
=
undefined
;
root
.
openOccurrence
=
undefined
;
}
incidenceWrapper
.
setRecurrenceDataItem
(
"
endDateTime
"
,
endDate
);
CalendarManager
.
editIncidence
(
incidenceWrapper
);
closeDialog
();
}
onDeleteIncidence
:
{
// Deleting an incidence also means deleting all of its occurrences
if
(
incidenceInfo
.
incidenceWrapper
.
incidenceId
==
deleteIncidenceSheet
.
incidenceWrapper
.
incidenceId
)
{
incidenceInfo
.
incidenceData
=
undefined
;
root
.
openOccurrence
=
undefined
;
}
CalendarManager
.
deleteIncidence
(
incidencePtr
);
closeDialog
();
}
onDeleteIncidenceWithChildren
:
{
// TODO: Check if parent deleted too
if
(
incidenceInfo
.
incidenceWrapper
.
incidenceId
==
deleteIncidenceSheet
.
incidenceWrapper
.
incidenceId
)
{
incidenceInfo
.
incidenceData
=
undefined
;
root
.
openOccurrence
=
undefined
;
}
CalendarManager
.
deleteIncidence
(
incidencePtr
,
true
);
closeDialog
();
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment