OSDN Git Service

WinGui:
authorsr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Tue, 16 Dec 2008 20:51:46 +0000 (20:51 +0000)
committersr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Tue, 16 Dec 2008 20:51:46 +0000 (20:51 +0000)
- Minimize to system tray is now optional and can be set in tools > options > advanced.
- Removed the minimize to system tray button since it's not really needed. The windows minimize button performs the same task

git-svn-id: svn://localhost/HandBrake/trunk@2038 b64f7644-9d1e-0410-96f1-a4d463321fa5

win/C#/Properties/Settings.Designer.cs
win/C#/Properties/Settings.settings
win/C#/app.config
win/C#/frmMain.Designer.cs
win/C#/frmMain.cs
win/C#/frmMain.resx
win/C#/frmOptions.Designer.cs
win/C#/frmOptions.cs

index a488f9f..429e350 100644 (file)
@@ -310,5 +310,17 @@ namespace Handbrake.Properties {
                 this["VLC_Path"] = value;\r
             }\r
         }\r
+        \r
+        [global::System.Configuration.UserScopedSettingAttribute()]\r
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("Checked")]\r
+        public string MainWindowMinimize {\r
+            get {\r
+                return ((string)(this["MainWindowMinimize"]));\r
+            }\r
+            set {\r
+                this["MainWindowMinimize"] = value;\r
+            }\r
+        }\r
     }\r
 }\r
index 179177f..a652153 100644 (file)
@@ -74,5 +74,8 @@
     <Setting Name="VLC_Path" Type="System.String" Scope="User">\r
       <Value Profile="(Default)">T:\\Program Files\\VideoLAN\\vlc\\vlc.exe</Value>\r
     </Setting>\r
+    <Setting Name="MainWindowMinimize" Type="System.String" Scope="User">\r
+      <Value Profile="(Default)">Checked</Value>\r
+    </Setting>\r
   </Settings>\r
 </SettingsFile>
\ No newline at end of file
index 7098f26..f6a004d 100644 (file)
@@ -79,6 +79,9 @@
             <setting name="VLC_Path" serializeAs="String">\r
                 <value>T:\\Program Files\\VideoLAN\\vlc\\vlc.exe</value>\r
             </setting>\r
+            <setting name="MainWindowMinimize" serializeAs="String">\r
+                <value>Checked</value>\r
+            </setting>\r
         </Handbrake.Properties.Settings>\r
     </userSettings>\r
 <startup><supportedRuntime version="v2.0.50727"/></startup></configuration>\r
index ca288ce..34bbd48 100644 (file)
@@ -38,7 +38,7 @@ namespace Handbrake
             System.Windows.Forms.Label Label38;\r
             System.Windows.Forms.ContextMenuStrip notifyIconMenu;\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();\r
             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.File_Save = new System.Windows.Forms.SaveFileDialog();\r
@@ -254,11 +254,8 @@ namespace Handbrake
             this.btn_add2Queue = new System.Windows.Forms.ToolStripButton();\r
             this.btn_showQueue = new System.Windows.Forms.ToolStripButton();\r
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();\r
-            this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();\r
-            this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();\r
-            this.btn_minimize = new System.Windows.Forms.ToolStripButton();\r
-            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();\r
             this.btn_vidPreview = new System.Windows.Forms.ToolStripButton();\r
+            this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();\r
             this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);\r
             this.StatusStrip = new System.Windows.Forms.StatusStrip();\r
             this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();\r
@@ -655,9 +652,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle3.Format = "N0";\r
-            dataGridViewCellStyle3.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle3;\r
+            dataGridViewCellStyle1.Format = "N0";\r
+            dataGridViewCellStyle1.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
             this.number.Name = "number";\r
@@ -3041,10 +3038,7 @@ namespace Handbrake
             this.btn_showQueue,\r
             this.toolStripSeparator4,\r
             this.btn_vidPreview,\r
-            this.btn_ActivityWindow,\r
-            this.toolStripSeparator8,\r
-            this.btn_minimize,\r
-            this.toolStripSeparator2});\r
+            this.btn_ActivityWindow});\r
             this.toolStrip1.Location = new System.Drawing.Point(0, 24);\r
             this.toolStrip1.Name = "toolStrip1";\r
             this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;\r
@@ -3142,6 +3136,16 @@ namespace Handbrake
             this.toolStripSeparator4.Name = "toolStripSeparator4";\r
             this.toolStripSeparator4.Size = new System.Drawing.Size(6, 39);\r
             // \r
+            // btn_vidPreview\r
+            // \r
+            this.btn_vidPreview.Image = global::Handbrake.Properties.Resources.picture;\r
+            this.btn_vidPreview.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
+            this.btn_vidPreview.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.btn_vidPreview.Name = "btn_vidPreview";\r
+            this.btn_vidPreview.Size = new System.Drawing.Size(86, 36);\r
+            this.btn_vidPreview.Text = "Preview";\r
+            this.btn_vidPreview.Click += new System.EventHandler(this.btn_vidPreview_Click);\r
+            // \r
             // btn_ActivityWindow\r
             // \r
             this.btn_ActivityWindow.Image = global::Handbrake.Properties.Resources.ActivityWindow;\r
