BornToBeRoot · BornToBeRoot · Oct 20, 2018 · Oct 6, 2018 · Oct 6, 2018 · Oct 6, 2018
diff --git a/Documentation/README.md b/Documentation/README.md
@@ -3,4 +3,4 @@
 The documentation is currently available in the following languages:
 
 - [English](en-US/README.md)
-- [German](de-DE/README.md)
+- [German](de-DE/README.md)
diff --git a/Documentation/_images/ARPTable.png b/Documentation/_images/ARPTable.png
diff --git a/Documentation/_images/ARPTable_AddEntry.png b/Documentation/_images/ARPTable_AddEntry.png
diff --git a/Documentation/_images/Connections.png b/Documentation/_images/Connections.png
diff --git a/Documentation/_images/DNSLookup.png b/Documentation/_images/DNSLookup.png
diff --git a/Documentation/_images/HTTPHeaders.png b/Documentation/_images/HTTPHeaders.png
diff --git a/Documentation/_images/IPScanner.png b/Documentation/_images/IPScanner.png
diff --git a/Documentation/_images/Listeners.png b/Documentation/_images/Listeners.png
diff --git a/Documentation/_images/Lookup_OUI.png b/Documentation/_images/Lookup_OUI.png
diff --git a/Documentation/_images/Lookup_Port.png b/Documentation/_images/Lookup_Port.png
diff --git a/Documentation/_images/NetworkInterface_Configure.png b/Documentation/_images/NetworkInterface_Configure.png
diff --git a/Documentation/_images/NetworkInterface_Information.png b/Documentation/_images/NetworkInterface_Information.png
diff --git a/Documentation/_images/Ping.png b/Documentation/_images/Ping.png
diff --git a/Documentation/_images/PortScanner.png b/Documentation/_images/PortScanner.png
diff --git a/Documentation/_images/PuTTY.png b/Documentation/_images/PuTTY.png
diff --git a/Documentation/_images/RemoteDesktop.png b/Documentation/_images/RemoteDesktop.png
diff --git a/Documentation/_images/SNMP_v2c_Walk.png b/Documentation/_images/SNMP_v2c_Walk.png
diff --git a/Documentation/_images/SNMP_v3_Get.png b/Documentation/_images/SNMP_v3_Get.png
diff --git a/Documentation/_images/SNMP_v3_Set.png b/Documentation/_images/SNMP_v3_Set.png
diff --git a/Documentation/_images/SNMP_v3_Walk.png b/Documentation/_images/SNMP_v3_Walk.png
diff --git a/Documentation/_images/SubnetCalculator_Calculator.png b/Documentation/_images/SubnetCalculator_Calculator.png
diff --git a/Documentation/_images/SubnetCalculator_IPv4Calculator.png b/Documentation/_images/SubnetCalculator_IPv4Calculator.png
diff --git a/Documentation/_images/SubnetCalculator_IPv4Splitter.png b/Documentation/_images/SubnetCalculator_IPv4Splitter.png
diff --git a/Documentation/_images/SubnetCalculator_Subnetting.png b/Documentation/_images/SubnetCalculator_Subnetting.png
diff --git a/Documentation/_images/SubnetCalculator_Supernetting.png b/Documentation/_images/SubnetCalculator_Supernetting.png
diff --git a/Documentation/_images/TightVNC.png b/Documentation/_images/TightVNC.png
diff --git a/Documentation/_images/Traceroute.png b/Documentation/_images/Traceroute.png
diff --git a/Documentation/_images/WakeOnLAN.png b/Documentation/_images/WakeOnLAN.png
diff --git a/Documentation/_images/Whois.png b/Documentation/_images/Whois.png
diff --git a/Documentation/de-DE/Application/ARPTable.md b/Documentation/de-DE/Application/ARPTable.md
@@ -2,8 +2,4 @@
 
 ![ARPTable](../../_images/ARPTable.png)
 
-## Eintrag hinzufügen
-
-![ARPTable_AddEntry](../../_images/ARPTable_AddEntry.png)
-
 [zurück](../README.md)
diff --git a/Documentation/de-DE/Application/SubnetCalculator.md b/Documentation/de-DE/Application/SubnetCalculator.md
@@ -1,11 +1,15 @@
 # Subnetz-Rechner
 
-## IPv4-Rechner
+## Rechner
 
