tvplanit: Improved header text in weekview.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8360 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2022-07-21 12:31:50 +00:00
parent 06d68b2390
commit 02a881fd02
10 changed files with 39 additions and 72 deletions

View File

@ -150,6 +150,10 @@ msgctxt "vpsr.rscalendarrevert"
msgid "Revert"
msgstr "Zurück"
#: vpsr.rscalendarweek
msgid "Calendar week"
msgstr "Kalenderwoche"
#: vpsr.rscalendarweekabbr
msgid "CW"
msgstr "KW"
@ -1221,10 +1225,6 @@ msgstr "Aufgabenliste - "
msgid "Text"
msgstr "Text"
#: vpsr.rsthrough
msgid "Through"
msgstr "Bis"
#: vpsr.rsthursday
msgid "Thursday"
msgstr "Donnerstag"
@ -1328,10 +1328,6 @@ msgstr "Mittwoch"
msgid "Weekly"
msgstr "Wöchentlich"
#: vpsr.rsweekof
msgid "Week of"
msgstr "Woche mit"
#: vpsr.rsweeks
msgid "Weeks"
msgstr "Wochen"

View File

@ -150,6 +150,10 @@ msgctxt "vpsr.rscalendarrevert"
msgid "Revert"
msgstr "Revert"
#: vpsr.rscalendarweek
msgid "Calendar week"
msgstr "Calendar week"
#: vpsr.rscalendarweekabbr
msgid "CW"
msgstr "CW"
@ -1205,10 +1209,6 @@ msgstr "Task list - "
msgid "Text"
msgstr "Text"
#: vpsr.rsthrough
msgid "Through"
msgstr "Through"
#: vpsr.rsthursday
msgid "Thursday"
msgstr "Thursday"
@ -1310,10 +1310,6 @@ msgstr "Wednesday"
msgid "Weekly"
msgstr "Weekly"
#: vpsr.rsweekof
msgid "Week of"
msgstr "Week of"
#: vpsr.rsweeks
msgid "Weeks"
msgstr "Weeks"

View File

@ -140,6 +140,10 @@ msgctxt "vpsr.rscalendarrevert"
msgid "Revert"
msgstr ""
#: vpsr.rscalendarweek
msgid "Calendar week"
msgstr ""
#: vpsr.rscalendarweekabbr
msgid "CW"
msgstr ""
@ -1212,10 +1216,6 @@ msgstr ""
msgid "Text"
msgstr ""
#: vpsr.rsthrough
msgid "Through"
msgstr ""
#: vpsr.rsthursday
msgid "Thursday"
msgstr "Torstai"
@ -1320,10 +1320,6 @@ msgstr "Keskiviikko"
msgid "Weekly"
msgstr ""
#: vpsr.rsweekof
msgid "Week of"
msgstr ""
#: vpsr.rsweeks
msgid "Weeks"
msgstr ""

View File

@ -156,6 +156,10 @@ msgctxt "vpsr.rscalendarrevert"
msgid "Revert"
msgstr "Revenir en arrière"
#: vpsr.rscalendarweek
msgid "Calendar week"
msgstr ""
#: vpsr.rscalendarweekabbr
msgid "CW"
msgstr ""
@ -1229,10 +1233,6 @@ msgstr "Liste des tâches -"
msgid "Text"
msgstr ""
#: vpsr.rsthrough
msgid "Through"
msgstr "Par"
#: vpsr.rsthursday
msgid "Thursday"
msgstr "Jeudi"
@ -1336,10 +1336,6 @@ msgstr "Mercredi"
msgid "Weekly"
msgstr "Hebdomadaire"
#: vpsr.rsweekof
msgid "Week of"
msgstr "Semaine du"
#: vpsr.rsweeks
msgid "Weeks"
msgstr ""

View File

@ -150,6 +150,10 @@ msgctxt "vpsr.rscalendarrevert"
msgid "Revert"
msgstr "Terug"
#: vpsr.rscalendarweek
msgid "Calendar week"
msgstr ""
#: vpsr.rscalendarweekabbr
msgid "CW"
msgstr "KW"
@ -1223,10 +1227,6 @@ msgstr "Taaklijst - "
msgid "Text"
msgstr ""
#: vpsr.rsthrough
msgid "Through"
msgstr "t/m"
#: vpsr.rsthursday
msgid "Thursday"
msgstr "Donderdag"
@ -1330,10 +1330,6 @@ msgstr "Woensdag"
msgid "Weekly"
msgstr "Wekelijks"
#: vpsr.rsweekof
msgid "Week of"
msgstr "Week van"
#: vpsr.rsweeks
msgid "Weeks"
msgstr ""

View File

