WinGui:

- Offer option to disable balloon popups on the tray icon.
- Misc code cleanup

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

1 files changed, 23 insertions, 14 deletions

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index 0feae4cbb..93842b5d2 100644
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -90,21 +90,18 @@ namespace Handbrake
             // Advanced

             // #############################

 

-            // Unstable Snapshot checking should only be visible for stable builds.

-            if (Properties.Settings.Default.hb_build.ToString().EndsWith("1"))

-            {

-                lbl_appcastUnstable.Visible = false;

-                check_snapshot.Visible = false;

-            }

-

-            // Enable snapshot updating

-            if (Properties.Settings.Default.checkSnapshot == "Checked")

-                check_snapshot.CheckState = CheckState.Checked;

-

             // Enable GUI DVD Drive detection code

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

                 btn_drive_detect.CheckState = CheckState.Checked;

 

+            // Minimise to Tray

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

+                check_trayStatusAlerts.CheckState = CheckState.Checked;

+

+            // Tray Balloon popups

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

+                check_mainMinimize.CheckState = CheckState.Checked;

+

             // Enable / Disable Query editor tab

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

                 check_queryEditorTab.CheckState = CheckState.Checked;

@@ -116,10 +113,17 @@ namespace Handbrake
             // 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;

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

+                check_snapshot.CheckState = CheckState.Checked;

+            

+            // Unstable Snapshot checking should only be visible for stable builds.

+            if (Properties.Settings.Default.hb_build.ToString().EndsWith("1"))

+            {

+                lbl_appcastUnstable.Visible = false;

+                check_snapshot.Visible = false;

+            }

 

             // x264 step

             drop_x264step.SelectedItem = Properties.Settings.Default.x264cqstep;

@@ -246,6 +250,11 @@ namespace Handbrake
             Properties.Settings.Default.MainWindowMinimize = check_mainMinimize.CheckState.ToString();

         }

 

+        private void check_trayStatusAlerts_CheckedChanged(object sender, EventArgs e)

+        {

+            Properties.Settings.Default.trayIconAlerts = check_trayStatusAlerts.CheckState.ToString();

+        }

+

         private void check_queryEditorTab_CheckedChanged(object sender, EventArgs e)

         {

             Properties.Settings.Default.QueryEditorTab = check_queryEditorTab.CheckState.ToString();