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

7 files changed, 123 insertions, 107 deletions

diff --git a/win/C#/Properties/AssemblyInfo.cs b/win/C#/Properties/AssemblyInfo.cs
index f88d1cc1a..59fcc36df 100644
--- a/win/C#/Properties/AssemblyInfo.cs
+++ b/win/C#/Properties/AssemblyInfo.cs
@@ -17,7 +17,7 @@ using System.Resources;
 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("HandBrake")]

 [assembly: AssemblyProduct("HandBrake")]

-[assembly: AssemblyCopyright("Copyright ©  2008")]

+[assembly: AssemblyCopyright("Copyright ©  2009")]

 [assembly: AssemblyTrademark("")]

 [assembly: AssemblyCulture("")]

 

@@ -36,6 +36,6 @@ using System.Resources;
 //      Build Number

 //      Revision

 //

-[assembly: AssemblyVersion("0.9.3.0")]

-[assembly: AssemblyFileVersion("0.9.3.0")]

+[assembly: AssemblyVersion("0.9.3.5")]

+[assembly: AssemblyFileVersion("0.9.3.5")]

 [assembly: NeutralResourcesLanguageAttribute("")]

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

             }

         }

+        

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

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

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

+        public string trayIconAlerts {

+            get {

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

+            }

+            set {

+                this["trayIconAlerts"] = value;

+            }

+        }

     }

 }

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

       <Value Profile="(Default)" />

     </Setting>

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

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

+    </Setting>

   </Settings>

 </SettingsFile>
\ No newline at end of file
diff --git a/win/C#/app.config b/win/C#/app.config
index ef6471be5..d4c74e98a 100644
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -94,6 +94,9 @@
             <setting name="enocdeStatusInGui" serializeAs="String">

                 <value />

             </setting>

+            <setting name="trayIconAlerts" serializeAs="String">

+                <value />

+            </setting>

         </Handbrake.Properties.Settings>

     </userSettings>

 <startup><supportedRuntime version="v2.0.50727"/></startup></configuration>

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 7ed6d0f48..cc28130ac 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -253,8 +253,7 @@ namespace Handbrake
         }

         private void mnu_encodeLog_Click(object sender, EventArgs e)

         {

-            String file;

-            file = lastAction == "scan" ? "last_scan_log.txt" : "last_encode_log.txt";

+            String file = lastAction == "scan" ? "last_scan_log.txt" : "last_encode_log.txt";

 

             frmActivityWindow dvdInfoWindow = new frmActivityWindow(file, encodeQueue, this);

             dvdInfoWindow.Show();

@@ -379,15 +378,9 @@ namespace Handbrake
             if (treeView_presets.SelectedNode != null)

             {

                 presetHandler.remove(treeView_presets.SelectedNode.Text);

-

-                // Remember each nodes expanded status so we can reload it

-                List<Boolean> nodeStatus = saveTreeViewState();

-

-                // Now reload the preset panel

+                List<Boolean> nodeStatus = saveTreeViewState();  // Remember each nodes expanded status so we can reload it

                 loadPresetPanel();

-

-                // Now reload the TreeView states

-                loadTreeViewStates(nodeStatus);

+                loadTreeViewStates(nodeStatus);   // Now reload the TreeView states

             }

             treeView_presets.Select();

         }

@@ -398,12 +391,9 @@ namespace Handbrake
 

             // Now enable the save menu if the selected preset is a user preset

             if (treeView_presets.SelectedNode != null)

-            {

                 if (presetHandler.checkIfUserPresetExists(treeView_presets.SelectedNode.Text))

-                {

                     pmnu_saveChanges.Enabled = true;

-                }

-            }

+

             treeView_presets.Select();

         }

 

@@ -429,14 +419,9 @@ namespace Handbrake
                 if (treeView_presets.SelectedNode != null)

                     presetHandler.remove(treeView_presets.SelectedNode.Text);

 

-                // Remember each nodes expanded status so we can reload it

-                List<Boolean> nodeStatus = saveTreeViewState();

-

-                // Now reload the preset panel

+                List<Boolean> nodeStatus = saveTreeViewState();  // Remember each nodes expanded status so we can reload it

                 loadPresetPanel();

-

-                // Now reload the TreeView states

-                loadTreeViewStates(nodeStatus);

+                loadTreeViewStates(nodeStatus); // Now reload the TreeView states

             }

             treeView_presets.Select();

         }

