From 92a5f7dc13fda88de7f7ed1a6ffe371eb3610e23 Mon Sep 17 00:00:00 2001
From: April Ayres-Griffiths <aag6581@gmail.com>
Date: Fri, 19 Apr 2019 17:23:11 +1000
Subject: [PATCH] remove web debugger launch from ui

---
 backup/main.pas |   3 +-
 backup/poc.lps  | 384 ++++++++++++++++++++++++------------------------
 main.lfm        |  59 +++-----
 main.pas        |   3 +-
 poc.lps         |  84 +++++------
 5 files changed, 255 insertions(+), 278 deletions(-)

diff --git a/backup/main.pas b/backup/main.pas
index daeb4ed..6f968d3 100644
--- a/backup/main.pas
+++ b/backup/main.pas
@@ -1820,6 +1820,7 @@ end;
 
 procedure TGUIForm.miToolsWebDebuggerClick(Sender: TObject);
 begin
+  disableFocusStealing:= true;
   SimpleGet( baseUrl + '/api/control/debug/attach' );
 end;
 
@@ -2876,7 +2877,7 @@ var
 begin
   //StatusBar1.SimpleText := IntToStr(sbButton) + ':' + FileNames[0];
   filename := FileNames[0];
-  ext := ExtractFileExt(filename);
+  ext := LowerCase(ExtractFileExt(filename));
   case sbButton of
   0, 1: begin
              case ext of
