pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

tvplanit: Fix resource not found error. Fix SysToUtf8 compilation error with Laz trunk.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4632 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-04-26 15:54:35 +00:00
parent 357860b2cf
commit c344ae8762
14 changed files with 59 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
components/tvplanit/packages/v103_lazarus.lpk
View File

@ -1,22 +1,23 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Package Version="3">
<Package Version="4">
<Name Value="v103_lazarus"/>
<Type Value="RunAndDesignTime"/>
<AddToProjectUsesSection Value="True"/>
<CompilerOptions>
<Version Value="5"/>
<Version Value="11"/>
<SearchPaths>
<IncludeFiles Value="../source/"/>
<OtherUnitFiles Value="../source/"/>
<IncludeFiles Value="../source"/>
<OtherUnitFiles Value="../source"/>
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<CodeGeneration>
<Generate Value="Faster"/>
</CodeGeneration>
<Other>
<CompilerPath Value="$(CompPath)"/>
</Other>
<Parsing>
<SyntaxOptions>
<UseAnsiStrings Value="False"/>
</SyntaxOptions>
</Parsing>
</CompilerOptions>
<Files Count="60">
<Files Count="61">
<Item1>
<Filename Value="../source/vpabout.pas"/>
<UnitName Value="VpAbout"/>
@ -258,8 +259,11 @@
<Filename Value="../source/vpxparsr.pas"/>
<UnitName Value="VpXParsr"/>
</Item60>
<Item61>
<Filename Value="../source/vpbase.res"/>
<Type Value="Binary"/>
</Item61>
</Files>
<Type Value="RunAndDesignTime"/>
<RequiredPkgs Count="3">
<Item1>
<PackageName Value="FCL"/>

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

@ -282,11 +282,13 @@ begin
Self.Height := 210;
OpenItemBtn.SetFocus;
end;
(*
initialization
{$IFDEF LCL}
{$I vpalarmdlg.lrs}
{$ENDIF}
*)
end.

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

@ -384,6 +384,8 @@ type
implementation
{$R vpbase.res}
uses
Math
{$IFNDEF LCL}
@ -959,11 +961,13 @@ begin
end;
end;
{=====}
(*
//soenr ich habe das hinzugefügt
{$IFDEF FPC}
initialization
{$i vpbase.lrs}
{$i ../source/vpbase.lrs}
{$ENDIF}
*)
end.

BIN
components/tvplanit/source/vpbase.res
View File

Binary file not shown.

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

@ -35,7 +35,7 @@ interface
uses
{$IFDEF LCL}
LMessages,LCLProc,LCLType,LCLIntf,
LMessages,LCLProc,LCLType,LCLIntf,LazUTF8,
{$ELSE}
Windows,
{$ENDIF}
@ -1537,6 +1537,9 @@ var
S := FormatDateTime('mmm yyyy', RenderDate)
else
S := FormatDateTime('mmm', RenderDate);
{$IF FPC_FULLVERSION < 30000}
S := SysToUTF8(S);
{$ENDIF}
R := Rect (clRowCol[0, 1].Left + RealLeft,
clRowCol[0, 1].Top + RealTop,
@ -1547,7 +1550,11 @@ var
{switch to short date format if string won't fit}
if FDateFormat = dfLong then
if RenderCanvas.TextWidth(S) > R.Right-R.Left then
{$IF FPC_FULLVERSION >= 30000}
S := FormatDateTime('mmm yyyy', RenderDate);
{$ELSE}
S := SysToUTF8(FormatDateTime('mmm yyyy', RenderDate));
{$ENDIF}
RenderCanvas.Font.Color := MonthYearColor;
if Assigned(FOnDrawDate) then
@ -1587,6 +1594,9 @@ var
else
S := Copy(LongDayNames[Ord(DOW)+1], 1, FDayNameWidth)
end;
{$IF FPC_FULLVERSION < 30000}
S := SysToUTF8(S);
{$ENDIF}
{draw the day name above each column}
DrawRect := Rect (clRowCol[1, I].Left + RealLeft,

3
components/tvplanit/source/vpcontacteditdlg.pas
View File

@ -667,11 +667,12 @@ begin
NameEdit.SetFocus;
end;
{=====}
(*
initialization
{$IFDEF LCL}
{$I vpcontacteditdlg.lrs}
{$ENDIF}
*)
end.

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

@ -724,9 +724,9 @@ begin
StartTime.Text := FormatDateTime('hh:mm',ET- (30/MinutesInDay));
end;
end;
(*
initialization
{$I vpevnteditdlg.lrs}
*)
end.

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

@ -580,7 +580,11 @@ var
end;
{ Acquire startdate and end date }
{$IF FPC_FULLVERSION >= 30000}
HeadStr := FormatDateTime(DateLabelFormat, DisplayDate);
{$ELSE}
HeadStr := SysToUTF8(FormatDateTime(DateLabelFormat, DisplayDate));
{$ENDIF}
{ draw the text }
if (DisplayOnly) and

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

@ -415,11 +415,11 @@ begin
if Key = VK_ESCAPE then
actCancel.Execute;
end;
(*
initialization
{$IFDEF LCL}
{$I vpprtprvdlg.lrs}
{$ENDIF}
*)
end.

3
components/tvplanit/source/vpreseditdlg.pas
View File

@ -238,11 +238,12 @@ procedure TResEditForm.SetControls;
begin
OKBtn.Enabled := (DescriptionEdit.Text <> '');
end;
(*
initialization
{$IFDEF LCL}
{$I vpreseditdlg.lrs}
{$ENDIF}
*)
end.

3
components/tvplanit/source/vpselresdlg.pas
View File

@ -75,11 +75,12 @@ procedure TfrmSelectResource.btnEditClick(Sender: TObject);
begin
VpResourceEditDialog1.Execute;
end;
(*
initialization
{$IFDEF LCL}
{$I vpselresdlg.lrs}
{$ENDIF}
*)
end.

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

@ -224,11 +224,11 @@ begin
end;
end;
{=====}
(*
initialization
{$IFDEF LCL}
{$I vptaskeditdlg.lrs}
{$ENDIF}
*)
end.

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

@ -187,11 +187,11 @@ begin
if Key = VK_ESCAPE then
Close;
end;
(*
initialization
{$IFDEF LCL}
{$I vpwavdlg.lrs}
{$ENDIF}
*)
end.

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

@ -810,7 +810,11 @@ var
if FDayHeadAttributes.Bordered then
TPSRectangle (RenderCanvas, Angle, RenderIn, TextRect);
{ Fix Header String }
{$IF FPC_FULLVERSION >= 30000}
DayStr := FormatDateTime(FDayHeadAttributes.DateFormat, StartDate + I);
{$ELSE}
DayStr := SysToUTF8(FormatDateTime(FDayHeadAttributes.DateFormat, StartDate + I));
{$ENDIF}
SL := RenderCanvas.TextWidth(DayStr);
if SL > TextRect.Right - TextRect.Left then begin
DayStr := GetDisplayString(RenderCanvas, DayStr, 0, TextRect.Right -