WinGui: Improve Langauge for process isolation and be clear what it i…

…s, and how it works.

Locked down protable mode so process isolation can't be tricked to be on.

win/CS/HandBrakeWPF/Instance/HandBrakeInstanceManager.cs

@@ -17,6 +17,7 @@ namespace HandBrakeWPF.Instance
 
     using HandBrakeWPF.Services.Interfaces;
     using HandBrakeWPF.Services.Logging.Interfaces;
+    using HandBrakeWPF.Utilities;
 
     /// <summary>
     /// The HandBrake Instance manager.
@@ -51,7 +52,7 @@ public static IEncodeInstance GetEncodeInstance(int verbosity, HBConfiguration c
 
             IEncodeInstance newInstance;
 
-            if (userSettingService.GetUserSetting<bool>(UserSettingConstants.RemoteServiceEnabled))
+            if (userSettingService.GetUserSetting<bool>(UserSettingConstants.ProcessIsolationEnabled) && Portable.IsProcessIsolationEnabled())
             {
                 newInstance = new RemoteInstance(configuration, logService, userSettingService);
             }

win/CS/HandBrakeWPF/Instance/RemoteInstance.cs

@@ -63,7 +63,7 @@ public RemoteInstance(HBConfiguration configuration, ILog logService, IUserSetti
             this.configuration = configuration;
             this.logService = logService;
             this.userSettingService = userSettingService;
-            this.port = this.GetOpenPort(userSettingService.GetUserSetting<int>(UserSettingConstants.RemoteServicePort));
+            this.port = this.GetOpenPort(userSettingService.GetUserSetting<int>(UserSettingConstants.ProcessIsolationPort));
             this.serverUrl = string.Format("http://127.0.0.1:{0}/", this.port);
         }
 

win/CS/HandBrakeWPF/Properties/Resources.resx

@@ -2222,4 +2222,13 @@ This is typically an indication that your system does not support the hardware r
 
 Please choose a different preset.</value>
   </data>
+  <data name="OptionsView_ProcessIsolation" xml:space="preserve">
+    <value>Process Isolation</value>
+  </data>
+  <data name="OptionsView_ProcessIsolation_Warning1" xml:space="preserve">
+    <value>Please note, using this feature will start an HTTP server bound to 127.0.0.1 on the port stated.</value>
+  </data>
+  <data name="OptionsView_ProcessIsolation_Warning2" xml:space="preserve">
+    <value>If the set port is in use, it will find the first free port within +100 from the defined port.</value>
+  </data>
 </root>

win/CS/HandBrakeWPF/Services/UserSettingService.cs

@@ -304,8 +304,8 @@ private Dictionary<string, object> GetDefaults()
             defaults.Add(UserSettingConstants.DefaultPlayer, false);
 
             // Experimental
-            defaults.Add(UserSettingConstants.RemoteServiceEnabled, true);
-            defaults.Add(UserSettingConstants.RemoteServicePort, 8037);
+            defaults.Add(UserSettingConstants.ProcessIsolationEnabled, true);
+            defaults.Add(UserSettingConstants.ProcessIsolationPort, 8037);
 
             // Misc
             defaults.Add(UserSettingConstants.ShowPresetPanel, false);

win/CS/HandBrakeWPF/UserSettingConstants.cs

@@ -59,8 +59,8 @@ public class UserSettingConstants
         public const string PlaySoundWhenDone = "PlaySoundWhenDone";
         public const string PlaySoundWhenQueueDone = "PlaySoundWhenQueueDone";
         public const string WhenDoneAudioFile = "WhenDoneAudioFile";
-        public const string RemoteServiceEnabled = "RemoteServiceEnabled";
-        public const string RemoteServicePort = "RemoteServicePort";
+        public const string ProcessIsolationEnabled = "ProcessIsolationEnabled";
+        public const string ProcessIsolationPort = "ProcessIsolationPort";
         public const string EnableQuickSyncEncoding = "EnableQuickSyncEncoding";
         public const string EnableVceEncoder = "EnableVceEncoder";
         public const string EnableNvencEncoder = "EnableNvencEncoder";

win/CS/HandBrakeWPF/Utilities/Portable.cs

@@ -193,11 +193,11 @@ public static bool IsHardwareEnabled()
             return true; // Default to On.
         }
 