diff --git a/backup/poc.lps b/backup/poc.lps
index 99f2a1a..72b9023 100644
--- a/backup/poc.lps
+++ b/backup/poc.lps
@@ -1,194 +1,190 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CONFIG>
-  <ProjectSession>
-    <PathDelim Value="\"/>
-    <Version Value="11"/>
-    <BuildModes Active="Default"/>
-    <Units Count="6">
-      <Unit0>
-        <Filename Value="poc.lpr"/>
-        <IsPartOfProject Value="True"/>
-        <EditorIndex Value="-1"/>
-        <WindowIndex Value="-1"/>
-        <TopLine Value="-1"/>
-        <CursorPos X="-1" Y="-1"/>
-        <UsageCount Value="323"/>
-      </Unit0>
-      <Unit1>
-        <Filename Value="main.pas"/>
-        <IsPartOfProject Value="True"/>
-        <ComponentName Value="GUIForm"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
-        <IsVisibleTab Value="True"/>
-        <TopLine Value="871"/>
-        <CursorPos X="4" Y="873"/>
-        <UsageCount Value="323"/>
-        <Loaded Value="True"/>
-        <LoadedDesigner Value="True"/>
-      </Unit1>
-      <Unit2>
-        <Filename Value="mixer.pas"/>
-        <IsPartOfProject Value="True"/>
-        <ComponentName Value="frmMixer"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="3"/>
-        <CursorPos X="26" Y="25"/>
-        <UsageCount Value="206"/>
-      </Unit2>
-      <Unit3>
-        <Filename Value="C:\lazarus\lcl\include\picture.inc"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="576"/>
-        <CursorPos X="49" Y="591"/>
-        <UsageCount Value="96"/>
-      </Unit3>
-      <Unit4>
-        <Filename Value="C:\lazarus\components\lazutils\utf8process.pp"/>
-        <UnitName Value="UTF8Process"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="636"/>
-        <CursorPos Y="654"/>
-        <UsageCount Value="1"/>
-      </Unit4>
-      <Unit5>
-        <Filename Value="images\memory.pas"/>
-        <ComponentName Value="memform"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="40"/>
-        <CursorPos X="17" Y="44"/>
-        <UsageCount Value="10"/>
-      </Unit5>
-    </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
-      <Position1>
-        <Filename Value="main.pas"/>
-        <Caret Line="2998" Column="6" TopLine="2978"/>
-      </Position1>
-      <Position2>
-        <Filename Value="main.pas"/>
-        <Caret Line="3039" Column="26" TopLine="3026"/>
-      </Position2>
-      <Position3>
-        <Filename Value="main.pas"/>
-        <Caret Line="3035" Column="34" TopLine="3024"/>
-      </Position3>
-      <Position4>
-        <Filename Value="main.pas"/>
-        <Caret Line="335" Column="59" TopLine="318"/>
-      </Position4>
-      <Position5>
-        <Filename Value="main.pas"/>
-        <Caret Line="3046" Column="36" TopLine="3032"/>
-      </Position5>
-      <Position6>
-        <Filename Value="main.pas"/>
-        <Caret Line="2882" Column="27" TopLine="2867"/>
-      </Position6>
-      <Position7>
-        <Filename Value="main.pas"/>
-        <Caret Line="2888" Column="23" TopLine="2877"/>
-      </Position7>
-      <Position8>
-        <Filename Value="main.pas"/>
-        <Caret Line="706" Column="34" TopLine="732"/>
-      </Position8>
-      <Position9>
-        <Filename Value="main.pas"/>
-        <Caret Line="2752" Column="28" TopLine="2729"/>
-      </Position9>
-      <Position10>
-        <Filename Value="main.pas"/>
-        <Caret Line="1788" Column="61" TopLine="1785"/>
-      </Position10>
-      <Position11>
-        <Filename Value="main.pas"/>
-        <Caret Line="2341" Column="6" TopLine="2313"/>
-      </Position11>
-      <Position12>
-        <Filename Value="main.pas"/>
-        <Caret Line="1801" Column="28" TopLine="1786"/>
-      </Position12>
-      <Position13>
-        <Filename Value="main.pas"/>
-        <Caret Line="2900" Column="14" TopLine="2888"/>
-      </Position13>
-      <Position14>
-        <Filename Value="main.pas"/>
-        <Caret Line="1897" Column="16" TopLine="1894"/>
-      </Position14>
-      <Position15>
-        <Filename Value="main.pas"/>
-        <Caret Line="426" Column="15" TopLine="408"/>
-      </Position15>
-      <Position16>
-        <Filename Value="main.pas"/>
-        <Caret Line="1183" TopLine="1178"/>
-      </Position16>
-      <Position17>
-        <Filename Value="main.pas"/>
-        <Caret Line="1923" Column="42" TopLine="1895"/>
-      </Position17>
-      <Position18>
-        <Filename Value="main.pas"/>
-        <Caret Line="2892" Column="43" TopLine="2879"/>
-      </Position18>
-      <Position19>
-        <Filename Value="main.pas"/>
-        <Caret Line="2899" Column="43" TopLine="2886"/>
-      </Position19>
-      <Position20>
-        <Filename Value="main.pas"/>
-        <Caret Line="1833" Column="87" TopLine="1829"/>
-      </Position20>
-      <Position21>
-        <Filename Value="main.pas"/>
-        <Caret Line="1839" Column="38" TopLine="1820"/>
-      </Position21>
-      <Position22>
-        <Filename Value="main.pas"/>
-        <Caret Line="1098" Column="15" TopLine="1092"/>
-      </Position22>
-      <Position23>
-        <Filename Value="main.pas"/>
-        <Caret Line="1925" Column="3" TopLine="1923"/>
-      </Position23>
-      <Position24>
-        <Filename Value="main.pas"/>
-        <Caret Line="3205" Column="13" TopLine="3198"/>
-      </Position24>
-      <Position25>
-        <Filename Value="main.pas"/>
-        <Caret Line="3279" Column="24" TopLine="3223"/>
-      </Position25>
-      <Position26>
-        <Filename Value="main.pas"/>
-        <Caret Line="581" Column="11" TopLine="563"/>
-      </Position26>
-      <Position27>
-        <Filename Value="main.pas"/>
-        <Caret Line="2250" Column="17" TopLine="2231"/>
-      </Position27>
-      <Position28>
-        <Filename Value="main.pas"/>
-        <Caret Line="2255" Column="14" TopLine="2231"/>
-      </Position28>
-      <Position29>
-        <Filename Value="main.pas"/>
-        <Caret Line="2265" Column="21" TopLine="2234"/>
-      </Position29>
-      <Position30>
-        <Filename Value="main.pas"/>
-        <Caret Line="3202" Column="9" TopLine="3174"/>
-      </Position30>
-    </JumpHistory>
-    <RunParams>
-      <FormatVersion Value="2"/>
-      <Modes Count="0" ActiveMode=""/>
-    </RunParams>
-  </ProjectSession>
-</CONFIG>
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectSession>
+    <PathDelim Value="\"/>
+    <Version Value="11"/>
+    <BuildModes Active="Default"/>
+    <Units Count="6">
+      <Unit0>
+        <Filename Value="poc.lpr"/>
+        <IsPartOfProject Value="True"/>
+        <EditorIndex Value="-1"/>
+        <WindowIndex Value="-1"/>
+        <TopLine Value="-1"/>
+        <CursorPos X="-1" Y="-1"/>
+        <UsageCount Value="323"/>
+      </Unit0>
+      <Unit1>
+        <Filename Value="main.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="GUIForm"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
+        <IsVisibleTab Value="True"/>
+        <TopLine Value="871"/>
+        <CursorPos X="33" Y="874"/>
+        <UsageCount Value="323"/>
+        <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
+      </Unit1>
+      <Unit2>
+        <Filename Value="mixer.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="frmMixer"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="3"/>
+        <CursorPos X="26" Y="25"/>
+        <UsageCount Value="206"/>
+      </Unit2>
+      <Unit3>
+        <Filename Value="C:\lazarus\lcl\include\picture.inc"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="576"/>
+        <CursorPos X="49" Y="591"/>
+        <UsageCount Value="96"/>
+      </Unit3>
+      <Unit4>
+        <Filename Value="C:\lazarus\components\lazutils\utf8process.pp"/>
+        <UnitName Value="UTF8Process"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="636"/>
+        <CursorPos Y="654"/>
+        <UsageCount Value="1"/>
+      </Unit4>
+      <Unit5>
+        <Filename Value="images\memory.pas"/>
+        <ComponentName Value="memform"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="40"/>
+        <CursorPos X="17" Y="44"/>
+        <UsageCount Value="10"/>
+      </Unit5>
+    </Units>
+    <JumpHistory Count="29" HistoryIndex="28">
+      <Position1>
+        <Filename Value="main.pas"/>
+        <Caret Line="2998" Column="6" TopLine="2978"/>
+      </Position1>
+      <Position2>
+        <Filename Value="main.pas"/>
+        <Caret Line="3039" Column="26" TopLine="3026"/>
+      </Position2>
+      <Position3>
+        <Filename Value="main.pas"/>
+        <Caret Line="3035" Column="34" TopLine="3024"/>
+      </Position3>
+      <Position4>
+        <Filename Value="main.pas"/>
+        <Caret Line="335" Column="59" TopLine="318"/>
+      </Position4>
+      <Position5>
+        <Filename Value="main.pas"/>
+        <Caret Line="3046" Column="36" TopLine="3032"/>
+      </Position5>
+      <Position6>
+        <Filename Value="main.pas"/>
+        <Caret Line="2882" Column="27" TopLine="2867"/>
+      </Position6>
+      <Position7>
+        <Filename Value="main.pas"/>
+        <Caret Line="2888" Column="23" TopLine="2877"/>
+      </Position7>
+      <Position8>
+        <Filename Value="main.pas"/>
+        <Caret Line="2752" Column="28" TopLine="2729"/>
+      </Position8>
+      <Position9>
+        <Filename Value="main.pas"/>
+        <Caret Line="1788" Column="61" TopLine="1785"/>
+      </Position9>
+      <Position10>
+        <Filename Value="main.pas"/>
+        <Caret Line="2341" Column="6" TopLine="2313"/>
+      </Position10>
+      <Position11>
+        <Filename Value="main.pas"/>
+        <Caret Line="1801" Column="28" TopLine="1786"/>
+      </Position11>
+      <Position12>
+        <Filename Value="main.pas"/>
+        <Caret Line="2900" Column="14" TopLine="2888"/>
+      </Position12>
+      <Position13>
+        <Filename Value="main.pas"/>
+        <Caret Line="1897" Column="16" TopLine="1894"/>
+      </Position13>
+      <Position14>
+        <Filename Value="main.pas"/>
+        <Caret Line="426" Column="15" TopLine="408"/>
+      </Position14>
+      <Position15>
+        <Filename Value="main.pas"/>
+        <Caret Line="1183" TopLine="1178"/>
+      </Position15>
+      <Position16>
+        <Filename Value="main.pas"/>
+        <Caret Line="1923" Column="42" TopLine="1895"/>
+      </Position16>
+      <Position17>
+        <Filename Value="main.pas"/>
+        <Caret Line="2892" Column="43" TopLine="2879"/>
+      </Position17>
+      <Position18>
+        <Filename Value="main.pas"/>
+        <Caret Line="2899" Column="43" TopLine="2886"/>
+      </Position18>
+      <Position19>
+        <Filename Value="main.pas"/>
+        <Caret Line="1833" Column="87" TopLine="1829"/>
+      </Position19>
+      <Position20>
+        <Filename Value="main.pas"/>
+        <Caret Line="1839" Column="38" TopLine="1820"/>
+      </Position20>
+      <Position21>
+        <Filename Value="main.pas"/>
+        <Caret Line="1098" Column="15" TopLine="1092"/>
+      </Position21>
+      <Position22>
+        <Filename Value="main.pas"/>
+        <Caret Line="1925" Column="3" TopLine="1923"/>
+      </Position22>
+      <Position23>
+        <Filename Value="main.pas"/>
+        <Caret Line="3205" Column="13" TopLine="3198"/>
+      </Position23>
+      <Position24>
+        <Filename Value="main.pas"/>
+        <Caret Line="3279" Column="24" TopLine="3223"/>
+      </Position24>
+      <Position25>
+        <Filename Value="main.pas"/>
+        <Caret Line="581" Column="11" TopLine="563"/>
+      </Position25>
+      <Position26>
+        <Filename Value="main.pas"/>
+        <Caret Line="2250" Column="17" TopLine="2231"/>
+      </Position26>
+      <Position27>
+        <Filename Value="main.pas"/>
+        <Caret Line="2255" Column="14" TopLine="2231"/>
+      </Position27>
+      <Position28>
+        <Filename Value="main.pas"/>
+        <Caret Line="2265" Column="21" TopLine="2234"/>
+      </Position28>
+      <Position29>
+        <Filename Value="main.pas"/>
+        <Caret Line="3202" Column="9" TopLine="3174"/>
+      </Position29>
+    </JumpHistory>
+    <RunParams>
+      <FormatVersion Value="2"/>
+      <Modes Count="0" ActiveMode=""/>
+    </RunParams>
+  </ProjectSession>
+</CONFIG>
diff --git a/main.lfm b/main.lfm
index 564b9c5..ea07b14 100644
--- a/main.lfm
+++ b/main.lfm
@@ -60,7 +60,7 @@ object GUIForm: TGUIForm
     end
     object tbRMVoxels: TToolButton
       Tag = 1
