diff --git a/.idea/.idea.VAR.ScreenAutomation/.idea/.gitignore b/.idea/.idea.VAR.ScreenAutomation/.idea/.gitignore
deleted file mode 100644
index c516e08..0000000
--- a/.idea/.idea.VAR.ScreenAutomation/.idea/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Rider ignored files
-/projectSettingsUpdater.xml
-/.idea.VAR.ScreenAutomation.iml
-/contentModel.xml
-/modules.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/.idea.VAR.ScreenAutomation/.idea/encodings.xml b/.idea/.idea.VAR.ScreenAutomation/.idea/encodings.xml
deleted file mode 100644
index df87cf9..0000000
--- a/.idea/.idea.VAR.ScreenAutomation/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/.idea/.idea.VAR.ScreenAutomation/.idea/indexLayout.xml b/.idea/.idea.VAR.ScreenAutomation/.idea/indexLayout.xml
deleted file mode 100644
index 7b08163..0000000
--- a/.idea/.idea.VAR.ScreenAutomation/.idea/indexLayout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/.idea.VAR.ScreenAutomation/.idea/vcs.xml b/.idea/.idea.VAR.ScreenAutomation/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/.idea.VAR.ScreenAutomation/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/VAR.ScreenAutomation.sln b/VAR.ScreenAutomation.sln
deleted file mode 100644
index 8f78bf1..0000000
--- a/VAR.ScreenAutomation.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29418.71
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VAR.ScreenAutomation", "VAR.ScreenAutomation\VAR.ScreenAutomation.csproj", "{E2BE8E2A-3422-42A6-82FA-5E0CCDC42032}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {E2BE8E2A-3422-42A6-82FA-5E0CCDC42032}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E2BE8E2A-3422-42A6-82FA-5E0CCDC42032}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E2BE8E2A-3422-42A6-82FA-5E0CCDC42032}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E2BE8E2A-3422-42A6-82FA-5E0CCDC42032}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {8DEFE02E-819D-4286-8378-BE842DBBBFC4}
- EndGlobalSection
-EndGlobal
diff --git a/VAR.ScreenAutomation.sln.DotSettings b/VAR.ScreenAutomation.sln.DotSettings
deleted file mode 100644
index 33636c2..0000000
--- a/VAR.ScreenAutomation.sln.DotSettings
+++ /dev/null
@@ -1,60 +0,0 @@
-
- NotRequired
- True
- True
- TOGETHER_SAME_LINE
- True
- True
- False
- True
- True
- True
- OneStep
- OneStep
- True
- UseVarWhenEvident
- UseVarWhenEvident
- AES
- AM
- AUX
- BPP
- CYC
- DC
- DES
- EPM
- GDI
- ID
- IP
- RECT
- RGB
- SCART
- SPDIF
- SQL
- SRCCOPY
- TCP
- URL
- USB
- VAR
- WMIC
- YRYBY
- False
- <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb_AaBb" />
- <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb_AaBb"><ExtraRule Prefix="T" Suffix="" Style="AaBb_AaBb" /></Policy>
- <Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb_AaBb" />
- <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb_AaBb" />
- <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb_AaBb" />
- <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb_AaBb" />
- <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb_AaBb" />
- <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb_AaBb" />
- <Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb_AaBb" />
- <Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb_AaBb" />
- <Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb_AaBb" />
- <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb_AaBb" />
- <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb_AaBb" />
- <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" />
- <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb_AaBb" />
- True
- True
- True
- True
-
\ No newline at end of file
diff --git a/VAR.ScreenAutomation/App.config b/VAR.ScreenAutomation/App.config
deleted file mode 100644
index 7597626..0000000
--- a/VAR.ScreenAutomation/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/VAR.ScreenAutomation/Program.cs b/VAR.ScreenAutomation/Program.cs
deleted file mode 100644
index 62a2ead..0000000
--- a/VAR.ScreenAutomation/Program.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace VAR.ScreenAutomation
-{
- internal static class Program
- {
- ///
- /// The main entry point for the application.
- ///
- [STAThread]
- private static void Main()
- {
- Application.EnableVisualStyles();
- Application.SetCompatibleTextRenderingDefault(false);
- Application.Run(new FrmScreenAutomation());
- }
- }
-}
\ No newline at end of file
diff --git a/VAR.ScreenAutomation/Properties/AssemblyInfo.cs b/VAR.ScreenAutomation/Properties/AssemblyInfo.cs
deleted file mode 100644
index 0ece480..0000000
--- a/VAR.ScreenAutomation/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("VAR.ScreenAutomation")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("VAR.ScreenAutomation")]
-[assembly: AssemblyCopyright("Copyright © 2019")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("e2be8e2a-3422-42a6-82fa-5e0ccdc42032")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/VAR.ScreenAutomation/Properties/Resources.Designer.cs b/VAR.ScreenAutomation/Properties/Resources.Designer.cs
deleted file mode 100644
index 106fa66..0000000
--- a/VAR.ScreenAutomation/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Runtime Version:4.0.30319.42000
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-namespace VAR.ScreenAutomation.Properties
-{
-
-
- ///
- /// A strongly-typed resource class, for looking up localized strings, etc.
- ///
- // This class was auto-generated by the StronglyTypedResourceBuilder
- // class via a tool like ResGen or Visual Studio.
- // To add or remove a member, edit your .ResX file then rerun ResGen
- // with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources
- {
-
- private static global::System.Resources.ResourceManager resourceMan;
-
- private static global::System.Globalization.CultureInfo resourceCulture;
-
- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Resources()
- {
- }
-
- ///
- /// Returns the cached ResourceManager instance used by this class.
- ///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager
- {
- get
- {
- if ((resourceMan == null))
- {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("VAR.ScreenAutomation.Properties.Resources", typeof(Resources).Assembly);
- resourceMan = temp;
- }
- return resourceMan;
- }
- }
-
- ///
- /// Overrides the current thread's CurrentUICulture property for all
- /// resource lookups using this strongly typed resource class.
- ///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture
- {
- get
- {
- return resourceCulture;
- }
- set
- {
- resourceCulture = value;
- }
- }
- }
-}
diff --git a/VAR.ScreenAutomation/Properties/Resources.resx b/VAR.ScreenAutomation/Properties/Resources.resx
deleted file mode 100644
index 1c875c9..0000000
--- a/VAR.ScreenAutomation/Properties/Resources.resx
+++ /dev/null
@@ -1,122 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral,
- PublicKeyToken=b77a5c561934e089
-
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral,
- PublicKeyToken=b77a5c561934e089
-
-
-
\ No newline at end of file
diff --git a/VAR.ScreenAutomation/Properties/Settings.Designer.cs b/VAR.ScreenAutomation/Properties/Settings.Designer.cs
deleted file mode 100644
index 15e5d03..0000000
--- a/VAR.ScreenAutomation/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Runtime Version:4.0.30319.42000
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-namespace VAR.ScreenAutomation.Properties
-{
-
-
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
- {
-
- private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
- public static Settings Default
- {
- get
- {
- return defaultInstance;
- }
- }
- }
-}
diff --git a/VAR.ScreenAutomation/Properties/Settings.settings b/VAR.ScreenAutomation/Properties/Settings.settings
deleted file mode 100644
index 796d34b..0000000
--- a/VAR.ScreenAutomation/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/VAR.ScreenAutomation/VAR.ScreenAutomation.csproj b/VAR.ScreenAutomation/VAR.ScreenAutomation.csproj
deleted file mode 100644
index 905957e..0000000
--- a/VAR.ScreenAutomation/VAR.ScreenAutomation.csproj
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {E2BE8E2A-3422-42A6-82FA-5E0CCDC42032}
- WinExe
- VAR.ScreenAutomation
- VAR.ScreenAutomation
- v4.7.2
- 512
- true
- true
-
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
- app.manifest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Form
-
-
- FrmAutomationBotParams.cs
-
-
-
-
-
-
- Component
-
-
- Component
-
-
- Form
-
-
- FrmScreenAutomation.cs
-
-
-
-
-
-
- FrmAutomationBotParams.cs
-
-
- FrmScreenAutomation.cs
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
- Designer
-
-
- True
- Resources.resx
-
-
-
- SettingsSingleFileGenerator
- Settings.Designer.cs
-
-
- True
- Settings.settings
- True
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/VAR.ScreenAutomation/app.manifest b/VAR.ScreenAutomation/app.manifest
deleted file mode 100644
index d25cb99..0000000
--- a/VAR.ScreenAutomation/app.manifest
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
-
-
-
-
-
-
diff --git a/VAR.ScreenAutomation/Code/AutomationBotFactory.cs b/VAR.Toolbox/Code/AutomationBotFactory.cs
similarity index 100%
rename from VAR.ScreenAutomation/Code/AutomationBotFactory.cs
rename to VAR.Toolbox/Code/AutomationBotFactory.cs
diff --git a/VAR.ScreenAutomation/Bots/DummyBot.cs b/VAR.Toolbox/Code/Bots/DummyBot.cs
similarity index 100%
rename from VAR.ScreenAutomation/Bots/DummyBot.cs
rename to VAR.Toolbox/Code/Bots/DummyBot.cs
diff --git a/VAR.ScreenAutomation/Interfaces/IAutomationBot.cs b/VAR.Toolbox/Code/Bots/IAutomationBot.cs
similarity index 100%
rename from VAR.ScreenAutomation/Interfaces/IAutomationBot.cs
rename to VAR.Toolbox/Code/Bots/IAutomationBot.cs
diff --git a/VAR.ScreenAutomation/Interfaces/IOutputHandler.cs b/VAR.Toolbox/Code/Bots/IOutputHandler.cs
similarity index 100%
rename from VAR.ScreenAutomation/Interfaces/IOutputHandler.cs
rename to VAR.Toolbox/Code/Bots/IOutputHandler.cs
diff --git a/VAR.ScreenAutomation/Code/Mouse.cs b/VAR.Toolbox/Code/Bots/Mouse.cs
similarity index 100%
rename from VAR.ScreenAutomation/Code/Mouse.cs
rename to VAR.Toolbox/Code/Bots/Mouse.cs
diff --git a/VAR.ScreenAutomation/Code/Screenshoter.cs b/VAR.Toolbox/Code/Bots/Screenshoter.cs
similarity index 100%
rename from VAR.ScreenAutomation/Code/Screenshoter.cs
rename to VAR.Toolbox/Code/Bots/Screenshoter.cs
diff --git a/VAR.ScreenAutomation/Bots/TetrisBot.cs b/VAR.Toolbox/Code/Bots/TetrisBot.cs
similarity index 100%
rename from VAR.ScreenAutomation/Bots/TetrisBot.cs
rename to VAR.Toolbox/Code/Bots/TetrisBot.cs
diff --git a/VAR.ScreenAutomation/Code/WindowHandling.cs b/VAR.Toolbox/Code/Bots/WindowHandling.cs
similarity index 100%
rename from VAR.ScreenAutomation/Code/WindowHandling.cs
rename to VAR.Toolbox/Code/Bots/WindowHandling.cs
diff --git a/VAR.ScreenAutomation/Code/FileBackedConfiguration.cs b/VAR.Toolbox/Code/FileBackedConfiguration.cs
similarity index 100%
rename from VAR.ScreenAutomation/Code/FileBackedConfiguration.cs
rename to VAR.Toolbox/Code/FileBackedConfiguration.cs
diff --git a/VAR.ScreenAutomation/Interfaces/IConfiguration.cs b/VAR.Toolbox/Code/IConfiguration.cs
similarity index 100%
rename from VAR.ScreenAutomation/Interfaces/IConfiguration.cs
rename to VAR.Toolbox/Code/IConfiguration.cs
diff --git a/VAR.ScreenAutomation/Code/MemoryBackedConfiguration.cs b/VAR.Toolbox/Code/MemoryBackedConfiguration.cs
similarity index 100%
rename from VAR.ScreenAutomation/Code/MemoryBackedConfiguration.cs
rename to VAR.Toolbox/Code/MemoryBackedConfiguration.cs
diff --git a/VAR.ScreenAutomation/Controls/CtrImageViewer.cs b/VAR.Toolbox/UI/Tools/ScreenAutomation/CtrImageViewer.cs
similarity index 100%
rename from VAR.ScreenAutomation/Controls/CtrImageViewer.cs
rename to VAR.Toolbox/UI/Tools/ScreenAutomation/CtrImageViewer.cs
diff --git a/VAR.ScreenAutomation/Controls/CtrOutput.cs b/VAR.Toolbox/UI/Tools/ScreenAutomation/CtrOutput.cs
similarity index 100%
rename from VAR.ScreenAutomation/Controls/CtrOutput.cs
rename to VAR.Toolbox/UI/Tools/ScreenAutomation/CtrOutput.cs
diff --git a/VAR.ScreenAutomation/FrmAutomationBotParams.Designer.cs b/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmAutomationBotParams.Designer.cs
similarity index 100%
rename from VAR.ScreenAutomation/FrmAutomationBotParams.Designer.cs
rename to VAR.Toolbox/UI/Tools/ScreenAutomation/FrmAutomationBotParams.Designer.cs
diff --git a/VAR.ScreenAutomation/FrmAutomationBotParams.cs b/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmAutomationBotParams.cs
similarity index 100%
rename from VAR.ScreenAutomation/FrmAutomationBotParams.cs
rename to VAR.Toolbox/UI/Tools/ScreenAutomation/FrmAutomationBotParams.cs
diff --git a/VAR.ScreenAutomation/FrmAutomationBotParams.resx b/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmAutomationBotParams.resx
similarity index 100%
rename from VAR.ScreenAutomation/FrmAutomationBotParams.resx
rename to VAR.Toolbox/UI/Tools/ScreenAutomation/FrmAutomationBotParams.resx
diff --git a/VAR.ScreenAutomation/FrmScreenAutomation.Designer.cs b/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.Designer.cs
similarity index 100%
rename from VAR.ScreenAutomation/FrmScreenAutomation.Designer.cs
rename to VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.Designer.cs
diff --git a/VAR.ScreenAutomation/FrmScreenAutomation.cs b/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.cs
similarity index 97%
rename from VAR.ScreenAutomation/FrmScreenAutomation.cs
rename to VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.cs
index d85d534..3f8ab4b 100644
--- a/VAR.ScreenAutomation/FrmScreenAutomation.cs
+++ b/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.cs
@@ -9,8 +9,12 @@ using VAR.ScreenAutomation.Interfaces;
namespace VAR.ScreenAutomation
{
- public partial class FrmScreenAutomation : Form
+ public partial class FrmScreenAutomation : Form, VAR.Toolbox.UI.IToolForm
{
+ public string ToolName => "ScreenAutomation";
+
+ public bool HasIcon => false;
+
private bool _running;
private IAutomationBot _automationBot;
diff --git a/VAR.ScreenAutomation/FrmScreenAutomation.resx b/VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.resx
similarity index 100%
rename from VAR.ScreenAutomation/FrmScreenAutomation.resx
rename to VAR.Toolbox/UI/Tools/ScreenAutomation/FrmScreenAutomation.resx
diff --git a/VAR.Toolbox/VAR.Toolbox.csproj b/VAR.Toolbox/VAR.Toolbox.csproj
index 9541011..5bfa6e9 100644
--- a/VAR.Toolbox/VAR.Toolbox.csproj
+++ b/VAR.Toolbox/VAR.Toolbox.csproj
@@ -74,10 +74,21 @@
Code\Json\ParserContext.cs
+
+
+
+
+
+
+
+
+
+
+
@@ -244,6 +255,24 @@
FrmWebcam.cs
+
+ Component
+
+
+ Component
+
+
+ Form
+
+
+ FrmAutomationBotParams.cs
+
+
+ Form
+
+
+ FrmScreenAutomation.cs
+
Form
@@ -293,6 +322,14 @@
+
+
+ FrmAutomationBotParams.cs
+
+
+ FrmScreenAutomation.cs
+
+