@@ -3154,35 +3158,6 @@ namespace Handbrake
                 "ently running encode.";\r
             this.btn_ActivityWindow.Click += new System.EventHandler(this.btn_ActivityWindow_Click);\r
             // \r
-            // toolStripSeparator8\r
-            // \r
-            this.toolStripSeparator8.Name = "toolStripSeparator8";\r
-            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 39);\r
-            // \r
-            // btn_minimize\r
-            // \r
-            this.btn_minimize.Image = global::Handbrake.Properties.Resources.hb32;\r
-            this.btn_minimize.ImageTransparentColor = System.Drawing.Color.Magenta;\r
-            this.btn_minimize.Name = "btn_minimize";\r
-            this.btn_minimize.Size = new System.Drawing.Size(162, 36);\r
-            this.btn_minimize.Text = "Minimize To System Tray";\r
-            this.btn_minimize.Click += new System.EventHandler(this.btn_minimize_Click);\r
-            // \r
-            // toolStripSeparator2\r
-            // \r
-            this.toolStripSeparator2.Name = "toolStripSeparator2";\r
-            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 39);\r
-            // \r
-            // btn_vidPreview\r
-            // \r
-            this.btn_vidPreview.Image = global::Handbrake.Properties.Resources.picture;\r
-            this.btn_vidPreview.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
-            this.btn_vidPreview.ImageTransparentColor = System.Drawing.Color.Magenta;\r
-            this.btn_vidPreview.Name = "btn_vidPreview";\r
-            this.btn_vidPreview.Size = new System.Drawing.Size(86, 36);\r
-            this.btn_vidPreview.Text = "Preview";\r
-            this.btn_vidPreview.Click += new System.EventHandler(this.btn_vidPreview_Click);\r
-            // \r
             // notifyIcon\r
             // \r
             this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info;\r
@@ -3384,7 +3359,6 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripButton btn_showQueue;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;\r
         private System.Windows.Forms.ToolStripButton btn_ActivityWindow;\r
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_handbrake_home;\r
         internal System.Windows.Forms.Button btn_removePreset;\r
         internal System.Windows.Forms.Button btn_addPreset;\r
@@ -3463,7 +3437,6 @@ namespace Handbrake
         internal System.Windows.Forms.TreeView treeView_presets;\r
         internal System.Windows.Forms.RichTextBox rtf_query;\r
         private System.Windows.Forms.NotifyIcon notifyIcon;\r
-        private System.Windows.Forms.ToolStripButton btn_minimize;\r
         private System.Windows.Forms.ToolStripMenuItem btn_restore;\r
         internal System.Windows.Forms.Label lbl_src_res;\r
         internal System.Windows.Forms.Label label7;\r
@@ -3499,7 +3472,6 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripSeparator sep1;\r
         private System.Windows.Forms.ToolStripMenuItem pmnu_delete;\r
         private System.Windows.Forms.SplitContainer splitContainer1;\r
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;\r
         private System.Windows.Forms.ToolStripButton btn_vidPreview;\r
 \r
     }\r
index adbe7c2..3efa040 100644 (file)
@@ -109,7 +109,8 @@ namespace Handbrake
             this.Enabled = true;\r
 \r
             // Event Handlers\r
-            this.Resize += new EventHandler(frmMain_Resize);\r
+            if (Properties.Settings.Default.MainWindowMinimize == "Checked")\r
+                this.Resize += new EventHandler(frmMain_Resize);\r
 \r
             // Queue Recovery\r
             queueRecovery();\r
@@ -556,10 +557,6 @@ namespace Handbrake
             this.WindowState = FormWindowState.Normal;\r
             notifyIcon.Visible = false;\r
         }\r
