From b49c70a039daacf783d8eda83bb0fb16002f599b Mon Sep 17 00:00:00 2001
From: "Valeriano A.R" <valen.alfonso@gmail.com>
Date: Fri, 24 May 2019 07:29:02 +0200
Subject: [PATCH] Replace IFromWithIcon with IToolForm.HasIcon.

---
 VAR.Toolbox/UI/FrmToolbox.cs             |  2 +-
 VAR.Toolbox/UI/IFormWithIcon.cs          |  6 ------
 VAR.Toolbox/UI/IToolForm.cs              |  1 +
 VAR.Toolbox/UI/Tools/FrmCoder.cs         |  2 ++
 VAR.Toolbox/UI/Tools/FrmIPScan.cs        |  2 ++
 VAR.Toolbox/UI/Tools/FrmNetworkInfo.cs   |  2 ++
 VAR.Toolbox/UI/Tools/FrmProxyCmd.cs      |  2 ++
 VAR.Toolbox/UI/Tools/FrmScreenshooter.cs |  2 ++
 VAR.Toolbox/UI/Tools/FrmTunnelTCP.cs     | 10 ++++++----
 VAR.Toolbox/UI/Tools/FrmWebcam.cs        |  2 ++
 VAR.Toolbox/VAR.Toolbox.csproj           |  1 -
 11 files changed, 20 insertions(+), 12 deletions(-)
 delete mode 100644 VAR.Toolbox/UI/IFormWithIcon.cs

diff --git a/VAR.Toolbox/UI/FrmToolbox.cs b/VAR.Toolbox/UI/FrmToolbox.cs
index 66c97e8..3fb0d25 100644
--- a/VAR.Toolbox/UI/FrmToolbox.cs
+++ b/VAR.Toolbox/UI/FrmToolbox.cs
@@ -153,7 +153,7 @@ namespace VAR.Toolbox.UI
             }
             _forms.Add(frm);
             frm.FormClosing += frmChild_FormClosing;
-            if ((frm is IFormWithIcon) == false)
+            if ((frm as IToolForm)?.HasIcon == false)
             {
                 frm.Icon = Icon;
             }
diff --git a/VAR.Toolbox/UI/IFormWithIcon.cs b/VAR.Toolbox/UI/IFormWithIcon.cs
deleted file mode 100644
index fa5a45a..0000000
--- a/VAR.Toolbox/UI/IFormWithIcon.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace VAR.Toolbox.UI
-{
-    public interface IFormWithIcon
-    {
-    }
-}
diff --git a/VAR.Toolbox/UI/IToolForm.cs b/VAR.Toolbox/UI/IToolForm.cs
index 17d7977..8e6101b 100644
--- a/VAR.Toolbox/UI/IToolForm.cs
+++ b/VAR.Toolbox/UI/IToolForm.cs
@@ -3,5 +3,6 @@
     public interface IToolForm
     {
         string ToolName { get; }
+        bool HasIcon { get; }
     }
 }