-      Left = 613
+      Left = 577
       Hint = 'Voxel Render'
       Top = 2
       Caption = 'Voxels'
@@ -74,7 +74,7 @@ object GUIForm: TGUIForm
       Style = tbsCheck
     end
     object tbRMDots: TToolButton
-      Left = 649
+      Left = 613
       Hint = 'Dot Render'
       Top = 2
       Caption = 'Dots'
@@ -87,7 +87,7 @@ object GUIForm: TGUIForm
     end
     object tbRMRaster: TToolButton
       Tag = 2
-      Left = 685
+      Left = 649
       Hint = 'Raster Render'
       Top = 2
       Caption = 'Raster'
@@ -99,7 +99,7 @@ object GUIForm: TGUIForm
       Style = tbsCheck
     end
     object tbRMColor: TToolButton
-      Left = 721
+      Left = 685
       Hint = 'Toggle Color/Mono'
       Top = 2
       Caption = 'tbRMColor'
@@ -109,7 +109,7 @@ object GUIForm: TGUIForm
       ShowHint = True
     end
     object tbRECState: TToolButton
-      Left = 789
+      Left = 753
       Hint = 'Start Recording'
       Top = 2
       Caption = 'tbRECState'
@@ -119,7 +119,7 @@ object GUIForm: TGUIForm
       ShowHint = True
     end
     object ToolButton5: TToolButton