-        private void btn_minimize_Click(object sender, EventArgs e)\r
-        {\r
-            this.WindowState = FormWindowState.Minimized;\r
-        }\r
         private void btn_restore_Click(object sender, EventArgs e)\r
         {\r
             this.Visible = true;\r
@@ -1961,6 +1958,9 @@ namespace Handbrake
 \r
         #endregion\r
 \r
+\r
+\r
+\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file
index 4601e59..1ae5e66 100644 (file)
@@ -155,12 +155,6 @@ Make sure you have selected a "Title" from the "Source" box above otherwise
 the list will not be populated with the correct amount of chapters.\r
 Note: Do not change any of the chapter numbers!</value>\r
   </data>\r
-  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
-    <value>True</value>\r
-  </metadata>\r
-  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
-    <value>True</value>\r
-  </metadata>\r
   <data name="check_Cabac.ToolTip" xml:space="preserve">\r
     <value>CABAC, or context adaptive binary arithmetic coding, is used by x264 to reduce the bitrate needed for a given quality by 15%. \r
 This makes it very cool and very useful, and it should be left on whenever possible. However, it is incompatible with the iPod 5.5G, and makes the AppleTV struggle. \r
index b0953dc..044b7ab 100644 (file)
@@ -54,6 +54,9 @@ namespace Handbrake
             this.label1 = new System.Windows.Forms.Label();\r
             this.label2 = new System.Windows.Forms.Label();\r
             this.tab_picture = new System.Windows.Forms.TabPage();\r
+            this.btn_vlcPath = new System.Windows.Forms.Button();\r
+            this.txt_vlcPath = new System.Windows.Forms.TextBox();\r
+            this.label29 = new System.Windows.Forms.Label();\r
             this.txt_decomb = new System.Windows.Forms.TextBox();\r
             this.label3 = new System.Windows.Forms.Label();\r
             this.tab_cli = new System.Windows.Forms.TabPage();\r
@@ -71,7 +74,6 @@ namespace Handbrake
             this.drp_processors = new System.Windows.Forms.ComboBox();\r
             this.Label4 = new System.Windows.Forms.Label();\r
             this.tab_advanced = new System.Windows.Forms.TabPage();\r
-            this.lbl_appcastUnstable = new System.Windows.Forms.Label();\r
             this.check_snapshot = new System.Windows.Forms.CheckBox();\r
             this.btn_drive_detect = new System.Windows.Forms.CheckBox();\r
             this.label6 = new System.Windows.Forms.Label();\r
@@ -79,38 +81,37 @@ namespace Handbrake
             this.pictureBox2 = new System.Windows.Forms.PictureBox();\r
             this.pathFinder = new System.Windows.Forms.FolderBrowserDialog();\r
             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
-            this.label16 = new System.Windows.Forms.Label();\r
-            this.label17 = new System.Windows.Forms.Label();\r
             this.textBox1 = new System.Windows.Forms.TextBox();\r
-            this.button1 = new System.Windows.Forms.Button();\r
-            this.label18 = new System.Windows.Forms.Label();\r
             this.textBox2 = new System.Windows.Forms.TextBox();\r
             this.checkBox1 = new System.Windows.Forms.CheckBox();\r
-            this.label19 = new System.Windows.Forms.Label();\r
             this.checkBox2 = new System.Windows.Forms.CheckBox();\r
             this.checkBox3 = new System.Windows.Forms.CheckBox();\r
             this.checkBox4 = new System.Windows.Forms.CheckBox();\r
-            this.label20 = new System.Windows.Forms.Label();\r
-            this.label21 = new System.Windows.Forms.Label();\r
             this.comboBox1 = new System.Windows.Forms.ComboBox();\r
-            this.label22 = new System.Windows.Forms.Label();\r
-            this.label23 = new System.Windows.Forms.Label();\r
             this.textBox3 = new System.Windows.Forms.TextBox();\r
-            this.button2 = new System.Windows.Forms.Button();\r
-            this.label24 = new System.Windows.Forms.Label();\r
             this.textBox4 = new System.Windows.Forms.TextBox();\r
             this.checkBox5 = new System.Windows.Forms.CheckBox();\r
-            this.label25 = new System.Windows.Forms.Label();\r
             this.checkBox6 = new System.Windows.Forms.CheckBox();\r
             this.checkBox7 = new System.Windows.Forms.CheckBox();\r
             this.checkBox8 = new System.Windows.Forms.CheckBox();\r
+            this.comboBox2 = new System.Windows.Forms.ComboBox();\r
+            this.label16 = new System.Windows.Forms.Label();\r
+            this.label17 = new System.Windows.Forms.Label();\r
+            this.button1 = new System.Windows.Forms.Button();\r
+            this.label18 = new System.Windows.Forms.Label();\r
+            this.label19 = new System.Windows.Forms.Label();\r
+            this.label20 = new System.Windows.Forms.Label();\r
+            this.label21 = new System.Windows.Forms.Label();\r
+            this.label22 = new System.Windows.Forms.Label();\r
+            this.label23 = new System.Windows.Forms.Label();\r
+            this.button2 = new System.Windows.Forms.Button();\r
+            this.label24 = new System.Windows.Forms.Label();\r
+            this.label25 = new System.Windows.Forms.Label();\r
             this.label26 = new System.Windows.Forms.Label();\r
             this.label27 = new System.Windows.Forms.Label();\r
-            this.comboBox2 = new System.Windows.Forms.ComboBox();\r
-            this.btn_vlcPath = new System.Windows.Forms.Button();\r
-            this.txt_vlcPath = new System.Windows.Forms.TextBox();\r
-            this.label29 = new System.Windows.Forms.Label();\r
             this.openFile_vlc = new System.Windows.Forms.OpenFileDialog();\r
+            this.check_mainMinimize = new System.Windows.Forms.CheckBox();\r
+            this.lbl_appcastUnstable = new System.Windows.Forms.Label();\r
             this.tab_options.SuspendLayout();\r
             this.tab_general.SuspendLayout();\r
             this.tab_picture.SuspendLayout();\r
@@ -352,6 +353,38 @@ namespace Handbrake
             this.tab_picture.Text = "Picture";\r
             this.tab_picture.UseVisualStyleBackColor = true;\r
             // \r
+            // btn_vlcPath\r
+            // \r
+            this.btn_vlcPath.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.btn_vlcPath.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_vlcPath.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.btn_vlcPath.Location = new System.Drawing.Point(398, 56);\r
+            this.btn_vlcPath.Name = "btn_vlcPath";\r
+            this.btn_vlcPath.Size = new System.Drawing.Size(68, 22);\r
+            this.btn_vlcPath.TabIndex = 83;\r
+            this.btn_vlcPath.Text = "Browse";\r
+            this.btn_vlcPath.UseVisualStyleBackColor = true;\r
+            this.btn_vlcPath.Click += new System.EventHandler(this.btn_vlcPath_Click);\r
+            // \r
+            // txt_vlcPath\r
+            // \r
+            this.txt_vlcPath.Location = new System.Drawing.Point(98, 56);\r
+            this.txt_vlcPath.Name = "txt_vlcPath";\r
+            this.txt_vlcPath.Size = new System.Drawing.Size(294, 21);\r
+            this.txt_vlcPath.TabIndex = 81;\r
+            this.ToolTip.SetToolTip(this.txt_vlcPath, "The default location where auto named files are stored.");\r
+            this.txt_vlcPath.TextChanged += new System.EventHandler(this.txt_vlcPath_TextChanged);\r
+            // \r
+            // label29\r
+            // \r
+            this.label29.AutoSize = true;\r
+            this.label29.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label29.Location = new System.Drawing.Point(17, 61);\r
+            this.label29.Name = "label29";\r
+            this.label29.Size = new System.Drawing.Size(67, 13);\r
+            this.label29.TabIndex = 79;\r
+            this.label29.Text = "VLC Path:";\r
+            // \r
             // txt_decomb\r
             // \r
             this.txt_decomb.Location = new System.Drawing.Point(98, 16);\r
@@ -562,6 +595,7 @@ namespace Handbrake
             // tab_advanced\r
             // \r
             this.tab_advanced.Controls.Add(this.lbl_appcastUnstable);\r
+            this.tab_advanced.Controls.Add(this.check_mainMinimize);\r
             this.tab_advanced.Controls.Add(this.check_snapshot);\r
             this.tab_advanced.Controls.Add(this.btn_drive_detect);\r
             this.tab_advanced.Controls.Add(this.label6);\r
@@ -570,25 +604,15 @@ namespace Handbrake
             this.tab_advanced.Padding = new System.Windows.Forms.Padding(3);\r
             this.tab_advanced.Size = new System.Drawing.Size(482, 259);\r
             this.tab_advanced.TabIndex = 4;\r
-            this.tab_advanced.Text = "Advanced";\r
+            this.tab_advanced.Text = "Advanced / Other";\r
             this.tab_advanced.UseVisualStyleBackColor = true;\r
             // \r
-            // lbl_appcastUnstable\r
-            // \r
-            this.lbl_appcastUnstable.AutoSize = true;\r
-            this.lbl_appcastUnstable.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_appcastUnstable.Location = new System.Drawing.Point(6, 42);\r
-            this.lbl_appcastUnstable.Name = "lbl_appcastUnstable";\r
-            this.lbl_appcastUnstable.Size = new System.Drawing.Size(64, 13);\r
-            this.lbl_appcastUnstable.TabIndex = 81;\r
-            this.lbl_appcastUnstable.Text = "Updates:";\r
-            // \r
             // check_snapshot\r
             // \r
             this.check_snapshot.AutoSize = true;\r
             this.check_snapshot.BackColor = System.Drawing.Color.Transparent;\r
             this.check_snapshot.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_snapshot.Location = new System.Drawing.Point(76, 41);\r
+            this.check_snapshot.Location = new System.Drawing.Point(76, 81);\r
             this.check_snapshot.Name = "check_snapshot";\r
             this.check_snapshot.Size = new System.Drawing.Size(273, 17);\r
             this.check_snapshot.TabIndex = 80;\r
@@ -648,26 +672,6 @@ namespace Handbrake
             this.ToolTip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;\r
             this.ToolTip.ToolTipTitle = "Tooltip";\r
             // \r
-            // label16\r
-            // \r
-            this.label16.AutoSize = true;\r
-            this.label16.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label16.Location = new System.Drawing.Point(197, 222);\r
-            this.label16.Name = "label16";\r
-            this.label16.Size = new System.Drawing.Size(242, 12);\r
-            this.label16.TabIndex = 81;\r
-            this.label16.Text = "Available Options: {source} {title} {chapters}";\r
-            // \r
-            // label17\r
-            // \r
-            this.label17.AutoSize = true;\r
-            this.label17.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label17.Location = new System.Drawing.Point(111, 201);\r
-            this.label17.Name = "label17";\r
-            this.label17.Size = new System.Drawing.Size(52, 13);\r
-            this.label17.TabIndex = 80;\r
-            this.label17.Text = "Format:";\r
-            // \r
             // textBox1\r
             // \r
             this.textBox1.Location = new System.Drawing.Point(199, 198);\r
@@ -678,28 +682,6 @@ namespace Handbrake
                     "xt\r\n{source} {title} {chapters} will be automatically substituted for the input " +\r
                     "sources values.");\r
             // \r
