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

1 files changed, 12 insertions, 1 deletions

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index 289fdb798..0feae4cbb 100644
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -109,9 +109,14 @@ namespace Handbrake
             if (Properties.Settings.Default.QueryEditorTab == "Checked")

                 check_queryEditorTab.CheckState = CheckState.Checked;

 

+            // Preset update notification

             if (Properties.Settings.Default.presetNotification == "Checked")

                 check_disablePresetNotification.CheckState = CheckState.Checked;

 

+            // Experimental In-GUI encode status indicator.

+            if (Properties.Settings.Default.enocdeStatusInGui == "Checked")

+                check_inGuiStatus.CheckState = CheckState.Checked;

+

             // Enable snapshot updating

             if (Properties.Settings.Default.MainWindowMinimize == "Checked")

                 check_mainMinimize.CheckState = CheckState.Checked;

@@ -251,6 +256,11 @@ namespace Handbrake
             Properties.Settings.Default.presetNotification = check_disablePresetNotification.CheckState.ToString();

         }

 

+        private void check_inGuiStatus_CheckedChanged(object sender, EventArgs e)

+        {

+            Properties.Settings.Default.enocdeStatusInGui = check_inGuiStatus.CheckState.ToString();

+        } 

+

         private void check_snapshot_CheckedChanged(object sender, EventArgs e)

         {

             Properties.Settings.Default.checkSnapshot = check_snapshot.CheckState.ToString();

@@ -271,6 +281,7 @@ namespace Handbrake
         {

             Properties.Settings.Default.Save(); // Small hack for Vista. Seems to work fine on XP without this

             this.Close();

-        } 

+        }

+

     }

 }
\ No newline at end of file