@@ -649,7 +634,6 @@ namespace Handbrake
                 if (rtf_query.Text != "")

                     query = rtf_query.Text;

 

-

                 if (encodeQueue.checkDestinationPath(text_destination.Text))

                 {

                     DialogResult result = MessageBox.Show("There is already a queue item for this destination path. \n\n If you continue, the encode will be overwritten. Do you wish to continue?",

@@ -707,7 +691,8 @@ namespace Handbrake
                 if (!encodeQueue.isEncoding)

                 {

                     notifyIcon.BalloonTipText = lbl_encode.Text != "" ? lbl_encode.Text : "Not Encoding";

-                    notifyIcon.ShowBalloonTip(500);

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

+                        notifyIcon.ShowBalloonTip(500);

                 }

                 this.Hide();

             }

@@ -1067,7 +1052,28 @@ namespace Handbrake
                 setExtension(".mkv");

 

             audioPanel.setAudioByContainer(drop_format.Text);

-            setVideoByContainer(drop_format.Text);

+

+            string oldval;

+            if ((drop_format.Text.Contains("MP4")) || (drop_format.Text.Contains("M4V")))

+            {

+                oldval = drp_videoEncoder.Text;

+                drp_videoEncoder.Items.Clear();

+                drp_videoEncoder.Items.Add("MPEG-4 (FFmpeg)");

+                drp_videoEncoder.Items.Add("H.264 (x264)");

+                if (oldval == "VP3 (Theora)")

+                    drp_videoEncoder.SelectedIndex = 1;

+                else

+                    drp_videoEncoder.Text = oldval;

+            }

+            else if (drop_format.Text.Contains("MKV"))

+            {

+                oldval = drp_videoEncoder.Text;

+                drp_videoEncoder.Items.Clear();

+                drp_videoEncoder.Items.Add("MPEG-4 (FFmpeg)");

+                drp_videoEncoder.Items.Add("H.264 (x264)");

+                drp_videoEncoder.Items.Add("VP3 (Theora)");

+                drp_videoEncoder.Text = oldval;

+            }

         }

         private void setExtension(string newExtension)

         {

@@ -1153,7 +1159,7 @@ namespace Handbrake
         /// </summary>

         public void setContainerOpts()

         {

-            if ((text_destination.Text.Contains(".mp4")) || (text_destination.Text.Contains(".m4v")))

+            if ((drop_format.Text.Contains("MP4")) || (drop_format.Text.Contains("M4V")))

             {

                 check_largeFile.Enabled = true;

                 check_optimiseMP4.Enabled = true;

@@ -1272,10 +1278,7 @@ namespace Handbrake
                 text_height.BackColor = Color.White;

 

             maxHeight = 0;  // Reset max height so that it's not using the MaxHeight -Y. Quick hack to allow -Y for preset usage.

-            if (maxWidth != 0)

-                lbl_max.Text = "Max Width";

-            else

-                lbl_max.Text = "";

+            lbl_max.Text = maxWidth != 0 ? "Max Width" : "";

 

             int height;

             Boolean parsed = int.TryParse(text_height.Text, out height);

@@ -1360,7 +1363,6 @@ namespace Handbrake
         }

 

         //Subtitles Tab

-

         private void drp_subtitle_SelectedIndexChanged(object sender, EventArgs e)

         {

             if (drp_subtitle.Text.Contains("None"))

@@ -1377,7 +1379,7 @@ namespace Handbrake
         {

             if (Check_ChapterMarkers.Checked)

             {

-                text_destination.Text = text_destination.Text.Replace(".m4v", ".mp4");

+                drop_format.SelectedIndex = 1;

                 data_chpt.Rows.Clear();

                 data_chpt.Enabled = true;

                 DataGridView chapterGridView = Main.chapterNaming(data_chpt, drop_chapterFinish.Text);

@@ -1386,7 +1388,7 @@ namespace Handbrake
             }

             else

             {

-                text_destination.Text = text_destination.Text.Replace(".m4v", ".mp4");

+                drop_format.SelectedIndex = 0;

                 data_chpt.Rows.Clear();

                 data_chpt.Enabled = false;

             }

@@ -1700,36 +1702,6 @@ namespace Handbrake
         }

         #endregion

 

-        #region Audio Panel Code Helpers

-        

-        private void setVideoByContainer(String path)

-        {

-            string oldval;

-

-            if ((path.Contains("MP4")) || (path.Contains("M4V")))

-            {

-                oldval = drp_videoEncoder.Text;

-                drp_videoEncoder.Items.Clear();

-                drp_videoEncoder.Items.Add("MPEG-4 (FFmpeg)");

-                drp_videoEncoder.Items.Add("H.264 (x264)");

-                if (oldval == "VP3 (Theora)")

-                    drp_videoEncoder.SelectedIndex = 1;

-                else

-                    drp_videoEncoder.Text = oldval;

-

-            }

-            else if (path.Contains("MKV"))

-            {

-                oldval = drp_videoEncoder.Text;

-                drp_videoEncoder.Items.Clear();

-                drp_videoEncoder.Items.Add("MPEG-4 (FFmpeg)");

-                drp_videoEncoder.Items.Add("H.264 (x264)");

-                drp_videoEncoder.Items.Add("VP3 (Theora)");

-                drp_videoEncoder.Text = oldval;

-            }

-        }

-        #endregion

-

         #region Public Methods

         /// <summary>

         /// Access the preset Handler and setup the preset panel.

@@ -1803,8 +1775,6 @@ namespace Handbrake
         }

         #endregion

 

-

-

         // This is the END of the road ****************************************

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index c05ba9faf..24b9bf11a 100644
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -73,6 +73,7 @@ namespace Handbrake
             this.drp_processors = new System.Windows.Forms.ComboBox();

             this.Label4 = new System.Windows.Forms.Label();

             this.tab_advanced = new System.Windows.Forms.TabPage();

+            this.check_inGuiStatus = new System.Windows.Forms.CheckBox();

             this.check_disablePresetNotification = new System.Windows.Forms.CheckBox();

             this.check_dvdnav = new System.Windows.Forms.CheckBox();

             this.label32 = new System.Windows.Forms.Label();

@@ -118,7 +119,7 @@ namespace Handbrake
             this.label26 = new System.Windows.Forms.Label();

             this.label27 = new System.Windows.Forms.Label();

             this.openFile_vlc = new System.Windows.Forms.OpenFileDialog();

-            this.check_inGuiStatus = new System.Windows.Forms.CheckBox();

+            this.check_trayStatusAlerts = new System.Windows.Forms.CheckBox();

             this.tab_options.SuspendLayout();

             this.tab_general.SuspendLayout();

             this.tab_picture.SuspendLayout();

@@ -191,7 +192,7 @@ namespace Handbrake
             this.tab_general.Controls.Add(this.drp_completeOption);

             this.tab_general.Location = new System.Drawing.Point(4, 22);

             this.tab_general.Name = "tab_general";

-            this.tab_general.Size = new System.Drawing.Size(482, 283);

+            this.tab_general.Size = new System.Drawing.Size(482, 295);

             this.tab_general.TabIndex = 3;

             this.tab_general.Text = "General";

             this.tab_general.UseVisualStyleBackColor = true;

@@ -353,7 +354,7 @@ namespace Handbrake
             this.tab_picture.Controls.Add(this.label29);

             this.tab_picture.Location = new System.Drawing.Point(4, 22);

             this.tab_picture.Name = "tab_picture";

-            this.tab_picture.Size = new System.Drawing.Size(482, 283);

+            this.tab_picture.Size = new System.Drawing.Size(482, 295);

             this.tab_picture.TabIndex = 5;

             this.tab_picture.Text = "Picture";

             this.tab_picture.UseVisualStyleBackColor = true;

@@ -409,7 +410,7 @@ namespace Handbrake
             this.tab_cli.Controls.Add(this.Label4);

             this.tab_cli.Location = new System.Drawing.Point(4, 22);

             this.tab_cli.Name = "tab_cli";

-            this.tab_cli.Size = new System.Drawing.Size(482, 283);

+            this.tab_cli.Size = new System.Drawing.Size(482, 295);

             this.tab_cli.TabIndex = 2;

             this.tab_cli.Text = "CLI";

             this.tab_cli.UseVisualStyleBackColor = true;

@@ -599,6 +600,7 @@ namespace Handbrake
             // 

             // tab_advanced

             // 

+            this.tab_advanced.Controls.Add(this.check_trayStatusAlerts);

             this.tab_advanced.Controls.Add(this.check_inGuiStatus);

             this.tab_advanced.Controls.Add(this.check_disablePresetNotification);

             this.tab_advanced.Controls.Add(this.check_dvdnav);

@@ -620,12 +622,26 @@ namespace Handbrake
             this.tab_advanced.Text = "Advanced / Other";

             this.tab_advanced.UseVisualStyleBackColor = true;

             // 

+            // check_inGuiStatus

+            // 

+            this.check_inGuiStatus.AutoSize = true;

+            this.check_inGuiStatus.BackColor = System.Drawing.Color.Transparent;

+            this.check_inGuiStatus.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.check_inGuiStatus.Location = new System.Drawing.Point(76, 133);

+            this.check_inGuiStatus.Name = "check_inGuiStatus";

+            this.check_inGuiStatus.Size = new System.Drawing.Size(281, 17);

+            this.check_inGuiStatus.TabIndex = 92;

+            this.check_inGuiStatus.Text = "Enable in-GUI Encode status. (Experimental)";

+            this.ToolTip.SetToolTip(this.check_inGuiStatus, "Displays the CLI status in the GUI windows instead of the CLI window.");

+            this.check_inGuiStatus.UseVisualStyleBackColor = false;

+            this.check_inGuiStatus.CheckedChanged += new System.EventHandler(this.check_inGuiStatus_CheckedChanged);

+            // 

             // check_disablePresetNotification

             // 

             this.check_disablePresetNotification.AutoSize = true;

             this.check_disablePresetNotification.BackColor = System.Drawing.Color.Transparent;

             this.check_disablePresetNotification.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_disablePresetNotification.Location = new System.Drawing.Point(76, 87);

+            this.check_disablePresetNotification.Location = new System.Drawing.Point(76, 110);

             this.check_disablePresetNotification.Name = "check_disablePresetNotification";

             this.check_disablePresetNotification.Size = new System.Drawing.Size(261, 17);

             this.check_disablePresetNotification.TabIndex = 91;

@@ -640,7 +656,7 @@ namespace Handbrake
             this.check_dvdnav.AutoSize = true;

             this.check_dvdnav.BackColor = System.Drawing.Color.Transparent;

             this.check_dvdnav.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_dvdnav.Location = new System.Drawing.Point(76, 232);

+            this.check_dvdnav.Location = new System.Drawing.Point(76, 257);

             this.check_dvdnav.Name = "check_dvdnav";

             this.check_dvdnav.Size = new System.Drawing.Size(297, 17);

             this.check_dvdnav.TabIndex = 90;

@@ -652,7 +668,7 @@ namespace Handbrake
             // 

             this.label32.AutoSize = true;

             this.label32.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label32.Location = new System.Drawing.Point(38, 232);

+            this.label32.Location = new System.Drawing.Point(38, 257);

             this.label32.Name = "label32";

             this.label32.Size = new System.Drawing.Size(32, 13);

             this.label32.TabIndex = 89;

@@ -661,7 +677,7 @@ namespace Handbrake
             // label30

             // 

             this.label30.AutoSize = true;

-            this.label30.Location = new System.Drawing.Point(73, 190);

+            this.label30.Location = new System.Drawing.Point(73, 215);

             this.label30.Name = "label30";

             this.label30.Size = new System.Drawing.Size(230, 13);

             this.label30.TabIndex = 87;

@@ -677,7 +693,7 @@ namespace Handbrake
             "0.50",

             "0.25",

             "0.20"});