-            // button1\r
-            // \r
-            this.button1.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.button1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.button1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.button1.Location = new System.Drawing.Point(386, 171);\r
-            this.button1.Name = "button1";\r
-            this.button1.Size = new System.Drawing.Size(68, 22);\r
-            this.button1.TabIndex = 78;\r
-            this.button1.Text = "Browse";\r
-            this.button1.UseVisualStyleBackColor = true;\r
-            // \r
-            // label18\r
-            // \r
-            this.label18.AutoSize = true;\r
-            this.label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label18.Location = new System.Drawing.Point(111, 174);\r
-            this.label18.Name = "label18";\r
-            this.label18.Size = new System.Drawing.Size(82, 13);\r
-            this.label18.TabIndex = 77;\r
-            this.label18.Text = "Default Path:";\r
-            // \r
             // textBox2\r
             // \r
             this.textBox2.Location = new System.Drawing.Point(199, 171);\r
@@ -720,16 +702,6 @@ namespace Handbrake
             this.ToolTip.SetToolTip(this.checkBox1, "Automatically name output files");\r
             this.checkBox1.UseVisualStyleBackColor = true;\r
             // \r
-            // label19\r
-            // \r
-            this.label19.AutoSize = true;\r
-            this.label19.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label19.Location = new System.Drawing.Point(10, 149);\r
-            this.label19.Name = "label19";\r
-            this.label19.Size = new System.Drawing.Size(86, 13);\r
-            this.label19.TabIndex = 71;\r
-            this.label19.Text = "Output files:";\r
-            // \r
             // checkBox2\r
             // \r
             this.checkBox2.AutoSize = true;\r
