WinGui:

- Remove 2 options.
    "Enable DVD drive detection..."  Feature seems stable, so no longer required.
    "Load my default preset"  No real need for this option.

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

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index bf243e7a0c4d0b55d16e3d24518565c32de135e6..be86c49b487b2155ac7611058cde9fdd40d26d11 100644 (file)
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -47,18 +47,6 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]\r
-        public bool defaultSettings {\r
-            get {\r
-                return ((bool)(this["defaultSettings"]));\r
-            }\r
-            set {\r
-                this["defaultSettings"] = value;\r
-            }\r
-        }\r
-        \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
         [global::System.Configuration.DefaultSettingValueAttribute("True")]\r
@@ -191,18 +179,6 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]\r
-        public bool drive_detection {\r
-            get {\r
-                return ((bool)(this["drive_detection"]));\r
-            }\r
-            set {\r
-                this["drive_detection"] = value;\r
-            }\r
-        }\r
-        \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
         [global::System.Configuration.DefaultSettingValueAttribute("False")]\r

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index 360089ff079d87edf3a37ac2c7da4447467ff3f0..b52c8c706b842260c38011f1d3ee757799f426f5 100644 (file)
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -8,9 +8,6 @@
     <Setting Name="Processors" Type="System.String" Scope="User">\r
       <Value Profile="(Default)">Automatic</Value>\r
     </Setting>\r
-    <Setting Name="defaultSettings" Type="System.Boolean" Scope="User">\r
-      <Value Profile="(Default)">True</Value>\r
-    </Setting>\r
     <Setting Name="updateStatus" Type="System.Boolean" Scope="User">\r
       <Value Profile="(Default)">True</Value>\r
     </Setting>\r
@@ -44,9 +41,6 @@
     <Setting Name="appcast_unstable" Type="System.String" Scope="User">\r
       <Value Profile="(Default)">http://handbrake.fr/appcast_unstable.xml</Value>\r
     </Setting>\r
-    <Setting Name="drive_detection" Type="System.Boolean" Scope="User">\r
-      <Value Profile="(Default)">True</Value>\r
-    </Setting>\r
     <Setting Name="cli_minimized" Type="System.Boolean" Scope="User">\r
       <Value Profile="(Default)">False</Value>\r
     </Setting>\r

diff --git a/win/C#/app.config b/win/C#/app.config
index 12068df9a4a00f79836291780318b81b4ca7480a..d213f50632845732c8f8959101afbf7bbb937971 100644 (file)
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -13,9 +13,6 @@
             <setting name="Processors" serializeAs="String">\r
                 <value>Automatic</value>\r
             </setting>\r
-            <setting name="defaultSettings" serializeAs="String">\r
-                <value>True</value>\r
-            </setting>\r
             <setting name="updateStatus" serializeAs="String">\r
                 <value>True</value>\r
             </setting>\r
@@ -49,9 +46,6 @@
             <setting name="appcast_unstable" serializeAs="String">\r
                 <value>http://handbrake.fr/appcast_unstable.xml</value>\r
             </setting>\r
-            <setting name="drive_detection" serializeAs="String">\r
-                <value>True</value>\r
-            </setting>\r
             <setting name="cli_minimized" serializeAs="String">\r
                 <value>False</value>\r
             </setting>\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 97307655288d2522c0e5c92cd958f4ce12ea389b..53b1541d7d962b120d1ec173237230f5c7e76205 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -88,7 +88,7 @@ namespace Handbrake
                 tabs_panel.TabPages.RemoveAt(7); // Remove the query editor tab if the user does not want it enabled.\r
 \r
             // Load the user's default settings or Normal Preset\r