-            this.drop_x264step.Location = new System.Drawing.Point(312, 187);

+            this.drop_x264step.Location = new System.Drawing.Point(312, 212);

             this.drop_x264step.Name = "drop_x264step";

             this.drop_x264step.Size = new System.Drawing.Size(111, 21);

             this.drop_x264step.TabIndex = 86;

@@ -689,7 +705,7 @@ namespace Handbrake
             // 

             this.label28.AutoSize = true;

             this.label28.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label28.Location = new System.Drawing.Point(27, 190);

+            this.label28.Location = new System.Drawing.Point(27, 215);

             this.label28.Name = "label28";

             this.label28.Size = new System.Drawing.Size(43, 13);

             this.label28.TabIndex = 85;

@@ -700,7 +716,7 @@ namespace Handbrake
             this.check_queryEditorTab.AutoSize = true;

             this.check_queryEditorTab.BackColor = System.Drawing.Color.Transparent;

             this.check_queryEditorTab.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_queryEditorTab.Location = new System.Drawing.Point(76, 64);

+            this.check_queryEditorTab.Location = new System.Drawing.Point(76, 87);

             this.check_queryEditorTab.Name = "check_queryEditorTab";

             this.check_queryEditorTab.Size = new System.Drawing.Size(175, 17);

             this.check_queryEditorTab.TabIndex = 84;

