To 0.1.3.0 Splash screen added

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5602 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
gbamber
2017-01-06 19:34:23 +00:00
parent c18b3d9808
commit 95f0041020
8 changed files with 169 additions and 92 deletions

View File

@ -16,11 +16,14 @@
<TextDesc Value="Your application description."/> <TextDesc Value="Your application description."/>
</XPManifest> </XPManifest>
<Icon Value="0"/> <Icon Value="0"/>
<Resources Count="1">
<Resource_0 FileName="splashimage.jpg" Type="RCDATA" ResourceName="SPLASHIMAGE"/>
</Resources>
</General> </General>
<VersionInfo> <VersionInfo>
<UseVersionInfo Value="True"/> <UseVersionInfo Value="True"/>
<MinorVersionNr Value="1"/> <MinorVersionNr Value="1"/>
<RevisionNr Value="2"/> <RevisionNr Value="3"/>
<StringTable Comments="Uses Foobot public API to query Foobot #1" FileDescription="Monitor for Foobot" InternalName="foobotmonitor" LegalCopyright="(c)2016 minesadorada@charcodelvalle.com" LegalTrademarks="Foobot" ProductName="Foobot" ProductVersion="0.0.0.0"/> <StringTable Comments="Uses Foobot public API to query Foobot #1" FileDescription="Monitor for Foobot" InternalName="foobotmonitor" LegalCopyright="(c)2016 minesadorada@charcodelvalle.com" LegalTrademarks="Foobot" ProductName="Foobot" ProductVersion="0.0.0.0"/>
</VersionInfo> </VersionInfo>
<BuildModes Count="6"> <BuildModes Count="6">
@ -209,7 +212,7 @@
<PackageName Value="LCL"/> <PackageName Value="LCL"/>
</Item4> </Item4>
</RequiredPackages> </RequiredPackages>
<Units Count="8"> <Units Count="9">
<Unit0> <Unit0>
<Filename Value="foobotmonitor.lpr"/> <Filename Value="foobotmonitor.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
@ -248,6 +251,12 @@
<Filename Value="foobot_sensors.pas"/> <Filename Value="foobot_sensors.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit7> </Unit7>
<Unit8>
<Filename Value="usplash.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="splashform"/>
<ResourceBaseClass Value="Form"/>
</Unit8>
</Units> </Units>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>

View File

@ -15,7 +15,7 @@ uses
cthreads, cthreads,
{$ENDIF}{$ENDIF} {$ENDIF}{$ENDIF}
Interfaces, // this includes the LCL widgetset Interfaces, // this includes the LCL widgetset
Forms, tachartlazaruspkg, umainform, uconfigform, foobot_sensors Forms, usplash, tachartlazaruspkg, umainform, uconfigform, foobot_sensors
{ you can add units after this }; { you can add units after this };
{$R *.res} {$R *.res}
@ -24,6 +24,9 @@ begin
Application.Title:='Foobot monitor'; Application.Title:='Foobot monitor';
RequireDerivedFormResource:=True; RequireDerivedFormResource:=True;
Application.Initialize; Application.Initialize;
SplashForm := TSplashForm.Create(Application);
SplashForm.Show;
Application.ProcessMessages; // process splash paint message
Application.CreateForm(Tmainform, mainform); Application.CreateForm(Tmainform, mainform);
Application.CreateForm(Tconfigform, configform); Application.CreateForm(Tconfigform, configform);
Application.Run; Application.Run;

View File

