Changes by Bora4d (soner)

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2537 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/tvplanit/source/vpbase.lrs

@@ -0,0 +1,60 @@
+LazarusResources.Add('VPCHECKPAD','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#12#0#0#0#14#4#3#0#0#0#233#147#224
+  +#223#0#0#0'0PLTE'#0#0#0#128#0#0#0#128#0#128#128#0#0#0#128#128#0#128#0#128#128
+  +#128#128#128#192#192#192#255#0#0#0#255#0#255#255#0#0#0#255#255#0#255#0#255
+  +#255#255#255#255'{'#31#177#196#0#0#0'TIDATx'#218'c4f8'#203'`'#204#192'hp'#225
+  +#199#132#10'fF'#254#135#2#12#252#15#25#249'?000|'#4'S'#159#255#129')'#205#19
+  +' '#234#243#180#12#16#165#145#145#200#200'/|'#193#236':PI'#241#130#180'r '
+  +#245#210' '#189#0#164#161#179#28#170#15'H'#25'\'#0'R'#204#0'&O '#152'J=!*'#0
+  +#0#0#0'IEND'#174'B`'#130
+]);
+LazarusResources.Add('VPLEFTARROW','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#7#0#0#0#9#4#3#0#0#0#12'v+'#144#0#0
+  +#0'0PLTE'#0#0#0#128#0#0#0#128#0#128#128#0#0#0#128#128#0#128#0#128#128#192#192
+  +#192#128#128#128#255#0#0#0#255#0#255#255#0#0#0#255#255#0#255#0#255#255#255
+  +#255#255'O'#19'&I'#0#0#0'''IDATx'#218'c'#252#207#192#240#145#241'?'#3#227#7
+  +#198#255#31#5#128#4'#'#195#7#198#15#2#12'P'#22'D'#12','#11'T'#7#0#184#15#19
+  +'zV'#186#30#10#0#0#0#0'IEND'#174'B`'#130
+]);
+LazarusResources.Add('VPLEFTARROWS','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#13#0#0#0#9#4#3#0#0#0#27'T'#187'Y'#0
+  +#0#0'0PLTE'#0#0#0#128#0#0#0#128#0#128#128#0#0#0#128#128#0#128#0#128#128#192
+  +#192#192#128#128#128#255#0#0#0#255#0#255#255#0#0#0#255#255#0#255#0#255#255
+  +#255#255#255'O'#19'&I'#0#0#0',IDATx'#218'c'#252#207#0#2#31#25#255'3'#128#208
+  +#7#198#255#31#5#128#8'H32'#0#209#7#198#15#2#12' '#4#231#195#229'a'#234'!'#250
+  +#1#4#224#28'z'#252#185#25#191#0#0#0#0'IEND'#174'B`'#130
+]);
+LazarusResources.Add('VPREVERT','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#14#0#0#0#9#4#3#0#0#0#240'c'#0'Z'#0
+  +#0#0'0PLTE'#0#0#0#128#0#0#0#128#0#128#128#0#0#0#128#128#0#128#0#128#128#128
+  +#128#128#192#192#192#255#0#0#0#255#0#255#255#0#0#0#255#255#0#255#0#255#255
+  +#255#255#255'{'#31#177#196#0#0#0'9IDATx'#218'c'#236'`'#0#3'F '#253#231#0#179
+  +'#c'#11#203#159'#'#14#127#190'0'#182#28'ap``8'#192#216'r'#192#133#1'B'#179'@'
+  +#249#12'.'#12'@y'#176#190'7"'#140'P'#253#0#247#153#19#242')m'#192#203#0#0#0#0
+  +'IEND'#174'B`'#130
+]);
+LazarusResources.Add('VPRIGHTARROW','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#7#0#0#0#9#4#3#0#0#0#12'v+'#144#0#0
+  +#0'0PLTE'#0#0#0#128#0#0#0#128#0#128#128#0#0#0#128#128#0#128#0#128#128#192#192
+  +#192#128#128#128#255#0#0#0#255#0#255#255#0#0#0#255#255#0#255#0#255#255#255
+  +#255#255'O'#19'&I'#0#0#0'#IDATx'#218'c'#252#207#192#240#145#241#131#252#7' !'
+  +#240#31'D'#240'?'#4#18#12#31'`'#172#255'PY'#144':'#0#226#15#21'zw'#127#141
+  +#168#0#0#0#0'IEND'#174'B`'#130
+]);
+LazarusResources.Add('VPRIGHTARROWS','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#13#0#0#0#9#4#3#0#0#0#27'T'#187'Y'#0
+  +#0#0'0PLTE'#0#0#0#128#0#0#0#128#0#128#128#0#0#0#128#128#0#128#0#128#128#192
+  +#192#192#128#128#128#255#0#0#0#255#0#255#255#0#0#0#255#255#0#255#0#255#255
+  +#255#255#255'O'#19'&I'#0#0#0',IDATx'#218'c'#252#207#0#2#31#25'?'#200#127#248
+  +#8'D'#140#31#4#254#127#4'" '#205#255#16#136#128'4'#3#8'!'#241#161#242'P'#245
+  +'P'#253#0#142#224' z'#178#244'P'#227#0#0#0#0'IEND'#174'B`'#130
+]);
+LazarusResources.Add('VPTODAY','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#14#0#0#0#9#4#3#0#0#0#240'c'#0'Z'#0
+  +#0#0'0PLTE'#0#0#0#128#0#0#0#128#0#128#128#0#0#0#128#128#0#128#0#128#128#192
+  +#192#192#128#128#128#255#0#0#0#255#0#255#255#0#0#0#255#255#0#255#0#255#255
+  +#255#255#255'O'#19'&I'#0#0#0'?IDATx'#218'%'#199#177#17#192' '#12#4#193#255#8
+  +';'#250#144'6i'#193#149'P'#27#29#160#200'('#18'b'#184'd'#231#24#239#143#140
+  +#179#183#171'@'#205#244')&/'#12'j'#136'b'#248#249#197#0'L'#176'c'#246']'#189
+  +'n%'#225#22#132'e.'#203#134#0#0#0#0'IEND'#174'B`'#130
+]);

