Close #31, some improvements

BornToBeRoot · Aug 23, 2017 · 26fcc18 · 26fcc18
1 parent 48576f6
commit 26fcc18
Show file tree

Hide file tree

Showing 12 changed files with 257 additions and 86 deletions.
diff --git a/Source/NETworkManager/Models/Settings/CommandLineManager.cs b/Source/NETworkManager/Models/Settings/CommandLineManager.cs
@@ -54,29 +54,26 @@ public static void Parse()
                     }
                     else
                     {
-                        AddToWrongParameter(parameters[i]);
-
-                        Current.Help = true;
+                        WrongParameterDetected(parameters);
+                        return;
                     }
                 }
                 else
                 {
                     // Ignore the first parameter because it's the path of the .exe
                     if (i != 0)
                     {
-                        AddToWrongParameter(parameters[i]);
-                        Current.Help = true;
+                        WrongParameterDetected(parameters);
+                        return;
                     }
                 }
             }
         }
 
-        private static void AddToWrongParameter(string parameter)
+        private static void WrongParameterDetected(string[] parameters)
         {
-            if (!string.IsNullOrEmpty(Current.WrongParameter))
-                Current.WrongParameter += Environment.NewLine;
-
-            Current.WrongParameter += parameter;
+            Current.WrongParameter = string.Join(" ", parameters);
+            Current.Help = true;
         }
     }
 }
diff --git a/Source/NETworkManager/Models/Settings/SettingsInfo.cs b/Source/NETworkManager/Models/Settings/SettingsInfo.cs
@@ -718,6 +718,20 @@ public bool PortScanner_ResolveHostnamePreferIPv4
                 SettingsChanged = true;
             }
         }
+
+        private bool _portScanner_ExpandStatistics = true;
+        public bool PortScanner_ExpandStatistics
+        {
+            get { return _portScanner_ExpandStatistics; }
+            set
+            {
+                if (value == _portScanner_ExpandStatistics)
+                    return;
+
+                _portScanner_ExpandStatistics = value;
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region WakeOnLAN

diff --git a/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml b/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
@@ -64,7 +64,6 @@
     <system:String x:Key="String_Header_Transparency">Transparenz</system:String>
     <system:String x:Key="String_Header_WakeOnLAN">Wake on LAN</system:String>
     <system:String x:Key="String_Header_CommandLineArguments">Befehlszeilenargumente</system:String>
-    <system:String x:Key="String_Header_WrongParameter">Falscher Parameter</system:String>
 
     <!-- Normal strings -->
     <system:String x:Key="String_ProductName">NETworkManager</system:String>
@@ -224,7 +223,8 @@
     <system:String x:Key="String_TheApplicationCanBeStartedWithoutParameters">Die Anwendung kann ohne Parameter gestartet werden!</system:String>
     <system:String x:Key="String_TheFollwingParametersCanNotBeProcesses">Die folgenden Parameter können nicht verarbeitet werden:</system:String>
     <system:String x:Key="String_TheFollowingParametersAreAvailable">Folgende Parameter stehen zur Verfügung:</system:String>
-
+    <system:String x:Key="String_Open">Offen</system:String>
+
     <!-- Buttons -->
     <system:String x:Key="String_Button_Change">Wechseln</system:String>
     <system:String x:Key="String_Button_Default">Standard</system:String>

diff --git a/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml b/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml
@@ -65,7 +65,6 @@
     <system:String x:Key="String_Header_Transparency">Transparency</system:String>
     <system:String x:Key="String_Header_WakeOnLAN">Wake on LAN</system:String>
     <system:String x:Key="String_Header_CommandLineArguments">Command Line Arguments</system:String>
-    <system:String x:Key="String_Header_WrongParameter">Wrong parameter</system:String>
 
     <!-- Normal strings -->
     <system:String x:Key="String_ProductName">NETworkManager</system:String>
@@ -226,6 +225,7 @@
     <system:String x:Key="String_TheApplicationCanBeStartedWithoutParameters">The application can be started without parameters!</system:String>
     <system:String x:Key="String_TheFollwingParametersCanNotBeProcesses">The following parameters can not be processed:</system:String>
     <system:String x:Key="String_TheFollowingParametersAreAvailable">The following parameters are available:</system:String>
+    <system:String x:Key="String_Open">Open</system:String>
 
     <!-- Buttons -->
     <system:String x:Key="String_Button_Change">Change</system:String>

diff --git a/Source/NETworkManager/ViewModels/Applications/IPScannerViewModel.cs b/Source/NETworkManager/ViewModels/Applications/IPScannerViewModel.cs
@@ -361,9 +361,7 @@ private void StopScan()
         }
 
         private void ScanFinished()
-        {
-            IsScanRunning = false;
-
+        {            
             // Stop timer and stopwatch
             stopwatch.Stop();
             dispatcherTimer.Stop();
@@ -372,6 +370,9 @@ private void ScanFinished()
             EndTime = DateTime.Now;
 
             stopwatch.Reset();
+
+            CancelScan = false;
+            IsScanRunning = false;
         }
 
         public void OnShutdown()
@@ -406,12 +407,10 @@ private void IpScanner_ProgressChanged(object sender, ProgressChangedArgs e)
 
         private void UserHasCanceled(object sender, EventArgs e)
         {
-            CancelScan = false;
-
-            ScanFinished();
-
             StatusMessage = Application.Current.Resources["String_CanceledByUser"] as string;
             DisplayStatusMessage = true;
+
+            ScanFinished();
         }
 
         private void DispatcherTimer_Tick(object sender, EventArgs e)