-      Left = 825
+      Left = 789
       Hint = 'Rewind'
       Top = 2
       Caption = 'ToolButton5'
@@ -129,7 +129,7 @@ object GUIForm: TGUIForm
       ShowHint = True
     end
     object ToolButton6: TToolButton
-      Left = 861
+      Left = 825
       Hint = 'Forwards'
       Top = 2
       Caption = 'ToolButton6'
@@ -139,7 +139,7 @@ object GUIForm: TGUIForm
       ShowHint = True
     end
     object ToolButton7: TToolButton
-      Left = 897
+      Left = 861
       Hint = 'Resume'
       Top = 2
       Caption = 'ToolButton7'
@@ -149,7 +149,7 @@ object GUIForm: TGUIForm
       ShowHint = True
     end
     object ToolButton8: TToolButton
-      Left = 933
+      Left = 897
       Hint = 'Stop Recording'
       Top = 2
       Caption = 'ToolButton8'
@@ -159,7 +159,7 @@ object GUIForm: TGUIForm
       ShowHint = True
     end
     object ToolButton9: TToolButton
-      Left = 969
+      Left = 933
       Hint = 'Pause'
       Top = 2
       Caption = 'ToolButton9'
@@ -169,7 +169,7 @@ object GUIForm: TGUIForm
       ShowHint = True
     end
     object ToolButton10: TToolButton
