CUETools & CUERipper: Cosmetic changes to encoderSettings button

CUERipper/Options.Designer.cs

@@ -78,6 +78,6 @@ namespace CUERipper
         #endregion
 
         private System.Windows.Forms.Button buttonCancel;
-        private System.Windows.Forms.PropertyGrid propertyGrid1;
+        public System.Windows.Forms.PropertyGrid propertyGrid1;
     }
 }

CUERipper/frmCUERipper.Designer.cs

@@ -28,6 +28,7 @@ namespace CUERipper
 		/// </summary>
 		private void InitializeComponent()
 		{
+            this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmCUERipper));
             CUEControls.RectRadius rectRadius1 = new CUEControls.RectRadius();
             CUEControls.RectRadius rectRadius2 = new CUEControls.RectRadius();
@@ -58,22 +59,22 @@ namespace CUERipper
             this.buttonEncoderSettings = new System.Windows.Forms.Button();
             this.checkBoxTestAndCopy = new System.Windows.Forms.CheckBox();
             this.bnComboBoxLosslessOrNot = new CUEControls.ImgComboBox();
-            this.losslessOrNotBindingSource = new System.Windows.Forms.BindingSource();
-            this.bindingSourceCR = new System.Windows.Forms.BindingSource();
+            this.losslessOrNotBindingSource = new System.Windows.Forms.BindingSource(this.components);
+            this.bindingSourceCR = new System.Windows.Forms.BindingSource(this.components);
             this.bnComboBoxEncoder = new CUEControls.ImgComboBox();
-            this.encodersBindingSource = new System.Windows.Forms.BindingSource();
+            this.encodersBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.labelSecureMode = new System.Windows.Forms.Label();
             this.bnComboBoxFormat = new CUEControls.ImgComboBox();
-            this.formatsBindingSource = new System.Windows.Forms.BindingSource();
+            this.formatsBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.labelEncoderMinMode = new System.Windows.Forms.Label();
             this.bnComboBoxImage = new CUEControls.ImgComboBox();
-            this.cUEStylesBindingSource = new System.Windows.Forms.BindingSource();
+            this.cUEStylesBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.labelEncoderMaxMode = new System.Windows.Forms.Label();
             this.labelEncoderMode = new System.Windows.Forms.Label();
             this.trackBarEncoderMode = new System.Windows.Forms.TrackBar();
             this.trackBarSecureMode = new System.Windows.Forms.TrackBar();
-            this.drivesBindingSource = new System.Windows.Forms.BindingSource();
-            this.imageListChecked = new System.Windows.Forms.ImageList();
+            this.drivesBindingSource = new System.Windows.Forms.BindingSource(this.components);
+            this.imageListChecked = new System.Windows.Forms.ImageList(this.components);
             this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.progressBarErrors = new ProgressODoom.ProgressBarEx();
             this.plainBackgroundPainter1 = new ProgressODoom.PlainBackgroundPainter();
@@ -83,10 +84,10 @@ namespace CUERipper
             this.progressBarCD = new ProgressODoom.ProgressBarEx();
             this.plainProgressPainter2 = new ProgressODoom.PlainProgressPainter();
             this.txtOutputPath = new System.Windows.Forms.TextBox();
-            this.toolTip1 = new System.Windows.Forms.ToolTip();
+            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             this.bnComboBoxRelease = new CUEControls.ImgComboBox();
-            this.releasesBindingSource = new System.Windows.Forms.BindingSource();
-            this.imageListMetadataSource = new System.Windows.Forms.ImageList();
+            this.releasesBindingSource = new System.Windows.Forms.BindingSource(this.components);
+            this.imageListMetadataSource = new System.Windows.Forms.ImageList(this.components);
             this.bnComboBoxDrives = new CUEControls.ImgComboBox();
             this.bnComboBoxOutputFormat = new CUEControls.ImgComboBox();
             this.listMetadata = new System.Windows.Forms.ListView();
