#49 Settings - Reset dialog enhanced

Author: BornToBeRoot

Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml

@@ -161,8 +161,9 @@
     <system:String x:Key="String_ApplicationSettings">Anwendungseinstellungen</system:String>
     <system:String x:Key="String_NetworkInterfaceProfiles">Netzwerkinterface Profile</system:String>
     <system:String x:Key="String_WakeOnLANClients">Wake on LAN Clients</system:String>
-    <system:String x:Key="String_SelectedSettingsAreReset">Die ausgewählten Einstellungen werden zurückgesetzt. (Der Speicherpfad ist hiervon nicht betroffen.)</system:String>
-    <system:String x:Key="String_ApplicationIsRestartedAfterwards">* Die Anwendung wird danach neu gestartet</system:String>
+    <system:String x:Key="String_SelectedSettingsAreReset">Die ausgewählten Einstellungen werden zurückgesetzt.</system:String>
+    <system:String x:Key="String_TheSettingsLocationIsNotAffected">Der Speicherpfad ist hiervon nicht betroffen</system:String>
+    <system:String x:Key="String_ApplicationIsRestartedAfterwards">Die Anwendung wird danach neu gestartet</system:String>
     <system:String x:Key="String_SelectTheSettingsYouWantToImport">Wählen Sie die Einstellungen aus, die Sie importieren möchten:</system:String>
     <system:String x:Key="String_SelectTheSettingsYouWantToExport">Wählen Sie die Einstellungen aus, die Sie exportieren möchten:</system:String>
     <system:String x:Key="String_SelectTheSettingsYouWantToReset">Wählen Sie die Einstellungen aus, die Sie zurücksetzen möchten:</system:String>

Source/NETworkManager/Resources/Localization/Resources.en-US.xaml

@@ -161,8 +161,9 @@
     <system:String x:Key="String_ApplicationSettings">Application settings</system:String>
     <system:String x:Key="String_NetworkInterfaceProfiles">Network interface profiles</system:String>
     <system:String x:Key="String_WakeOnLANClients">Wake on LAN clients</system:String>
-    <system:String x:Key="String_SelectedSettingsAreReset">The selected settings are reset (The settings location is not affected.)</system:String>
-    <system:String x:Key="String_ApplicationIsRestartedAfterwards">* Application is restarted afterwards</system:String>
+    <system:String x:Key="String_SelectedSettingsAreReset">The selected settings are reset.</system:String>
+    <system:String x:Key="String_TheSettingsLocationIsNotAffected">The settings location is not affected</system:String>
+    <system:String x:Key="String_ApplicationIsRestartedAfterwards">Application is restarted afterwards</system:String>
     <system:String x:Key="String_SelectTheSettingsYouWantToImport">Select the settings you want to import:</system:String>
     <system:String x:Key="String_SelectTheSettingsYouWantToExport">Select the settings you want to export:</system:String>
     <system:String x:Key="String_SelectTheSettingsYouWantToReset">Select the settings you want to reset:</system:String>

Source/NETworkManager/ViewModels/Settings/SettingsGeneralSettingsViewModel.cs

@@ -241,7 +241,7 @@ private async void ChangeSettingsAction()
 
             LocationSelectedPath = string.Empty;
             LocationSelectedPath = Properties.Settings.Default.Settings_CustomSettingsLocation;
-            
+
             MovingFiles = false;
         }
 
@@ -272,7 +272,10 @@ public async void ResetSettingsAction()
             string message = Application.Current.Resources["String_SelectedSettingsAreReset"] as string;
 
             if (ResetEverything || ResetApplicationSettings)
-                message += Environment.NewLine + Environment.NewLine + Application.Current.Resources["String_ApplicationIsRestartedAfterwards"] as string;
+            {
+                message += Environment.NewLine + Environment.NewLine + string.Format("* {0}", Application.Current.Resources["String_TheSettingsLocationIsNotAffected"] as string);
+                message += Environment.NewLine + string.Format("* {0}", Application.Current.Resources["String_ApplicationIsRestartedAfterwards"] as string);
+            }
 
             if (await dialogCoordinator.ShowMessageAsync(this, Application.Current.Resources["String_Header_AreYouSure"] as string, message, MessageDialogStyle.AffirmativeAndNegative, settings) != MessageDialogResult.Affirmative)
                 return;
@@ -291,10 +294,17 @@ public async void ResetSettingsAction()
             if (WakeOnLANClientsExists && (ResetEverything || ResetWakeOnLANClients))
                 WakeOnLANClientManager.Reset();
 
+            // Restart after reset or show a completed message
             if (forceRestart)
+            {
                 CloseAction();
+            }
             else
-                await dialogCoordinator.ShowMessageAsync(this, Application.Current.Resources["String_Header_Success"] as string, Application.Current.Resources["String_SettingsSuccessfullyReset"] as string, MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog);
+            {
+                settings.AffirmativeButtonText = Application.Current.Resources["String_Button_OK"] as string;
+
+                await dialogCoordinator.ShowMessageAsync(this, Application.Current.Resources["String_Header_Success"] as string, Application.Current.Resources["String_SettingsSuccessfullyReset"] as string, MessageDialogStyle.Affirmative, settings);
+            }
         }
         #endregion