diff --git a/components/longtimer/demo/longtimerdemo.ico b/components/longtimer/demo/longtimerdemo.ico index 0341321b5..0962c4679 100644 Binary files a/components/longtimer/demo/longtimerdemo.ico and b/components/longtimer/demo/longtimerdemo.ico differ diff --git a/components/longtimer/demo/longtimerdemo.lpi b/components/longtimer/demo/longtimerdemo.lpi index 347c7a88a..beb279bf7 100644 --- a/components/longtimer/demo/longtimerdemo.lpi +++ b/components/longtimer/demo/longtimerdemo.lpi @@ -9,14 +9,16 @@ <ResourceType Value="res"/> <UseXPManifest Value="True"/> + <XPManifest> + <DpiAware Value="True"/> + <ExecutionLevel Value="1"/> + <UIAccess Value="True"/> + </XPManifest> <Icon Value="0"/> </General> <i18n> <EnableI18N LFM="False"/> </i18n> - <VersionInfo> - <StringTable ProductVersion=""/> - </VersionInfo> <BuildModes Count="3"> <Item1 Name="Default" Default="True"/> <Item2 Name="Debug"> @@ -56,10 +58,7 @@ </Options> </Linking> <Other> - <CompilerMessages> - <MsgFileName Value=""/> - </CompilerMessages> - <CompilerPath Value="$(CompPath)"/> + <CustomOptions Value="-dDEBUG"/> </Other> </CompilerOptions> </Item2> @@ -92,12 +91,6 @@ </Win32> </Options> </Linking> - <Other> - <CompilerMessages> - <MsgFileName Value=""/> - </CompilerMessages> - <CompilerPath Value="$(CompPath)"/> - </Other> </CompilerOptions> </Item3> </BuildModes> @@ -122,7 +115,6 @@ <Unit0> <Filename Value="longtimerdemo.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="longtimerdemo"/> </Unit0> <Unit1> <Filename Value="umainform.pas"/> @@ -130,7 +122,6 @@ <ComponentName Value="mainform"/> <HasResources Value="True"/> <ResourceBaseClass Value="Form"/> - <UnitName Value="umainform"/> </Unit1> </Units> </ProjectOptions> @@ -151,12 +142,6 @@ </Win32> </Options> </Linking> - <Other> - <CompilerMessages> - <MsgFileName Value=""/> - </CompilerMessages> - <CompilerPath Value="$(CompPath)"/> - </Other> </CompilerOptions> <Debugging> <Exceptions Count="3"> diff --git a/components/longtimer/demo/longtimerdemo.res b/components/longtimer/demo/longtimerdemo.res index 7c6cf3e4b..426ac653a 100644 Binary files a/components/longtimer/demo/longtimerdemo.res and b/components/longtimer/demo/longtimerdemo.res differ diff --git a/components/longtimer/demo/umainform.lfm b/components/longtimer/demo/umainform.lfm index 641dee9b9..598c726ce 100644 --- a/components/longtimer/demo/umainform.lfm +++ b/components/longtimer/demo/umainform.lfm @@ -11,7 +11,7 @@ object mainform: Tmainform DefaultMonitor = dmPrimary OnCreate = FormCreate Position = poScreenCenter - LCLVersion = '1.2.4.0' + LCLVersion = '1.7' object cmd_Close: TBitBtn Left = 104 Height = 30 @@ -30,6 +30,8 @@ object mainform: Tmainform Lines.Strings = ( 'Memo1' ) + ReadOnly = True + ScrollBars = ssAutoVertical TabOrder = 1 end object cmd_StopTimer: TButton @@ -56,10 +58,9 @@ object mainform: Tmainform Top = 8 Width = 184 Caption = 'Set up LongTimer' - ClientHeight = 158 + ClientHeight = 156 ClientWidth = 180 TabOrder = 4 - OnClick = crp_SetTimerClick object Label1: TLabel Left = 16 Height = 15 @@ -146,6 +147,17 @@ object mainform: Tmainform ParentColor = False end end + object cmd_clearmemo: TBitBtn + Left = 16 + Height = 30 + Top = 224 + Width = 75 + Caption = 'Clear' + Kind = bkCancel + ModalResult = 2 + OnClick = cmd_clearmemoClick + TabOrder = 5 + end object LongTimer1: TLongTimer About.Description.Strings = ( 'LongTimer is a descendent of TIdleTimer'#13#10'and shares its properties and methods.'#13#10#13#10'Additional properties affect when the'#13#10'OnTimer event is fired.'#13#10#13#10'With LongTimer, the OnTimer event'#13#10'will be fired only ONCE - every time'#13#10'the interval that you set is reached.' diff --git a/components/longtimer/demo/umainform.pas b/components/longtimer/demo/umainform.pas index d933ae6c1..215020a1c 100644 --- a/components/longtimer/demo/umainform.pas +++ b/components/longtimer/demo/umainform.pas @@ -11,6 +11,7 @@ uses { Tmainform } type Tmainform = class(TForm) + cmd_clearmemo: TBitBtn; cmb_Daily24Hour: TComboBox; cmb_IntervalType: TComboBox; cmb_weekordate: TComboBox; @@ -25,13 +26,13 @@ type Label4: TLabel; LongTimer1: TLongTimer; memo_ReportTimerEvent: TMemo; + procedure cmd_clearmemoClick(Sender: TObject); procedure cmb_SampleIntervalChange(Sender: TObject); procedure cmd_StopTimerClick(Sender: TObject); procedure cmd_StartTimerClick(Sender: TObject); procedure cmb_Daily24HourChange(Sender: TObject); procedure cmb_IntervalTypeChange(Sender: TObject); procedure cmb_weekordateChange(Sender: TObject); - procedure crp_SetTimerClick(Sender: TObject); procedure FormCreate(Sender: TObject); procedure LongTimer1Sample(Sender: TObject); procedure LongTimer1StartTimer(Sender: TObject); @@ -39,7 +40,7 @@ type procedure LongTimer1Timer(Sender: TObject); private { private declarations } - procedure PopulateWeekOrDate(Const i:Integer); + procedure PopulateWeekOrDate(const i: integer); public { public declarations } @@ -58,21 +59,23 @@ procedure Tmainform.LongTimer1Timer(Sender: TObject); begin // memo_ReportTimerEvent.Lines.Add('LastFired at ' + FormatDateTime('hh:nn:ss', LongTimer1.LastFired)); memo_ReportTimerEvent.Lines.Add('Timer fired at ' + FormatDateTime('hh:nn:ss dd-mm-yyyy', Now)); + //memo_ReportTimerEvent.Lines.Add(LongTimer1.fDebugString); + end; procedure Tmainform.FormCreate(Sender: TObject); -Var i:Integer; +var i: integer; begin - Caption:=Application.Title; + Caption := Application.Title; memo_ReportTimerEvent.Clear; cmb_Daily24Hour.Clear; cmb_Daily24Hour.Items.Add('Midnight'); - For i:=1 to 23 do - cmb_Daily24Hour.Items.Add(Format('%2.d:00',[i])); - LongTimer1.IntervalType:=lt1Daily; - LongTimer1.Daily24Hour:=0; - LongTimer1.Enabled:=FALSE; - cmb_Daily24Hour.ItemIndex:=0; + for i := 1 to 23 do + cmb_Daily24Hour.Items.Add(Format('%2.d:00', [i])); + LongTimer1.IntervalType := lt1Daily; + LongTimer1.Daily24Hour := 0; + LongTimer1.Enabled := False; + cmb_Daily24Hour.ItemIndex := 0; cmb_SampleInterval.Clear; cmb_SampleInterval.Items.Add('Every minute'); cmb_SampleInterval.Items.Add('Every 5 minutes'); @@ -80,54 +83,59 @@ begin cmb_SampleInterval.Items.Add('Every 30 minutes'); cmb_SampleInterval.Items.Add('Every 45 minutes'); memo_ReportTimerEvent.Lines.Add('Timer initially disabled'); - cmb_SampleInterval.ItemIndex:=2; + cmb_SampleInterval.ItemIndex := 2; end; procedure Tmainform.LongTimer1Sample(Sender: TObject); begin - memo_ReportTimerEvent.Lines.Add('Sampled at ' + FormatDateTime('hh:nn:ss',Now)); + memo_ReportTimerEvent.Lines.Add('Sampled at ' + FormatDateTime('hh:nn:ss', Now)); + //memo_ReportTimerEvent.Lines.Add(LongTimer1.fDebugString); end; procedure Tmainform.LongTimer1StartTimer(Sender: TObject); begin - Self.Caption:='Timer was started at ' + FormatDateTime('dd/mm/yyyy hh:nn:ss',Now); + Self.Caption := 'Timer was started at ' + FormatDateTime('dd/mm/yyyy hh:nn:ss', Now); end; procedure Tmainform.LongTimer1StopTimer(Sender: TObject); begin - Self.Caption:=Application.Title; + Self.Caption := Application.Title; end; procedure Tmainform.cmd_StopTimerClick(Sender: TObject); begin - LongTimer1.Enabled:=FALSE; + LongTimer1.Enabled := False; memo_ReportTimerEvent.Lines.Add('Timer disabled'); end; procedure Tmainform.cmb_SampleIntervalChange(Sender: TObject); begin - LongTimer1.SampleInterval:=TSampleInterval(cmb_SampleInterval.ItemIndex); + LongTimer1.SampleInterval := TSampleInterval(cmb_SampleInterval.ItemIndex); +end; + +procedure Tmainform.cmd_clearmemoClick(Sender: TObject); +begin + memo_ReportTimerEvent.Lines.Clear; end; procedure Tmainform.cmd_StartTimerClick(Sender: TObject); begin - LongTimer1.Enabled:=TRUE; - memo_ReportTimerEvent.Lines.Add('Timer enabled'); - + LongTimer1.Enabled := True; + memo_ReportTimerEvent.Lines.Add('Timer enabled'); end; procedure Tmainform.cmb_Daily24HourChange(Sender: TObject); begin - LongTimer1.Daily24Hour:=cmb_Daily24Hour.ItemIndex; + LongTimer1.Daily24Hour := cmb_Daily24Hour.ItemIndex; end; -procedure Tmainform.PopulateWeekOrDate(const i: Integer); +procedure Tmainform.PopulateWeekOrDate(const i: integer); // 0=Weekly, 1=Monthly -Var iMonthDay:Integer; +var iMonthDay: integer; begin cmb_weekordate.Clear; - Case i of - 0:begin + case i of + 0: begin cmb_weekordate.Items.Add('Monday'); cmb_weekordate.Items.Add('Tuesday'); cmb_weekordate.Items.Add('Wednesday'); @@ -135,51 +143,46 @@ begin cmb_weekordate.Items.Add('Friday'); cmb_weekordate.Items.Add('Saturday'); cmb_weekordate.Items.Add('Sunday'); - end; - 1:begin - For iMonthDay := 1 to 31 do - cmb_weekordate.Items.Add(Format('%2.d',[iMonthDay])); - end; - end; - cmb_weekordate.ItemIndex:=0; + end; + 1: begin + for iMonthDay := 1 to 31 do + cmb_weekordate.Items.Add(Format('%2.d', [iMonthDay])); + end; + end; + cmb_weekordate.ItemIndex := 0; end; procedure Tmainform.cmb_IntervalTypeChange(Sender: TObject); begin cmd_StopTimer.Click; - Case cmb_IntervalType.ItemIndex of - 0: - begin - LongTimer1.IntervalType:=lt1Daily; - cmb_weekordate.Enabled:=FALSE; - end; - 1: - begin - LongTimer1.IntervalType:=lt2Weekly; - PopulateWeekOrDate(0); - cmb_weekordate.Enabled:=TRUE; - end; - 2: - begin - LongTimer1.IntervalType:=lt3Monthly; - PopulateWeekOrDate(1); - cmb_weekordate.Enabled:=TRUE; - end; + case cmb_IntervalType.ItemIndex of + 0: + begin + LongTimer1.IntervalType := lt1Daily; + cmb_weekordate.Enabled := False; + end; + 1: + begin + LongTimer1.IntervalType := lt2Weekly; + PopulateWeekOrDate(0); + cmb_weekordate.Enabled := True; + end; + 2: + begin + LongTimer1.IntervalType := lt3Monthly; + PopulateWeekOrDate(1); + cmb_weekordate.Enabled := True; + end; end; end; procedure Tmainform.cmb_weekordateChange(Sender: TObject); begin - Case LongTimer1.IntervalType of - lt2Weekly:LongTimer1.WeeklyDay:=TDay(cmb_weekordate.ItemIndex); - lt3Monthly:LongTimer1.MonthlyDate:=(cmb_weekordate.ItemIndex+1); + case LongTimer1.IntervalType of + lt2Weekly: LongTimer1.WeeklyDay := TDay(cmb_weekordate.ItemIndex); + lt3Monthly: LongTimer1.MonthlyDate := (cmb_weekordate.ItemIndex + 1); end; end; -procedure Tmainform.crp_SetTimerClick(Sender: TObject); -begin - -end; - end. - \ No newline at end of file +