tvplanit: By default, new events in WeekView begin at the next full hour now (no longer ar noon). Some cosmetics.

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

components/tvplanit/source/vpdayview.pas

@@ -359,13 +359,7 @@ type
     procedure SetHint(const AValue: TTranslateString); override;
     procedure SetHintMode(const AValue: TVpHintMode);
 
-    { internal methods }
+    { Popup }
-    function dvCalcRowHeight(Scale: Extended; UseGran: TVpGranularity): Integer;
-    function dvCalcVisibleLines(RenderHeight, ColHeadHeight, ARowHeight: Integer;
-      Scale: Extended; StartLine, StopLine: Integer): Integer;
-    function dvCalcColHeadHeight(Scale: Extended): Integer;
-    procedure dvEditInPlace(Sender: TObject);
-    procedure dvHookUp;
     procedure PopupAddEvent(Sender: TObject);
     procedure PopupAddFromICalFile(Sender: TObject);
     procedure PopupDeleteEvent(Sender: TObject);
@@ -384,29 +378,39 @@ type
     procedure PopupPickResourceGroupEvent(Sender: TObject);
     procedure PopupDropdownEvent(Sender: TObject);
     procedure InitializeDefaultPopup;
-    procedure Paint; override;
+
-    procedure Loaded; override;
+    { internal methods }
+    procedure CreateParams(var Params: TCreateParams); override;
+    procedure CreateWnd; override;
+    function dvCalcRowHeight(Scale: Extended; UseGran: TVpGranularity): Integer;
+    function dvCalcVisibleLines(RenderHeight, ColHeadHeight, ARowHeight: Integer;
+      Scale: Extended; StartLine, StopLine: Integer): Integer;
+    function dvCalcColHeadHeight(Scale: Extended): Integer;
+    procedure dvEditInPlace(Sender: TObject);
+    procedure dvHookUp;
+    procedure dvNavButtonsClick(Sender: TObject);
+    procedure dvPopulate;
+    procedure dvScrollVertical(Lines: Integer);
     procedure dvSpawnEventEditDialog(IsNewEvent: Boolean);
     procedure dvSetActiveRowByCoord(Pnt: TPoint; Sloppy: Boolean);
     procedure dvSetActiveColByCoord(Pnt: TPoint);
-    procedure dvPopulate;
+    procedure EditEvent;
-    procedure dvNavButtonsClick(Sender: TObject);
+    function EditEventAtCoord(APoint: TPoint): Boolean;
-    procedure dvScrollVertical(Lines: Integer);
+    procedure EndEdit(Sender: TObject);
-    procedure CreateParams(var Params: TCreateParams); override;
+    function GetEventAtCoord(APoint: TPoint): TVpEvent;
-    procedure CreateWnd; override;
+    function GetEventRect(AEvent: TVpEvent): TRect;
+    procedure SetActiveEventByCoord(APoint: TPoint);
+    procedure SetTimeIntervals(UseGran: TVpGranularity);
+
+    { inherited methods }
+    procedure KeyDown(var Key: Word; Shift: TShiftState); override;
+    procedure Loaded; override;
+    procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X,Y: Integer); override;
     procedure MouseEnter; override;
     procedure MouseLeave; override;
     procedure MouseMove(Shift: TShiftState; X,Y: Integer); override;
-    procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X,Y: Integer); override;
     procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X,Y: Integer); override;
-    procedure SetActiveEventByCoord(APoint: TPoint);
+    procedure Paint; override;
-    function EditEventAtCoord(APoint: TPoint): Boolean;
-    function GetEventAtCoord(APoint: TPoint): TVpEvent;
-    function GetEventRect(AEvent: TVpEvent): TRect;
-    procedure EditEvent;
-    procedure EndEdit(Sender: TObject);
-    procedure KeyDown(var Key: Word; Shift: TShiftState); override;
-    procedure SetTimeIntervals(UseGran: TVpGranularity);
 
     { message handlers }
     procedure VpDayViewInit(var Msg: {$IFDEF DELPHI}TMessage{$ELSE}TLMessage{$ENDIF}); message Vp_DayViewInit;

components/tvplanit/source/vpmisc.pas

