- reverted canvas utils

- corrected dismiss of repeated events

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

components/tvplanit/source/vpalarmdlg.lfm

@@ -1,14 +1,14 @@
 object AlarmNotifyForm: TAlarmNotifyForm
-  Left = 645
+  Left = 176
-  Height = 199
+  Height = 197
-  Top = 273
+  Top = 232
   Width = 400
   HorzScrollBar.Page = 399
-  VertScrollBar.Page = 198
+  VertScrollBar.Page = 196
   BorderIcons = [biSystemMenu]
   BorderStyle = bsDialog
   Caption = 'Reminder'
-  ClientHeight = 199
+  ClientHeight = 197
   ClientWidth = 400
   Color = clWindow
   KeyPreview = True

components/tvplanit/source/vpalarmdlg.lrs

@@ -1,12 +1,12 @@
 { Das ist eine automatisch erzeugte Lazarus-Ressourcendatei }
 
 LazarusResources.Add('TAlarmNotifyForm','FORMDATA',[
-  'TPF0'#16'TAlarmNotifyForm'#15'AlarmNotifyForm'#4'Left'#3#133#2#6'Height'#3
+  'TPF0'#16'TAlarmNotifyForm'#15'AlarmNotifyForm'#4'Left'#3#176#0#6'Height'#3
-  +#199#0#3'Top'#3#17#1#5'Width'#3#144#1#18'HorzScrollBar.Page'#3#143#1#18'Vert'
+  +#197#0#3'Top'#3#232#0#5'Width'#3#144#1#18'HorzScrollBar.Page'#3#143#1#18'Ver'
-  +'ScrollBar.Page'#3#198#0#11'BorderIcons'#11#12'biSystemMenu'#0#11'BorderStyl'
+  +'tScrollBar.Page'#3#196#0#11'BorderIcons'#11#12'biSystemMenu'#0#11'BorderSty'
-  +'e'#7#8'bsDialog'#7'Caption'#6#8'Reminder'#12'ClientHeight'#3#199#0#11'Clien'
+  +'le'#7#8'bsDialog'#7'Caption'#6#8'Reminder'#12'ClientHeight'#3#197#0#11'Clie'
-  +'tWidth'#3#144#1#5'Color'#7#8'clWindow'#10'KeyPreview'#9#9'OnKeyDown'#7#11'F'
+  +'ntWidth'#3#144#1#5'Color'#7#8'clWindow'#10'KeyPreview'#9#9'OnKeyDown'#7#11
-  +'ormKeyDown'#6'OnShow'#7#8'FormShow'#8'Position'#7#9'poDefault'#0#6'TLabel'
+  +'FormKeyDown'#6'OnShow'#7#8'FormShow'#8'Position'#7#9'poDefault'#0#6'TLabel'
   +#13'SnoozeCaption'#4'Left'#2'0'#6'Height'#2#13#3'Top'#3#136#0#5'Width'#2'N'#9
   +'Alignment'#7#14'taRightJustify'#8'AutoSize'#8#7'Caption'#6#13'SnoozeCaption'
   +#11'ParentColor'#8#0#0#6'TLabel'#8'lSubject'#4'Left'#2#24#6'Height'#2#14#3'T'

components/tvplanit/source/vpalarmdlg.pas

@@ -230,13 +230,15 @@ end;
 procedure TAlarmNotifyForm.DismissBtnClick(Sender: TObject);
 begin
   if Event.RepeatCode = rtNone then
-    Event.AlarmSet := false
+    begin
+      Event.AlarmSet := false
+    end
   else
     begin
       SnoozeDelay := 0;
       case Event.RepeatCode of
-      rtDaily:SnoozeDelay := 1.0;
+      rtDaily:Event.SnoozeTime := Trunc(Now)+1+(Frac(Event.StartTime)-EncodeTime(0,Event.AlarmAdv,0,0));
-      rtWeekly:SnoozeDelay := 7.0;
+      rtWeekly:Event.SnoozeTime := Trunc(Now)+7+(Frac(Event.StartTime)-EncodeTime(0,Event.AlarmAdv,0,0));
 //TODO:      rtMonthlyByDay:
 //TODO:      rtMonthlyByDate:
 //TODO:      rtYearlyByDay:
@@ -245,7 +247,6 @@ begin
       else
         Event.AlarmSet := false
       end;
-      CalcSnooze;
     end;
   Close;
 end;

components/tvplanit/source/vpcanvasutils.pas

@@ -84,8 +84,7 @@ interface
 uses
   {$IFDEF LCL}
   LMessages,LCLProc,LCLType,LCLIntf,
-  {$ENDIF}
+  {$ELSE}
-  {$IFDEF WINDOWS}
   Windows,
   {$ENDIF}
   Classes,
@@ -110,7 +109,7 @@ type
 
     protected                                                            
       procedure DrawRotatedText (x, y   : Integer;
-                                 Text   : Widestring;
+                                 Text   : string;
                                  Rotate : Boolean);
       procedure Swap (var a, b : Integer);
 
@@ -978,7 +977,7 @@ begin
 end;
 
 procedure TVpExCanvas.DrawRotatedText (x, y   : Integer;
-                                       Text   : Widestring;
+                                       Text   : string;
                                        Rotate : Boolean);
 
 var
@@ -986,6 +985,7 @@ var
   OldFont       : TFont;
   RealPoint     : TPoint;
   OldBrushStyle : TBrushStyle;
+
 begin
   if not Assigned (FCanvas) then
     raise EVpCanvasError.Create (RSNoCanvas);
@@ -1035,7 +1035,7 @@ begin
     OldBrushStyle := FCanvas.Brush.Style;       
     try
       FCanvas.Brush.Style := bsClear;
-      FCanvas.TextOut(RealPoint.X,RealPoint.Y,Text);
+      FCanvas.TextOut (RealPoint.X, RealPoint.Y, Text);
     finally
       FCanvas.Brush.Style := OldBrushStyle;
     end;
@@ -1044,26 +1044,6 @@ begin
   end;
 end;
 
-procedure DrawTextW(Canvas: TCanvas; lpString: PWideChar; var lpRect: TRect; uFormat: Cardinal;
-  AdjustRight: Boolean);
-var Style:TTextStyle;
-begin
-  {$ifndef WINCE}
-    {$ifdef UNIX}
-      {$ifdef LCLgtk}
-        Style.Layout:=tlCenter;
-        Canvas.TextRect(lpRect,lpRect.Left,lpRect.Top,lpString,Style); // theo 24.2.2007 Gibt sonst Striche auf GTK1
-      {$else}
-        DrawTextW(Canvas.Handle, lpString, Length(lpString), lpRect, uFormat, AdjustRight);
-      {$endif}
-    {$else}
-    Canvas.TextOut(lpRect.Left,lpRect.Top,lpString);
-    {$endif}
-  {$else}
-  Canvas.TextOut(lpRect.Left,lpRect.Top,lpString);
-  {$endif}
-end;
-
 function TVpExCanvas.ViewportWidth : Integer;
 var
   FixRect : TRect;

components/tvplanit/source/vpevnteditdlg.lfm

@@ -534,6 +534,7 @@ object DlgEventEdit: TDlgEventEdit
       Height = 23
       Top = 168
       Width = 64
+      OnChange = AlarmAdvanceChange
       TabOrder = 14
       Text = 'AlarmAdvance'
     end

components/tvplanit/source/vpevnteditdlg.lrs

@@ -351,9 +351,9 @@ LazarusResources.Add('TDlgEventEdit','FORMDATA',[
   +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
   +#255#255#0#255#255#255#0#255#255#255#0#9'NumGlyphs'#2#1#8'TabOrder'#2#13#0#0
   +#5'TEdit'#12'AlarmAdvance'#4'Left'#3#130#0#6'Height'#2#23#3'Top'#3#168#0#5'W'
-  +'idth'#2'@'#8'TabOrder'#2#14#4'Text'#6#12'AlarmAdvance'#0#0#0#5'TMemo'#9'Not'
+  +'idth'#2'@'#8'OnChange'#7#18'AlarmAdvanceChange'#8'TabOrder'#2#14#4'Text'#6
-  +'esMemo'#4'Left'#2#8#6'Height'#2'n'#3'Top'#3#224#0#5'Width'#3#167#2#7'Anchor'
+  +#12'AlarmAdvance'#0#0#0#5'TMemo'#9'NotesMemo'#4'Left'#2#8#6'Height'#2'n'#3'T'
-  +'s'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#10'ScrollBars'#7#10'ssVer'
+  +'op'#3#224#0#5'Width'#3#167#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8
-  +'tical'#8'TabOrder'#2#2#0#0#11'TOpenDialog'#10'FileDialog'#4'left'#3'd'#1#3
+  +'akBottom'#0#10'ScrollBars'#7#10'ssVertical'#8'TabOrder'#2#2#0#0#11'TOpenDia'
-  +'top'#3#199#0#0#0#0
+  +'log'#10'FileDialog'#4'left'#3'd'#1#3'top'#3#199#0#0#0#0
 ]);