-        public static bool IsRemoteWorkerProcessEnabled()
+        public static bool IsProcessIsolationEnabled()
         {
-            if (keyPairs.ContainsKey("remote.worker.enabled"))
+            if (keyPairs.ContainsKey("process.isolation.enabled"))
             {
-                string enabled = keyPairs["remote.worker.enabled"];
+                string enabled = keyPairs["process.isolation.enabled"];
                 if (!string.IsNullOrEmpty(enabled) && enabled.Trim() == "true")
                 {
                     return true;

win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs

@@ -1354,11 +1354,11 @@ public int RemoteServicePort
             }
         }
 
-        public bool IsRemoteWorkedAllowed
+        public bool IsProcessIsolationAllowed
         {
             get
             {
-                return Portable.IsRemoteWorkerProcessEnabled();
+                return Portable.IsProcessIsolationEnabled();
             }
         }
 
@@ -1677,8 +1677,8 @@ public override void OnLoad()
             // #############################
             // Experimental
             // #############################
-            this.RemoteServiceEnabled = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.RemoteServiceEnabled);
-            this.RemoteServicePort = userSettingService.GetUserSetting<int>(UserSettingConstants.RemoteServicePort);
+            this.RemoteServiceEnabled = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ProcessIsolationEnabled);
+            this.RemoteServicePort = userSettingService.GetUserSetting<int>(UserSettingConstants.ProcessIsolationPort);
         }
 
         /// <summary>
@@ -1790,8 +1790,8 @@ private void Save()
             this.userSettingService.SetUserSetting(UserSettingConstants.LowBatteryLevel, this.LowBatteryLevel);
 
             /* Experimental */
-            this.userSettingService.SetUserSetting(UserSettingConstants.RemoteServiceEnabled, this.RemoteServiceEnabled);
-            this.userSettingService.SetUserSetting(UserSettingConstants.RemoteServicePort, this.RemoteServicePort);
+            this.userSettingService.SetUserSetting(UserSettingConstants.ProcessIsolationEnabled, this.RemoteServiceEnabled);
+            this.userSettingService.SetUserSetting(UserSettingConstants.ProcessIsolationPort, this.RemoteServicePort);
         }
 
         /// <summary>

win/CS/HandBrakeWPF/Views/OptionsView.xaml

@@ -400,17 +400,20 @@
                         </StackPanel>
                     </StackPanel>
 
-                    <StackPanel Orientation="Vertical"  Visibility="{Binding IsRemoteWorkedAllowed, Converter={StaticResource boolToVisConverter}}">
+                    <StackPanel Orientation="Vertical"  Visibility="{Binding IsProcessIsolationAllowed, Converter={StaticResource boolToVisConverter}}">
 
-                        <TextBlock Text="Worker Processes" FontSize="14" Margin="0,10,0,10"/>
+                        <TextBlock Text="{x:Static Properties:Resources.OptionsView_ProcessIsolation}" FontSize="14" Margin="0,10,0,10"/>
 
-                        <CheckBox Content="{x:Static Properties:Resources.OptionsView_EnableWorkerProcesses}" IsChecked="{Binding RemoteServiceEnabled}" Margin="10,5,0,0" />
+                        <TextBlock Text="{x:Static Properties:Resources.OptionsView_ProcessIsolation_Warning1}" Margin="10,0,0,0"  TextWrapping="Wrap" FontStyle="Italic" />
+                        <TextBlock Text="{x:Static Properties:Resources.OptionsView_ProcessIsolation_Warning2}" Margin="10,0,0,0"  TextWrapping="Wrap" FontStyle="Italic" />
+
+                        <CheckBox Content="{x:Static Properties:Resources.OptionsView_EnableWorkerProcesses}" IsChecked="{Binding RemoteServiceEnabled}" Margin="10,10,0,0" />
 
                         <StackPanel Orientation="Horizontal" Margin="10,10,0,0">
                             <TextBlock Text="{x:Static Properties:Resources.OptionsView_WorkerDefaultPort}" />
                             <TextBox Text="{Binding RemoteServicePort}" Width="100" />
                         </StackPanel>
-
+                        
                     </StackPanel>
 
 

win/CS/HandBrakeWPF/portable.ini.template

@@ -3,11 +3,13 @@
 #################################
 # Notes:
 # - Rename this file to portable.ini to activate feature.
+#
 # - storage.dir => Stores Presets, Settings and Log Files.
 # - tmp.dir => temporary files only. (i.e Preview images)
 # - update.check =>  true | false   (enabled / disabled, default disabled for portable)
 # - hardware.enabled => true | false (Enables the hardware encoders such as QSV, NVENC or VCE)
-# - remote.worker.enabled => true | false (Allows use of the remote worker process 'HandBrake.worker.exe' which uses a localhost http server. Setting to false will process jobs in-process.)
+# - process.isolation.enabled => true | false 
+#	(Process Isolation uses an HTTP server on 127.0.0.1 port 8037 or within +100 if in use. This is 'HandBrake.worker.exe' and it is designed to protect the user interface and queue should one job cause an application crash.)
 #
 # Set to 'cwd' to use the current applications directory. It will automatically create "storage" and "tmp" folders in this instance.
 # Leave blank to use the system "TMP" directory and the "AppData" user profile folder.
@@ -17,4 +19,4 @@ storage.dir = cwd
 tmp.dir = cwd
 update.check = false
 hardware.enabled = true
-remote.worker.enabled = true
+process.isolation.enabled = true