-            if (Properties.Settings.Default.defaultSettings && Properties.Settings.Default.defaultPreset != "")\r
+            if (Properties.Settings.Default.defaultPreset != "")\r
             {\r
                 if (presetHandler.getPreset(Properties.Settings.Default.defaultPreset) != null)\r
                 {\r
@@ -639,14 +639,9 @@ namespace Handbrake
         #region ToolStrip\r
         private void btn_source_Click(object sender, EventArgs e)\r
         {\r
-            if (Properties.Settings.Default.drive_detection)\r
-            {\r
-                mnu_dvd_drive.Visible = true;\r
-                Thread driveInfoThread = new Thread(getDriveInfoThread);\r
-                driveInfoThread.Start();\r
-            }\r
-            else\r
-                mnu_dvd_drive.Visible = false;\r
+            mnu_dvd_drive.Visible = true;\r
+            Thread driveInfoThread = new Thread(getDriveInfoThread);\r
+            driveInfoThread.Start();\r
         }\r
         private void btn_start_Click(object sender, EventArgs e)\r
         {\r
@@ -1125,7 +1120,7 @@ namespace Handbrake
         {\r
             if (newExtension == ".mp4" || newExtension == ".m4v")\r
                 if (Properties.Settings.Default.useM4v || Check_ChapterMarkers.Checked || AudioSettings.RequiresM4V() || Subtitles.RequiresM4V())\r
-                    newExtension = ".m4v" ;\r
+                    newExtension = ".m4v";\r
                 else\r
                     newExtension = ".mp4";\r
 \r
@@ -1400,10 +1395,9 @@ namespace Handbrake
             // Setup the GUI components for the scan.\r
             sourcePath = filename;\r
             foreach (Control ctrl in Controls)\r
-            {\r
                 if (!(ctrl is StatusStrip || ctrl is MenuStrip || ctrl is ToolStrip))\r
                     ctrl.Enabled = false;\r
-            }\r
+\r
             lbl_encode.Visible = true;\r
             lbl_encode.Text = "Scanning ...";\r
             btn_source.Enabled = false;\r

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 450bad6ee25bddf8ed09ca39861a988257b12aa0..6c9a4548b5926aa1afa3d9eae2834c915727f5ad 100644 (file)
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -40,21 +40,22 @@ namespace Handbrake
             this.drp_completeOption = new System.Windows.Forms.ComboBox();\r
             this.tab_options = new System.Windows.Forms.TabControl();\r
             this.tab_general = new System.Windows.Forms.TabPage();\r
+            this.check_growlEncode = new System.Windows.Forms.CheckBox();\r
+            this.check_GrowlQueue = new System.Windows.Forms.CheckBox();\r
+            this.check_m4v = new System.Windows.Forms.CheckBox();\r
             this.label1 = new System.Windows.Forms.Label();\r
-            this.drop_updateCheckDays = new System.Windows.Forms.ComboBox();\r
             this.label7 = new System.Windows.Forms.Label();\r
-            this.check_updateCheck = new System.Windows.Forms.CheckBox();\r
+            this.drop_updateCheckDays = new System.Windows.Forms.ComboBox();\r
+            this.check_autoNaming = new System.Windows.Forms.CheckBox();\r
             this.txt_autoNameFormat = new System.Windows.Forms.TextBox();\r
+            this.check_tooltip = new System.Windows.Forms.CheckBox();\r
             this.label5 = new System.Windows.Forms.Label();\r
+            this.check_updateCheck = new System.Windows.Forms.CheckBox();\r
+            this.label10 = new System.Windows.Forms.Label();\r
+            this.btn_browse = new System.Windows.Forms.Button();\r
             this.label2 = new System.Windows.Forms.Label();\r
             this.label13 = new System.Windows.Forms.Label();\r
-            this.btn_browse = new System.Windows.Forms.Button();\r
-            this.check_tooltip = new System.Windows.Forms.CheckBox();\r
             this.text_an_path = new System.Windows.Forms.TextBox();\r
-            this.label10 = new System.Windows.Forms.Label();\r
-            this.check_userDefaultSettings = new System.Windows.Forms.CheckBox();\r
-            this.check_autoNaming = new System.Windows.Forms.CheckBox();\r
-            this.check_m4v = new System.Windows.Forms.CheckBox();\r
             this.tab_picture = new System.Windows.Forms.TabPage();\r
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();\r
             this.label29 = new System.Windows.Forms.Label();\r
@@ -93,7 +94,6 @@ namespace Handbrake
             this.label6 = new System.Windows.Forms.Label();\r
             this.drop_x264step = new System.Windows.Forms.ComboBox();\r
             this.label30 = new System.Windows.Forms.Label();\r
-            this.btn_drive_detect = new System.Windows.Forms.CheckBox();\r
             this.check_mainMinimize = new System.Windows.Forms.CheckBox();\r
             this.label28 = new System.Windows.Forms.Label();\r
             this.check_queryEditorTab = new System.Windows.Forms.CheckBox();\r
@@ -135,8 +135,6 @@ namespace Handbrake
             this.label27 = new System.Windows.Forms.Label();\r
             this.openFile_vlc = new System.Windows.Forms.OpenFileDialog();\r
             this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel();\r
-            this.check_GrowlQueue = new System.Windows.Forms.CheckBox();\r
-            this.check_growlEncode = new System.Windows.Forms.CheckBox();\r
             this.tab_options.SuspendLayout();\r
             this.tab_general.SuspendLayout();\r
             this.tab_picture.SuspendLayout();\r
@@ -179,7 +177,7 @@ namespace Handbrake
             "Lock system",\r
             "Log off",\r
             "Quit HandBrake"});\r
-            this.drp_completeOption.Location = new System.Drawing.Point(108, 119);\r
+            this.drp_completeOption.Location = new System.Drawing.Point(108, 95);\r
             this.drp_completeOption.Name = "drp_completeOption";\r
             this.drp_completeOption.Size = new System.Drawing.Size(166, 21);\r
             this.drp_completeOption.TabIndex = 43;\r
@@ -213,7 +211,6 @@ namespace Handbrake
             this.tab_general.Controls.Add(this.drop_updateCheckDays);\r
             this.tab_general.Controls.Add(this.check_autoNaming);\r
             this.tab_general.Controls.Add(this.txt_autoNameFormat);\r
-            this.tab_general.Controls.Add(this.check_userDefaultSettings);\r
             this.tab_general.Controls.Add(this.check_tooltip);\r
             this.tab_general.Controls.Add(this.label5);\r
             this.tab_general.Controls.Add(this.check_updateCheck);\r
@@ -230,6 +227,47 @@ namespace Handbrake
             this.tab_general.Text = "General";\r
             this.tab_general.UseVisualStyleBackColor = true;\r
             // \r
+            // check_growlEncode\r
+            // \r
+            this.check_growlEncode.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.check_growlEncode.AutoSize = true;\r
+            this.check_growlEncode.BackColor = System.Drawing.Color.Transparent;\r
+            this.check_growlEncode.Location = new System.Drawing.Point(282, 122);\r
+            this.check_growlEncode.Name = "check_growlEncode";\r
+            this.check_growlEncode.Size = new System.Drawing.Size(171, 17);\r
+            this.check_growlEncode.TabIndex = 99;\r
+            this.check_growlEncode.Text = "Growl after Encode Completes";\r
+            this.ToolTip.SetToolTip(this.check_growlEncode, "Growl for Windows");\r
+            this.check_growlEncode.UseVisualStyleBackColor = false;\r
+            this.check_growlEncode.CheckedChanged += new System.EventHandler(this.check_growlEncode_CheckedChanged);\r
+            // \r
+            // check_GrowlQueue\r
+            // \r
+            this.check_GrowlQueue.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.check_GrowlQueue.AutoSize = true;\r
+            this.check_GrowlQueue.BackColor = System.Drawing.Color.Transparent;\r
+            this.check_GrowlQueue.Location = new System.Drawing.Point(108, 122);\r
+            this.check_GrowlQueue.Name = "check_GrowlQueue";\r
+            this.check_GrowlQueue.Size = new System.Drawing.Size(168, 17);\r
+            this.check_GrowlQueue.TabIndex = 98;\r
+            this.check_GrowlQueue.Text = "Growl after Queue Completes";\r
+            this.ToolTip.SetToolTip(this.check_GrowlQueue, "Growl for Windows");\r
+            this.check_GrowlQueue.UseVisualStyleBackColor = false;\r
+            this.check_GrowlQueue.CheckedChanged += new System.EventHandler(this.check_GrowlQueue_CheckedChanged);\r
+            // \r
+            // check_m4v\r
+            // \r
+            this.check_m4v.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.check_m4v.AutoSize = true;\r
+            this.check_m4v.Location = new System.Drawing.Point(108, 279);\r
+            this.check_m4v.Name = "check_m4v";\r
+            this.check_m4v.Size = new System.Drawing.Size(283, 17);\r
+            this.check_m4v.TabIndex = 82;\r
+            this.check_m4v.Text = "Use iPod/iTunes friendly file extension (.m4v) for MP4";\r
+            this.ToolTip.SetToolTip(this.check_m4v, "Use .m4v instead of .mp4 for MP4 files");\r
+            this.check_m4v.UseVisualStyleBackColor = true;\r
+            this.check_m4v.CheckedChanged += new System.EventHandler(this.check_m4v_CheckedChanged);\r
+            // \r
             // label1\r
             // \r
             this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));\r