@@ -154,6 +154,8 @@ function GetTimeFormatStr(ATimeFormat: TVpTimeFormat): String;
 function HourToAMPM(Hour: TVpHours): string;
 function HourToStr(Hour: TVpHours; Mil: Boolean): string;
 
+function NextFullHour(ADateTime: TDateTime): TDateTime;
+
 function HourToLine(const Value: TVpHours; const Granularity: TVpGranularity): Integer;
 function GetStartLine(StartTime: TDateTime; Granularity: TVpGranularity): Integer;
 function GetEndLine(EndTime: TDateTime; Granularity: TVpGranularity): Integer;
@@ -712,6 +714,20 @@ begin
     Result := IntToStr(ord(Hour) mod 12);
 end;
 
+{ Calculates the time of the next full hour }
+function NextFullHour(ADateTime: TDateTime): TDateTime;
+var
+  hr, min, sec, ms: Word;
+  dt: TDate;
+begin
+  dt := Trunc(ADateTime);
+  DecodeTime(ADateTime, hr, min, sec, ms);
+  if hr = 23 then
+    Result := dt + 1
+  else
+    Result := dt + EncodeTime(hr + 1, 0, 0, 0);
+end;
+
 function GetStartLine(StartTime: TDateTime; Granularity: TVpGranularity): Integer;
 var
   LineDuration: Double;    // percentage of a day covered by each line

components/tvplanit/source/vpweekview.pas

@@ -184,9 +184,7 @@ type
     procedure SetActiveDate(Value: TDateTime);
     procedure SetWeekStartsOn(Value: TVpDayType);
 
-    { internal methods }
+    { Popup }
-    procedure wvEditInPlace(Sender: TObject);
-    procedure wvHookUp;
     procedure PopupAddEvent(Sender: TObject);
     procedure PopupAddFromICalFile(Sender: TObject);
     procedure PopupDeleteEvent(Sender: TObject);
@@ -201,6 +199,10 @@ type
     procedure PopupPickResourceGroupEvent(Sender: TObject);
     procedure PopupDropdownEvent(Sender: TObject);
     procedure InitializeDefaultPopup;
+
+    { internal methods }
+    procedure wvEditInPlace(Sender: TObject);
+    procedure wvHookUp;
     procedure wvPopulate;
     procedure wvSpinButtonClick(Sender: TObject; Button: TUDBtnType);
 
@@ -218,9 +220,9 @@ type
     procedure CreateWnd; override;
     procedure Loaded; override;
     procedure KeyDown(var Key: Word; Shift: TShiftState); override;
+    procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X,Y: Integer); override;
     procedure MouseEnter; override;
     procedure MouseLeave; override;
-    procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X,Y: Integer); override;
     procedure MouseMove(Shift: TShiftState; X, Y: Integer); override;
     procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X,Y: Integer); override;
     procedure Paint; override;
@@ -1019,7 +1021,7 @@ begin
     Exit;
 
   wvSetDateByCoord(Point(Msg.XPos, Msg.YPos));
-  EventAtCoord(Point (Msg.XPos, Msg.YPos));
+  EventAtCoord(Point(Msg.XPos, Msg.YPos));
 
   // if the mouse was pressed down in the client area, then select the cell.
   if not focused then
@@ -1036,7 +1038,8 @@ begin
     else
     if (DataStore.Resource <> nil) then begin
       { otherwise, we must want to create a new event }
-      StartTime := trunc(Date) + 0.5; { default to 12:00 noon }
+      StartTime := NextFullHour(Now());
+//      StartTime := trunc(Date) + 0.5; { default to 12:00 noon }
       EndTime := StartTime + 30 / MinutesInDay; { StartTime + 30 minutes }
       ActiveEvent := DataStore.Resource.Schedule.AddEvent(
         DataStore.GetNextID('Events'),
@@ -1227,8 +1230,8 @@ begin
   then
     Exit;
 
-  StartTime := trunc(Date) + 1 / 2; { default to 12:00 noon }
+  StartTime := NextFullHour(Now());       { Default start time: next full hour }
-  EndTime := StartTime + (30 / MinutesInDay); { StartTime + 30 minutes }
+  EndTime := StartTime + 30 / MinutesInDay;           { StartTime + 30 minutes }
   ActiveEvent := DataStore.Resource.Schedule.AddEvent(
     DataStore.GetNextID('Events'),
     StartTime,