@ -3,14 +3,14 @@
<ProjectSession> <ProjectSession>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Version Value="10"/> <Version Value="10"/>
<BuildModes Active="win32GTK2"/> <BuildModes Active="linux64"/>
<Units Count="28"> <Units Count="32">
<Unit0> <Unit0>
<Filename Value="foobotmonitor.lpr"/> <Filename Value="foobotmonitor.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="11"/> <EditorIndex Value="14"/>
<CursorPos X="33" Y="25"/> <CursorPos Y="31"/>
<UsageCount Value="87"/> <UsageCount Value="94"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
@ -19,10 +19,9 @@
<ComponentName Value="mainform"/> <ComponentName Value="mainform"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/> <TopLine Value="272"/>
<TopLine Value="200"/> <CursorPos X="36" Y="280"/>
<CursorPos X="23" Y="227"/> <UsageCount Value="94"/>
<UsageCount Value="87"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
</Unit1> </Unit1>
@ -32,9 +31,10 @@
<ComponentName Value="configform"/> <ComponentName Value="configform"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<EditorIndex Value="5"/> <EditorIndex Value="8"/>
<CursorPos X="2" Y="20"/> <TopLine Value="33"/>
<UsageCount Value="77"/> <CursorPos Y="89"/>
<UsageCount Value="84"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit2> </Unit2>
<Unit3> <Unit3>
@ -44,7 +44,7 @@
<WindowIndex Value="-1"/> <WindowIndex Value="-1"/>
<TopLine Value="-1"/> <TopLine Value="-1"/>
<CursorPos X="-1" Y="-1"/> <CursorPos X="-1" Y="-1"/>
<UsageCount Value="69"/> <UsageCount Value="76"/>
</Unit3> </Unit3>
<Unit4> <Unit4>
<Filename Value="..\foobot_objects.pas"/> <Filename Value="..\foobot_objects.pas"/>
@ -53,15 +53,15 @@
<WindowIndex Value="-1"/> <WindowIndex Value="-1"/>
<TopLine Value="-1"/> <TopLine Value="-1"/>
<CursorPos X="-1" Y="-1"/> <CursorPos X="-1" Y="-1"/>
<UsageCount Value="69"/> <UsageCount Value="76"/>
</Unit4> </Unit4>
<Unit5> <Unit5>
<Filename Value="..\foobot_utility.pas"/> <Filename Value="..\foobot_utility.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="8"/> <EditorIndex Value="11"/>
<TopLine Value="34"/> <TopLine Value="34"/>
<CursorPos X="18" Y="83"/> <CursorPos X="18" Y="83"/>
<UsageCount Value="87"/> <UsageCount Value="94"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit5> </Unit5>
<Unit6> <Unit6>
@ -71,30 +71,30 @@
<WindowIndex Value="-1"/> <WindowIndex Value="-1"/>
<TopLine Value="-1"/> <TopLine Value="-1"/>
<CursorPos X="-1" Y="-1"/> <CursorPos X="-1" Y="-1"/>
<UsageCount Value="69"/> <UsageCount Value="76"/>
</Unit6> </Unit6>
<Unit7> <Unit7>
<Filename Value="foobot_sensors.pas"/> <Filename Value="foobot_sensors.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="2"/> <EditorIndex Value="5"/>
<TopLine Value="299"/> <TopLine Value="299"/>
<CursorPos X="14" Y="321"/> <CursorPos X="14" Y="321"/>
<UsageCount Value="21"/> <UsageCount Value="28"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit7> </Unit7>
<Unit8> <Unit8>
<Filename Value="..\latest_stable\foobot_httpclient.pas"/> <Filename Value="..\latest_stable\foobot_httpclient.pas"/>
<EditorIndex Value="6"/> <EditorIndex Value="9"/>
<TopLine Value="43"/> <TopLine Value="43"/>
<CursorPos X="47" Y="13"/> <CursorPos X="47" Y="13"/>
<UsageCount Value="59"/> <UsageCount Value="63"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit8> </Unit8>
<Unit9> <Unit9>
<Filename Value="..\latest_stable\foobot_objects.pas"/> <Filename Value="..\latest_stable\foobot_objects.pas"/>
<EditorIndex Value="10"/> <EditorIndex Value="13"/>
<CursorPos X="32" Y="61"/> <CursorPos X="32" Y="61"/>
<UsageCount Value="59"/> <UsageCount Value="63"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit9> </Unit9>
<Unit10> <Unit10>
@ -127,10 +127,10 @@
</Unit13> </Unit13>
<Unit14> <Unit14>
<Filename Value="..\umainform.pas"/> <Filename Value="..\umainform.pas"/>
<EditorIndex Value="7"/> <EditorIndex Value="10"/>
<TopLine Value="284"/> <TopLine Value="284"/>
<CursorPos X="38" Y="313"/> <CursorPos X="38" Y="313"/>
<UsageCount Value="39"/> <UsageCount Value="43"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit14> </Unit14>
<Unit15> <Unit15>
@ -163,10 +163,10 @@
<Unit19> <Unit19>
<Filename Value="C:\trunklatest\lazarus\ide\lazarus.pp"/> <Filename Value="C:\trunklatest\lazarus\ide\lazarus.pp"/>
<UnitName Value="Lazarus"/> <UnitName Value="Lazarus"/>
<EditorIndex Value="3"/> <EditorIndex Value="6"/>
<TopLine Value="101"/> <TopLine Value="101"/>
<CursorPos Y="154"/> <CursorPos Y="154"/>
<UsageCount Value="10"/> <UsageCount Value="14"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit19> </Unit19>
<Unit20> <Unit20>
@ -192,25 +192,25 @@
</Unit22> </Unit22>
<Unit23> <Unit23>
<Filename Value="C:\trunklatest\fpc\packages\rtl-objpas\src\inc\dateutil.inc"/> <Filename Value="C:\trunklatest\fpc\packages\rtl-objpas\src\inc\dateutil.inc"/>
<EditorIndex Value="9"/> <EditorIndex Value="12"/>
<TopLine Value="381"/> <TopLine Value="381"/>
<CursorPos X="24" Y="409"/> <CursorPos X="24" Y="409"/>
<UsageCount Value="28"/> <UsageCount Value="32"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit23> </Unit23>
<Unit24> <Unit24>
<Filename Value="..\latest_stable\udataform.pas"/> <Filename Value="..\latest_stable\udataform.pas"/>
<EditorIndex Value="4"/> <EditorIndex Value="7"/>
<TopLine Value="70"/> <TopLine Value="70"/>
<UsageCount Value="28"/> <UsageCount Value="32"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit24> </Unit24>
<Unit25> <Unit25>
<Filename Value="D:\lazarustrunk\common_components\cryptini\ucryptini.pas"/> <Filename Value="D:\lazarustrunk\common_components\cryptini\ucryptini.pas"/>
<EditorIndex Value="1"/> <EditorIndex Value="4"/>
<TopLine Value="781"/> <TopLine Value="781"/>
<CursorPos X="28" Y="795"/> <CursorPos X="28" Y="795"/>
<UsageCount Value="13"/> <UsageCount Value="17"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit25> </Unit25>
<Unit26> <Unit26>
@ -226,6 +226,43 @@
<CursorPos X="18" Y="11"/> <CursorPos X="18" Y="11"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit27> </Unit27>
<Unit28>
<Filename Value="..\..\..\components\poweredby\latest_stable\upoweredby.pas"/>
<UnitName Value="uPoweredby"/>
<EditorIndex Value="3"/>
<TopLine Value="190"/>
<CursorPos X="33" Y="205"/>
<UsageCount Value="14"/>
<Loaded Value="True"/>
</Unit28>
<Unit29>
<Filename Value="usplash.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="splashform"/>
<ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/>
<CursorPos X="21" Y="35"/>
<UsageCount Value="23"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
</Unit29>
<Unit30>
<Filename Value="C:\trunklatest\lazarus\lcl\include\customform.inc"/>
<EditorIndex Value="-1"/>
<TopLine Value="2228"/>
<CursorPos X="14" Y="2239"/>
<UsageCount Value="10"/>
</Unit30>
<Unit31>
<Filename Value="C:\trunklatest\lazarus\lcl\graphics.pp"/>
<UnitName Value="Graphics"/>
<EditorIndex Value="2"/>
<TopLine Value="1811"/>
<CursorPos X="13" Y="1834"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit31>
</Units> </Units>
<OtherDefines Count="1"> <OtherDefines Count="1">
<Define0 Value="DEBUGMODE"/> <Define0 Value="DEBUGMODE"/>
@ -233,123 +270,122 @@
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="373" Column="11" TopLine="351"/> <Caret Line="208" TopLine="186"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="umainform.pas"/> <Filename Value="foobotmonitor.lpr"/>
<Caret Line="292" Column="24" TopLine="248"/> <Caret Line="29"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="286" Column="21" TopLine="283"/> <Caret Line="43" Column="28" TopLine="16"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="58" Column="29" TopLine="35"/> <Caret Line="207" TopLine="180"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="347" Column="40" TopLine="311"/> <Caret Line="209" TopLine="182"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="D:\lazarustrunk\common_components\cryptini\ucryptini.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="795" Column="28" TopLine="781"/> <Caret Line="311" Column="24" TopLine="309"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="646" Column="114" TopLine="641"/> <Caret Line="41" Column="49" TopLine="21"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="434" Column="3" TopLine="434"/> <Caret Line="255" Column="31" TopLine="235"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="48" Column="11" TopLine="34"/> <Caret Line="256" Column="31" TopLine="236"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="79" Column="15" TopLine="59"/> <Caret Line="255" Column="31" TopLine="235"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="434" Column="3" TopLine="432"/> <Caret Line="248" Column="31" TopLine="235"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="435" Column="3" TopLine="433"/> <Caret Line="247" Column="31" TopLine="234"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="436" Column="3" TopLine="434"/> <Caret Line="280" Column="25" TopLine="234"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="443" TopLine="441"/> <Caret Line="201" Column="13" TopLine="174"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="umainform.pas"/> <Filename Value="foobotmonitor.lpr"/>
<Caret Line="179" Column="43" TopLine="156"/> <Caret Line="18" Column="77"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="umainform.pas"/> <Filename Value="foobotmonitor.lpr"/>
<Caret Line="180" Column="60" TopLine="167"/> <Caret Line="26" Column="22"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="umainform.pas"/> <Filename Value="foobotmonitor.lpr"/>
<Caret Line="648" TopLine="627"/> <Caret Line="29"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="umainform.pas"/> <Filename Value="foobotmonitor.lpr"/>
<Caret Line="669" Column="41" TopLine="664"/> <Caret Line="30" Column="17"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="umainform.pas"/> <Filename Value="foobotmonitor.lpr"/>
<Caret Line="188" Column="29" TopLine="166"/> <Caret Line="28" Column="35"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="umainform.pas"/> <Filename Value="usplash.pas"/>
<Caret Line="425" Column="3" TopLine="423"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="415" Column="5" TopLine="413"/> <Caret Line="281" Column="26" TopLine="245"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="umainform.pas"/> <Filename Value="usplash.pas"/>
<Caret Line="439" Column="3" TopLine="437"/> <Caret Line="33" Column="3"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="umainform.pas"/> <Filename Value="usplash.pas"/>
<Caret Line="548" Column="26" TopLine="546"/> <Caret Line="16" Column="33"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="umainform.pas"/> <Filename Value="usplash.pas"/>
<Caret Line="563" TopLine="534"/> <Caret Line="35" Column="49"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="D:\lazarustrunk\common_components\cryptini\ucryptini.pas"/> <Filename Value="usplash.pas"/>
<Caret Line="795" Column="28" TopLine="781"/> <Caret Line="34" Column="49"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="C:\trunklatest\lazarus\ide\lazarus.pp"/> <Filename Value="usplash.pas"/>
<Caret Line="154" TopLine="111"/> <Caret Line="37" Column="37"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="umainform.pas"/> <Filename Value="usplash.pas"/>
<Caret Line="563" Column="28" TopLine="561"/> <Caret Line="38" Column="12"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="umainform.pas"/> <Filename Value="usplash.pas"/>
<Caret Line="424" Column="29" TopLine="195"/> <Caret Line="33" Column="32"/>
</Position28> </Position28>
<Position29> <Position29>
<Filename Value="umainform.pas"/> <Filename Value="usplash.pas"/>
<Caret Line="223" Column="66" TopLine="219"/> <Caret Line="24" Column="41"/>
</Position29> </Position29>
<Position30> <Position30>
<Filename Value="umainform.pas"/> <Filename Value="usplash.pas"/>
<Caret Line="342" Column="24" TopLine="319"/> <Caret Line="34" Column="30"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>
</ProjectSession> </ProjectSession>