@@ -770,27 +742,6 @@ namespace Handbrake
             this.ToolTip.SetToolTip(this.checkBox4, "Loads the users default settings rather than the Normal preset.");\r
             this.checkBox4.UseVisualStyleBackColor = false;\r
             // \r
-            // label20\r
-            // \r
-            this.label20.AutoSize = true;\r
-            this.label20.BackColor = System.Drawing.Color.Transparent;\r
-            this.label20.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label20.Location = new System.Drawing.Point(21, 19);\r
-            this.label20.Name = "label20";\r
-            this.label20.Size = new System.Drawing.Size(75, 13);\r
-            this.label20.TabIndex = 67;\r
-            this.label20.Text = "At Launch:";\r
-            // \r
-            // label21\r
-            // \r
-            this.label21.AutoSize = true;\r
-            this.label21.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label21.Location = new System.Drawing.Point(12, 103);\r
-            this.label21.Name = "label21";\r
-            this.label21.Size = new System.Drawing.Size(84, 13);\r
-            this.label21.TabIndex = 54;\r
-            this.label21.Text = "When Done:";\r
-            // \r
             // comboBox1\r
             // \r
             this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
@@ -810,26 +761,6 @@ namespace Handbrake
             this.comboBox1.TabIndex = 43;\r
             this.ToolTip.SetToolTip(this.comboBox1, "Performs an action when an encode or queue has completed.");\r
             // \r
-            // label22\r
-            // \r
-            this.label22.AutoSize = true;\r
-            this.label22.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label22.Location = new System.Drawing.Point(197, 222);\r
-            this.label22.Name = "label22";\r
-            this.label22.Size = new System.Drawing.Size(242, 12);\r
-            this.label22.TabIndex = 81;\r
-            this.label22.Text = "Available Options: {source} {title} {chapters}";\r
-            // \r
-            // label23\r
-            // \r
-            this.label23.AutoSize = true;\r
-            this.label23.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label23.Location = new System.Drawing.Point(111, 201);\r
-            this.label23.Name = "label23";\r
-            this.label23.Size = new System.Drawing.Size(52, 13);\r
-            this.label23.TabIndex = 80;\r
-            this.label23.Text = "Format:";\r
-            // \r
             // textBox3\r
             // \r
             this.textBox3.Location = new System.Drawing.Point(199, 198);\r
@@ -840,28 +771,6 @@ namespace Handbrake
                     "xt\r\n{source} {title} {chapters} will be automatically substituted for the input " +\r
                     "sources values.");\r
             // \r