components/tvplanit/source/vpbase.pas

@@ -30,15 +30,12 @@
 
 unit VpBase;
 
-{$IFDEF WINDOWS}
-{$R VpBASE.RES}
-{$ENDIF}
 
 interface
 
 uses
   {$IFDEF LCL}
-  LMessages,LCLProc,LCLType,
+  LMessages,LCLProc,LCLType, LResources,
   {$ELSE}
   Windows,
   {$ENDIF}
@@ -963,5 +960,10 @@ begin
 end;
 {=====}
 
+//soenr ich habe das hinzugefügt
+{$IFDEF FPC}
+initialization
+  {$i vpbase.lrs}
+{$ENDIF}
 end.
 

components/tvplanit/source/vpcalendar.pas

@@ -843,28 +843,28 @@ begin
   {create navigation buttons}
   clBtnLeft      := TSpeedButton.Create(Self);
   clBtnLeft.Parent := Self;
-  clBtnLeft.Glyph.Handle := LoadBaseBitmap('VPLEFTARROW');
+  clBtnLeft.Glyph.LoadFromResourceName(HINSTANCE,'VPLEFTARROW'); //soner geändert: clBtnLeft.Glyph.Handle := LoadBaseBitmap('VPLEFTARROW');
   clBtnLeft.OnClick := calBtnClick;
   clBtnLeft.Hint := RSCalendarPrevMonth;
   clBtnLeft.ShowHint := True;
 
   clBtnRight := TSpeedButton.Create(Self);
   clBtnRight.Parent := Self;
-  clBtnRight.Glyph.Handle := LoadBaseBitmap('VPRIGHTARROW');
+  clBtnRight.Glyph.LoadFromResourceName(HINSTANCE,'VPRIGHTARROW'); //soner geändert: clBtnRight.Glyph.Handle := LoadBaseBitmap('VPRIGHTARROW');
   clBtnRight.OnClick := calBtnClick;
   clBtnRight.Hint := RSCalendarNextMonth;
   clBtnRight.ShowHint := True;
 
   clBtnNextYear := TSpeedButton.Create(Self);
   clBtnNextYear.Parent := Self;
-  clBtnNextYear.Glyph.Handle := LoadBaseBitmap('VPRIGHTARROWS');
+  clBtnNextYear.Glyph.LoadFromResourceName(HINSTANCE,'VPRIGHTARROWS'); //soner geöndert: clBtnNextYear.Glyph.Handle := LoadBaseBitmap('VPRIGHTARROWS');
   clBtnNextYear.OnClick := calBtnClick;
   clBtnNextYear.Hint := RSCalendarNextYear;
   clBtnNextYear.ShowHint := True;
 
   clBtnPrevYear := TSpeedButton.Create(Self);
   clBtnPrevYear.Parent := Self;
-  clBtnPrevYear.Glyph.Handle := LoadBaseBitmap('VPLEFTARROWS');
+  clBtnPrevYear.Glyph.LoadFromResourceName(HINSTANCE,'VPLEFTARROWS'); //soner geöndert: clBtnPrevYear.Glyph.Handle := LoadBaseBitmap('VPLEFTARROWS');
   clBtnPrevYear.OnClick := calBtnClick;
   clBtnPrevYear.Hint := RSCalendarPrevYear;
   clBtnPrevYear.ShowHint := True;
@@ -872,7 +872,7 @@ begin
   {create "revert" button}
   clBtnRevert := TSpeedButton.Create(Self);
   clBtnRevert.Parent := Self;
