WinGui:

- The CLI status information can now optionally be displayed in the encode status bar in the GUI.
- Fixed Scan and Encode cancel functions with a hack. It was killing CMD.exe, not HandBrakeCLI.exe

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2416 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 15 insertions, 0 deletions

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 4b8fffbea..3df9d6ba3 100644
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -358,5 +358,17 @@ namespace Handbrake.Properties {
                 this["presetNotification"] = value;

             }

         }

+        

+        [global::System.Configuration.UserScopedSettingAttribute()]

+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

+        [global::System.Configuration.DefaultSettingValueAttribute("")]

+        public string enocdeStatusInGui {

+            get {

+                return ((string)(this["enocdeStatusInGui"]));

+            }

+            set {

+                this["enocdeStatusInGui"] = value;

+            }

+        }

     }

 }

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index a5766339d..f4f00c1fb 100644
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -86,5 +86,8 @@
     <Setting Name="presetNotification" Type="System.String" Scope="User">

       <Value Profile="(Default)" />

     </Setting>

+    <Setting Name="enocdeStatusInGui" Type="System.String" Scope="User">

+      <Value Profile="(Default)" />

+    </Setting>

   </Settings>

 </SettingsFile>
\ No newline at end of file