@@ -303,10 +304,11 @@ namespace CUERipper
             // 
             // buttonEncoderSettings
             // 
-            this.buttonEncoderSettings.BackgroundImage = global::CUERipper.Properties.Resources.cog;
+            this.buttonEncoderSettings.FlatAppearance.BorderColor = System.Drawing.SystemColors.Control;
+            this.buttonEncoderSettings.FlatAppearance.BorderSize = 0;
             resources.ApplyResources(this.buttonEncoderSettings, "buttonEncoderSettings");
+            this.buttonEncoderSettings.Image = global::CUERipper.Properties.Resources.cog;
             this.buttonEncoderSettings.Name = "buttonEncoderSettings";
-            this.buttonEncoderSettings.UseVisualStyleBackColor = true;
             this.buttonEncoderSettings.Click += new System.EventHandler(this.buttonEncoderSettings_Click);
             // 
             // checkBoxTestAndCopy

CUERipper/frmCUERipper.cs

@@ -1598,6 +1598,7 @@ namespace CUERipper
             if (encoder == null)
                 return;
             var form = new Options(encoder.settings);
+            form.propertyGrid1.HelpVisible = true;
             form.ShowDialog(this);
             resetEncoderModes(encoder);
         }

CUERipper/frmCUERipper.resx

@@ -415,8 +415,11 @@
   <data name="&gt;&gt;lblWriteOffset.ZOrder" xml:space="preserve">
     <value>12</value>
   </data>
-  <data name="buttonEncoderSettings.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
-    <value>Stretch</value>
+  <data name="buttonEncoderSettings.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
+    <value>Flat</value>
+  </data>
+  <data name="buttonEncoderSettings.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
   <data name="buttonEncoderSettings.Location" type="System.Drawing.Point, System.Drawing">
     <value>83, 46</value>
@@ -427,9 +430,6 @@
   <data name="buttonEncoderSettings.TabIndex" type="System.Int32, mscorlib">
     <value>35</value>
   </data>
-  <data name="buttonEncoderSettings.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
-    <value>MiddleLeft</value>
-  </data>
   <data name="&gt;&gt;buttonEncoderSettings.Name" xml:space="preserve">
     <value>buttonEncoderSettings</value>
   </data>
@@ -816,7 +816,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABy
-        CQAAAk1TRnQBSQFMAgEBBAEAARwBAgEcAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBBAEAAUwBAgFMAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -966,7 +966,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAY
-        EgAAAk1TRnQBSQFMAgEBCwEAARwBAgEcAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        EgAAAk1TRnQBSQFMAgEBCwEAAUwBAgFMAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

CUETools/CUETools.csproj

@@ -82,12 +82,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Options.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Options.Designer.cs">
-      <DependentUpon>Options.cs</DependentUpon>
-    </Compile>
     <Compile Include="TreeNodes\FileSystemTreeNodeLocalDBCollision.cs" />
     <Compile Include="TreeNodes\FileSystemTreeNodeLocalDB.cs" />
     <Compile Include="TreeNodes\FileSystemTreeNodeLocalDBCategory.cs" />
@@ -226,9 +220,6 @@
     <EmbeddedResource Include="frmSubmit.ru-RU.resx">
       <DependentUpon>frmSubmit.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Options.resx">
-      <DependentUpon>Options.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

CUETools/frmCUETools.Designer.cs

@@ -477,6 +477,7 @@ namespace JDP {
             // 
             // buttonEncoderSettings
             // 
+            this.buttonEncoderSettings.FlatAppearance.BorderColor = System.Drawing.SystemColors.Control;
             this.buttonEncoderSettings.FlatAppearance.BorderSize = 0;
             resources.ApplyResources(this.buttonEncoderSettings, "buttonEncoderSettings");
             this.buttonEncoderSettings.Image = global::JDP.Properties.Resources.cog;