-            // button2\r
-            // \r
-            this.button2.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.button2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.button2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.button2.Location = new System.Drawing.Point(386, 171);\r
-            this.button2.Name = "button2";\r
-            this.button2.Size = new System.Drawing.Size(68, 22);\r
-            this.button2.TabIndex = 78;\r
-            this.button2.Text = "Browse";\r
-            this.button2.UseVisualStyleBackColor = true;\r
-            // \r
-            // label24\r
-            // \r
-            this.label24.AutoSize = true;\r
-            this.label24.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label24.Location = new System.Drawing.Point(111, 174);\r
-            this.label24.Name = "label24";\r
-            this.label24.Size = new System.Drawing.Size(82, 13);\r
-            this.label24.TabIndex = 77;\r
-            this.label24.Text = "Default Path:";\r
-            // \r
             // textBox4\r
             // \r
             this.textBox4.Location = new System.Drawing.Point(199, 171);\r
@@ -882,16 +791,6 @@ namespace Handbrake
             this.ToolTip.SetToolTip(this.checkBox5, "Automatically name output files");\r
             this.checkBox5.UseVisualStyleBackColor = true;\r
             // \r
-            // label25\r
-            // \r
-            this.label25.AutoSize = true;\r
-            this.label25.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label25.Location = new System.Drawing.Point(10, 149);\r
-            this.label25.Name = "label25";\r
-            this.label25.Size = new System.Drawing.Size(86, 13);\r
-            this.label25.TabIndex = 71;\r
-            this.label25.Text = "Output files:";\r
-            // \r
             // checkBox6\r
             // \r
             this.checkBox6.AutoSize = true;\r
@@ -932,27 +831,6 @@ namespace Handbrake
             this.ToolTip.SetToolTip(this.checkBox8, "Loads the users default settings rather than the Normal preset.");\r
             this.checkBox8.UseVisualStyleBackColor = false;\r
             // \r
-            // label26\r
-            // \r
-            this.label26.AutoSize = true;\r
-            this.label26.BackColor = System.Drawing.Color.Transparent;\r
-            this.label26.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label26.Location = new System.Drawing.Point(21, 19);\r
-            this.label26.Name = "label26";\r
-            this.label26.Size = new System.Drawing.Size(75, 13);\r
-            this.label26.TabIndex = 67;\r
-            this.label26.Text = "At Launch:";\r
-            // \r
-            // label27\r
-            // \r
-            this.label27.AutoSize = true;\r
-            this.label27.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label27.Location = new System.Drawing.Point(12, 103);\r
-            this.label27.Name = "label27";\r
-            this.label27.Size = new System.Drawing.Size(84, 13);\r
-            this.label27.TabIndex = 54;\r
-            this.label27.Text = "When Done:";\r
-            // \r
             // comboBox2\r
             // \r
             this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
@@ -972,43 +850,183 @@ namespace Handbrake
             this.comboBox2.TabIndex = 43;\r
             this.ToolTip.SetToolTip(this.comboBox2, "Performs an action when an encode or queue has completed.");\r
             // \r
-            // btn_vlcPath\r
+            // label16\r
             // \r
-            this.btn_vlcPath.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_vlcPath.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_vlcPath.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_vlcPath.Location = new System.Drawing.Point(398, 56);\r
-            this.btn_vlcPath.Name = "btn_vlcPath";\r
-            this.btn_vlcPath.Size = new System.Drawing.Size(68, 22);\r
-            this.btn_vlcPath.TabIndex = 83;\r
-            this.btn_vlcPath.Text = "Browse";\r
-            this.btn_vlcPath.UseVisualStyleBackColor = true;\r
-            this.btn_vlcPath.Click += new System.EventHandler(this.btn_vlcPath_Click);\r
+            this.label16.AutoSize = true;\r
+            this.label16.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label16.Location = new System.Drawing.Point(197, 222);\r
+            this.label16.Name = "label16";\r
+            this.label16.Size = new System.Drawing.Size(242, 12);\r
+            this.label16.TabIndex = 81;\r
+            this.label16.Text = "Available Options: {source} {title} {chapters}";\r
             // \r
-            // txt_vlcPath\r
+            // label17\r
             // \r
-            this.txt_vlcPath.Location = new System.Drawing.Point(98, 56);\r
-            this.txt_vlcPath.Name = "txt_vlcPath";\r
-            this.txt_vlcPath.Size = new System.Drawing.Size(294, 21);\r
-            this.txt_vlcPath.TabIndex = 81;\r
-            this.ToolTip.SetToolTip(this.txt_vlcPath, "The default location where auto named files are stored.");\r
-            this.txt_vlcPath.TextChanged += new System.EventHandler(this.txt_vlcPath_TextChanged);\r
+            this.label17.AutoSize = true;\r
+            this.label17.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label17.Location = new System.Drawing.Point(111, 201);\r
+            this.label17.Name = "label17";\r
+            this.label17.Size = new System.Drawing.Size(52, 13);\r
+            this.label17.TabIndex = 80;\r
+            this.label17.Text = "Format:";\r
             // \r
