From 9206ede6eb6e8e9ad1428168abb45d404204e21d Mon Sep 17 00:00:00 2001
From: "Valeriano A.R" <valen.alfonso@gmail.com>
Date: Sat, 9 Apr 2022 16:12:16 +0200
Subject: [PATCH] FrmScreenAutomation: Use VAR.Toolbox controls

---
 .../FrmAutomationBotParams.cs                 |   3 +-
 .../FrmAutomationBotParams.resx               | 125 ------------------
 .../FrmScreenAutomation.Designer.cs           |  20 +--
 .../ScreenAutomation/FrmScreenAutomation.cs   |   3 +-
 .../ScreenAutomation/FrmScreenAutomation.resx | 125 ------------------
 VAR.Toolbox/VAR.Toolbox.csproj                |   8 --
 6 files changed, 14 insertions(+), 270 deletions(-)
 delete mode 100644 VAR.Toolbox/UI/Tools/ScreenAutomation/FrmAutomationBotParams.resx
 delete mode 100644 VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.resx

diff --git a/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmAutomationBotParams.cs b/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmAutomationBotParams.cs
index 5f9fcf0..e641da2 100644
--- a/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmAutomationBotParams.cs
+++ b/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmAutomationBotParams.cs
@@ -4,10 +4,11 @@ using System.ComponentModel;
 using System.Linq;
 using System.Windows.Forms;
 using VAR.Toolbox.Code.Configuration;