-![SubnetCalculator_IPv4Calculator](../../_images/SubnetCalculator_IPv4Calculator.png)
+![SubnetCalculator_Calculator](../../_images/SubnetCalculator_Calculator.png)
 
-## IPv4-Splitter
+## Subnetting
 
-![SubnetCalculator_IPv4Splitter](../../_images/SubnetCalculator_IPv4Splitter.png)
+![SubnetCalculator_Subnetting](../../_images/SubnetCalculator_Subnetting.png)
+
+## Subnetting
+
+![SubnetCalculator_Supernetting](../../_images/SubnetCalculator_Supernetting.png)
 
 [zurück](../README.md)
diff --git a/Documentation/de-DE/Application/TightVNC.md b/Documentation/de-DE/Application/TightVNC.md
@@ -0,0 +1,5 @@
+# TightVNC
+
+![TightVNC](../../_images/TightVNC.png)
+
+[zurück](../README.md)
diff --git a/Documentation/de-DE/Application/Whois.md b/Documentation/de-DE/Application/Whois.md
@@ -0,0 +1,5 @@
+# Whois
+
+![Whois](../../_images/Whois.png)
+
+[zurück](../README.md)
diff --git a/Documentation/de-DE/README.md b/Documentation/de-DE/README.md
@@ -9,9 +9,11 @@
 - [DNS-Lookup](Application/DNSLookup.md)
 - [Remote Desktop](Application/RemoteDesktop.md)
 - [PuTTY](Application/PuTTY.md)
+- [TightVNC](Application/TightVNC.md)
 - [SNMP](Application/SNMP.md)
 - [Wake on LAN](Application/WakeOnLAN.md)
 - [HTTP Headers](Application/HTTPHeaders.md)
+- [Whois](Application/Whois.md)
 - [Subnetz Rechner](Application/SubnetCalculator.md)
 - [Lookup](Application/Lookup.md)
 - [Verbindungen](Application/Connections.md)

diff --git a/Documentation/en-US/Application/ARPTable.md b/Documentation/en-US/Application/ARPTable.md
@@ -2,8 +2,4 @@
 
 ![ARPTable](../../_images/ARPTable.png)
 
-## Add Entry
-
-![ARPTable_AddEntry](../../_images/ARPTable_AddEntry.png)
-
 [back](../README.md)
diff --git a/Documentation/en-US/Application/SubnetCalculator.md b/Documentation/en-US/Application/SubnetCalculator.md
@@ -1,11 +1,16 @@
 # Subnet Calculator
 
-## IPv4 Calculator
+## Calculator
 
-![SubnetCalculator_IPv4Calculator](../../_images/SubnetCalculator_IPv4Calculator.png)
+![SubnetCalculator_Calculator](../../_images/SubnetCalculator_Calculator.png)
 
-## IPv4 Splitter
+## Subnetting
+
+![SubnetCalculator_Subnetting](../../_images/SubnetCalculator_Subnetting.png)
+
+## Subnetting
+
+![SubnetCalculator_Supernetting](../../_images/SubnetCalculator_Supernetting.png)
 
-![SubnetCalculator_IPv4Splitter](../../_images/SubnetCalculator_IPv4Splitter.png)
 
 [back](../README.md)
diff --git a/Documentation/en-US/Application/TightVNC.md b/Documentation/en-US/Application/TightVNC.md
@@ -0,0 +1,5 @@
+# TightVNC
+
+![TightVNC](../../_images/TightVNC.png)
+
+[back](../README.md)
diff --git a/Documentation/en-US/Application/Whois.md b/Documentation/en-US/Application/Whois.md
@@ -0,0 +1,5 @@
+# Whois
+
+![Whois](../../_images/Whois.png)
+
+[back](../README.md)
diff --git a/Documentation/en-US/README.md b/Documentation/en-US/README.md
@@ -9,9 +9,11 @@
 - [DNS Lookup](Application/DNSLookup.md)
 - [Remote Desktop](Application/RemoteDesktop.md)
 - [PuTTY](Application/PuTTY.md)
+- [TightVNC](Application/TightVNC.md)
 - [SNMP](Application/SNMP.md)
 - [Wake on LAN](Application/WakeOnLAN.md)
 - [HTTP Headers](Application/HTTPHeaders.md)
+- [Whois](Application/Whois.md)
 - [Subnet Calculator](Application/SubnetCalculator.md)
 - [Lookup](Application/Lookup.md)
 - [Connections](Application/Connections.md)

