From ec29b907578dc98289d5bc60f707c8478ef8b507 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 18 May 2018 15:52:16 +0000
Subject: [PATCH] tvplanit: VpDayView icons are painted side-by-side now.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6437 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/tvplanit/examples/fulldemo/demomain.lfm |  1 -
 components/tvplanit/source/vpconst.pas             | 11 ++++++-----
 components/tvplanit/source/vpdayviewpainter.pas    | 13 ++++++++-----
 components/tvplanit/source/vpxmlds.pas             |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/components/tvplanit/examples/fulldemo/demomain.lfm b/components/tvplanit/examples/fulldemo/demomain.lfm
index 1b8b49ede..5020811af 100644
--- a/components/tvplanit/examples/fulldemo/demomain.lfm
+++ b/components/tvplanit/examples/fulldemo/demomain.lfm
@@ -775,7 +775,6 @@ object MainForm: TMainForm
     Images = ImageList1
     ImagesWidth = 0
     ItemFont.Color = clWhite
-    PlaySounds = False
     SelectedItem = -1
     SelectedItemFont.Color = clWhite
     SelectedItemFont.Style = [fsBold]
diff --git a/components/tvplanit/source/vpconst.pas b/components/tvplanit/source/vpconst.pas
index fdc24d982..a73a2f2c9 100644
--- a/components/tvplanit/source/vpconst.pas
+++ b/components/tvplanit/source/vpconst.pas
@@ -48,13 +48,14 @@ uses
 
 const
   BuildTime = {$I %DATE%} + {$I %TIME}; //'09/13/2002 09:25 AM';
-  VpVersionStr = 'v1.10';    {Visual PlanIt library version}
+  VpVersionStr = 'v1.12';    {Visual PlanIt library version}
   VpProductName = 'Visual PlanIt';
 
-  BorderStyles    : array[TBorderStyle] of LongInt =
-                    (0, WS_BORDER);
-  ScrollBarStyles : array [TScrollStyle] of LongInt =
-                    (0, WS_HSCROLL, WS_VSCROLL, WS_HSCROLL or WS_VSCROLL{$IFDEF LCL},0,0,0{$ENDIF});
+  BorderStyles: array[TBorderStyle] of LongInt = (0, WS_BORDER);
+
+  ScrollBarStyles: array[TScrollStyle] of LongInt = (
+    0, WS_HSCROLL, WS_VSCROLL, WS_HSCROLL or WS_VSCROLL{$IFDEF LCL},0,0,0{$ENDIF}
+  );
 
   SecondsInDay     = 86400;   { Number of seconds in a day               }
   SecondsInHour    = 3600;    { Number of seconds in an hour             }
diff --git a/components/tvplanit/source/vpdayviewpainter.pas b/components/tvplanit/source/vpdayviewpainter.pas
index 47272536f..171e1d22a 100644
--- a/components/tvplanit/source/vpdayviewpainter.pas
+++ b/components/tvplanit/source/vpdayviewpainter.pas
@@ -1029,7 +1029,10 @@ var
     begin
       ABitmap.Transparent := True;
       R := Rect(0, 0, w, h);
-      OffsetRect(R, AIconRect.Left + FScaledIconMargin, AIconRect.Top + FScaledIconMargin);
+      OffsetRect(R,
+        AIconRect.Left + FScaledIconMargin + DrawPos,
+        AIconRect.Top + FScaledIconMargin
+      );
 
       bmp := TBitmap.Create;
       try
@@ -1049,10 +1052,10 @@ var
   end;
 
 begin
-  DrawPos := 1;
-  DrawIcon(dvBmpCustom, CustomW, CustomH);
-  DrawIcon(dvBmpCategory, CategoryW, CategoryH);
-  DrawIcon(dvBmpAlarm, AlarmW, AlarmH);
+  DrawPos := 0;
+  DrawIcon(dvBmpCustom, CustomW, CustomH, true);
+  DrawIcon(dvBmpCategory, CategoryW, CategoryH, true);
+  DrawIcon(dvBmpAlarm, AlarmW, AlarmH, true);
   DrawIcon(dvBmpRecurring, RecurringW, RecurringH, false);
 end;
 
diff --git a/components/tvplanit/source/vpxmlds.pas b/components/tvplanit/source/vpxmlds.pas
index 2e9d4ca0d..8786ab77b 100644
--- a/components/tvplanit/source/vpxmlds.pas
+++ b/components/tvplanit/source/vpxmlds.pas
@@ -2,7 +2,7 @@
 
 {$I vp.inc}
 
-unit VpXmlDs;
+unit VpXmlDS;
 
 interface