@@ -243,6 +281,17 @@ namespace Handbrake
             this.label1.TabIndex = 67;\r
             this.label1.Text = "At Launch:";\r
             // \r
+            // label7\r
+            // \r
+            this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.label7.AutoSize = true;\r
+            this.label7.Location = new System.Drawing.Point(179, 260);\r
+            this.label7.Margin = new System.Windows.Forms.Padding(3);\r
+            this.label7.Name = "label7";\r
+            this.label7.Size = new System.Drawing.Size(225, 13);\r
+            this.label7.TabIndex = 81;\r
+            this.label7.Text = "Available Options: {source} {title} {chapters}";\r
+            // \r
             // drop_updateCheckDays\r
             // \r
             this.drop_updateCheckDays.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
@@ -260,36 +309,23 @@ namespace Handbrake
                     "n Automatic.");\r
             this.drop_updateCheckDays.SelectedIndexChanged += new System.EventHandler(this.drop_updateCheckDays_SelectedIndexChanged);\r
             // \r
-            // label7\r
-            // \r
-            this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.label7.AutoSize = true;\r
-            this.label7.Location = new System.Drawing.Point(179, 284);\r
-            this.label7.Margin = new System.Windows.Forms.Padding(3);\r
-            this.label7.Name = "label7";\r
-            this.label7.Size = new System.Drawing.Size(225, 13);\r
-            this.label7.TabIndex = 81;\r
-            this.label7.Text = "Available Options: {source} {title} {chapters}";\r
-            // \r
-            // check_updateCheck\r
+            // check_autoNaming\r
             // \r
-            this.check_updateCheck.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.check_updateCheck.AutoSize = true;\r
-            this.check_updateCheck.BackColor = System.Drawing.Color.Transparent;\r
-            this.check_updateCheck.Location = new System.Drawing.Point(108, 14);\r
-            this.check_updateCheck.Name = "check_updateCheck";\r
-            this.check_updateCheck.Size = new System.Drawing.Size(114, 17);\r
-            this.check_updateCheck.TabIndex = 68;\r
-            this.check_updateCheck.Text = "Check for updates";\r
-            this.ToolTip.SetToolTip(this.check_updateCheck, "Enables the built in update checker. This check is performed when the application" +\r
-                    " starts.");\r
-            this.check_updateCheck.UseVisualStyleBackColor = false;\r
-            this.check_updateCheck.CheckedChanged += new System.EventHandler(this.check_updateCheck_CheckedChanged);\r
+            this.check_autoNaming.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.check_autoNaming.AutoSize = true;\r
+            this.check_autoNaming.Location = new System.Drawing.Point(108, 174);\r
+            this.check_autoNaming.Name = "check_autoNaming";\r
+            this.check_autoNaming.Size = new System.Drawing.Size(176, 17);\r
+            this.check_autoNaming.TabIndex = 72;\r
+            this.check_autoNaming.Text = "Automatically name output files";\r
+            this.ToolTip.SetToolTip(this.check_autoNaming, "Automatically name output files");\r
+            this.check_autoNaming.UseVisualStyleBackColor = true;\r
+            this.check_autoNaming.CheckedChanged += new System.EventHandler(this.check_autoNaming_CheckedChanged);\r
             // \r
             // txt_autoNameFormat\r
             // \r
             this.txt_autoNameFormat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));\r
