summaryrefslogtreecommitdiffstats
path: root/win/C#
diff options
context:
space:
mode:
Diffstat (limited to 'win/C#')
-rw-r--r--win/C#/HandBrakeCS.csproj3
-rw-r--r--win/C#/frmMain.Designer.cs20
-rw-r--r--win/C#/frmMain.resx6
3 files changed, 10 insertions, 19 deletions
diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 73667f78e..d004eb2ab 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -364,9 +364,6 @@
<Isolated>False</Isolated>
</COMReference>
</ItemGroup>
- <ItemGroup>
- <Folder Include="Experimental\" />
- </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index df944cefc..b656adbd7 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -38,7 +38,7 @@ namespace Handbrake
System.Windows.Forms.Label Label38;
System.Windows.Forms.ContextMenuStrip notifyIconMenu;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();
this.DVD_Save = new System.Windows.Forms.SaveFileDialog();
this.File_Save = new System.Windows.Forms.SaveFileDialog();
@@ -171,7 +171,6 @@ namespace Handbrake
this.Label46 = new System.Windows.Forms.Label();
this.Label40 = new System.Windows.Forms.Label();
this.TabPage1 = new System.Windows.Forms.TabPage();
- this.lbl_test = new System.Windows.Forms.Label();
this.slider_deblock = new System.Windows.Forms.TrackBar();
this.label8 = new System.Windows.Forms.Label();
this.lbl_deblockVal = new System.Windows.Forms.Label();
@@ -645,9 +644,9 @@ namespace Handbrake
//
// number
//
- dataGridViewCellStyle1.Format = "N0";
- dataGridViewCellStyle1.NullValue = null;
- this.number.DefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle2.Format = "N0";
+ dataGridViewCellStyle2.NullValue = null;
+ this.number.DefaultCellStyle = dataGridViewCellStyle2;
this.number.HeaderText = "Chapter Number";
this.number.MaxInputLength = 3;
this.number.Name = "number";
@@ -1964,7 +1963,6 @@ namespace Handbrake
// TabPage1
//
this.TabPage1.BackColor = System.Drawing.Color.Transparent;
- this.TabPage1.Controls.Add(this.lbl_test);
this.TabPage1.Controls.Add(this.slider_deblock);
this.TabPage1.Controls.Add(this.label8);
this.TabPage1.Controls.Add(this.lbl_deblockVal);
@@ -2004,15 +2002,6 @@ namespace Handbrake
this.TabPage1.TabIndex = 0;
this.TabPage1.Text = "Picture Settings";
//
- // lbl_test
- //
- this.lbl_test.AutoSize = true;
- this.lbl_test.Location = new System.Drawing.Point(83, 217);
- this.lbl_test.Name = "lbl_test";
- this.lbl_test.Size = new System.Drawing.Size(48, 13);
- this.lbl_test.TabIndex = 39;
- this.lbl_test.Text = "label12";
- //
// slider_deblock
//
this.slider_deblock.Location = new System.Drawing.Point(407, 264);
@@ -3198,7 +3187,6 @@ namespace Handbrake
private System.Windows.Forms.ToolStripDropDownButton tb_preview;
private System.Windows.Forms.ToolStripMenuItem mnu_qtpreview;
private System.Windows.Forms.ToolStripMenuItem mnu_vlcpreview;
- private System.Windows.Forms.Label lbl_test;
}
} \ No newline at end of file
diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index d6bf08e3e..0039ebd87 100644
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -155,6 +155,12 @@ 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.
Note: Do not change any of the chapter numbers!</value>
</data>
+ <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
<data name="check_Cabac.ToolTip" xml:space="preserve">
<value>CABAC, or context adaptive binary arithmetic coding, is used by x264 to reduce the bitrate needed for a given quality by 15%.
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.