-            // label29\r
+            // button1\r
             // \r
-            this.label29.AutoSize = true;\r
-            this.label29.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label29.Location = new System.Drawing.Point(17, 61);\r
-            this.label29.Name = "label29";\r
-            this.label29.Size = new System.Drawing.Size(67, 13);\r
-            this.label29.TabIndex = 79;\r
-            this.label29.Text = "VLC Path:";\r
+            this.button1.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.button1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.button1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.button1.Location = new System.Drawing.Point(386, 171);\r
+            this.button1.Name = "button1";\r
+            this.button1.Size = new System.Drawing.Size(68, 22);\r
+            this.button1.TabIndex = 78;\r
+            this.button1.Text = "Browse";\r
+            this.button1.UseVisualStyleBackColor = true;\r
+            // \r
+            // label18\r
+            // \r
+            this.label18.AutoSize = true;\r
+            this.label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label18.Location = new System.Drawing.Point(111, 174);\r
+            this.label18.Name = "label18";\r
+            this.label18.Size = new System.Drawing.Size(82, 13);\r
+            this.label18.TabIndex = 77;\r
+            this.label18.Text = "Default Path:";\r
+            // \r
+            // label19\r
+            // \r
+            this.label19.AutoSize = true;\r
+            this.label19.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label19.Location = new System.Drawing.Point(10, 149);\r
+            this.label19.Name = "label19";\r
+            this.label19.Size = new System.Drawing.Size(86, 13);\r
+            this.label19.TabIndex = 71;\r
+            this.label19.Text = "Output files:";\r
+            // \r
+            // label20\r
+            // \r
+            this.label20.AutoSize = true;\r
+            this.label20.BackColor = System.Drawing.Color.Transparent;\r
+            this.label20.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label20.Location = new System.Drawing.Point(21, 19);\r
+            this.label20.Name = "label20";\r
+            this.label20.Size = new System.Drawing.Size(75, 13);\r
+            this.label20.TabIndex = 67;\r
+            this.label20.Text = "At Launch:";\r
+            // \r
+            // label21\r
+            // \r
+            this.label21.AutoSize = true;\r
+            this.label21.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label21.Location = new System.Drawing.Point(12, 103);\r
+            this.label21.Name = "label21";\r
+            this.label21.Size = new System.Drawing.Size(84, 13);\r
+            this.label21.TabIndex = 54;\r
+            this.label21.Text = "When Done:";\r
+            // \r
+            // label22\r
+            // \r
+            this.label22.AutoSize = true;\r
+            this.label22.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label22.Location = new System.Drawing.Point(197, 222);\r
+            this.label22.Name = "label22";\r
+            this.label22.Size = new System.Drawing.Size(242, 12);\r
+            this.label22.TabIndex = 81;\r
+            this.label22.Text = "Available Options: {source} {title} {chapters}";\r
+            // \r
+            // label23\r
+            // \r
+            this.label23.AutoSize = true;\r
+            this.label23.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label23.Location = new System.Drawing.Point(111, 201);\r
+            this.label23.Name = "label23";\r
+            this.label23.Size = new System.Drawing.Size(52, 13);\r
+            this.label23.TabIndex = 80;\r
+            this.label23.Text = "Format:";\r
+            // \r
+            // button2\r
+            // \r
+            this.button2.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.button2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.button2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.button2.Location = new System.Drawing.Point(386, 171);\r
+            this.button2.Name = "button2";\r
+            this.button2.Size = new System.Drawing.Size(68, 22);\r
+            this.button2.TabIndex = 78;\r
+            this.button2.Text = "Browse";\r
+            this.button2.UseVisualStyleBackColor = true;\r
+            // \r
+            // label24\r
+            // \r
+            this.label24.AutoSize = true;\r
+            this.label24.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label24.Location = new System.Drawing.Point(111, 174);\r
+            this.label24.Name = "label24";\r
+            this.label24.Size = new System.Drawing.Size(82, 13);\r
+            this.label24.TabIndex = 77;\r
+            this.label24.Text = "Default Path:";\r
+            // \r
+            // label25\r
+            // \r
+            this.label25.AutoSize = true;\r
+            this.label25.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label25.Location = new System.Drawing.Point(10, 149);\r
+            this.label25.Name = "label25";\r
+            this.label25.Size = new System.Drawing.Size(86, 13);\r
+            this.label25.TabIndex = 71;\r
+            this.label25.Text = "Output files:";\r
+            // \r
+            // label26\r
+            // \r
+            this.label26.AutoSize = true;\r
+            this.label26.BackColor = System.Drawing.Color.Transparent;\r
+            this.label26.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label26.Location = new System.Drawing.Point(21, 19);\r
+            this.label26.Name = "label26";\r
+            this.label26.Size = new System.Drawing.Size(75, 13);\r
+            this.label26.TabIndex = 67;\r
+            this.label26.Text = "At Launch:";\r
+            // \r
+            // label27\r
+            // \r
+            this.label27.AutoSize = true;\r
+            this.label27.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label27.Location = new System.Drawing.Point(12, 103);\r
+            this.label27.Name = "label27";\r
+            this.label27.Size = new System.Drawing.Size(84, 13);\r
+            this.label27.TabIndex = 54;\r
+            this.label27.Text = "When Done:";\r
             // \r
             // openFile_vlc\r
             // \r
             this.openFile_vlc.DefaultExt = "exe";\r
             this.openFile_vlc.Filter = "exe|*.exe";\r
             // \r