-            this.txt_autoNameFormat.Location = new System.Drawing.Point(182, 257);\r
+            this.txt_autoNameFormat.Location = new System.Drawing.Point(182, 233);\r
             this.txt_autoNameFormat.Name = "txt_autoNameFormat";\r
             this.txt_autoNameFormat.Size = new System.Drawing.Size(349, 21);\r
             this.txt_autoNameFormat.TabIndex = 79;\r
@@ -298,22 +334,75 @@ namespace Handbrake
                     "sources values.");\r
             this.txt_autoNameFormat.TextChanged += new System.EventHandler(this.txt_autoNameFormat_TextChanged);\r
             // \r
+            // check_tooltip\r
+            // \r
+            this.check_tooltip.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.check_tooltip.AutoSize = true;\r
+            this.check_tooltip.BackColor = System.Drawing.Color.Transparent;\r
+            this.check_tooltip.Location = new System.Drawing.Point(108, 62);\r
+            this.check_tooltip.Name = "check_tooltip";\r
+            this.check_tooltip.Size = new System.Drawing.Size(117, 17);\r
+            this.check_tooltip.TabIndex = 70;\r
+            this.check_tooltip.Text = "Enable GUI tooltips";\r
+            this.ToolTip.SetToolTip(this.check_tooltip, "Enable the built in tooltips for gui controls. (Requires Restart)");\r
+            this.check_tooltip.UseVisualStyleBackColor = false;\r
+            this.check_tooltip.CheckedChanged += new System.EventHandler(this.check_tooltip_CheckedChanged);\r
+            // \r
             // label5\r
             // \r
             this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.label5.AutoSize = true;\r
-            this.label5.Location = new System.Drawing.Point(105, 260);\r
+            this.label5.Location = new System.Drawing.Point(105, 236);\r
             this.label5.Name = "label5";\r
             this.label5.Size = new System.Drawing.Size(45, 13);\r
             this.label5.TabIndex = 80;\r
             this.label5.Text = "Format:";\r
             // \r
+            // check_updateCheck\r
+            // \r
+            this.check_updateCheck.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.check_updateCheck.AutoSize = true;\r
+            this.check_updateCheck.BackColor = System.Drawing.Color.Transparent;\r
+            this.check_updateCheck.Location = new System.Drawing.Point(108, 14);\r
+            this.check_updateCheck.Name = "check_updateCheck";\r
+            this.check_updateCheck.Size = new System.Drawing.Size(114, 17);\r
+            this.check_updateCheck.TabIndex = 68;\r
+            this.check_updateCheck.Text = "Check for updates";\r
+            this.ToolTip.SetToolTip(this.check_updateCheck, "Enables the built in update checker. This check is performed when the application" +\r
+                    " starts.");\r
+            this.check_updateCheck.UseVisualStyleBackColor = false;\r
+            this.check_updateCheck.CheckedChanged += new System.EventHandler(this.check_updateCheck_CheckedChanged);\r
+            // \r
+            // label10\r
+            // \r
+            this.label10.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.label10.AutoSize = true;\r
+            this.label10.Location = new System.Drawing.Point(105, 209);\r
+            this.label10.Name = "label10";\r
+            this.label10.Size = new System.Drawing.Size(71, 13);\r
+            this.label10.TabIndex = 77;\r
+            this.label10.Text = "Default Path:";\r
+            // \r
+            // btn_browse\r
+            // \r
+            this.btn_browse.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+            this.btn_browse.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.btn_browse.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.btn_browse.Location = new System.Drawing.Point(456, 204);\r
+            this.btn_browse.Name = "btn_browse";\r
+            this.btn_browse.Size = new System.Drawing.Size(75, 23);\r
+            this.btn_browse.TabIndex = 78;\r
+            this.btn_browse.Text = "Browse";\r
+            this.btn_browse.UseVisualStyleBackColor = true;\r
+            this.btn_browse.Click += new System.EventHandler(this.btn_browse_Click);\r
+            // \r
             // label2\r
             // \r
             this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
             this.label2.AutoSize = true;\r
             this.label2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label2.Location = new System.Drawing.Point(7, 122);\r
+            this.label2.Location = new System.Drawing.Point(7, 98);\r
             this.label2.Name = "label2";\r
             this.label2.Size = new System.Drawing.Size(74, 13);\r
             this.label2.TabIndex = 54;\r
@@ -324,45 +413,17 @@ namespace Handbrake
             this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));\r
             this.label13.AutoSize = true;\r
             this.label13.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label13.Location = new System.Drawing.Point(4, 188);\r
+            this.label13.Location = new System.Drawing.Point(4, 164);\r
             this.label13.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);\r
             this.label13.Name = "label13";\r
             this.label13.Size = new System.Drawing.Size(77, 13);\r
             this.label13.TabIndex = 71;\r
             this.label13.Text = "Output Files:";\r
             // \r