-      Left = 757
+      Left = 721
       Top = 2
       Caption = 'ToolButton10'
       Enabled = False
@@ -206,24 +206,14 @@ object GUIForm: TGUIForm
       ParentShowHint = False
       ShowHint = True
     end
-    object tbWebDebugger: TToolButton
-      Left = 145
-      Hint = 'Web Debugger'
-      Top = 2
-      Caption = 'tbWebDebugger'
-      ImageIndex = 28
-      OnClick = miToolsWebDebuggerClick
-      ParentShowHint = False
-      ShowHint = True
-    end
     object ToolButton15: TToolButton
-      Left = 181
+      Left = 145
       Top = 2
       Caption = 'ToolButton15'
       Enabled = False
     end
     object tbVolDown: TToolButton
-      Left = 213
+      Left = 177
       Hint = 'Volume Down'
       Top = 2
       Caption = 'tbVolDown'
@@ -233,7 +223,7 @@ object GUIForm: TGUIForm
       ShowHint = True
     end
     object tbMasterVolume: TTrackBar
-      Left = 249
+      Left = 213
       Height = 38
       Top = 2
       Width = 96
@@ -251,7 +241,7 @@ object GUIForm: TGUIForm
       TabOrder = 0
     end
     object tbVolUp: TToolButton
-      Left = 345
+      Left = 309
       Hint = 'Volume Up'
       Top = 2
       Caption = 'tbVolUp'
@@ -261,13 +251,13 @@ object GUIForm: TGUIForm
       ShowHint = True
     end
     object ToolButton3: TToolButton
-      Left = 381
+      Left = 345
       Top = 2
       Caption = 'ToolButton3'
       Enabled = False
     end
     object tbSpeedDown: TToolButton
-      Left = 413
+      Left = 377
       Hint = 'CPU Speed Down'
       Top = 2
       Caption = 'tbSpeedDown'
@@ -277,7 +267,7 @@ object GUIForm: TGUIForm
       ShowHint = True
     end
     object TrackBar2: TTrackBar
-      Left = 449
+      Left = 413
       Height = 38
       Top = 2
       Width = 96
@@ -295,7 +285,7 @@ object GUIForm: TGUIForm
       TabOrder = 1
     end
     object tbSpeedUp: TToolButton
-      Left = 545
+      Left = 509
       Hint = 'CPU Speed Up'
       Top = 2
       Caption = 'tbSpeedUp'
@@ -305,19 +295,19 @@ object GUIForm: TGUIForm
       ShowHint = True
     end
     object ToolButton18: TToolButton
-      Left = 581
+      Left = 545
       Top = 2
       Caption = 'ToolButton18'
       Enabled = False
     end
     object ToolButton1: TToolButton
-      Left = 1005
+      Left = 969
       Top = 2
       Caption = 'ToolButton1'
       Enabled = False
     end
     object tbFullscreen: TToolButton
-      Left = 1037
+      Left = 1001
       Hint = 'Fullscreen'
       Top = 2
       Caption = 'tbFullscreen'
@@ -6584,11 +6574,6 @@ object GUIForm: TGUIForm
         Caption = 'microTracker'
         OnClick = miToolsTrackerClick
       end
-      object miToolsWebDebugger: TMenuItem
-        Caption = 'Web Debugger'
-        ShortCut = 24642
-        OnClick = miToolsWebDebuggerClick
-      end
       object miMemoryEdit: TMenuItem
         Caption = 'Read/Write Memory'
         OnClick = miMemoryEditClick
diff --git a/main.pas b/main.pas
index f41c4c0..d41c5c0 100644
--- a/main.pas
+++ b/main.pas
@@ -75,7 +75,6 @@ type
     miApps816Paint: TMenuItem;
     miAppsPrintShop: TMenuItem;
     miAppsTerminal: TMenuItem;