-  clBtnRevert.Glyph.Handle := LoadBaseBitmap('VPREVERT');
+  clBtnRevert.Glyph.LoadFromResourceName(HINSTANCE,'VPREVERT'); //soner geändert: clBtnRevert.Glyph.Handle := LoadBaseBitmap('VPREVERT');
   clBtnRevert.OnClick := calBtnClick;
   clBtnRevert.Hint := RSCalendarRevert;
   clBtnRevert.ShowHint := True;
@@ -880,7 +880,7 @@ begin
   {create "today" button}
   clBtnToday := TSpeedButton.Create(Self);
   clBtnToday.Parent := Self;
-  clBtnToday.Glyph.Handle := LoadBaseBitmap('VPTODAY');
+  clBtnToday.Glyph.LoadFromResourceName(HINSTANCE,'VPTODAY'); //soner geändert: clBtnToday.Glyph.Handle := LoadBaseBitmap('VPTODAY');
   clBtnToday.OnClick := calBtnClick;
   clBtnToday.Hint := RSCalendarToday;
   clBtnToday.ShowHint := True;

components/tvplanit/source/vpdayview.pas

@@ -742,13 +742,11 @@ begin
   dvDayUpBtn.Transparent         := true;
   dvWeekUpBtn.Transparent        := true;
   { load their images }
-  {$IFNDEF UNIX}
+  dvDayUpBtn.Glyph.LoadFromResourceName(HINSTANCE,'VPRIGHTARROW');
-  dvDayUpBtn.Glyph.Handle        := LoadBaseBitmap('VPRIGHTARROW');
+  dvDayDownBtn.Glyph.LoadFromResourceName(HINSTANCE,'VPLEFTARROW');
-  dvDayDownBtn.Glyph.Handle      := LoadBaseBitmap('VPLEFTARROW');
+  dvTodayBtn.Glyph.LoadFromResourceName(HINSTANCE,'VPTODAY');
-  dvTodayBtn.Glyph.Handle        := LoadBaseBitmap('VPTODAY');
+  dvWeekUpBtn.Glyph.LoadFromResourceName(HINSTANCE,'VPRIGHTARROWS');
-  dvWeekUpBtn.Glyph.Handle       := LoadBaseBitmap('VPRIGHTARROWS');
+  dvWeekDownBtn.Glyph.LoadFromResourceName(HINSTANCE,'VPLEFTARROWS');
-  dvWeekDownBtn.Glyph.Handle     := LoadBaseBitmap('VPLEFTARROWS');
-  {$ENDIF}
   { set their OnClick handler }
   dvDayUpBtn.OnClick             := dvNavButtonsClick;
   dvDayDownBtn.OnClick           := dvNavButtonsClick;

components/tvplanit/source/vpmisc.pas

@@ -221,6 +221,10 @@ end;
 
 function LoadBaseBitmap(lpBitmapName : PAnsiChar) : HBITMAP;
 begin
+  {$IFDEF FPC}
+   //wird direkt geladen
+   //fImageList.AddLazarusResource('TABSET_SCROLLER');//, clFuchsia);
+  {$ENDIF}
 //  Result := LoadBitmap(FindClassHInstance(TVpCustomControl), lpBitmapName);
 end;
 {=====}

components/tvplanit/source/vptasklist.pas

@@ -1006,7 +1006,7 @@ var
       { Draw the glyph }
       Bmp := Graphics.TBitmap.Create;
       try
-        Bmp.Handle := LoadBaseBitmap('VPCHECKPAD');
+        Bmp.LoadFromResourceName(HINSTANCE,'VPCHECKPAD'); //soner changed: Bmp.Handle := LoadBaseBitmap('VPCHECKPAD');
         { load and return the handle to bitmap resource}
         if Bmp.Height > 0 then begin
           GlyphRect.TopLeft := Point (HeadRect.Left + TextMargin,
@@ -1016,6 +1016,7 @@ var
 //TODO:          RenderCanvas.BrushCopy (TPSRotateRectangle (Angle, RenderIn, GlyphRect),
 //                                  Bmp, Rect(0, 0, Bmp.Width, Bmp.Height),
 //            Bmp.Canvas.Pixels[0, Bmp.Height - 1]);
+          RenderCanvas.Draw(GlyphRect.TopLeft.x,GlyphRect.TopLeft.y,Bmp); //soner added
           HeadRect.Left := HeadRect.Left + Bmp.Width + TextMargin;
         end;
       finally

components/tvplanit/source/vpxbase.pas

@@ -669,7 +669,7 @@ end;
 procedure TVpMemoryStream.SetPointer(Ptr : Pointer; Size : Integer);
 begin
   Assert(not Assigned(Memory));
-  inherited;
+//  inherited;
 end;
 
 {===TVpFileStream====================================================}