-            // btn_browse\r
-            // \r
-            this.btn_browse.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.btn_browse.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_browse.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_browse.Location = new System.Drawing.Point(456, 228);\r
-            this.btn_browse.Name = "btn_browse";\r
-            this.btn_browse.Size = new System.Drawing.Size(75, 23);\r
-            this.btn_browse.TabIndex = 78;\r
-            this.btn_browse.Text = "Browse";\r
-            this.btn_browse.UseVisualStyleBackColor = true;\r
-            this.btn_browse.Click += new System.EventHandler(this.btn_browse_Click);\r
-            // \r
-            // check_tooltip\r
-            // \r
-            this.check_tooltip.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.check_tooltip.AutoSize = true;\r
-            this.check_tooltip.BackColor = System.Drawing.Color.Transparent;\r
-            this.check_tooltip.Location = new System.Drawing.Point(108, 62);\r
-            this.check_tooltip.Name = "check_tooltip";\r
-            this.check_tooltip.Size = new System.Drawing.Size(117, 17);\r
-            this.check_tooltip.TabIndex = 70;\r
-            this.check_tooltip.Text = "Enable GUI tooltips";\r
-            this.ToolTip.SetToolTip(this.check_tooltip, "Enable the built in tooltips for gui controls. (Requires Restart)");\r
-            this.check_tooltip.UseVisualStyleBackColor = false;\r
-            this.check_tooltip.CheckedChanged += new System.EventHandler(this.check_tooltip_CheckedChanged);\r
-            // \r
             // text_an_path\r
             // \r
             this.text_an_path.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));\r
-            this.text_an_path.Location = new System.Drawing.Point(182, 230);\r
+            this.text_an_path.Location = new System.Drawing.Point(182, 206);\r
             this.text_an_path.Name = "text_an_path";\r
             this.text_an_path.Size = new System.Drawing.Size(253, 21);\r
             this.text_an_path.TabIndex = 76;\r
@@ -370,56 +431,6 @@ namespace Handbrake
                     "cally name output files\" is enabled.");\r
             this.text_an_path.TextChanged += new System.EventHandler(this.text_an_path_TextChanged);\r
             // \r
-            // label10\r
-            // \r
-            this.label10.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.label10.AutoSize = true;\r
-            this.label10.Location = new System.Drawing.Point(105, 233);\r
-            this.label10.Name = "label10";\r
-            this.label10.Size = new System.Drawing.Size(71, 13);\r
-            this.label10.TabIndex = 77;\r
-            this.label10.Text = "Default Path:";\r
-            // \r
-            // check_userDefaultSettings\r
-            // \r
-            this.check_userDefaultSettings.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.check_userDefaultSettings.AutoSize = true;\r
-            this.check_userDefaultSettings.BackColor = System.Drawing.Color.Transparent;\r
-            this.check_userDefaultSettings.Location = new System.Drawing.Point(108, 85);\r
-            this.check_userDefaultSettings.Name = "check_userDefaultSettings";\r
-            this.check_userDefaultSettings.Size = new System.Drawing.Size(137, 17);\r
-            this.check_userDefaultSettings.TabIndex = 69;\r
-            this.check_userDefaultSettings.Text = "Load my default preset";\r
-            this.ToolTip.SetToolTip(this.check_userDefaultSettings, "Loads the users default settings rather than the Normal preset.");\r
-            this.check_userDefaultSettings.UseVisualStyleBackColor = false;\r
-            this.check_userDefaultSettings.CheckedChanged += new System.EventHandler(this.check_userDefaultSettings_CheckedChanged);\r
-            // \r
-            // check_autoNaming\r
-            // \r
-            this.check_autoNaming.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.check_autoNaming.AutoSize = true;\r
-            this.check_autoNaming.Location = new System.Drawing.Point(108, 198);\r
-            this.check_autoNaming.Name = "check_autoNaming";\r
-            this.check_autoNaming.Size = new System.Drawing.Size(176, 17);\r
-            this.check_autoNaming.TabIndex = 72;\r
-            this.check_autoNaming.Text = "Automatically name output files";\r
-            this.ToolTip.SetToolTip(this.check_autoNaming, "Automatically name output files");\r
-            this.check_autoNaming.UseVisualStyleBackColor = true;\r
-            this.check_autoNaming.CheckedChanged += new System.EventHandler(this.check_autoNaming_CheckedChanged);\r
-            // \r
-            // check_m4v\r
-            // \r
-            this.check_m4v.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.check_m4v.AutoSize = true;\r
-            this.check_m4v.Location = new System.Drawing.Point(108, 303);\r
-            this.check_m4v.Name = "check_m4v";\r
-            this.check_m4v.Size = new System.Drawing.Size(283, 17);\r
-            this.check_m4v.TabIndex = 82;\r
-            this.check_m4v.Text = "Use iPod/iTunes friendly file extension (.m4v) for MP4";\r
-            this.ToolTip.SetToolTip(this.check_m4v, "Use .m4v instead of .mp4 for MP4 files");\r
-            this.check_m4v.UseVisualStyleBackColor = true;\r
-            this.check_m4v.CheckedChanged += new System.EventHandler(this.check_m4v_CheckedChanged);\r
-            // \r
             // tab_picture\r
             // \r
             this.tab_picture.Controls.Add(this.tableLayoutPanel2);\r
@@ -592,7 +603,6 @@ namespace Handbrake
             this.tableLayoutPanel3.Controls.Add(this.label9, 0, 4);\r
             this.tableLayoutPanel3.Controls.Add(this.btn_saveLog, 6, 7);\r
             this.tableLayoutPanel3.Controls.Add(this.check_logsInSpecifiedLocation, 2, 6);\r
