paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tvplanit: Replace time format strings "hh:mm" by "hh:nn" (I think fpc takes care of this (m = month!), but just to make sure...) - see https://sourceforge.net/p/tpvplanit/bugs/79/

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4749 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2016-06-14 11:25:38 +00:00
parent 4f72acf8cd
commit faca8ece98
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/tvplanit/source/vpclock.pas
View File

@ -1296,13 +1296,13 @@ begin
if DisplayMode = dmDigital then begin
if FDigitalOptions.ShowSeconds and FMilitaryTime then
TimeStr := FormatDateTime('hh:mm:ss', FTime)
TimeStr := FormatDateTime('hh:nn:ss', FTime)
else if FDigitalOptions.ShowSeconds and not FMilitaryTime then
TimeStr := FormatDateTime('hh:mm:ss am/pm', FTime)
TimeStr := FormatDateTime('hh:nn:ss am/pm', FTime)
else if not FDigitalOptions.ShowSeconds and FMilitaryTime then
TimeStr := FormatDateTime('hh:mm', FTime)
TimeStr := FormatDateTime('hh:nn', FTime)
else if not FDigitalOptions.ShowSeconds and not FMilitaryTime then
TimeStr := FormatDateTime('hh:mm am/pm', FTime);
TimeStr := FormatDateTime('hh:nn am/pm', FTime);
ckLEDDisplay.Caption := TimeStr;
end;

8
components/tvplanit/source/vpeventrpt.pas
View File

@ -1637,14 +1637,14 @@ var
EventStr := '';
if ShowEventTime then begin
if TimeFormat = tf24Hour then
EventStr := FormatDateTime ('hh:mm',
EventStr := FormatDateTime ('hh:nn',
TVpEvent (EventList.List^[j]).StartTime) +
' - ' + FormatDateTime('hh:mm',
' - ' + FormatDateTime('hh:nn',
TVpEvent (EventList.List^[j]).EndTime) + ': '
else
EventStr := FormatDateTime ('hh:mm AM/PM',
EventStr := FormatDateTime ('hh:nn AM/PM',
TVpEvent (EventList.List^[j]).StartTime) +
' - ' + FormatDateTime('hh:mm AM/PM',
' - ' + FormatDateTime('hh:nn AM/PM',
TVpEvent (EventList.List^[j]).EndTime) + ': ';
end;

12
components/tvplanit/source/vpevnteditdlg.pas
View File

@ -353,8 +353,8 @@ begin
StartDate.Date := Event.StartTime;
EndDate.Date := Event.EndTime;
RepeatUntil.Date := Event.RepeatRangeEnd;
StartTime.Text := FormatDateTime('hh:mm',Event.StartTime);
EndTime.Text := FormatDateTime('hh:mm',Event.EndTime);
StartTime.Text := FormatDateTime('hh:nn',Event.StartTime);
EndTime.Text := FormatDateTime('hh:nn',Event.EndTime);
StartTimeChange(Self);
CBAllDay.Checked := Event.AllDayEvent;
@ -444,9 +444,9 @@ begin
{ follow the start time by 30 minutes }
if ST > StrToTime(EndTime.Text) then begin
if TimeFormat = tf24Hour then
EndTime.Text := FormatDateTime('h:mm', ST + 30 / MinutesInDay)
EndTime.Text := FormatDateTime('h:nn', ST + 30 / MinutesInDay)
else
EndTime.Text := FormatDateTime('hh:mm AM/PM', ST + 30 / MinutesInDay);
EndTime.Text := FormatDateTime('hh:nn AM/PM', ST + 30 / MinutesInDay);
end;
end;
@ -774,7 +774,7 @@ begin
{ time to follow the start time by 30 minutes }
if ST > EndDate.Date + StrToTime (EndTime.Text) then
EndTime.Text := FormatDateTime('hh:mm', ST + 30 / MinutesInDay);
EndTime.Text := FormatDateTime('hh:nn', ST + 30 / MinutesInDay);
end;
procedure TDlgEventEdit.EndTimeExit(Sender: TObject);
@ -795,7 +795,7 @@ begin
{ start time to precede the end time by 30 minutes }
if ET < StartDate.Date + StrToTime (StartTime.Text) then
StartTime.Text := FormatDateTime('hh:mm', ET - 30 / MinutesInDay);
StartTime.Text := FormatDateTime('hh:nn', ET - 30 / MinutesInDay);
end;
end.

4
components/tvplanit/source/vpmonthview.pas
View File

@ -1092,10 +1092,10 @@ var
{ format the display text }
if ShowEventTime then begin
if (TimeFormat = tf24Hour) then
Str := FormatDateTime('hh:mm',
Str := FormatDateTime('hh:nn',
TVpEvent(EventList.List^[j]).StartTime)
else
Str := FormatDateTime('hh:mm AM/PM',
Str := FormatDateTime('hh:nn AM/PM',
TVpEvent(EventList.List^[j]).StartTime);
Str := Str + ' - ' + TVpEvent(EventList.List^[j]).Description;
end else

8
components/tvplanit/source/vpweekview.pas
View File

@ -888,11 +888,11 @@ var
if ShowEventTime then
begin
if TimeFormat = tf24Hour then
DayStr := FormatDateTime('hh:mm',TodayStartTime)
+ ' - ' + FormatDateTime('hh:mm',TodayEndTime) + ': '
DayStr := FormatDateTime('hh:nn',TodayStartTime)
+ ' - ' + FormatDateTime('hh:nn',TodayEndTime) + ': '
else
DayStr := FormatDateTime('hh:mm AM/PM',TVpEvent(EventList.List^[j]).StartTime)
+ ' - ' + FormatDateTime('hh:mm AM/PM',TVpEvent(EventList.List^[j]).EndTime) + ': ';
DayStr := FormatDateTime('hh:nn AM/PM',TVpEvent(EventList.List^[j]).StartTime)
+ ' - ' + FormatDateTime('hh:nn AM/PM',TVpEvent(EventList.List^[j]).EndTime) + ': ';
end;
if DayStr = '' then
DayStr := TVpEvent(EventList.List^[j]).Description