diff --git a/applications/foobot/monitor/foobotmonitor.lps b/applications/foobot/monitor/foobotmonitor.lps index ed9f3bc74..101a9889f 100644 --- a/applications/foobot/monitor/foobotmonitor.lps +++ b/applications/foobot/monitor/foobotmonitor.lps @@ -10,7 +10,7 @@ - + @@ -19,9 +19,10 @@ - - - + + + + @@ -33,7 +34,7 @@ - + @@ -43,7 +44,7 @@ - + @@ -52,7 +53,7 @@ - + @@ -60,7 +61,7 @@ - + @@ -70,16 +71,15 @@ - + - - - - + + + @@ -230,119 +230,127 @@ - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - + + + + + + - + + + + + + + + + diff --git a/applications/foobot/monitor/innosetup/setup_foobotmonitor.exe b/applications/foobot/monitor/innosetup/setup_foobotmonitor.exe index b708d6a6f..6a2eb41ae 100644 Binary files a/applications/foobot/monitor/innosetup/setup_foobotmonitor.exe and b/applications/foobot/monitor/innosetup/setup_foobotmonitor.exe differ diff --git a/applications/foobot/monitor/linuxbinaries/foobotmonitor.zip b/applications/foobot/monitor/linuxbinaries/foobotmonitor.zip index 2fb49579a..a9fbc8327 100644 Binary files a/applications/foobot/monitor/linuxbinaries/foobotmonitor.zip and b/applications/foobot/monitor/linuxbinaries/foobotmonitor.zip differ diff --git a/applications/foobot/monitor/umainform.lfm b/applications/foobot/monitor/umainform.lfm index 0f7eaa4e0..d3a050bb0 100644 --- a/applications/foobot/monitor/umainform.lfm +++ b/applications/foobot/monitor/umainform.lfm @@ -419,37 +419,44 @@ object mainform: Tmainform AutoCheck = True Caption = 'Half-Hour' GroupIndex = 1 + RadioItem = True OnClick = mnu_SampleEveryHalfHourClick end object mnu_SampleEvery1Hour: TMenuItem AutoCheck = True Caption = 'Hour (default)' Checked = True + Default = True GroupIndex = 1 + RadioItem = True OnClick = mnu_SampleEvery1HourClick end object mnu_SampleEvery2Hours: TMenuItem AutoCheck = True Caption = '2 Hours' GroupIndex = 1 + RadioItem = True OnClick = mnu_SampleEvery2HoursClick end object mnu_SampleEvery4Hours: TMenuItem AutoCheck = True Caption = '4 Hours' GroupIndex = 1 + RadioItem = True OnClick = mnu_SampleEvery4HoursClick end object mnu_SampleEvery8Hours: TMenuItem AutoCheck = True Caption = '8 Hours' GroupIndex = 1 + RadioItem = True OnClick = mnu_SampleEvery8HoursClick end object mnu_SampleEvery24Hours: TMenuItem AutoCheck = True Caption = '24 Hours' GroupIndex = 1 + RadioItem = True OnClick = mnu_SampleEvery24HoursClick end end diff --git a/applications/foobot/monitor/umainform.pas b/applications/foobot/monitor/umainform.pas index ed3ffe8e8..e82340658 100644 --- a/applications/foobot/monitor/umainform.pas +++ b/applications/foobot/monitor/umainform.pas @@ -220,11 +220,13 @@ begin end; INI.SectionHashing := False; ResetHighLows; - iFudgeFactor := 20; // only needed if height set here + iFudgeFactor := 20; // only needed if height set in form.create bDisplayGuagesOnly := False; - bDisplayYellowLines := False; + INI.PlainTextMode:=TRUE; + bDisplayYellowLines := INI.ReadBool('Config','DisplayYellowLines',False); + bDisplayRedLines := INI.ReadBool('Config','DisplayRedLines',False); + INI.PlainTextMode:=FALSE; SetYellowRecommendedLevels; - bDisplayRedLines := False; SetRedSessionMax; TrayIcon1.Icon := Application.Icon; TrayIcon1.Hint := Application.Title; @@ -336,6 +338,8 @@ begin INI.WriteFloat('Config', 'vocMaxValue', as_voc.ValueMax); INI.WriteFloat('Config', 'allpolluMinValue', as_allpollu.ValueMin); INI.WriteFloat('Config', 'allpolluMaxValue', as_allpollu.ValueMax); + INI.WriteBool('Config','DisplayYellowLines',bDisplayYellowLines); + INI.WriteBool('Config','DisplayRedLines',bDisplayRedLines); INI.PlainTextMode := False; end;