+            // check_mainMinimize\r
+            // \r
+            this.check_mainMinimize.AutoSize = true;\r
+            this.check_mainMinimize.BackColor = System.Drawing.Color.Transparent;\r
+            this.check_mainMinimize.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_mainMinimize.Location = new System.Drawing.Point(76, 41);\r
+            this.check_mainMinimize.Name = "check_mainMinimize";\r
+            this.check_mainMinimize.Size = new System.Drawing.Size(286, 17);\r
+            this.check_mainMinimize.TabIndex = 82;\r
+            this.check_mainMinimize.Text = "Minimize to System Tray rather than task bar";\r
+            this.ToolTip.SetToolTip(this.check_mainMinimize, "Minimize the window to the system tray rather than the task bar.\r\nThe system tray" +\r
+                    " icon has encode status notifications.\r\nNote: requires restart to take effect!\r\n" +\r
+                    "");\r
+            this.check_mainMinimize.UseVisualStyleBackColor = false;\r
+            this.check_mainMinimize.CheckedChanged += new System.EventHandler(this.check_mainMinimize_CheckedChanged);\r
+            // \r
+            // lbl_appcastUnstable\r
+            // \r
+            this.lbl_appcastUnstable.AutoSize = true;\r
+            this.lbl_appcastUnstable.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_appcastUnstable.Location = new System.Drawing.Point(6, 82);\r
+            this.lbl_appcastUnstable.Name = "lbl_appcastUnstable";\r
+            this.lbl_appcastUnstable.Size = new System.Drawing.Size(64, 13);\r
+            this.lbl_appcastUnstable.TabIndex = 83;\r
+            this.lbl_appcastUnstable.Text = "Updates:";\r
+            // \r
             // frmOptions\r
             // \r
             this.ClientSize = new System.Drawing.Size(514, 375);\r
@@ -1069,7 +1087,6 @@ namespace Handbrake
         internal System.Windows.Forms.CheckBox check_cli_minimized;\r
         private System.Windows.Forms.Label label12;\r
         internal System.Windows.Forms.ToolTip ToolTip;\r
-        private System.Windows.Forms.Label lbl_appcastUnstable;\r
         internal System.Windows.Forms.CheckBox check_snapshot;\r
         private System.Windows.Forms.TabPage tab_picture;\r
         private System.Windows.Forms.TextBox txt_decomb;\r
@@ -1116,5 +1133,7 @@ namespace Handbrake
         private System.Windows.Forms.Label label27;\r
         internal System.Windows.Forms.ComboBox comboBox2;\r
         private System.Windows.Forms.OpenFileDialog openFile_vlc;\r
+        private System.Windows.Forms.Label lbl_appcastUnstable;\r
+        internal System.Windows.Forms.CheckBox check_mainMinimize;\r
     }\r
 }
\ No newline at end of file
index d139998..32c63b2 100644 (file)
@@ -114,6 +114,9 @@ namespace Handbrake
             if (Properties.Settings.Default.drive_detection == "Checked")\r
                 btn_drive_detect.CheckState = CheckState.Checked;\r
 \r
+            // Enable snapshot updating\r
+            if (Properties.Settings.Default.MainWindowMinimize == "Checked")\r
+                check_mainMinimize.CheckState = CheckState.Checked;\r
         }\r
 \r
         #region General\r
@@ -243,6 +246,11 @@ namespace Handbrake
             Properties.Settings.Default.drive_detection = btn_drive_detect.CheckState.ToString();\r
         }\r
 \r
+        private void check_mainMinimize_CheckedChanged(object sender, EventArgs e)\r
+        {\r
+            Properties.Settings.Default.MainWindowMinimize = check_mainMinimize.CheckState.ToString();\r
+        }\r
+\r
         private void check_snapshot_CheckedChanged(object sender, EventArgs e)\r
         {\r
             Properties.Settings.Default.checkSnapshot = check_snapshot.CheckState.ToString();\r
@@ -254,6 +262,5 @@ namespace Handbrake
             Properties.Settings.Default.Save(); // Small hack for Vista. Seems to work fine on XP without this\r
             this.Close();\r
         }\r
-\r
     }\r
 }
\ No newline at end of file