Feature: UI

Author: BornToBeRoot

Source/NETworkManager.Localization/Resources/Strings.Designer.cs

@@ -3975,6 +3975,14 @@ If you click Cancel, the profile file will remain unencrypted.</value>
   <data name="RestoreDefaultLocationSettingsMessage" xml:space="preserve">
     <value>The default path is restored and the application is restarted afterwards.
 
+You can copy the “settings.json” file from "{0}" to "{1}" to migrate your previous settings, if necessary. The application must be closed for this to prevent the settings from being overwritten.</value>
+  </data>
+  <data name="ChangeLocationQuestion" xml:space="preserve">
+    <value>Change location?</value>
+  </data>
+  <data name="ChangeLocationSettingsMessage" xml:space="preserve">
+    <value>The location is changed and the application is restarted afterwards.
+
 You can copy the “settings.json” file from "{0}" to "{1}" to migrate your previous settings, if necessary. The application must be closed for this to prevent the settings from being overwritten.</value>
   </data>
 </root>

Source/NETworkManager.Localization/Resources/Strings.resx

@@ -205,22 +205,29 @@ public void SetLocationPathFromDragDrop(string path)
         Location = path;
     }
 
-    public ICommand ChangeLocationCommand => new RelayCommand(_ => ChangeLocationAction());
+    public ICommand ChangeLocationCommand => new RelayCommand(_ => ChangeLocationAction().ConfigureAwait(false));
 
     private async Task ChangeLocationAction()
     {
-        /*
-       var result = await DialogHelper.ShowConfirmationMessageAsync(Application.Current.MainWindow,
-            Strings.ChangeSettingsLocationQuestion,
-            Strings.SettingsLocationWillBeChangedAndApplicationWillBeRestartedMessage,
-            ChildWindowIcon.Question,
-            Strings.Apply);
+        var result = await DialogHelper.ShowConfirmationMessageAsync(Application.Current.MainWindow,
+             Strings.ChangeLocationQuestion,
+             string.Format(Strings.ChangeLocationSettingsMessage, SettingsManager.GetSettingsFolderLocation(), Location),
+             ChildWindowIcon.Question,
+             Strings.Change);
+
+        if (!result)
+            return;
+
+        // Save settings at the current location before changing it to prevent
+        // unintended saves to the new location (e.g., triggered by background timer or the app close & restart).
+        SettingsManager.Save();
 
+        // Set new location
+        LocalSettingsManager.Current.SettingsFolderLocation = Location;
         LocalSettingsManager.Save();
 
         // Restart the application
         (Application.Current.MainWindow as MainWindow)?.RestartApplication();
-        */
     }
 
     public ICommand RestoreDefaultLocationCommand => new RelayCommand(_ => RestoreDefaultLocationActionAsync().ConfigureAwait(false));
@@ -229,15 +236,19 @@ private async Task RestoreDefaultLocationActionAsync()
     {
         var result = await DialogHelper.ShowConfirmationMessageAsync(Application.Current.MainWindow,
             Strings.RestoreDefaultLocationQuestion,
-            string.Format(Strings.RestoreDefaultLocationSettingsMessage, SettingsManager.GetSettingsFolderLocation(),SettingsManager.GetDefaultSettingsFolderLocation()),
+            string.Format(Strings.RestoreDefaultLocationSettingsMessage, SettingsManager.GetSettingsFolderLocation(), SettingsManager.GetDefaultSettingsFolderLocation()),
             ChildWindowIcon.Question,
             Strings.Restore);
 
         if (!result)
             return;
 
-        LocalSettingsManager.Current.SettingsFolderLocation = null;
+        // Save settings at the current location before changing it to prevent
+        // unintended saves to the new location (e.g., triggered by background timer or the app close & restart).
+        SettingsManager.Save();
 
+        // Clear custom location to revert to default
+        LocalSettingsManager.Current.SettingsFolderLocation = null;
         LocalSettingsManager.Save();
 
         // Restart the application

Source/NETworkManager/ViewModels/SettingsSettingsViewModel.cs

@@ -68,7 +68,10 @@
                     </Style>
                 </StackPanel.Style>
                 <Button Style="{StaticResource ImageWithTextButton}"
-                        HorizontalAlignment="Left" Margin="0,0,10,0" >
+                        Command="{Binding ChangeLocationCommand}"
+                        Visibility="{Binding IsLocationChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
+                        HorizontalAlignment="Left" 
+                        Margin="0,0,10,0" >
                     <Button.Content>
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -81,7 +84,7 @@
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                             <TextBlock Grid.Column="1" Grid.Row="0"
-                                       Text="{x:Static localization:Strings.Apply}"
+                                       Text="{x:Static localization:Strings.Change}"
                                        Style="{StaticResource ButtonWithImageTextBlock}" />
                         </Grid>
                     </Button.Content>