-            this.tableLayoutPanel3.Controls.Add(this.label14, 2, 7);\r
             this.tableLayoutPanel3.Controls.Add(this.Label11, 2, 1);\r
             this.tableLayoutPanel3.Controls.Add(this.check_saveLogWithVideo, 2, 5);\r
             this.tableLayoutPanel3.Controls.Add(this.Label4, 2, 2);\r
@@ -603,6 +613,7 @@ namespace Handbrake
             this.tableLayoutPanel3.Controls.Add(this.drp_processors, 3, 1);\r
             this.tableLayoutPanel3.Controls.Add(this.btn_viewLogs, 2, 8);\r
             this.tableLayoutPanel3.Controls.Add(this.btn_clearLogs, 4, 8);\r
+            this.tableLayoutPanel3.Controls.Add(this.label14, 2, 7);\r
             this.tableLayoutPanel3.Location = new System.Drawing.Point(10, 10);\r
             this.tableLayoutPanel3.Name = "tableLayoutPanel3";\r
             this.tableLayoutPanel3.RowCount = 10;\r
@@ -873,7 +884,6 @@ namespace Handbrake
             this.tableLayoutPanel4.Controls.Add(this.label6, 0, 0);\r
             this.tableLayoutPanel4.Controls.Add(this.drop_x264step, 4, 8);\r
             this.tableLayoutPanel4.Controls.Add(this.label30, 2, 8);\r
-            this.tableLayoutPanel4.Controls.Add(this.btn_drive_detect, 2, 0);\r
             this.tableLayoutPanel4.Controls.Add(this.check_mainMinimize, 2, 1);\r
             this.tableLayoutPanel4.Controls.Add(this.label28, 0, 8);\r
             this.tableLayoutPanel4.Controls.Add(this.check_queryEditorTab, 2, 3);\r
@@ -894,14 +904,14 @@ namespace Handbrake
             this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
             this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
             this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel4.Size = new System.Drawing.Size(396, 251);\r
+            this.tableLayoutPanel4.Size = new System.Drawing.Size(395, 228);\r
             this.tableLayoutPanel4.TabIndex = 62;\r
             // \r
             // check_promptOnUnmatchingQueries\r
             // \r
             this.check_promptOnUnmatchingQueries.AutoSize = true;\r
             this.tableLayoutPanel4.SetColumnSpan(this.check_promptOnUnmatchingQueries, 3);\r
-            this.check_promptOnUnmatchingQueries.Location = new System.Drawing.Point(87, 95);\r
+            this.check_promptOnUnmatchingQueries.Location = new System.Drawing.Point(87, 72);\r
             this.check_promptOnUnmatchingQueries.Name = "check_promptOnUnmatchingQueries";\r
             this.check_promptOnUnmatchingQueries.Size = new System.Drawing.Size(305, 17);\r
             this.check_promptOnUnmatchingQueries.TabIndex = 63;\r
@@ -915,7 +925,7 @@ namespace Handbrake
             this.check_dvdnav.AutoSize = true;\r
             this.check_dvdnav.BackColor = System.Drawing.Color.Transparent;\r
             this.tableLayoutPanel4.SetColumnSpan(this.check_dvdnav, 4);\r
-            this.check_dvdnav.Location = new System.Drawing.Point(67, 231);\r
+            this.check_dvdnav.Location = new System.Drawing.Point(67, 208);\r
             this.check_dvdnav.Name = "check_dvdnav";\r
             this.check_dvdnav.Size = new System.Drawing.Size(250, 17);\r
             this.check_dvdnav.TabIndex = 90;\r
@@ -929,7 +939,7 @@ namespace Handbrake
             this.check_trayStatusAlerts.AutoSize = true;\r
             this.check_trayStatusAlerts.BackColor = System.Drawing.Color.Transparent;\r
             this.tableLayoutPanel4.SetColumnSpan(this.check_trayStatusAlerts, 3);\r
-            this.check_trayStatusAlerts.Location = new System.Drawing.Point(87, 49);\r
+            this.check_trayStatusAlerts.Location = new System.Drawing.Point(87, 26);\r
             this.check_trayStatusAlerts.Name = "check_trayStatusAlerts";\r
             this.check_trayStatusAlerts.Size = new System.Drawing.Size(296, 17);\r
             this.check_trayStatusAlerts.TabIndex = 93;\r
@@ -945,7 +955,7 @@ namespace Handbrake
             this.label32.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
             this.label32.AutoSize = true;\r
             this.label32.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label32.Location = new System.Drawing.Point(8, 233);\r
+            this.label32.Location = new System.Drawing.Point(8, 210);\r
             this.label32.Name = "label32";\r
             this.label32.Size = new System.Drawing.Size(33, 13);\r
             this.label32.TabIndex = 89;\r
@@ -974,7 +984,7 @@ namespace Handbrake
             "0.50",\r
             "0.25",\r
             "0.20"});\r
-            this.drop_x264step.Location = new System.Drawing.Point(262, 184);\r
+            this.drop_x264step.Location = new System.Drawing.Point(262, 161);\r
             this.drop_x264step.Name = "drop_x264step";\r
             this.drop_x264step.Size = new System.Drawing.Size(85, 21);\r
             this.drop_x264step.TabIndex = 86;\r
@@ -987,34 +997,19 @@ namespace Handbrake
             this.label30.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.label30.AutoSize = true;\r
             this.tableLayoutPanel4.SetColumnSpan(this.label30, 2);\r
