tvplanit: Event editor cannot be closed when the end of recurrence is not specified for an event which is repeated for a limited number of times.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8555 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2022-10-13 22:05:52 +00:00
parent f102404a6c
commit 4e55432d77
10 changed files with 42 additions and 4 deletions

View File

@ -840,6 +840,10 @@ msgstr "Komponente muss mit einem TVpControlLink verbunden sein"
msgid "Day increment unit not specified." msgid "Day increment unit not specified."
msgstr "Einheit für das Zeitintervall nicht angegeben." msgstr "Einheit für das Zeitintervall nicht angegeben."
#: vpsr.rsnoenddateforrecurringevent
msgid "End of recurrence not specified."
msgstr "Ende der Wiederholungen nicht angegeben."
#: vpsr.rsnoeventitemsfoundinical #: vpsr.rsnoeventitemsfoundinical
#, object-pascal-format #, object-pascal-format
msgid "No event items found in \"%s\"." msgid "No event items found in \"%s\"."

View File

@ -833,6 +833,10 @@ msgstr "Component must be linked to a TVpControlLink"
msgid "Day increment unit not specified." msgid "Day increment unit not specified."
msgstr "Day increment unit not specified." msgstr "Day increment unit not specified."
#: vpsr.rsnoenddateforrecurringevent
msgid "End of recurrence not specified."
msgstr "End of recurrence not specified."
#: vpsr.rsnoeventitemsfoundinical #: vpsr.rsnoeventitemsfoundinical
#, object-pascal-format #, object-pascal-format
msgid "No event items found in \"%s\"." msgid "No event items found in \"%s\"."

View File

@ -831,6 +831,10 @@ msgstr ""
msgid "Day increment unit not specified." msgid "Day increment unit not specified."
msgstr "" msgstr ""
#: vpsr.rsnoenddateforrecurringevent
msgid "End of recurrence not specified."
msgstr ""
#: vpsr.rsnoeventitemsfoundinical #: vpsr.rsnoeventitemsfoundinical
#, object-pascal-format #, object-pascal-format
msgid "No event items found in \"%s\"." msgid "No event items found in \"%s\"."

View File

@ -848,6 +848,10 @@ msgstr "Le composant doit être lié à un TVpControlLink"
msgid "Day increment unit not specified." msgid "Day increment unit not specified."
msgstr "" msgstr ""
#: vpsr.rsnoenddateforrecurringevent
msgid "End of recurrence not specified."
msgstr ""
#: vpsr.rsnoeventitemsfoundinical #: vpsr.rsnoeventitemsfoundinical
#, object-pascal-format #, object-pascal-format
msgid "No event items found in \"%s\"." msgid "No event items found in \"%s\"."

View File

@ -842,6 +842,10 @@ msgstr "Component moet moet met een TVpControlLink verbonden zijn"
msgid "Day increment unit not specified." msgid "Day increment unit not specified."
msgstr "" msgstr ""
#: vpsr.rsnoenddateforrecurringevent
msgid "End of recurrence not specified."
msgstr ""
#: vpsr.rsnoeventitemsfoundinical #: vpsr.rsnoeventitemsfoundinical
#, object-pascal-format #, object-pascal-format
msgid "No event items found in \"%s\"." msgid "No event items found in \"%s\"."

View File

@ -850,6 +850,10 @@ msgstr "Komponent musi być przypisany do TVpControlLink."
msgid "Day increment unit not specified." msgid "Day increment unit not specified."
msgstr "Nie określono interwału dnia." msgstr "Nie określono interwału dnia."
#: vpsr.rsnoenddateforrecurringevent
msgid "End of recurrence not specified."
msgstr ""
#: vpsr.rsnoeventitemsfoundinical #: vpsr.rsnoeventitemsfoundinical
#, object-pascal-format #, object-pascal-format
msgid "No event items found in \"%s\"." msgid "No event items found in \"%s\"."

View File

@ -820,6 +820,10 @@ msgstr ""
msgid "Day increment unit not specified." msgid "Day increment unit not specified."
msgstr "" msgstr ""
#: vpsr.rsnoenddateforrecurringevent
msgid "End of recurrence not specified."
msgstr ""
#: vpsr.rsnoeventitemsfoundinical #: vpsr.rsnoeventitemsfoundinical
#, object-pascal-format #, object-pascal-format
msgid "No event items found in \"%s\"." msgid "No event items found in \"%s\"."