+using VAR.Toolbox.Controls;
 
 namespace VAR.ScreenAutomation
 {
-    public partial class FrmAutomationBotParams : Form
+    public partial class FrmAutomationBotParams : Frame
     {
         private readonly FileBackedConfiguration _config;
 
diff --git a/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmAutomationBotParams.resx b/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmAutomationBotParams.resx
deleted file mode 100644
index d5a483d..0000000
--- a/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmAutomationBotParams.resx
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-    <!-- 
-      Microsoft ResX Schema 
-      
-      Version 2.0
-      
-      The primary goals of this format is to allow a simple XML format 
-      that is mostly human readable. The generation and parsing of the 
-      various data types are done through the TypeConverter classes 
-      associated with the data types.
-      
-      Example:
-      
-      ... ado.net/XML headers & schema ...
-      <resheader name="resmimetype">text/microsoft-resx</resheader>
-      <resheader name="version">2.0</resheader>
-      <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-      <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-      <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-      <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-      <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-          <value>[base64 mime encoded serialized .NET Framework object]</value>
-      </data>
-      <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-          <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-          <comment>This is a comment</comment>
-      </data>
-                  
-      There are any number of "resheader" rows that contain simple 
-      name/value pairs.
-      
-      Each data row contains a name, and value. The row also contains a 
-      type or mimetype. Type corresponds to a .NET class that support 
-      text/value conversion through the TypeConverter architecture. 
-      Classes that don't support this are serialized and stored with the 
-      mimetype set.
-      
-      The mimetype is used for serialized objects, and tells the 
-      ResXResourceReader how to depersist the object. This is currently not 
-      extensible. For a given mimetype the value must be set accordingly:
-      
-      Note - application/x-microsoft.net.object.binary.base64 is the format 
-      that the ResXResourceWriter will generate, however the reader can 
-      read any of the formats listed below.
-      
-      mimetype: application/x-microsoft.net.object.binary.base64
-      value   : The object must be serialized with 
-              : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-              : and then encoded with base64 encoding.
-      
-      mimetype: application/x-microsoft.net.object.soap.base64
-      value   : The object must be serialized with 
-              : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-              : and then encoded with base64 encoding.
-  
-      mimetype: application/x-microsoft.net.object.bytearray.base64
-      value   : The object must be serialized into a byte array 
-              : using a System.ComponentModel.TypeConverter
-              : and then encoded with base64 encoding.
-      -->
-    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-        <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
-        <xsd:element name="root" msdata:IsDataSet="true">
-            <xsd:complexType>
-                <xsd:choice maxOccurs="unbounded">
-                    <xsd:element name="metadata">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" use="required" type="xsd:string"/>
-                            <xsd:attribute name="type" type="xsd:string"/>
-                            <xsd:attribute name="mimetype" type="xsd:string"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="assembly">
-                        <xsd:complexType>
-                            <xsd:attribute name="alias" type="xsd:string"/>
-                            <xsd:attribute name="name" type="xsd:string"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="data">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="resheader">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:choice>
-            </xsd:complexType>
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>2.0</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b77a5c561934e089
-        </value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b77a5c561934e089
-        </value>
-    </resheader>
-</root>
\ No newline at end of file
diff --git a/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.Designer.cs b/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.Designer.cs
index c92efe8..8071cef 100644
--- a/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.Designer.cs
+++ b/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.Designer.cs
@@ -29,12 +29,12 @@
         private void InitializeComponent()
         {
             this.picCapturer = new System.Windows.Forms.PictureBox();
-            this.splitMain = new System.Windows.Forms.SplitContainer();
-            this.splitOutput = new System.Windows.Forms.SplitContainer();
-            this.btnAutomationBotConfig = new System.Windows.Forms.Button();
+            this.splitMain = new VAR.Toolbox.Controls.CSplitContainer();
+            this.splitOutput = new VAR.Toolbox.Controls.CSplitContainer();
+            this.btnAutomationBotConfig = new VAR.Toolbox.Controls.CButton();
             this.numFPS = new System.Windows.Forms.NumericUpDown();
-            this.ddlAutomationBot = new System.Windows.Forms.ComboBox();
-            this.btnStartEnd = new System.Windows.Forms.Button();
+            this.ddlAutomationBot = new VAR.Toolbox.Controls.CComboBox();
+            this.btnStartEnd = new VAR.Toolbox.Controls.CButton();
             this.chkKeepToplevel = new System.Windows.Forms.CheckBox();
             this.picPreview = new VAR.Toolbox.Controls.CtrImageViewer();
             this.ctrOutput = new VAR.Toolbox.Controls.CtrOutput();
@@ -253,12 +253,12 @@
         private System.Windows.Forms.PictureBox picCapturer;
         private VAR.Toolbox.Controls.CtrImageViewer picPreview;
         private VAR.Toolbox.Controls.CtrOutput ctrOutput;
-        private System.Windows.Forms.SplitContainer splitMain;
-        private System.Windows.Forms.SplitContainer splitOutput;
-        private System.Windows.Forms.Button btnStartEnd;
-        private System.Windows.Forms.ComboBox ddlAutomationBot;
+        private VAR.Toolbox.Controls.CSplitContainer splitMain;
+        private VAR.Toolbox.Controls.CSplitContainer splitOutput;
+        private VAR.Toolbox.Controls.CButton btnStartEnd;
+        private VAR.Toolbox.Controls.CComboBox ddlAutomationBot;
         private System.Windows.Forms.NumericUpDown numFPS;
-        private System.Windows.Forms.Button btnAutomationBotConfig;
+        private VAR.Toolbox.Controls.CButton btnAutomationBotConfig;
         private System.Windows.Forms.CheckBox chkKeepToplevel;
         private System.Windows.Forms.CheckBox chkClick;
     }
diff --git a/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.cs b/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.cs
index 824f26d..865cb8d 100644
--- a/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.cs
+++ b/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.cs
@@ -7,6 +7,7 @@ using VAR.ScreenAutomation.Code;
 using VAR.Toolbox.Code;
 using VAR.Toolbox.Code.Bots;
 using VAR.Toolbox.Code.Configuration;
+using VAR.Toolbox.Controls;
 using Mouse = VAR.ScreenAutomation.Code.Mouse;
 using Screenshoter = VAR.ScreenAutomation.Code.Screenshoter;
 
@@ -14,7 +15,7 @@ using Screenshoter = VAR.ScreenAutomation.Code.Screenshoter;
 
 namespace VAR.ScreenAutomation
 {
-    public partial class FrmScreenAutomation : Form, Toolbox.UI.IToolForm
+    public partial class FrmScreenAutomation : Frame, Toolbox.UI.IToolForm
     {
         public string ToolName => "ScreenAutomation";
 
diff --git a/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.resx b/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.resx
deleted file mode 100644
index d5a483d..0000000
--- a/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.resx
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-    <!-- 
-      Microsoft ResX Schema 
-      
-      Version 2.0
-      
-      The primary goals of this format is to allow a simple XML format 
-      that is mostly human readable. The generation and parsing of the 
-      various data types are done through the TypeConverter classes 
-      associated with the data types.
-      
-      Example:
-      
-      ... ado.net/XML headers & schema ...
-      <resheader name="resmimetype">text/microsoft-resx</resheader>
-      <resheader name="version">2.0</resheader>
-      <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-      <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-      <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-      <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-      <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-          <value>[base64 mime encoded serialized .NET Framework object]</value>
-      </data>
-      <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-          <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-          <comment>This is a comment</comment>
-      </data>
-                  
-      There are any number of "resheader" rows that contain simple 
-      name/value pairs.
-      
-      Each data row contains a name, and value. The row also contains a 
-      type or mimetype. Type corresponds to a .NET class that support 
-      text/value conversion through the TypeConverter architecture. 
-      Classes that don't support this are serialized and stored with the 
-      mimetype set.
-      
-      The mimetype is used for serialized objects, and tells the 
-      ResXResourceReader how to depersist the object. This is currently not 
-      extensible. For a given mimetype the value must be set accordingly:
-      
-      Note - application/x-microsoft.net.object.binary.base64 is the format 
-      that the ResXResourceWriter will generate, however the reader can 
-      read any of the formats listed below.
-      
-      mimetype: application/x-microsoft.net.object.binary.base64
-      value   : The object must be serialized with 
-              : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-              : and then encoded with base64 encoding.
-      
-      mimetype: application/x-microsoft.net.object.soap.base64
-      value   : The object must be serialized with 
-              : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-              : and then encoded with base64 encoding.
-  
-      mimetype: application/x-microsoft.net.object.bytearray.base64
-      value   : The object must be serialized into a byte array 
-              : using a System.ComponentModel.TypeConverter
-              : and then encoded with base64 encoding.
-      -->
-    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-        <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
-        <xsd:element name="root" msdata:IsDataSet="true">
-            <xsd:complexType>
-                <xsd:choice maxOccurs="unbounded">
-                    <xsd:element name="metadata">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" use="required" type="xsd:string"/>
-                            <xsd:attribute name="type" type="xsd:string"/>
-                            <xsd:attribute name="mimetype" type="xsd:string"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="assembly">
-                        <xsd:complexType>
-                            <xsd:attribute name="alias" type="xsd:string"/>
-                            <xsd:attribute name="name" type="xsd:string"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="data">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="resheader">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string" use="required"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:choice>
-            </xsd:complexType>
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>2.0</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b77a5c561934e089
-        </value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b77a5c561934e089
-        </value>
-    </resheader>
-</root>
\ No newline at end of file
diff --git a/VAR.Toolbox/VAR.Toolbox.csproj b/VAR.Toolbox/VAR.Toolbox.csproj
index 007da64..e8c1f53 100644
--- a/VAR.Toolbox/VAR.Toolbox.csproj
+++ b/VAR.Toolbox/VAR.Toolbox.csproj
@@ -315,14 +315,6 @@
     <Content Include="Images\toolbox.svg" />
     <Content Include="Toolbox.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="UI\Tools\ScreenAutomation\FrmAutomationBotParams.resx">
-      <DependentUpon>FrmAutomationBotParams.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Tools\ScreenAutomation\FrmScreenAutomation.resx">
-      <DependentUpon>FrmScreenAutomation.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
          Other similar extension points exist, see Microsoft.Common.targets.