diff --git a/NETworkManager.gif b/NETworkManager.gif
diff --git a/README.md b/README.md
@@ -21,6 +21,11 @@
       <img alt="AppVeyor Master" src="https://img.shields.io/appveyor/ci/BornToBeRoot/NETworkManager/master.svg?style=flat-square&&label=master" />
     </a>    
   </p>
+  </p>
+  <a href="https://twitter.com/intent/tweet?text=NETworkManager%20-%20A%20powerful%20tool%20for%20managing%20networks%20and%20troubleshoot network problems!&url=https%3A%2F%2Fgithub.com%2FBornToBeRoot%2FNETworkManager&hashtags=networkmanager,ipscanner,portscanner,ssh,remotedesktop,snmp,dns,traceroute" target="_blank">
+     <img alt="Tweet" src="https://img.shields.io/twitter/url/https/github.com/BornToBeRoot/NETworkManager.svg?style=flat-square" />
+  </a>        
+  </p>
 </div>
 
 <div align="center"> 
@@ -47,10 +52,12 @@
 - Traceroute
 - DNS Lookup
 - Remote Desktop
-- PuTTY
+- PuTTY ([requires PuTTY](https://www.chiark.greenend.org.uk/~sgtatham/putty/latest.html))
+- TightVNC ([requires TightVNC](https://www.tightvnc.com/download.php))
 - SNMP - Get, Walk, Set (v1, v2c, v3)
 - Wake on LAN
 - HTTP Headers
+- Whois
 - Subnet Calculator - Calculator, Subnetting, Supernetting
 - Lookup - OUI, Port
 - Connections

diff --git a/Source/NETworkManager.sln.DotSettings b/Source/NETworkManager.sln.DotSettings
@@ -24,12 +24,15 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SSH/@EntryIndexedValue">SSH</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TCP/@EntryIndexedValue">TCP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TTY/@EntryIndexedValue">PuTTY</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VNC/@EntryIndexedValue">VNC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=CIDR/@EntryIndexedValue">CIDR</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=DNS/@EntryIndexedValue">DNS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=HTTP/@EntryIndexedValue">HTTP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=LAN/@EntryIndexedValue">LAN</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=LANMAC/@EntryIndexedValue">LANMAC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=MAC/@EntryIndexedValue">MAC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=OID/@EntryIndexedValue">OID</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=TTY/@EntryIndexedValue">TTY</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=TTY/@EntryIndexedValue">TTY</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=VNC/@EntryIndexedValue">VNC</s:String></wpf:ResourceDictionary>
diff --git a/Source/NETworkManager/App.config b/Source/NETworkManager/App.config
@@ -8,7 +8,10 @@
     <userSettings>
         <NETworkManager.Properties.Settings>
             <setting name="Settings_CustomSettingsLocation" serializeAs="String">
-                <value/>
+                <value />
+            </setting>
+            <setting name="UpgradeRequired" serializeAs="String">
+                <value>True</value>
             </setting>
         </NETworkManager.Properties.Settings>
     </userSettings>

diff --git a/Source/NETworkManager/App.xaml b/Source/NETworkManager/App.xaml
@@ -25,6 +25,7 @@
                 <ResourceDictionary Source="/Resources/Styles/CheckBoxStyles.xaml" />
                 <ResourceDictionary Source="/Resources/Styles/ContextMenuStyles.xaml" />
                 <ResourceDictionary Source="/Resources/Styles/DataGridStyles.xaml" />
+                <ResourceDictionary Source="/Resources/Styles/DropDownButtonStyles.xaml" />
                 <ResourceDictionary Source="/Resources/Styles/GridSplitterStyles.xaml" />
                 <ResourceDictionary Source="/Resources/Styles/GroupBoxStyles.xaml" />
                 <ResourceDictionary Source="/Resources/Styles/NumericUpDownStyles.xaml" />

diff --git a/Source/NETworkManager/App.xaml.cs b/Source/NETworkManager/App.xaml.cs
@@ -49,7 +49,19 @@ private void Application_Startup(object sender, StartupEventArgs e)
             // Load application settings (profiles/Profiles/clients are loaded when needed)
             try
             {
+                // Update integrated settings %LocalAppData%\NETworkManager\NETworkManager_GUID (custom settings path)
+                if (Settings.Default.UpgradeRequired)
+                {
+                    Debug.Write("Upgrade settings...");
+                    Settings.Default.Upgrade();
+                    Settings.Default.UpgradeRequired = false;
+                }
+
                 SettingsManager.Load();
+
+                // Update settings (Default --> %AppData%\NETworkManager\Settings)
+                if (AssemblyManager.Current.Version > new Version(SettingsManager.Current.SettingsVersion))
+                    SettingsManager.Update(AssemblyManager.Current.Version, new Version(SettingsManager.Current.SettingsVersion));
             }
             catch (InvalidOperationException)
             {

diff --git a/Source/NETworkManager/ApplicationViewManager.cs b/Source/NETworkManager/ApplicationViewManager.cs
@@ -41,24 +41,26 @@ public static string GetTranslatedNameByName(Name name)
                     return Resources.Localization.Strings.RemoteDesktop;
                 case Name.PuTTY:
                     return Resources.Localization.Strings.PuTTY;
+                case Name.TightVNC:
+                    return Resources.Localization.Strings.TightVNC;
                 case Name.SNMP:
                     return Resources.Localization.Strings.SNMP;
                 case Name.WakeOnLAN:
-                    return Resources.Localization.Strings.WakeOnLAN;        
+                    return Resources.Localization.Strings.WakeOnLAN;
+                case Name.HTTPHeaders:
+                    return Resources.Localization.Strings.HTTPHeaders;
+                case Name.Whois:
+                    return Resources.Localization.Strings.Whois;
                 case Name.SubnetCalculator:
                     return Resources.Localization.Strings.SubnetCalculator;
                 case Name.Lookup:
                     return Resources.Localization.Strings.Lookup;
-                case Name.Whois:
-                    return Resources.Localization.Strings.Whois;
-                case Name.HTTPHeaders:
-                    return Resources.Localization.Strings.HTTPHeaders;
                 case Name.Connections:
                     return Resources.Localization.Strings.Connections;
                 case Name.Listeners:
                     return Resources.Localization.Strings.Listeners;
                 case Name.ARPTable:
-                    return Resources.Localization.Strings.ARPTable;                
+                    return Resources.Localization.Strings.ARPTable;
                 default:
                     return "Name not found!";
             }
@@ -94,24 +96,27 @@ public static Canvas GetIconByName(Name name)
                 case Name.PuTTY:
                     canvas.Children.Add(new PackIconOcticons { Kind = PackIconOcticonsKind.Terminal });
                     break;
+                case Name.TightVNC:
+                    canvas.Children.Add(new PackIconMaterial {Kind = PackIconMaterialKind.EyeOutline});
+                    break;
                 case Name.SNMP:
                     canvas.Children.Add(new PackIconMaterial { Kind = PackIconMaterialKind.Switch });
                     break;
                 case Name.WakeOnLAN:
                     canvas.Children.Add(new PackIconMaterial { Kind = PackIconMaterialKind.Power });
                     break;
+                case Name.HTTPHeaders:
+                    canvas.Children.Add(new PackIconMaterial { Kind = PackIconMaterialKind.Web });
+                    break;
+                case Name.Whois:
+                    canvas.Children.Add(new PackIconMaterial {Kind = PackIconMaterialKind.CloudSearchOutline});
+                    break;
                 case Name.SubnetCalculator:
                     canvas.Children.Add(new PackIconModern { Kind = PackIconModernKind.Calculator });
                     break;
                 case Name.Lookup:
                     canvas.Children.Add(new PackIconMaterial { Kind = PackIconMaterialKind.Magnify });
                     break;
-                case Name.Whois:
-                    canvas.Children.Add(new PackIconMaterial { Kind = PackIconMaterialKind.CloudSearchOutline });
-                    break;
-                case Name.HTTPHeaders:
-                    canvas.Children.Add(new PackIconMaterial { Kind = PackIconMaterialKind.Web });
-                    break;
                 case Name.Connections:
                     canvas.Children.Add(new PackIconModern { Kind = PackIconModernKind.Connect });
                     break;
@@ -140,12 +145,14 @@ public enum Name
             DNSLookup,
             RemoteDesktop,
             PuTTY,
+            TightVNC,
             SNMP,
-            WakeOnLAN,            
+            WakeOnLAN,
+            HTTPHeaders,
+            Whois,
             SubnetCalculator,
             Lookup,
-            Whois,
-            HTTPHeaders,
+            //Routing,
             Connections,
             Listeners,
             ARPTable