View File

@ -9,7 +9,7 @@
[Setup] [Setup]
AppName=Foobot Monitor AppName=Foobot Monitor
AppVersion=0.1.2.0 AppVersion=0.1.3.0
DefaultDirName={pf}\foobotmonitor DefaultDirName={pf}\foobotmonitor
DefaultGroupName=Foobot DefaultGroupName=Foobot
UninstallDisplayIcon={app}\foobotmonitor.exe UninstallDisplayIcon={app}\foobotmonitor.exe

View File

@ -1,7 +1,7 @@
object mainform: Tmainform object mainform: Tmainform
Left = 583 Left = 1072
Height = 451 Height = 451
Top = 174 Top = 245
Width = 784 Width = 784
BorderIcons = [biSystemMenu, biMinimize] BorderIcons = [biSystemMenu, biMinimize]
BorderStyle = bsSingle BorderStyle = bsSingle
@ -14,6 +14,7 @@ object mainform: Tmainform
OnClose = FormClose OnClose = FormClose
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
OnShow = FormShow
OnWindowStateChange = FormWindowStateChange OnWindowStateChange = FormWindowStateChange
Position = poWorkAreaCenter Position = poWorkAreaCenter
ShowInTaskBar = stNever ShowInTaskBar = stNever

View File

@ -38,9 +38,9 @@ V0.1.2.0: ??
interface interface
uses uses
SysUtils, TAGraph, TAIntervalSources, TASeries, SysUtils, TAGraph, TAIntervalSources, TASeries, foobot_sensors,
foobot_sensors, Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls, Menus, Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls, Menus, lclIntf,
lclIntf, foobot_utility, uCryptIni, dateutils, uconfigform, Classes; foobot_utility, uCryptIni, dateutils, uconfigform, Classes;
const const
// Timer milliseconds // Timer milliseconds
@ -150,10 +150,12 @@ type
traypopup: TPopupMenu; traypopup: TPopupMenu;
tmr_foobot: TTimer; tmr_foobot: TTimer;
TrayIcon1: TTrayIcon; TrayIcon1: TTrayIcon;
procedure ApplicationProperties1IdleEnd(Sender: TObject);
procedure FormActivate(Sender: TObject); procedure FormActivate(Sender: TObject);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject); procedure FormDestroy(Sender: TObject);
procedure FormShow(Sender: TObject);
procedure FormWindowStateChange(Sender: TObject); procedure FormWindowStateChange(Sender: TObject);
procedure mnupopup_fileRestoreClick(Sender: TObject); procedure mnupopup_fileRestoreClick(Sender: TObject);
procedure mnu_fileExitClick(Sender: TObject); procedure mnu_fileExitClick(Sender: TObject);
@ -196,7 +198,7 @@ var
mainform: Tmainform; mainform: Tmainform;
implementation implementation
Uses uSplash;
{$R *.lfm} {$R *.lfm}
{ Tmainform } { Tmainform }
@ -240,7 +242,7 @@ var
begin begin
ClientHeight := grp_sensorDisplay.Height + grp_highlow.Height + grp_chart.Height; ClientHeight := grp_sensorDisplay.Height + grp_highlow.Height + grp_chart.Height;
Application.ProcessMessages;
// Allow user to enter values in INIFile // Allow user to enter values in INIFile
sTempFoobotUserName := INI.ReadUnencryptedString('Config', 'Foobot User', 'unknown'); sTempFoobotUserName := INI.ReadUnencryptedString('Config', 'Foobot User', 'unknown');
sTempSecretKey := INI.ReadUnencryptedString('Config', 'Secret Key', 'unknown'); sTempSecretKey := INI.ReadUnencryptedString('Config', 'Secret Key', 'unknown');
@ -256,7 +258,7 @@ begin
sSecretKey := INI.ReadString('Foobot', 'Secret Key', 'unknown'); sSecretKey := INI.ReadString('Foobot', 'Secret Key', 'unknown');
if ((sFoobotUserName <> 'unknown') and (sSecretKey <> 'unknown')) then if ((sFoobotUserName <> 'unknown') and (sSecretKey <> 'unknown')) then
begin begin
Hide; //Show;
if FetchFoobotIdentity(sFoobotUserName, sSecretKey) then if FetchFoobotIdentity(sFoobotUserName, sSecretKey) then
begin begin
if FoobotIdentityObject.FoobotIdentityList.Count > 0 then if FoobotIdentityObject.FoobotIdentityList.Count > 0 then
@ -275,16 +277,30 @@ begin
{$IFNDEF DEBUGMODE} {$IFNDEF DEBUGMODE}
tmr_foobot.Enabled := True; tmr_foobot.Enabled := True;
{$ENDIF} {$ENDIF}
// Everything OK - lets go!
Show; Show;
grp_sensorDisplay.Refresh;
grp_highlow.Refresh;
Update;
Application.Processmessages;
splashform.hide;
Application.Processmessages;
end
else
begin
// Identity.Count = 0
end; end;
end end
else else
begin // Unable to fetch foobot identity
Close; Close;
end;
end end
else else
begin begin
// No valid cfg. Show config form // No valid cfg. Show config form
Hide; Hide;
splashform.Hide;
Application.ProcessMessages; Application.ProcessMessages;
configform.ShowModal; configform.ShowModal;
// If user quit without data, then bail out // If user quit without data, then bail out
@ -301,6 +317,12 @@ begin
LineEnding + 'New settings are applied on resart.'); LineEnding + 'New settings are applied on resart.');
Close; Close;
end; end;
end;
procedure Tmainform.ApplicationProperties1IdleEnd(Sender: TObject);
begin
end; end;
procedure Tmainform.FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure Tmainform.FormClose(Sender: TObject; var CloseAction: TCloseAction);
@ -311,9 +333,15 @@ end;
procedure Tmainform.FormDestroy(Sender: TObject); procedure Tmainform.FormDestroy(Sender: TObject);
begin begin
FreeAndNil(splashform);
FreeAndNil(INI); FreeAndNil(INI);
end; end;
procedure Tmainform.FormShow(Sender: TObject);
begin
end;
procedure Tmainform.SaveConfig; procedure Tmainform.SaveConfig;
begin begin
INI.PlainTextMode := True; INI.PlainTextMode := True;