View File

@ -848,6 +848,10 @@ msgstr ""
msgid "Day increment unit not specified." msgid "Day increment unit not specified."
msgstr "" msgstr ""
#: vpsr.rsnoenddateforrecurringevent
msgid "End of recurrence not specified."
msgstr ""
#: vpsr.rsnoeventitemsfoundinical #: vpsr.rsnoeventitemsfoundinical
#, object-pascal-format #, object-pascal-format
msgid "No event items found in \"%s\"." msgid "No event items found in \"%s\"."

View File

@ -185,6 +185,7 @@ resourcestring
'Do you want to exchange them?'; 'Do you want to exchange them?';
RSStartEndTimesEqual = 'Start and end times cannot be equal.'; RSStartEndTimesEqual = 'Start and end times cannot be equal.';
RSCannotEditOverlayedEvent= 'Cannot edit this overlayed event.'; RSCannotEditOverlayedEvent= 'Cannot edit this overlayed event.';
RSNoEndDateForRecurringEvent = 'End of recurrence not specified.';
RSLoadICalTitle = 'Import from iCal file(s)'; RSLoadICalTitle = 'Import from iCal file(s)';
RSSaveICalTitle = 'Export to iCal file'; RSSaveICalTitle = 'Export to iCal file';
RSNoOverlayedEvents = 'none'; RSNoOverlayedEvents = 'none';

View File

@ -312,6 +312,13 @@ begin
exit; exit;
end; end;
if (RecurringType.ItemIndex > 0) and rbRepeatUntil.Checked and (RepeatUntil.Text = '') then
begin
MessageDlg(RSNoEndDateForRecurringEvent, mtError, [mbOK], 0);
RepeatUntil.SetFocus;
exit;
end;
ReturnCode := rtCommit; ReturnCode := rtCommit;
Close; Close;
end; end;
@ -427,7 +434,7 @@ begin
StartDate.Date := trunc(Event.StartTime); StartDate.Date := trunc(Event.StartTime);
EndDate.Date := trunc(Event.EndTime); EndDate.Date := trunc(Event.EndTime);
d := trunc(Event.RepeatRangeEnd); d := trunc(Event.RepeatRangeEnd);
if d = FOREVER_DATE then if (d = 0) or (d = FOREVER_DATE) then
begin begin
RepeatUntil.Text := ''; RepeatUntil.Text := '';
rbRepeatForever.Checked := true; rbRepeatForever.Checked := true;
@ -465,11 +472,9 @@ begin
CustomInterval.Text := IntToStr(Event.CustomInterval); CustomInterval.Text := IntToStr(Event.CustomInterval);
Category.Items.Clear; Category.Items.Clear;
for I := 0 to 9 do for I := 0 to 9 do
if (CatColorMap.GetName(I) <> '') then if (CatColorMap.GetName(I) <> '') then
Category.Items.Add(CatColorMap.GetName(I)); Category.Items.Add(CatColorMap.GetName(I));
Category.ItemIndex := Event.Category; Category.ItemIndex := Event.Category;
FLastEndTime := Event.EndTime; FLastEndTime := Event.EndTime;
@ -649,7 +654,7 @@ begin
rbRepeatUntil.Enabled := (RecurringType.ItemIndex > 0); rbRepeatUntil.Enabled := (RecurringType.ItemIndex > 0);
rbRepeatForever.Enabled := rbRepeatUntil.Enabled; rbRepeatForever.Enabled := rbRepeatUntil.Enabled;
RepeatUntil.Enabled := rbRepeatUntil.Enabled and (not rbRepeatForever.Checked); RepeatUntil.Enabled := rbRepeatUntil.Enabled; // and (not rbRepeatForever.Checked);
CustomInterval.Enabled := RecurringType.ItemIndex = ord(rtCustom); CustomInterval.Enabled := RecurringType.ItemIndex = ord(rtCustom);
IntervalLbl.Enabled := CustomInterval.Enabled; IntervalLbl.Enabled := CustomInterval.Enabled;