@ -150,6 +150,10 @@ msgctxt "vpsr.rscalendarrevert"
msgid "Revert"
msgstr "Cofnij"
#: vpsr.rscalendarweek
msgid "Calendar week"
msgstr ""
#: vpsr.rscalendarweekabbr
msgid "CW"
msgstr "TR"
@ -1221,10 +1225,6 @@ msgstr "Lista zadań - "
msgid "Text"
msgstr "Tekst"
#: vpsr.rsthrough
msgid "Through"
msgstr "do"
#: vpsr.rsthursday
msgid "Thursday"
msgstr "Czwartek"
@ -1328,10 +1328,6 @@ msgstr "Środa"
msgid "Weekly"
msgstr "Tygodniowo"
#: vpsr.rsweekof
msgid "Week of"
msgstr "Tydzień od:"
#: vpsr.rsweeks
msgid "Weeks"
msgstr "Tygodnie"

View File

@ -140,6 +140,10 @@ msgctxt "vpsr.rscalendarrevert"
msgid "Revert"
msgstr ""
#: vpsr.rscalendarweek
msgid "Calendar week"
msgstr ""
#: vpsr.rscalendarweekabbr
msgid "CW"
msgstr ""
@ -1195,10 +1199,6 @@ msgstr ""
msgid "Text"
msgstr ""
#: vpsr.rsthrough
msgid "Through"
msgstr ""
#: vpsr.rsthursday
msgid "Thursday"
msgstr ""
@ -1300,10 +1300,6 @@ msgstr ""
msgid "Weekly"
msgstr ""
#: vpsr.rsweekof
msgid "Week of"
msgstr ""
#: vpsr.rsweeks
msgid "Weeks"
msgstr ""

View File

@ -150,6 +150,10 @@ msgctxt "vpsr.rscalendarrevert"
msgid "Revert"
msgstr "Возврат"
#: vpsr.rscalendarweek
msgid "Calendar week"
msgstr ""
#: vpsr.rscalendarweekabbr
msgid "CW"
msgstr "Номер недели:"
@ -1221,10 +1225,6 @@ msgstr "Список задач - "
msgid "Text"
msgstr ""
#: vpsr.rsthrough
msgid "Through"
msgstr "Через"
#: vpsr.rsthursday
msgid "Thursday"
msgstr "Четверг"
@ -1328,10 +1328,6 @@ msgstr "Среда"
msgid "Weekly"
msgstr "Еженедельно"
#: vpsr.rsweekof
msgid "Week of"
msgstr "Неделя"
#: vpsr.rsweeks
msgid "Weeks"
msgstr ""

View File

@ -103,8 +103,6 @@ resourcestring
RSNormal = 'Normal';
RSHigh = 'High';
RSWeekOf = 'Week of';
RSThrough = 'Through';
RSSunday = 'Sunday';
RSMonday = 'Monday';
RSTuesday = 'Tuesday';
@ -140,6 +138,7 @@ resourcestring
RSWeeks = 'Weeks';
RSMonths = 'Months';
RSYears = 'Years';
RSCalendarWeek = 'Calendar week';
RSCalendarWeekAbbr = 'CW'; // Abbreviation of "calendar week"
RSToday = 'Today';
@ -289,7 +288,7 @@ resourcestring
RSHomeAddress = 'Home address';
{ Print Preview dialog captions }
RSDlgPrintPreview = 'Print preview';
RSDlgPrintPreview = 'Print preview';
{ Task Edit Dialog Captions }
RSDlgTaskEdit = 'Task';

View File

@ -587,6 +587,7 @@ var
HeadStr: string = '';
HeadStrLen: Integer;
weekNo: Integer;
startStr, endStr: String;
begin
RenderCanvas.Brush.Color := RealHeadAttrColor;
RenderCanvas.Font.Assign(TFont(FWeekView.HeadAttributes.Font));
@ -609,17 +610,16 @@ begin
BevelDarkShadow
);
end else begin
// if FWeekView.DrawingStyle = dsFlat then begin
// { draw simple border rectangle }
{ draw simple border rectangle }
HeadRect := Rect(RealLeft, RealTop, RealRight, RealTop + TVpWeekViewOpener(FWeekView).wvHeaderHeight + 2);
TPSFillRect(RenderCanvas, Angle, RenderIn, HeadRect);
end;
{ build header caption }
weekNo := GetWeekOfYear(StartDate);
HeadStr := HeadStr + Format('%s %s (%s %d)', [
RSWeekOf, FormatDateTime(FWeekView.DateLabelFormat, StartDate), RSCalendarWeekAbbr, weekNo
]);
startStr := FormatDateTime(FWeekView.DateLabelFormat, StartDate);
endStr := FormatDateTime(FWeekView.DateLabelFormat, StartDate+6);
HeadStr := Format('%s %d (%s - %s)', [RSCalendarWeek, weekNo, startStr, endStr]);
{ draw the text }
if DisplayOnly and (RenderCanvas.TextWidth(HeadStr) >= WidthOf(RenderIn)) then