-            this.label30.Location = new System.Drawing.Point(67, 188);\r
+            this.label30.Location = new System.Drawing.Point(67, 165);\r
             this.label30.Name = "label30";\r
             this.label30.Size = new System.Drawing.Size(189, 13);\r
             this.label30.TabIndex = 87;\r
             this.label30.Text = "Constant quality fractional granularity";\r
             // \r
-            // btn_drive_detect\r
-            // \r
-            this.btn_drive_detect.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.btn_drive_detect.AutoSize = true;\r
-            this.tableLayoutPanel4.SetColumnSpan(this.btn_drive_detect, 4);\r
-            this.btn_drive_detect.Location = new System.Drawing.Point(67, 3);\r
-            this.btn_drive_detect.Name = "btn_drive_detect";\r
-            this.btn_drive_detect.Size = new System.Drawing.Size(326, 17);\r
-            this.btn_drive_detect.TabIndex = 72;\r
-            this.btn_drive_detect.Text = "Enable DVD drive detection in \"Source\" button dropdown menu";\r
-            this.ToolTip.SetToolTip(this.btn_drive_detect, "Enables the Source button\'s ability to detect DVD\'s.\r\nIf this option is enabled, " +\r
-                    "DVD\'s will be listed in the source menu.");\r
-            this.btn_drive_detect.UseVisualStyleBackColor = true;\r
-            this.btn_drive_detect.CheckedChanged += new System.EventHandler(this.btn_drive_detect_CheckedChanged);\r
-            // \r
             // check_mainMinimize\r
             // \r
             this.check_mainMinimize.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
             this.check_mainMinimize.AutoSize = true;\r
             this.check_mainMinimize.BackColor = System.Drawing.Color.Transparent;\r
             this.tableLayoutPanel4.SetColumnSpan(this.check_mainMinimize, 4);\r
-            this.check_mainMinimize.Location = new System.Drawing.Point(67, 26);\r
+            this.check_mainMinimize.Location = new System.Drawing.Point(67, 3);\r
             this.check_mainMinimize.Name = "check_mainMinimize";\r
             this.check_mainMinimize.Size = new System.Drawing.Size(138, 17);\r
             this.check_mainMinimize.TabIndex = 82;\r
@@ -1030,7 +1025,7 @@ namespace Handbrake
             this.label28.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
             this.label28.AutoSize = true;\r
             this.label28.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label28.Location = new System.Drawing.Point(3, 188);\r
+            this.label28.Location = new System.Drawing.Point(3, 165);\r
             this.label28.Name = "label28";\r
             this.label28.Size = new System.Drawing.Size(38, 13);\r
             this.label28.TabIndex = 85;\r
@@ -1042,7 +1037,7 @@ namespace Handbrake
             this.check_queryEditorTab.AutoSize = true;\r
             this.check_queryEditorTab.BackColor = System.Drawing.Color.Transparent;\r
             this.tableLayoutPanel4.SetColumnSpan(this.check_queryEditorTab, 4);\r
-            this.check_queryEditorTab.Location = new System.Drawing.Point(67, 72);\r
+            this.check_queryEditorTab.Location = new System.Drawing.Point(67, 49);\r
             this.check_queryEditorTab.Name = "check_queryEditorTab";\r
             this.check_queryEditorTab.Size = new System.Drawing.Size(241, 17);\r
             this.check_queryEditorTab.TabIndex = 84;\r
@@ -1058,7 +1053,7 @@ namespace Handbrake
             this.check_disablePresetNotification.AutoSize = true;\r
             this.check_disablePresetNotification.BackColor = System.Drawing.Color.Transparent;\r
             this.tableLayoutPanel4.SetColumnSpan(this.check_disablePresetNotification, 4);\r
-            this.check_disablePresetNotification.Location = new System.Drawing.Point(67, 118);\r
+            this.check_disablePresetNotification.Location = new System.Drawing.Point(67, 95);\r
             this.check_disablePresetNotification.Name = "check_disablePresetNotification";\r
             this.check_disablePresetNotification.Size = new System.Drawing.Size(222, 17);\r
             this.check_disablePresetNotification.TabIndex = 91;\r
@@ -1074,7 +1069,7 @@ namespace Handbrake
             this.check_inGuiStatus.AutoSize = true;\r
             this.check_inGuiStatus.BackColor = System.Drawing.Color.Transparent;\r
             this.tableLayoutPanel4.SetColumnSpan(this.check_inGuiStatus, 4);\r
-            this.check_inGuiStatus.Location = new System.Drawing.Point(67, 141);\r
+            this.check_inGuiStatus.Location = new System.Drawing.Point(67, 118);\r
             this.check_inGuiStatus.Name = "check_inGuiStatus";\r
             this.check_inGuiStatus.Size = new System.Drawing.Size(235, 17);\r
             this.check_inGuiStatus.TabIndex = 92;\r
@@ -1483,41 +1478,13 @@ namespace Handbrake
             this.tableLayoutPanel5.Size = new System.Drawing.Size(594, 429);\r
             this.tableLayoutPanel5.TabIndex = 62;\r
             // \r