-    miToolsWebDebugger: TMenuItem;
     miToolsTracker: TMenuItem;
     miTools: TMenuItem;
     miApps: TMenuItem;
@@ -223,7 +222,6 @@ type
     tbJoystickAxisSwitch: TToolButton;
     tbCapsMode: TToolButton;
     tbScanlines: TToolButton;
-    tbWebDebugger: TToolButton;
     ToolButton15: TToolButton;
     tbSpeedDown: TToolButton;
     tbSpeedUp: TToolButton;
@@ -1820,6 +1818,7 @@ end;
 
 procedure TGUIForm.miToolsWebDebuggerClick(Sender: TObject);
 begin
+  disableFocusStealing:= true;
   SimpleGet( baseUrl + '/api/control/debug/attach' );
 end;
 
diff --git a/poc.lps b/poc.lps
index 72b9023..cf75b40 100644
--- a/poc.lps
+++ b/poc.lps
@@ -4,7 +4,7 @@
     <PathDelim Value="\"/>
     <Version Value="11"/>
     <BuildModes Active="Default"/>
-    <Units Count="6">
+    <Units Count="5">
       <Unit0>
         <Filename Value="poc.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -21,8 +21,8 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="871"/>
-        <CursorPos X="33" Y="874"/>
+        <TopLine Value="1819"/>
+        <CursorPos X="56" Y="1825"/>
         <UsageCount Value="323"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -43,17 +43,9 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="576"/>
         <CursorPos X="49" Y="591"/>
-        <UsageCount Value="96"/>
+        <UsageCount Value="94"/>
       </Unit3>
       <Unit4>
-        <Filename Value="C:\lazarus\components\lazutils\utf8process.pp"/>
-        <UnitName Value="UTF8Process"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="636"/>
-        <CursorPos Y="654"/>
-        <UsageCount Value="1"/>
-      </Unit4>
-      <Unit5>
         <Filename Value="images\memory.pas"/>
         <ComponentName Value="memform"/>
         <HasResources Value="True"/>
@@ -61,126 +53,130 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="40"/>
         <CursorPos X="17" Y="44"/>
-        <UsageCount Value="10"/>
-      </Unit5>
+        <UsageCount Value="8"/>
+      </Unit4>
     </Units>
-    <JumpHistory Count="29" HistoryIndex="28">
+    <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="main.pas"/>
-        <Caret Line="2998" Column="6" TopLine="2978"/>
+        <Caret Line="2502" Column="34" TopLine="2471"/>
       </Position1>
       <Position2>
         <Filename Value="main.pas"/>
-        <Caret Line="3039" Column="26" TopLine="3026"/>
+        <Caret Line="2521" Column="34" TopLine="2490"/>
       </Position2>
       <Position3>
         <Filename Value="main.pas"/>
-        <Caret Line="3035" Column="34" TopLine="3024"/>
+        <Caret Line="2561" Column="34" TopLine="2531"/>
       </Position3>
       <Position4>
         <Filename Value="main.pas"/>
-        <Caret Line="335" Column="59" TopLine="318"/>
+        <Caret Line="2577" Column="34" TopLine="2546"/>
       </Position4>
       <Position5>
         <Filename Value="main.pas"/>
-        <Caret Line="3046" Column="36" TopLine="3032"/>
+        <Caret Line="2636" Column="34" TopLine="2605"/>
       </Position5>
       <Position6>
         <Filename Value="main.pas"/>
-        <Caret Line="2882" Column="27" TopLine="2867"/>
+        <Caret Line="2654" Column="34" TopLine="2623"/>
       </Position6>
       <Position7>
         <Filename Value="main.pas"/>
-        <Caret Line="2888" Column="23" TopLine="2877"/>
+        <Caret Line="2662" Column="27" TopLine="2631"/>
       </Position7>
       <Position8>
         <Filename Value="main.pas"/>
-        <Caret Line="2752" Column="28" TopLine="2729"/>
+        <Caret Line="2669" Column="26" TopLine="2638"/>
       </Position8>
       <Position9>
         <Filename Value="main.pas"/>
-        <Caret Line="1788" Column="61" TopLine="1785"/>
+        <Caret Line="2803" Column="29" TopLine="2772"/>
       </Position9>
       <Position10>
         <Filename Value="main.pas"/>
-        <Caret Line="2341" Column="6" TopLine="2313"/>
+        <Caret Line="2808" Column="29" TopLine="2777"/>
       </Position10>
       <Position11>
         <Filename Value="main.pas"/>
