diff --git a/Common/Common.sln b/Common/Common.sln
index 1889465d..16982f09 100644
--- a/Common/Common.sln
+++ b/Common/Common.sln
@@ -161,7 +161,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MjkControlledCodeRef", "Mjk
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "modbus_master_csharp", "..\..\..\MJK\Code\C#\modbus_master_csharp\src\modbus_master_csharp\modbus_master_csharp.csproj", "{F14940F8-3C86-4BB7-A915-B021E4B3052D}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagFluxToolBox", "MagFluxToolBox\MagFluxToolBox.csproj", "{FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagFluxToolBox", "Ui\MagFluxToolBox\MagFluxToolBox.csproj", "{A5E7CE52-3101-4E9B-B896-C2C0FADE4812}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
@@ -3589,70 +3589,70 @@ Global
{F14940F8-3C86-4BB7-A915-B021E4B3052D}.XP32bit|x64.Build.0 = Release|Any CPU
{F14940F8-3C86-4BB7-A915-B021E4B3052D}.XP32bit|x86.ActiveCfg = Release|Any CPU
{F14940F8-3C86-4BB7-A915-B021E4B3052D}.XP32bit|x86.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}._MANUAL_CONTROL|Any CPU.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}._MANUAL_CONTROL|Any CPU.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}._MANUAL_CONTROL|Mixed Platforms.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}._MANUAL_CONTROL|Mixed Platforms.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}._MANUAL_CONTROL|x64.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}._MANUAL_CONTROL|x64.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}._MANUAL_CONTROL|x86.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}._MANUAL_CONTROL|x86.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.COM|Any CPU.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.COM|Any CPU.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.COM|Mixed Platforms.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.COM|Mixed Platforms.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.COM|x64.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.COM|x64.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.COM|x86.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.COM|x86.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Debug|x64.ActiveCfg = Debug|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Debug|x64.Build.0 = Debug|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Debug|x86.ActiveCfg = Debug|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Debug|x86.Build.0 = Debug|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.GenesisDisplayTool_V01|Any CPU.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.GenesisDisplayTool_V01|Any CPU.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.GenesisDisplayTool_V01|Mixed Platforms.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.GenesisDisplayTool_V01|Mixed Platforms.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.GenesisDisplayTool_V01|x64.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.GenesisDisplayTool_V01|x64.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.GenesisDisplayTool_V01|x86.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.GenesisDisplayTool_V01|x86.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.PerformTest|Any CPU.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.PerformTest|Any CPU.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.PerformTest|Mixed Platforms.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.PerformTest|Mixed Platforms.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.PerformTest|x64.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.PerformTest|x64.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.PerformTest|x86.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.PerformTest|x86.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Release|Any CPU.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Release|x64.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Release|x64.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Release|x86.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.Release|x86.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.ReleaseTest|Any CPU.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.ReleaseTest|Any CPU.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.ReleaseTest|Mixed Platforms.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.ReleaseTest|Mixed Platforms.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.ReleaseTest|x64.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.ReleaseTest|x64.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.ReleaseTest|x86.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.ReleaseTest|x86.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.XP32bit|Any CPU.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.XP32bit|Any CPU.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.XP32bit|Mixed Platforms.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.XP32bit|Mixed Platforms.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.XP32bit|x64.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.XP32bit|x64.Build.0 = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.XP32bit|x86.ActiveCfg = Release|Any CPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}.XP32bit|x86.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}._MANUAL_CONTROL|Any CPU.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}._MANUAL_CONTROL|Any CPU.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}._MANUAL_CONTROL|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}._MANUAL_CONTROL|Mixed Platforms.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}._MANUAL_CONTROL|x64.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}._MANUAL_CONTROL|x64.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}._MANUAL_CONTROL|x86.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}._MANUAL_CONTROL|x86.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.COM|Any CPU.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.COM|Any CPU.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.COM|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.COM|Mixed Platforms.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.COM|x64.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.COM|x64.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.COM|x86.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.COM|x86.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Debug|x64.Build.0 = Debug|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Debug|x86.Build.0 = Debug|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.GenesisDisplayTool_V01|Any CPU.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.GenesisDisplayTool_V01|Any CPU.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.GenesisDisplayTool_V01|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.GenesisDisplayTool_V01|Mixed Platforms.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.GenesisDisplayTool_V01|x64.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.GenesisDisplayTool_V01|x64.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.GenesisDisplayTool_V01|x86.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.GenesisDisplayTool_V01|x86.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.PerformTest|Any CPU.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.PerformTest|Any CPU.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.PerformTest|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.PerformTest|Mixed Platforms.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.PerformTest|x64.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.PerformTest|x64.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.PerformTest|x86.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.PerformTest|x86.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Release|x64.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Release|x64.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Release|x86.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.Release|x86.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.ReleaseTest|Any CPU.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.ReleaseTest|Any CPU.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.ReleaseTest|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.ReleaseTest|Mixed Platforms.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.ReleaseTest|x64.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.ReleaseTest|x64.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.ReleaseTest|x86.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.ReleaseTest|x86.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.XP32bit|Any CPU.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.XP32bit|Any CPU.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.XP32bit|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.XP32bit|Mixed Platforms.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.XP32bit|x64.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.XP32bit|x64.Build.0 = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.XP32bit|x86.ActiveCfg = Release|Any CPU
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}.XP32bit|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -3725,7 +3725,7 @@ Global
{94579693-7AC6-4FF0-B540-1F3780E1BCFA} = {C9393A97-C0BB-4D59-A879-B572BE04CE15}
{B4F8545B-F379-42A5-BDE9-763FD7B79598} = {C9393A97-C0BB-4D59-A879-B572BE04CE15}
{F14940F8-3C86-4BB7-A915-B021E4B3052D} = {B4F8545B-F379-42A5-BDE9-763FD7B79598}
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43} = {03D4F23E-7E4A-4091-BC96-036C996D351A}
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812} = {03D4F23E-7E4A-4091-BC96-036C996D351A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4BCB7B69-696C-436A-86F7-C91EA5588164}
diff --git a/Common/Common.sln.DotSettings.user b/Common/Common.sln.DotSettings.user
index 43da7416..1a500749 100644
--- a/Common/Common.sln.DotSettings.user
+++ b/Common/Common.sln.DotSettings.user
@@ -28,6 +28,7 @@
True
NewVersion
True
+ C:\Users\Thomas\AppData\Local\Temp\JetBrains\ReSharperPlatformVs15\vAny_33007af5\CoverageData\_Common.-1885154465\Snapshot\snapshot.utdcvr
diff --git a/Common/MagFluxToolBox/App.xaml b/Common/MagFluxToolBox/App.xaml
deleted file mode 100644
index 4cb79d90..00000000
--- a/Common/MagFluxToolBox/App.xaml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
diff --git a/Common/MagFluxToolBox/App.xaml.cs b/Common/MagFluxToolBox/App.xaml.cs
deleted file mode 100644
index b1d0bf1d..00000000
--- a/Common/MagFluxToolBox/App.xaml.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
-
-namespace MagFluxToolBox
-{
- ///
- /// Interaction logic for App.xaml
- ///
- public partial class App : Application
- {
- }
-}
diff --git a/Common/MagFluxToolBox/MainWindow.xaml b/Common/MagFluxToolBox/MainWindow.xaml
deleted file mode 100644
index 224b4997..00000000
--- a/Common/MagFluxToolBox/MainWindow.xaml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
diff --git a/Common/MagFluxToolBox/MainWindow.xaml.cs b/Common/MagFluxToolBox/MainWindow.xaml.cs
deleted file mode 100644
index 9aec45c1..00000000
--- a/Common/MagFluxToolBox/MainWindow.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace MagFluxToolBox
-{
- ///
- /// Interaction logic for MainWindow.xaml
- ///
- public partial class MainWindow : Window
- {
- public MainWindow()
- {
- InitializeComponent();
- }
- }
-}
diff --git a/Common/MagFluxToolBox/Properties/Settings.settings b/Common/MagFluxToolBox/Properties/Settings.settings
deleted file mode 100644
index 033d7a5e..00000000
--- a/Common/MagFluxToolBox/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Common/Ui/GenesisToolBox/Program.cs b/Common/Ui/GenesisToolBox/Program.cs
index 4becb0c2..d6623317 100644
--- a/Common/Ui/GenesisToolBox/Program.cs
+++ b/Common/Ui/GenesisToolBox/Program.cs
@@ -1,5 +1,4 @@
-using GenesisToolBox;
-using System;
+using System;
using System.Windows.Forms;
namespace Xylem.Common.Ui.GenesisToolBox
diff --git a/Common/MagFluxToolBox/App.config b/Common/Ui/MagFluxToolBox/App.config
similarity index 100%
rename from Common/MagFluxToolBox/App.config
rename to Common/Ui/MagFluxToolBox/App.config
diff --git a/Common/MagFluxToolBox/MagFluxToolBox.csproj b/Common/Ui/MagFluxToolBox/MagFluxToolBox.csproj
similarity index 61%
rename from Common/MagFluxToolBox/MagFluxToolBox.csproj
rename to Common/Ui/MagFluxToolBox/MagFluxToolBox.csproj
index 754f4e67..8d049658 100644
--- a/Common/MagFluxToolBox/MagFluxToolBox.csproj
+++ b/Common/Ui/MagFluxToolBox/MagFluxToolBox.csproj
@@ -4,14 +4,12 @@
Debug
AnyCPU
- {FD55E1DE-E2C9-496A-B4E0-DC81A54F8F43}
+ {A5E7CE52-3101-4E9B-B896-C2C0FADE4812}
WinExe
MagFluxToolBox
MagFluxToolBox
v4.8
512
- {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 4
true
true
@@ -35,70 +33,86 @@
4
+
+ ..\..\packages\NLog.4.6.7\lib\net45\NLog.dll
+
-
-
-
+
+
+
+
+
+
+
+
+
-
- 4.0
-
-
-
-
+
+
-
- MSBuild:Compile
+
+ Form
+
+
+ FrmMainForm.cs
+
+
+
+
+ FrmMainForm.cs
Designer
-
-
- MSBuild:Compile
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
Designer
-
-
- App.xaml
- Code
-
-
- MainWindow.xaml
- Code
-
-
-
-
- Code
-
+
True
- True
Resources.resx
+ True
+
+
+ SettingsSingleFileGenerator
+ Settings.Designer.cs
+
True
Settings.settings
True
-
- ResXFileCodeGenerator
- Resources.Designer.cs
-
-
- SettingsSingleFileGenerator
- Settings.Designer.cs
-
-
- {f14940f8-3c86-4bb7-a915-b021e4b3052d}
- modbus_master_csharp
+
+ {1B02C79E-0B19-43E2-8F6B-71EF0C786C97}
+ CommonCore
+
+ {a33e3c6d-eaae-4a20-a0ee-f9e6922fd029}
+ SoftwareAccessHelper
+
+
+ {4B88B0D3-E791-4774-9521-EABEACDC420E}
+ Logging
+
+
+
+
+ PreserveNewest
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Common/Ui/MagFluxToolBox/NlogConfig.xml b/Common/Ui/MagFluxToolBox/NlogConfig.xml
new file mode 100644
index 00000000..cbabfd12
--- /dev/null
+++ b/Common/Ui/MagFluxToolBox/NlogConfig.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Common/Ui/MagFluxToolBox/Program.cs b/Common/Ui/MagFluxToolBox/Program.cs
new file mode 100644
index 00000000..35a33c3e
--- /dev/null
+++ b/Common/Ui/MagFluxToolBox/Program.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Windows.Forms;
+
+namespace Xylem.Common.Ui.MagFluxToolBox
+{
+ internal static class Program
+ {
+ ///
+ /// The main entry point for the application.
+ ///
+ [STAThread]
+ static void Main()
+ {
+ Application.EnableVisualStyles();
+ Application.SetCompatibleTextRenderingDefault(false);
+ Application.Run(new FrmMainForm());
+ }
+ }
+}
diff --git a/Common/MagFluxToolBox/Properties/AssemblyInfo.cs b/Common/Ui/MagFluxToolBox/Properties/AssemblyInfo.cs
similarity index 53%
rename from Common/MagFluxToolBox/Properties/AssemblyInfo.cs
rename to Common/Ui/MagFluxToolBox/Properties/AssemblyInfo.cs
index d1826127..5bd42c4d 100644
--- a/Common/MagFluxToolBox/Properties/AssemblyInfo.cs
+++ b/Common/Ui/MagFluxToolBox/Properties/AssemblyInfo.cs
@@ -1,8 +1,6 @@
using System.Reflection;
-using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-using System.Windows;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -21,25 +19,8 @@ using System.Windows;
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
-//In order to begin building localizable applications, set
-//CultureYouAreCodingWith in your .csproj file
-//inside a . For example, if you are using US english
-//in your source files, set the to en-US. Then uncomment
-//the NeutralResourceLanguage attribute below. Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
- ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
- //(used if a resource is not found in the page,
- // or application resource dictionaries)
- ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
- //(used if a resource is not found in the page,
- // app, or any theme specific resource dictionaries)
-)]
-
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("a5e7ce52-3101-4e9b-b896-c2c0fade4812")]
// Version information for an assembly consists of the following four values:
//
diff --git a/Common/MagFluxToolBox/Properties/Resources.Designer.cs b/Common/Ui/MagFluxToolBox/Properties/Resources.Designer.cs
similarity index 67%
rename from Common/MagFluxToolBox/Properties/Resources.Designer.cs
rename to Common/Ui/MagFluxToolBox/Properties/Resources.Designer.cs
index 5a867412..272080dc 100644
--- a/Common/MagFluxToolBox/Properties/Resources.Designer.cs
+++ b/Common/Ui/MagFluxToolBox/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
//
//------------------------------------------------------------------------------
-namespace MagFluxToolBox.Properties
-{
-
-
+namespace MagFluxToolBox.Properties {
+ using System;
+
+
///
/// A strongly-typed resource class, for looking up localized strings, etc.
///
@@ -19,53 +19,65 @@ namespace MagFluxToolBox.Properties
// 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.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources
- {
-
+ 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()
- {
+ 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))
- {
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MagFluxToolBox.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
- {
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
return resourceCulture;
}
- set
- {
+ set {
resourceCulture = value;
}
}
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap MagFluxVerySmall {
+ get {
+ object obj = ResourceManager.GetObject("MagFluxVerySmall", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap MjK_LogoSmall {
+ get {
+ object obj = ResourceManager.GetObject("MjK_LogoSmall", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
}
}
diff --git a/Common/MagFluxToolBox/Properties/Resources.resx b/Common/Ui/MagFluxToolBox/Properties/Resources.resx
similarity index 81%
rename from Common/MagFluxToolBox/Properties/Resources.resx
rename to Common/Ui/MagFluxToolBox/Properties/Resources.resx
index af7dbebb..850c0d14 100644
--- a/Common/MagFluxToolBox/Properties/Resources.resx
+++ b/Common/Ui/MagFluxToolBox/Properties/Resources.resx
@@ -46,7 +46,7 @@
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
- : System.Serialization.Formatters.Binary.BinaryFormatter
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
: and then encoded with base64 encoding.
-->
+
@@ -68,9 +69,10 @@
-
+
+
@@ -85,9 +87,10 @@
-
+
+
@@ -109,9 +112,16 @@
2.0
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ ..\Resources\MagFluxVerySmall.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\MjK-LogoSmall.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
diff --git a/Common/MagFluxToolBox/Properties/Settings.Designer.cs b/Common/Ui/MagFluxToolBox/Properties/Settings.Designer.cs
similarity index 100%
rename from Common/MagFluxToolBox/Properties/Settings.Designer.cs
rename to Common/Ui/MagFluxToolBox/Properties/Settings.Designer.cs
diff --git a/Common/Ui/MagFluxToolBox/Properties/Settings.settings b/Common/Ui/MagFluxToolBox/Properties/Settings.settings
new file mode 100644
index 00000000..39645652
--- /dev/null
+++ b/Common/Ui/MagFluxToolBox/Properties/Settings.settings
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/Common/Ui/MagFluxToolBox/Resources/MJK Logo.bmp b/Common/Ui/MagFluxToolBox/Resources/MJK Logo.bmp
new file mode 100644
index 00000000..55516c7a
Binary files /dev/null and b/Common/Ui/MagFluxToolBox/Resources/MJK Logo.bmp differ
diff --git a/Common/Ui/MagFluxToolBox/Resources/MagFluxSmall.jpg b/Common/Ui/MagFluxToolBox/Resources/MagFluxSmall.jpg
new file mode 100644
index 00000000..d011eabe
Binary files /dev/null and b/Common/Ui/MagFluxToolBox/Resources/MagFluxSmall.jpg differ
diff --git a/Common/Ui/MagFluxToolBox/Resources/MagFluxVerySmall.jpg b/Common/Ui/MagFluxToolBox/Resources/MagFluxVerySmall.jpg
new file mode 100644
index 00000000..61c768fb
Binary files /dev/null and b/Common/Ui/MagFluxToolBox/Resources/MagFluxVerySmall.jpg differ
diff --git a/Common/Ui/MagFluxToolBox/Resources/MjK-Logo.JPG b/Common/Ui/MagFluxToolBox/Resources/MjK-Logo.JPG
new file mode 100644
index 00000000..b3ca3856
Binary files /dev/null and b/Common/Ui/MagFluxToolBox/Resources/MjK-Logo.JPG differ
diff --git a/Common/Ui/MagFluxToolBox/Resources/MjK-LogoSmall.jpg b/Common/Ui/MagFluxToolBox/Resources/MjK-LogoSmall.jpg
new file mode 100644
index 00000000..878d8311
Binary files /dev/null and b/Common/Ui/MagFluxToolBox/Resources/MjK-LogoSmall.jpg differ
diff --git a/Common/Ui/MagFluxToolBox/frmMainForm.Designer.cs b/Common/Ui/MagFluxToolBox/frmMainForm.Designer.cs
new file mode 100644
index 00000000..edd14488
--- /dev/null
+++ b/Common/Ui/MagFluxToolBox/frmMainForm.Designer.cs
@@ -0,0 +1,139 @@
+namespace Xylem.Common.Ui.MagFluxToolBox
+{
+ partial class FrmMainForm
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.gpGerneral = new System.Windows.Forms.GroupBox();
+ this.btnTest = new System.Windows.Forms.Button();
+ this.btnSetup = new System.Windows.Forms.Button();
+ this.lblVersionNumber = new System.Windows.Forms.Label();
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.picLogo = new System.Windows.Forms.PictureBox();
+ this.gpGerneral.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picLogo)).BeginInit();
+ this.SuspendLayout();
+ //
+ // gpGerneral
+ //
+ this.gpGerneral.Controls.Add(this.btnTest);
+ this.gpGerneral.Controls.Add(this.btnSetup);
+ this.gpGerneral.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.gpGerneral.Location = new System.Drawing.Point(12, 110);
+ this.gpGerneral.Name = "gpGerneral";
+ this.gpGerneral.Size = new System.Drawing.Size(181, 245);
+ this.gpGerneral.TabIndex = 19;
+ this.gpGerneral.TabStop = false;
+ this.gpGerneral.Text = "General";
+ //
+ // btnTest
+ //
+ this.btnTest.Location = new System.Drawing.Point(6, 61);
+ this.btnTest.Name = "btnTest";
+ this.btnTest.Size = new System.Drawing.Size(152, 40);
+ this.btnTest.TabIndex = 19;
+ this.btnTest.Text = "Test";
+ this.btnTest.UseVisualStyleBackColor = true;
+ this.btnTest.Click += new System.EventHandler(this.btnTest_Click);
+ //
+ // btnSetup
+ //
+ this.btnSetup.Location = new System.Drawing.Point(6, 15);
+ this.btnSetup.Name = "btnSetup";
+ this.btnSetup.Size = new System.Drawing.Size(152, 40);
+ this.btnSetup.TabIndex = 1;
+ this.btnSetup.Text = "Setup";
+ this.btnSetup.UseVisualStyleBackColor = true;
+ this.btnSetup.Click += new System.EventHandler(this.btnSetup_Click);
+ //
+ // lblVersionNumber
+ //
+ this.lblVersionNumber.AutoSize = true;
+ this.lblVersionNumber.Location = new System.Drawing.Point(156, 5);
+ this.lblVersionNumber.Name = "lblVersionNumber";
+ this.lblVersionNumber.Size = new System.Drawing.Size(37, 13);
+ this.lblVersionNumber.TabIndex = 23;
+ this.lblVersionNumber.Text = "----------";
+ //
+ // pictureBox1
+ //
+ this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.pictureBox1.Image = global::MagFluxToolBox.Properties.Resources.MagFluxVerySmall;
+ this.pictureBox1.Location = new System.Drawing.Point(12, 5);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(84, 90);
+ this.pictureBox1.TabIndex = 25;
+ this.pictureBox1.TabStop = false;
+ //
+ // picLogo
+ //
+ this.picLogo.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.picLogo.Image = global::MagFluxToolBox.Properties.Resources.MjK_LogoSmall;
+ this.picLogo.InitialImage = null;
+ this.picLogo.Location = new System.Drawing.Point(293, 5);
+ this.picLogo.Name = "picLogo";
+ this.picLogo.Size = new System.Drawing.Size(91, 58);
+ this.picLogo.TabIndex = 24;
+ this.picLogo.TabStop = false;
+ //
+ // FrmMainForm
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(390, 367);
+ this.Controls.Add(this.pictureBox1);
+ this.Controls.Add(this.picLogo);
+ this.Controls.Add(this.lblVersionNumber);
+ this.Controls.Add(this.gpGerneral);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+ this.MaximizeBox = false;
+ this.MaximumSize = new System.Drawing.Size(410, 410);
+ this.MinimumSize = new System.Drawing.Size(410, 410);
+ this.Name = "FrmMainForm";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "MagFlux ToolBox";
+ this.Load += new System.EventHandler(this.FrmMainForm_Load);
+ this.gpGerneral.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picLogo)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.GroupBox gpGerneral;
+ private System.Windows.Forms.Button btnSetup;
+ private System.Windows.Forms.Label lblVersionNumber;
+ private System.Windows.Forms.Button btnTest;
+ private System.Windows.Forms.PictureBox picLogo;
+ private System.Windows.Forms.PictureBox pictureBox1;
+ }
+}
+
diff --git a/Common/Ui/MagFluxToolBox/frmMainForm.cs b/Common/Ui/MagFluxToolBox/frmMainForm.cs
new file mode 100644
index 00000000..540f0ae3
--- /dev/null
+++ b/Common/Ui/MagFluxToolBox/frmMainForm.cs
@@ -0,0 +1,127 @@
+using System;
+using System.IO;
+using System.Reflection;
+using System.Windows.Forms;
+using Xylem.Common.CommonCore.Consts;
+using Xylem.Common.Utils.Logging;
+
+namespace Xylem.Common.Ui.MagFluxToolBox
+{
+ ///
+ public partial class FrmMainForm : Form
+ {
+ private readonly String _configFile =
+ Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+ "MagFlux", ProgramConfig.SerialConfigFileName);
+
+ ///
+ /// Ctor
+ ///
+ public FrmMainForm()
+ {
+ InitializeComponent();
+ var logger = NLogHelper.CreateOrGetLogger("MagFluxToolBox");
+ var version = Assembly.GetExecutingAssembly().GetName().Version;
+ logger.Info($"MagFluxToolBox Version: {version.Major}.{version.Minor}.{version.Build}");
+ lblVersionNumber.Text = $@"Version: {version.Major}.{version.Minor}.{version.Build}";
+ }
+
+ private void Form_Closed(Object sender, EventArgs e)
+ {
+ Show();
+ }
+
+ private void FrmMainForm_Load(Object sender, EventArgs e)
+ {
+ var versionString = "NA";
+ Boolean access;
+
+ try
+ {
+ var assemblyName = Assembly.GetExecutingAssembly().GetName();
+ versionString = $@"Version: {assemblyName.Version.Major}.{assemblyName.Version.Minor}.{assemblyName.Version.Build}";
+ access = Logic.SoftwareAccessHelper.Access.HasAccess(assemblyName);
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(@"MagFluxToolBox\n\n" +
+ @"Starting in OfflineMode\n\n" +
+ $@"Your version ({versionString}) could not be verified Error\n\n" +
+ ex.Message);
+
+ Close();
+ CheckConfigs();
+ foreach (var item in Controls)
+ {
+ if (item is Button btn)
+ {
+ btn.Enabled = btn.Name == btnSetup.Name;
+ }
+ }
+ return;
+ }
+ if (!access)
+ {
+ MessageBox.Show(@"MagFluxToolBox\n\n" +
+ @"Your version licence has expired\n\n" +
+ versionString);
+
+ Close();
+ }
+
+ if (System.Diagnostics.Debugger.IsAttached)
+ {
+ //btnFiles.Enabled = true;
+ }
+
+ CheckConfigs();
+ }
+
+ private void CheckConfigs()
+ {
+ var nLogFile = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+ "MagFlux", ProgramConfig.NlogConfig);
+ var dir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "MagFlux");
+
+ if (!Directory.Exists(dir))
+ {
+ Directory.CreateDirectory(dir);
+ }
+
+ if (!File.Exists(nLogFile))
+ {
+ const String fileCop = ProgramConfig.NlogConfig;
+ try
+ {
+ File.Copy(fileCop, nLogFile);
+ }
+ catch (Exception)
+ {
+ MessageBox.Show(@"Unable to create log files!");
+ }
+ }
+
+ if (!File.Exists(_configFile))
+ {
+ var text = "Configuration file cannot be found!\nExecute setup.";
+ MessageBox.Show(text);
+ }
+ }
+
+ private void btnSetup_Click(Object sender, EventArgs e)
+ {
+ //var form = new FrmSetup();
+ //form.Show();
+ //form.Closed += Form_Closed;
+ //Hide();
+ }
+
+ private void btnTest_Click(Object sender, EventArgs e)
+ {
+ //var form = new FrmTest();
+ //form.Show();
+ //form.Closed += Form_Closed;
+ //Hide();
+ }
+ }
+}
diff --git a/Common/Ui/MagFluxToolBox/frmMainForm.resx b/Common/Ui/MagFluxToolBox/frmMainForm.resx
new file mode 100644
index 00000000..1af7de15
--- /dev/null
+++ b/Common/Ui/MagFluxToolBox/frmMainForm.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/Common/Ui/MagFluxToolBox/packages.config b/Common/Ui/MagFluxToolBox/packages.config
new file mode 100644
index 00000000..edcaaf36
--- /dev/null
+++ b/Common/Ui/MagFluxToolBox/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file