@@ -714,7 +730,7 @@ namespace Handbrake
             // 

             this.lbl_appcastUnstable.AutoSize = true;

             this.lbl_appcastUnstable.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.lbl_appcastUnstable.Location = new System.Drawing.Point(6, 153);

+            this.lbl_appcastUnstable.Location = new System.Drawing.Point(6, 178);

             this.lbl_appcastUnstable.Name = "lbl_appcastUnstable";

             this.lbl_appcastUnstable.Size = new System.Drawing.Size(64, 13);

             this.lbl_appcastUnstable.TabIndex = 83;

@@ -741,7 +757,7 @@ namespace Handbrake
             this.check_snapshot.AutoSize = true;

             this.check_snapshot.BackColor = System.Drawing.Color.Transparent;

             this.check_snapshot.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_snapshot.Location = new System.Drawing.Point(76, 152);

+            this.check_snapshot.Location = new System.Drawing.Point(76, 177);

             this.check_snapshot.Name = "check_snapshot";

             this.check_snapshot.Size = new System.Drawing.Size(273, 17);

             this.check_snapshot.TabIndex = 80;

@@ -1130,19 +1146,21 @@ namespace Handbrake
             this.openFile_vlc.DefaultExt = "exe";

             this.openFile_vlc.Filter = "exe|*.exe";

             // 