-        <Caret Line="1801" Column="28" TopLine="1786"/>
+        <Caret Line="2868" Column="26" TopLine="2846"/>
       </Position11>
       <Position12>
         <Filename Value="main.pas"/>
-        <Caret Line="2900" Column="14" TopLine="2888"/>
+        <Caret Line="2877" Column="26" TopLine="2846"/>
       </Position12>
       <Position13>
         <Filename Value="main.pas"/>
-        <Caret Line="1897" Column="16" TopLine="1894"/>
+        <Caret Line="3128" Column="38" TopLine="3098"/>
       </Position13>
       <Position14>
         <Filename Value="main.pas"/>
-        <Caret Line="426" Column="15" TopLine="408"/>
+        <Caret Line="3174" Column="26" TopLine="3143"/>
       </Position14>
       <Position15>
         <Filename Value="main.pas"/>
-        <Caret Line="1183" TopLine="1178"/>
+        <Caret Line="3189" Column="26" TopLine="3158"/>
       </Position15>
       <Position16>
         <Filename Value="main.pas"/>
-        <Caret Line="1923" Column="42" TopLine="1895"/>
+        <Caret Line="3294" Column="26" TopLine="3263"/>
       </Position16>
       <Position17>
         <Filename Value="main.pas"/>
-        <Caret Line="2892" Column="43" TopLine="2879"/>
+        <Caret Line="3314" Column="26" TopLine="3283"/>
       </Position17>
       <Position18>
         <Filename Value="main.pas"/>
-        <Caret Line="2899" Column="43" TopLine="2886"/>
+        <Caret Line="694" Column="29" TopLine="675"/>
       </Position18>
       <Position19>
         <Filename Value="main.pas"/>
-        <Caret Line="1833" Column="87" TopLine="1829"/>
+        <Caret Line="773" Column="33" TopLine="742"/>
       </Position19>
       <Position20>
         <Filename Value="main.pas"/>
-        <Caret Line="1839" Column="38" TopLine="1820"/>
+        <Caret Line="1194" Column="26" TopLine="1163"/>
       </Position20>
       <Position21>
         <Filename Value="main.pas"/>
-        <Caret Line="1098" Column="15" TopLine="1092"/>
+        <Caret Line="1266" Column="26" TopLine="1235"/>
       </Position21>
       <Position22>
         <Filename Value="main.pas"/>
-        <Caret Line="1925" Column="3" TopLine="1923"/>
+        <Caret Line="1409" Column="29" TopLine="1378"/>
       </Position22>
       <Position23>
         <Filename Value="main.pas"/>
-        <Caret Line="3205" Column="13" TopLine="3198"/>
+        <Caret Line="1588" Column="26" TopLine="1557"/>
       </Position23>
       <Position24>
         <Filename Value="main.pas"/>
-        <Caret Line="3279" Column="24" TopLine="3223"/>
+        <Caret Line="1638" Column="26" TopLine="1607"/>
       </Position24>
       <Position25>
         <Filename Value="main.pas"/>
-        <Caret Line="581" Column="11" TopLine="563"/>
+        <Caret Line="1896" Column="36" TopLine="1873"/>
       </Position25>
       <Position26>
         <Filename Value="main.pas"/>
-        <Caret Line="2250" Column="17" TopLine="2231"/>
+        <Caret Line="2903" Column="30" TopLine="2872"/>
       </Position26>
       <Position27>
         <Filename Value="main.pas"/>
-        <Caret Line="2255" Column="14" TopLine="2231"/>
+        <Caret Line="1823" Column="30" TopLine="1821"/>
       </Position27>
       <Position28>
         <Filename Value="main.pas"/>
-        <Caret Line="2265" Column="21" TopLine="2234"/>
+        <Caret Line="1827" Column="56" TopLine="1821"/>
       </Position28>
       <Position29>
         <Filename Value="main.pas"/>
-        <Caret Line="3202" Column="9" TopLine="3174"/>
+        <Caret Line="1826" Column="56" TopLine="1820"/>
       </Position29>
+      <Position30>
+        <Filename Value="main.pas"/>
+        <Caret Line="1825" Column="56" TopLine="1819"/>
+      </Position30>
     </JumpHistory>
     <RunParams>
       <FormatVersion Value="2"/>