tvplanit: Fix weekview displaying repeated events to begin at midnight after the second event.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4868 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-06-29 20:32:12 +00:00
parent 82e258bdb7
commit de22b0fbbd
3 changed files with 116 additions and 4 deletions

View File

@ -129,6 +129,60 @@ msgstr "Dienstag"
msgid "Wednesday" msgid "Wednesday"
msgstr "Mittwoch" msgstr "Mittwoch"
#: tfrmreportsetup.button1.caption
msgctxt "tfrmreportsetup.button1.caption"
msgid "OK"
msgstr ""
#: tfrmreportsetup.button2.caption
msgctxt "tfrmreportsetup.button2.caption"
msgid "Cancel"
msgstr ""
#: tfrmreportsetup.caption
msgid "Report Setup"
msgstr ""
#: tfrmreportsetup.dateedit1.cancelcaption
msgctxt "tfrmreportsetup.dateedit1.cancelcaption"
msgid "Cancel"
msgstr ""
#: tfrmreportsetup.dateedit1.okcaption
msgctxt "tfrmreportsetup.dateedit1.okcaption"
msgid "OK"
msgstr ""
#: tfrmreportsetup.dateedit1.text
msgid "DateEdit1"
msgstr ""
#: tfrmreportsetup.dateedit2.cancelcaption
msgctxt "tfrmreportsetup.dateedit2.cancelcaption"
msgid "Cancel"
msgstr ""
#: tfrmreportsetup.dateedit2.okcaption
msgctxt "tfrmreportsetup.dateedit2.okcaption"
msgid "OK"
msgstr ""
#: tfrmreportsetup.dateedit2.text
msgid "DateEdit2"
msgstr ""
#: tfrmreportsetup.label1.caption
msgid "Start Date:"
msgstr ""
#: tfrmreportsetup.label2.caption
msgid "End Date:"
msgstr ""
#: tfrmreportsetup.label3.caption
msgid "Format:"
msgstr ""
#: tmainform.btndeleteres.caption #: tmainform.btndeleteres.caption
msgid "Delete" msgid "Delete"
msgstr "Löschen" msgstr "Löschen"

View File

@ -118,6 +118,60 @@ msgstr ""
msgid "Wednesday" msgid "Wednesday"
msgstr "" msgstr ""
#: tfrmreportsetup.button1.caption
msgctxt "tfrmreportsetup.button1.caption"
msgid "OK"
msgstr ""
#: tfrmreportsetup.button2.caption
msgctxt "tfrmreportsetup.button2.caption"
msgid "Cancel"
msgstr ""
#: tfrmreportsetup.caption
msgid "Report Setup"
msgstr ""
#: tfrmreportsetup.dateedit1.cancelcaption
msgctxt "TFRMREPORTSETUP.DATEEDIT1.CANCELCAPTION"
msgid "Cancel"
msgstr ""
#: tfrmreportsetup.dateedit1.okcaption
msgctxt "TFRMREPORTSETUP.DATEEDIT1.OKCAPTION"
msgid "OK"
msgstr ""
#: tfrmreportsetup.dateedit1.text
msgid "DateEdit1"
msgstr ""
#: tfrmreportsetup.dateedit2.cancelcaption
msgctxt "TFRMREPORTSETUP.DATEEDIT2.CANCELCAPTION"
msgid "Cancel"
msgstr ""
#: tfrmreportsetup.dateedit2.okcaption
msgctxt "TFRMREPORTSETUP.DATEEDIT2.OKCAPTION"
msgid "OK"
msgstr ""
#: tfrmreportsetup.dateedit2.text
msgid "DateEdit2"
msgstr ""
#: tfrmreportsetup.label1.caption
msgid "Start Date:"
msgstr ""
#: tfrmreportsetup.label2.caption
msgid "End Date:"
msgstr ""
#: tfrmreportsetup.label3.caption
msgid "Format:"
msgstr ""
#: tmainform.btndeleteres.caption #: tmainform.btndeleteres.caption
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""

View File

@ -480,10 +480,14 @@ begin
{ format the display text } { format the display text }
todayStartTime := AEvent.StartTime; todayStartTime := AEvent.StartTime;
todayEndTime := AEvent.EndTime; todayEndTime := AEvent.EndTime;
if trunc(todayStartTime) < trunc(StartDate + ADayIndex) then // first event
todayStartTime := 0; // Event reaches into the next day(s)
if trunc(TodayEndTime) > trunc(StartDate + ADayIndex) then // last event if trunc(todayEndTime) > trunc(todayStartTime) then begin
todayEndTime := 0.9999; if trunc(todayStartTime) < trunc(StartDate + ADayIndex) then // first event
todayStartTime := 0;
if trunc(TodayEndTime) > trunc(StartDate + ADayIndex) then // last event
todayEndTime := 0.9999;
end;
{ set the event font } { set the event font }
RenderCanvas.Font.Assign(FWeekView.EventFont); RenderCanvas.Font.Assign(FWeekView.EventFont);