diff --git a/VAR.Toolbox/UI/Tools/FrmCoder.cs b/VAR.Toolbox/UI/Tools/FrmCoder.cs
index 225d02d..32d6086 100644
--- a/VAR.Toolbox/UI/Tools/FrmCoder.cs
+++ b/VAR.Toolbox/UI/Tools/FrmCoder.cs
@@ -8,6 +8,8 @@ namespace VAR.Toolbox.UI
     {
         public string ToolName { get { return "Coder"; } }
 
+        public bool HasIcon { get { return false; } }
+
         public FrmCoder()
         {
             InitializeComponent();
diff --git a/VAR.Toolbox/UI/Tools/FrmIPScan.cs b/VAR.Toolbox/UI/Tools/FrmIPScan.cs
index 9b4258a..ffd8f99 100644
--- a/VAR.Toolbox/UI/Tools/FrmIPScan.cs
+++ b/VAR.Toolbox/UI/Tools/FrmIPScan.cs
@@ -11,6 +11,8 @@ namespace VAR.Toolbox.UI
     {
         public string ToolName { get { return "IPScan"; } }
 
+        public bool HasIcon { get { return false; } }
+
         public FrmIPScan()
         {
             InitializeComponent();
diff --git a/VAR.Toolbox/UI/Tools/FrmNetworkInfo.cs b/VAR.Toolbox/UI/Tools/FrmNetworkInfo.cs
index 9c01256..4479164 100644
--- a/VAR.Toolbox/UI/Tools/FrmNetworkInfo.cs
+++ b/VAR.Toolbox/UI/Tools/FrmNetworkInfo.cs
@@ -10,6 +10,8 @@ namespace VAR.Toolbox.UI
     {
         public string ToolName { get { return "NetworkInfo"; } }
 
+        public bool HasIcon { get { return false; } }
+
         public FrmNetworkInfo()
         {
             InitializeComponent();
diff --git a/VAR.Toolbox/UI/Tools/FrmProxyCmd.cs b/VAR.Toolbox/UI/Tools/FrmProxyCmd.cs
index 2d28171..b8d3769 100644
--- a/VAR.Toolbox/UI/Tools/FrmProxyCmd.cs
+++ b/VAR.Toolbox/UI/Tools/FrmProxyCmd.cs
@@ -10,6 +10,8 @@ namespace VAR.Toolbox.UI
     {
         public string ToolName { get { return "ProxyCmd"; } }
 
+        public bool HasIcon { get { return false; } }
+
         #region Declarations
 
         private object _executionLock = new object();
diff --git a/VAR.Toolbox/UI/Tools/FrmScreenshooter.cs b/VAR.Toolbox/UI/Tools/FrmScreenshooter.cs
index 412f5bb..785ba25 100644
--- a/VAR.Toolbox/UI/Tools/FrmScreenshooter.cs
+++ b/VAR.Toolbox/UI/Tools/FrmScreenshooter.cs
@@ -10,6 +10,8 @@ namespace VAR.Toolbox.UI
     {
         public string ToolName { get { return "Screenshooter"; } }
 
+        public bool HasIcon { get { return false; } }
+
         private bool _repetitiveScreenshots = false;
         private Timer timTicker;
         private Bitmap bmpScreen = null;
diff --git a/VAR.Toolbox/UI/Tools/FrmTunnelTCP.cs b/VAR.Toolbox/UI/Tools/FrmTunnelTCP.cs
index b179053..c5d7417 100644
--- a/VAR.Toolbox/UI/Tools/FrmTunnelTCP.cs
+++ b/VAR.Toolbox/UI/Tools/FrmTunnelTCP.cs
@@ -10,6 +10,8 @@ namespace VAR.Toolbox.UI
     {
         public string ToolName { get { return "TunnelTCP"; } }
 
+        public bool HasIcon { get { return false; } }
+
         private bool _running = false;
 
         private class ConnectedClient
@@ -229,25 +231,25 @@ namespace VAR.Toolbox.UI
                 return string.Format("{0} B", number);
             }
 
-            number = number / 1024.0;
+            number /= 1024.0;
             if (number < 1024)
             {
                 return string.Format("{0:#.00} KiB", number);
             }
 
-            number = number / 1024.0;
+            number /= 1024.0;
             if (number < 1024)
             {
                 return string.Format("{0:#.00} MiB", number);
             }
 
-            number = number / 1024.0;
+            number /= 1024.0;
             if (number < 1024)
             {
                 return string.Format("{0:#.00} GiB", number);
             }
 
-            number = number / 1024.0;
+            number /= 1024.0;
 
             return string.Format("{0:#.00} TiB", number);
         }
diff --git a/VAR.Toolbox/UI/Tools/FrmWebcam.cs b/VAR.Toolbox/UI/Tools/FrmWebcam.cs
index b843be7..de3c8a0 100644
--- a/VAR.Toolbox/UI/Tools/FrmWebcam.cs
+++ b/VAR.Toolbox/UI/Tools/FrmWebcam.cs
@@ -10,6 +10,8 @@ namespace VAR.Toolbox.UI
     {
         public string ToolName { get { return "Webcam"; } }
 
+        public bool HasIcon { get { return false; } }
+
         private Webcam webcam = null;
 
         public FrmWebcam()
diff --git a/VAR.Toolbox/VAR.Toolbox.csproj b/VAR.Toolbox/VAR.Toolbox.csproj
index c4bb427..8ec8d79 100644
--- a/VAR.Toolbox/VAR.Toolbox.csproj
+++ b/VAR.Toolbox/VAR.Toolbox.csproj
@@ -194,7 +194,6 @@
     <Compile Include="UI\Tools\FrmWebcam.Designer.cs">
       <DependentUpon>FrmWebcam.cs</DependentUpon>
     </Compile>
-    <Compile Include="UI\IFormWithIcon.cs" />
     <Compile Include="UI\IToolForm.cs" />
     <Compile Include="UI\Tools\PnlCover.cs">
       <SubType>UserControl</SubType>