diff options
| author | sr55 <[email protected]> | 2010-03-10 21:11:07 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2010-03-10 21:11:07 +0000 |
| commit | 22586c9fbb1b75b66b12e8bdb231cd570813bdc2 (patch) | |
| tree | 6d87d3b78edc849b29e6e929976d39d58ce25d32 /win | |
| parent | 4f57fc45d8d98e44b10a8c22226899b7365ad293 (diff) | |
WinGui:
- Revert extra added -x and hopefully fix the cause of it being autogend
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3157 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win')
| -rw-r--r-- | win/C#/Controls/x264Panel.cs | 3 | ||||
| -rw-r--r-- | win/C#/Functions/QueryGenerator.cs | 2 | ||||
| -rw-r--r-- | win/C#/frmMain.Designer.cs | 9 | ||||
| -rw-r--r-- | win/C#/frmMain.resx | 21 |
4 files changed, 18 insertions, 17 deletions
diff --git a/win/C#/Controls/x264Panel.cs b/win/C#/Controls/x264Panel.cs index 59ed2c6ab..bc715f46b 100644 --- a/win/C#/Controls/x264Panel.cs +++ b/win/C#/Controls/x264Panel.cs @@ -37,8 +37,7 @@ namespace Handbrake.Controls {
get
{
- string query = " -x " + rtf_x264Query.Text;
- return query;
+ return rtf_x264Query.Text;
}
set { rtf_x264Query.Text = value; }
}
diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs index e14b52b79..d9aaf079c 100644 --- a/win/C#/Functions/QueryGenerator.cs +++ b/win/C#/Functions/QueryGenerator.cs @@ -433,7 +433,7 @@ namespace Handbrake.Functions #endregion
// X264 Panel
- query += mainWindow.x264Panel.X264Query;
+ query += " -x " + mainWindow.x264Panel.X264Query;
// Verbosity Level
query += " -v " + Properties.Settings.Default.verboseLevel;
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index dad2201f2..f29db7882 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -40,7 +40,7 @@ namespace Handbrake this.components = new System.ComponentModel.Container();
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.ToolTip = new System.Windows.Forms.ToolTip(this.components);
@@ -400,9 +400,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.Frozen = true;
this.number.HeaderText = "Chapter Number";
this.number.MaxInputLength = 3;
@@ -1077,7 +1077,6 @@ namespace Handbrake this.x264Panel.Name = "x264Panel";
this.x264Panel.Size = new System.Drawing.Size(720, 306);
this.x264Panel.TabIndex = 0;
- this.x264Panel.X264Query = " -x ";
//
// tab_query
//
diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx index a3662bdb2..7975f6d37 100644 --- a/win/C#/frmMain.resx +++ b/win/C#/frmMain.resx @@ -583,6 +583,18 @@ Note: Currently, if you wish to use a , in your chapter name, you must escape it <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>98</value>
</metadata>
+ <metadata name="File_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>664, 15</value>
+ </metadata>
+ <metadata name="openPreset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>680, 54</value>
+ </metadata>
+ <metadata name="File_ChapterImport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>787, 54</value>
+ </metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>98</value>
+ </metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA
@@ -962,13 +974,4 @@ Note: Currently, if you wish to use a , in your chapter name, you must escape it AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==
</value>
</data>
- <metadata name="File_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>664, 15</value>
- </metadata>
- <metadata name="openPreset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>680, 54</value>
- </metadata>
- <metadata name="File_ChapterImport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>787, 54</value>
- </metadata>
</root>
\ No newline at end of file |