-            // check_GrowlQueue\r
-            // \r
-            this.check_GrowlQueue.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.check_GrowlQueue.AutoSize = true;\r
-            this.check_GrowlQueue.BackColor = System.Drawing.Color.Transparent;\r
-            this.check_GrowlQueue.Location = new System.Drawing.Point(108, 146);\r
-            this.check_GrowlQueue.Name = "check_GrowlQueue";\r
-            this.check_GrowlQueue.Size = new System.Drawing.Size(168, 17);\r
-            this.check_GrowlQueue.TabIndex = 98;\r
-            this.check_GrowlQueue.Text = "Growl after Queue Completes";\r
-            this.ToolTip.SetToolTip(this.check_GrowlQueue, "Growl for Windows");\r
-            this.check_GrowlQueue.UseVisualStyleBackColor = false;\r
-            this.check_GrowlQueue.CheckedChanged += new System.EventHandler(this.check_GrowlQueue_CheckedChanged);\r
-            // \r
-            // check_growlEncode\r
-            // \r
-            this.check_growlEncode.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
-            this.check_growlEncode.AutoSize = true;\r
-            this.check_growlEncode.BackColor = System.Drawing.Color.Transparent;\r
-            this.check_growlEncode.Location = new System.Drawing.Point(282, 146);\r
-            this.check_growlEncode.Name = "check_growlEncode";\r
-            this.check_growlEncode.Size = new System.Drawing.Size(171, 17);\r
-            this.check_growlEncode.TabIndex = 99;\r
-            this.check_growlEncode.Text = "Growl after Encode Completes";\r
-            this.ToolTip.SetToolTip(this.check_growlEncode, "Growl for Windows");\r
-            this.check_growlEncode.UseVisualStyleBackColor = false;\r
-            this.check_growlEncode.CheckedChanged += new System.EventHandler(this.check_growlEncode_CheckedChanged);\r
-            // \r
             // frmOptions\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;\r
             this.AutoSize = true;\r
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;\r
-            this.ClientSize = new System.Drawing.Size(627, 488);\r
+            this.ClientSize = new System.Drawing.Size(627, 456);\r
             this.Controls.Add(this.tableLayoutPanel5);\r
             this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;\r
@@ -1572,10 +1539,8 @@ namespace Handbrake
         internal System.Windows.Forms.Label Label4;\r
         internal System.Windows.Forms.CheckBox check_tooltip;\r
         internal System.Windows.Forms.CheckBox check_updateCheck;\r
-        internal System.Windows.Forms.CheckBox check_userDefaultSettings;\r
         private System.Windows.Forms.Label label1;\r
         private System.Windows.Forms.TabPage tab_advanced;\r
-        internal System.Windows.Forms.CheckBox btn_drive_detect;\r
         private System.Windows.Forms.Label label6;\r
         private System.Windows.Forms.Label label13;\r
         internal System.Windows.Forms.Label label10;\r

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index ce281e9f1346f94cee1b8fae3f2c8154368d1888..9b33b9030cbad90025389242183c2d469618a412 100644 (file)
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -40,10 +40,6 @@ namespace Handbrake
             if (Properties.Settings.Default.updateStatus)\r
                 check_updateCheck.CheckState = CheckState.Checked;\r
 \r
-            // enable loading of default user settings.\r
-            if (Properties.Settings.Default.defaultSettings)\r
-                check_userDefaultSettings.CheckState = CheckState.Checked;\r
-\r
             // On Encode Completeion Action\r
             drp_completeOption.Text = Properties.Settings.Default.CompletionOption;\r
 \r
@@ -123,10 +119,6 @@ namespace Handbrake
             // Advanced\r
             // #############################\r
 \r
-            // Enable GUI DVD Drive detection code\r
-            if (Properties.Settings.Default.drive_detection)\r
-                btn_drive_detect.CheckState = CheckState.Checked;\r
-\r
             // Minimise to Tray\r
             if (Properties.Settings.Default.trayIconAlerts)\r
                 check_trayStatusAlerts.CheckState = CheckState.Checked;\r
@@ -199,15 +191,11 @@ namespace Handbrake
             Properties.Settings.Default.updateStatus = check_updateCheck.Checked;\r
         }\r
 \r
-        private void check_userDefaultSettings_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            Properties.Settings.Default.defaultSettings = check_userDefaultSettings.Checked;\r
-        }\r
-\r
         private void check_tooltip_CheckedChanged(object sender, EventArgs e)\r
         {\r
             Properties.Settings.Default.tooltipEnable = check_tooltip.Checked;\r
         }\r
+\r
         private void drp_completeOption_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             Properties.Settings.Default.CompletionOption = drp_completeOption.Text;\r
@@ -353,10 +341,6 @@ namespace Handbrake
         #endregion\r
 \r
         #region Advanced\r
-        private void btn_drive_detect_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            Properties.Settings.Default.drive_detection = btn_drive_detect.Checked;\r
-        }\r
 \r
         private void check_mainMinimize_CheckedChanged(object sender, EventArgs e)\r
         {\r

diff --git a/win/C#/frmOptions.resx b/win/C#/frmOptions.resx
index 502bece8e96f66a8db7d10ce6b1a66f9e0c83511..380b3873063d67e9ae957cdf2c318585a9b6e602 100644 (file)
--- a/win/C#/frmOptions.resx
+++ b/win/C#/frmOptions.resx
@@ -120,6 +120,9 @@
   <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>132, 18</value>\r
   </metadata>\r
+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>132, 18</value>\r
+  </metadata>\r
   <data name="check_disableResCalc.ToolTip" xml:space="preserve">\r
     <value>If the new Picture Settings panel is causing you problems, enable this option.\r
 It disables some of the resolution calcuation code for None and Custom modes.\r