-            // check_inGuiStatus

-            // 

-            this.check_inGuiStatus.AutoSize = true;

-            this.check_inGuiStatus.BackColor = System.Drawing.Color.Transparent;

-            this.check_inGuiStatus.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_inGuiStatus.Location = new System.Drawing.Point(76, 110);

-            this.check_inGuiStatus.Name = "check_inGuiStatus";

-            this.check_inGuiStatus.Size = new System.Drawing.Size(281, 17);

-            this.check_inGuiStatus.TabIndex = 92;

-            this.check_inGuiStatus.Text = "Enable in-GUI Encode status. (Experimental)";

-            this.ToolTip.SetToolTip(this.check_inGuiStatus, "Displays the CLI status in the GUI windows instead of the CLI window.");

-            this.check_inGuiStatus.UseVisualStyleBackColor = false;

-            this.check_inGuiStatus.CheckedChanged += new System.EventHandler(this.check_inGuiStatus_CheckedChanged);

+            // check_trayStatusAlerts

+            // 

+            this.check_trayStatusAlerts.AutoSize = true;

+            this.check_trayStatusAlerts.BackColor = System.Drawing.Color.Transparent;

+            this.check_trayStatusAlerts.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.check_trayStatusAlerts.Location = new System.Drawing.Point(97, 64);

+            this.check_trayStatusAlerts.Name = "check_trayStatusAlerts";

+            this.check_trayStatusAlerts.Size = new System.Drawing.Size(352, 17);

+            this.check_trayStatusAlerts.TabIndex = 93;

+            this.check_trayStatusAlerts.Text = "Display status messages from tray icon (balloon popups)";

+            this.ToolTip.SetToolTip(this.check_trayStatusAlerts, "Minimize the window to the system tray rather than the task bar.\r\nThe system tray" +

+                    " icon has encode status notifications.\r\nNote: requires restart to take effect!\r\n" +

+                    "");

+            this.check_trayStatusAlerts.UseVisualStyleBackColor = false;

+            this.check_trayStatusAlerts.CheckedChanged += new System.EventHandler(this.check_trayStatusAlerts_CheckedChanged);

             // 

             // frmOptions

             // 

@@ -1259,5 +1277,6 @@ namespace Handbrake
         internal System.Windows.Forms.CheckBox check_logsInSpecifiedLocation;

         internal System.Windows.Forms.CheckBox check_disablePresetNotification;

         internal System.Windows.Forms.CheckBox check_inGuiStatus;

+        internal System.Windows.Forms.CheckBox check_trayStatusAlerts;

     }

 }
\ No newline at end of file
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();