diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/C#/Functions/Main.cs | 4 | ||||
| -rw-r--r-- | win/C#/frmMain.Designer.cs | 124 | ||||
| -rw-r--r-- | win/C#/frmMain.cs | 54 | ||||
| -rw-r--r-- | win/C#/frmMain.resx | 6 | ||||
| -rw-r--r-- | win/C#/frmMain/PresetLoader.cs | 6 | ||||
| -rw-r--r-- | win/C#/frmMain/QueryGenerator.cs | 4 | ||||
| -rw-r--r-- | win/C#/frmPreview.cs | 2 |
7 files changed, 71 insertions, 129 deletions
diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs index 68306748a..a7e0626b5 100644 --- a/win/C#/Functions/Main.cs +++ b/win/C#/Functions/Main.cs @@ -221,10 +221,6 @@ namespace Handbrake.Functions destination_filename += ".m4v";
else if (format == 2)
destination_filename += ".mkv";
- else if (format == 3)
- destination_filename += ".avi";
- else if (format == 4)
- destination_filename += ".ogm";
// Now work out the path where the file will be stored.
// First case: If the destination box doesn't already contain a path, make one.
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index 6db93aaca..56ee46106 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.File_Save = new System.Windows.Forms.SaveFileDialog();
@@ -183,9 +183,14 @@ namespace Handbrake this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();
this.tabs_panel = new System.Windows.Forms.TabControl();
this.tab_Filters = new System.Windows.Forms.TabPage();
+ this.ctl_deinterlace = new Handbrake.Deinterlace();
+ this.ctl_denoise = new Handbrake.Denoise();
+ this.ctl_decomb = new Handbrake.Decomb();
+ this.ctl_detelecine = new Handbrake.Detelecine();
this.tab_chapters = new System.Windows.Forms.TabPage();
this.label31 = new System.Windows.Forms.Label();
this.h264Tab = new System.Windows.Forms.TabPage();
+ this.x264Panel = new Handbrake.Controls.x264Panel();
this.tab_query = new System.Windows.Forms.TabPage();
this.btn_clear = new System.Windows.Forms.Button();
this.label34 = new System.Windows.Forms.Label();
@@ -219,11 +224,6 @@ namespace Handbrake this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);
this.StatusStrip = new System.Windows.Forms.StatusStrip();
this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();
- this.ctl_deinterlace = new Handbrake.Deinterlace();
- this.ctl_denoise = new Handbrake.Denoise();
- this.ctl_decomb = new Handbrake.Decomb();
- this.ctl_detelecine = new Handbrake.Detelecine();
- this.x264Panel = new Handbrake.Controls.x264Panel();
notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
notifyIconMenu.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();
@@ -274,7 +274,7 @@ namespace Handbrake // DVD_Save
//
this.DVD_Save.CheckFileExists = true;
- this.DVD_Save.Filter = "mp4|*.mp4|m4v|*.m4v|mkv|*.mkv|avi|*.avi|ogm|*.ogm";
+ this.DVD_Save.Filter = "mp4|*.mp4|m4v|*.m4v|mkv|*.mkv";
this.DVD_Save.SupportMultiDottedExtensions = true;
//
// File_Save
@@ -610,9 +610,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;
@@ -681,9 +681,7 @@ namespace Handbrake this.drop_format.Items.AddRange(new object[] {
"MP4 File",
"M4V File",
- "MKV File",
- "AVI File",
- "OGM File"});
+ "MKV File"});
this.drop_format.Location = new System.Drawing.Point(75, 19);
this.drop_format.Name = "drop_format";
this.drop_format.Size = new System.Drawing.Size(106, 21);
@@ -1874,6 +1872,48 @@ namespace Handbrake this.tab_Filters.Text = "Video Filters";
this.tab_Filters.UseVisualStyleBackColor = true;
//
+ // ctl_deinterlace
+ //
+ this.ctl_deinterlace.AutoSize = true;
+ this.ctl_deinterlace.Location = new System.Drawing.Point(19, 95);
+ this.ctl_deinterlace.Margin = new System.Windows.Forms.Padding(0);
+ this.ctl_deinterlace.MaximumSize = new System.Drawing.Size(400, 30);
+ this.ctl_deinterlace.Name = "ctl_deinterlace";
+ this.ctl_deinterlace.Size = new System.Drawing.Size(275, 28);
+ this.ctl_deinterlace.TabIndex = 41;
+ this.ctl_deinterlace.onChange += new System.EventHandler(this.ctl_deinterlace_changed);
+ //
+ // ctl_denoise
+ //
+ this.ctl_denoise.AutoSize = true;
+ this.ctl_denoise.Location = new System.Drawing.Point(19, 123);
+ this.ctl_denoise.Margin = new System.Windows.Forms.Padding(0);
+ this.ctl_denoise.MaximumSize = new System.Drawing.Size(400, 30);
+ this.ctl_denoise.Name = "ctl_denoise";
+ this.ctl_denoise.Size = new System.Drawing.Size(275, 28);
+ this.ctl_denoise.TabIndex = 40;
+ //
+ // ctl_decomb
+ //
+ this.ctl_decomb.AutoSize = true;
+ this.ctl_decomb.Location = new System.Drawing.Point(19, 66);
+ this.ctl_decomb.Margin = new System.Windows.Forms.Padding(0);
+ this.ctl_decomb.MaximumSize = new System.Drawing.Size(400, 30);
+ this.ctl_decomb.Name = "ctl_decomb";
+ this.ctl_decomb.Size = new System.Drawing.Size(275, 28);
+ this.ctl_decomb.TabIndex = 39;
+ this.ctl_decomb.onChange += new System.EventHandler(this.ctl_decomb_changed);
+ //
+ // ctl_detelecine
+ //
+ this.ctl_detelecine.AutoSize = true;
+ this.ctl_detelecine.Location = new System.Drawing.Point(19, 38);
+ this.ctl_detelecine.Margin = new System.Windows.Forms.Padding(0);
+ this.ctl_detelecine.MaximumSize = new System.Drawing.Size(400, 30);
+ this.ctl_detelecine.Name = "ctl_detelecine";
+ this.ctl_detelecine.Size = new System.Drawing.Size(275, 28);
+ this.ctl_detelecine.TabIndex = 38;
+ //
// tab_chapters
//
this.tab_chapters.BackColor = System.Drawing.Color.Transparent;
@@ -1911,6 +1951,14 @@ namespace Handbrake this.h264Tab.Text = "Advanced";
this.h264Tab.UseVisualStyleBackColor = true;
//
+ // x264Panel
+ //
+ this.x264Panel.Location = new System.Drawing.Point(0, 0);
+ this.x264Panel.Name = "x264Panel";
+ this.x264Panel.Size = new System.Drawing.Size(720, 306);
+ this.x264Panel.TabIndex = 0;
+ this.x264Panel.x264Query = "";
+ //
// tab_query
//
this.tab_query.Controls.Add(this.btn_clear);
@@ -2259,56 +2307,6 @@ namespace Handbrake this.lbl_encode.Size = new System.Drawing.Size(31, 17);
this.lbl_encode.Text = "{0}";
//
- // ctl_deinterlace
- //
- this.ctl_deinterlace.AutoSize = true;
- this.ctl_deinterlace.Location = new System.Drawing.Point(19, 95);
- this.ctl_deinterlace.Margin = new System.Windows.Forms.Padding(0);
- this.ctl_deinterlace.MaximumSize = new System.Drawing.Size(400, 30);
- this.ctl_deinterlace.Name = "ctl_deinterlace";
- this.ctl_deinterlace.Size = new System.Drawing.Size(275, 28);
- this.ctl_deinterlace.TabIndex = 41;
- this.ctl_deinterlace.onChange += new System.EventHandler(this.ctl_deinterlace_changed);
- //
- // ctl_denoise
- //
- this.ctl_denoise.AutoSize = true;
- this.ctl_denoise.Location = new System.Drawing.Point(19, 123);
- this.ctl_denoise.Margin = new System.Windows.Forms.Padding(0);
- this.ctl_denoise.MaximumSize = new System.Drawing.Size(400, 30);
- this.ctl_denoise.Name = "ctl_denoise";
- this.ctl_denoise.Size = new System.Drawing.Size(275, 28);
- this.ctl_denoise.TabIndex = 40;
- //
- // ctl_decomb
- //
- this.ctl_decomb.AutoSize = true;
- this.ctl_decomb.Location = new System.Drawing.Point(19, 66);
- this.ctl_decomb.Margin = new System.Windows.Forms.Padding(0);
- this.ctl_decomb.MaximumSize = new System.Drawing.Size(400, 30);
- this.ctl_decomb.Name = "ctl_decomb";
- this.ctl_decomb.Size = new System.Drawing.Size(275, 28);
- this.ctl_decomb.TabIndex = 39;
- this.ctl_decomb.onChange += new System.EventHandler(this.ctl_decomb_changed);
- //
- // ctl_detelecine
- //
- this.ctl_detelecine.AutoSize = true;
- this.ctl_detelecine.Location = new System.Drawing.Point(19, 38);
- this.ctl_detelecine.Margin = new System.Windows.Forms.Padding(0);
- this.ctl_detelecine.MaximumSize = new System.Drawing.Size(400, 30);
- this.ctl_detelecine.Name = "ctl_detelecine";
- this.ctl_detelecine.Size = new System.Drawing.Size(275, 28);
- this.ctl_detelecine.TabIndex = 38;
- //
- // x264Panel
- //
- this.x264Panel.Location = new System.Drawing.Point(0, 0);
- this.x264Panel.Name = "x264Panel";
- this.x264Panel.Size = new System.Drawing.Size(720, 306);
- this.x264Panel.TabIndex = 0;
- this.x264Panel.x264Query = "";
- //
// frmMain
//
this.AllowDrop = true;
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index c8bc46eac..f1c6cf366 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -1011,11 +1011,6 @@ namespace Handbrake drop_format.SelectedIndex = 1;
else if (path.EndsWith(".mkv"))
drop_format.SelectedIndex = 2;
- else if (path.EndsWith(".avi"))
- drop_format.SelectedIndex = 3;
- else if (path.EndsWith(".ogm"))
- drop_format.SelectedIndex = 4;
-
}
// Output Settings
@@ -1027,10 +1022,6 @@ namespace Handbrake setExtension(".m4v");
else if (drop_format.SelectedIndex == 2)
setExtension(".mkv");
- else if (drop_format.SelectedIndex == 3)
- setExtension(".avi");
- else if (drop_format.SelectedIndex == 4)
- setExtension(".ogm");
setAudioByContainer(drop_format.Text);
setVideoByContainer(drop_format.Text);
@@ -1040,8 +1031,6 @@ namespace Handbrake text_destination.Text = text_destination.Text.Replace(".mp4", newExtension);
text_destination.Text = text_destination.Text.Replace(".m4v", newExtension);
text_destination.Text = text_destination.Text.Replace(".mkv", newExtension);
- text_destination.Text = text_destination.Text.Replace(".avi", newExtension);
- text_destination.Text = text_destination.Text.Replace(".ogm", newExtension);
}
//Video Tab
@@ -1808,23 +1797,6 @@ namespace Handbrake drp_audenc_1.SelectedIndex = 0;
}
- else if (path.Contains("AVI"))
- {
- oldval = drp_audenc_1.Text;
- drp_audenc_1.Items.Clear();
- drp_audenc_1.Items.Add("MP3");
- drp_audenc_1.Items.Add("AC3");
- if ((oldval != "MP3") && (oldval != "AC3"))
- drp_audenc_1.SelectedIndex = 0;
-
- }
- else if (path.Contains("OGM"))
- {
- drp_audenc_1.Items.Clear();
- drp_audenc_1.Items.Add("Vorbis");
- drp_audenc_1.SelectedIndex = 0;
-
- }
else if (path.Contains("MKV"))
{
drp_audenc_1.Items.Clear();
@@ -1847,7 +1819,7 @@ namespace Handbrake {
string oldval;
- if ((path.Contains("MP3")) || (path.Contains("M4V")))
+ if ((path.Contains("MP4")) || (path.Contains("M4V")))
{
oldval = drp_videoEncoder.Text;
drp_videoEncoder.Items.Clear();
@@ -1860,30 +1832,6 @@ namespace Handbrake drp_videoEncoder.Text = oldval;
}
- else if (path.Contains("AVI"))
- {
- oldval = drp_videoEncoder.Text;
- drp_videoEncoder.Items.Clear();
- drp_videoEncoder.Items.Add("MPEG-4 (FFmpeg)");
- drp_videoEncoder.Items.Add("MPEG-4 (XviD)");
- drp_videoEncoder.Items.Add("H.264 (x264)");
- if (oldval == "VP3 (Theora)")
- drp_videoEncoder.SelectedIndex = 2;
- else
- drp_videoEncoder.Text = oldval;
- }
- else if (path.Contains("OGM"))
- {
- oldval = drp_videoEncoder.Text;
- drp_videoEncoder.Items.Clear();
- drp_videoEncoder.Items.Add("MPEG-4 (FFmpeg)");
- drp_videoEncoder.Items.Add("MPEG-4 (XviD)");
- drp_videoEncoder.Items.Add("VP3 (Theora)");
- if (oldval == "H.264 (x264)")
- drp_videoEncoder.SelectedIndex = 2;
- else
- drp_videoEncoder.Text = oldval;
- }
else if (path.Contains("MKV"))
{
oldval = drp_videoEncoder.Text;
diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx index 77037cb54..9b96457b9 100644 --- a/win/C#/frmMain.resx +++ b/win/C#/frmMain.resx @@ -152,6 +152,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>
<metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>232, 15</value>
</metadata>
diff --git a/win/C#/frmMain/PresetLoader.cs b/win/C#/frmMain/PresetLoader.cs index 0a2ad328a..b616b2566 100644 --- a/win/C#/frmMain/PresetLoader.cs +++ b/win/C#/frmMain/PresetLoader.cs @@ -31,9 +31,7 @@ namespace Handbrake string destination = mainWindow.text_destination.Text;
destination = destination.Replace(".mp4", "." + presetQuery.Format);
destination = destination.Replace(".m4v", "." + presetQuery.Format);
- destination = destination.Replace(".avi", "." + presetQuery.Format);
destination = destination.Replace(".mkv", "." + presetQuery.Format);
- destination = destination.Replace(".ogm", "." + presetQuery.Format);
mainWindow.text_destination.Text = destination;
}
@@ -52,10 +50,6 @@ namespace Handbrake mainWindow.drop_format.SelectedIndex = 1;
else if (presetQuery.Format == "mkv")
mainWindow.drop_format.SelectedIndex = 2;
- else if (presetQuery.Format == "avi")
- mainWindow.drop_format.SelectedIndex = 3;
- else if (presetQuery.Format == "ogm")
- mainWindow.drop_format.SelectedIndex = 4;
if (presetQuery.ChapterMarkers && presetQuery.Format == "mp4")
mainWindow.drop_format.SelectedIndex = 1;
diff --git a/win/C#/frmMain/QueryGenerator.cs b/win/C#/frmMain/QueryGenerator.cs index 586c7a88a..e8407a4bc 100644 --- a/win/C#/frmMain/QueryGenerator.cs +++ b/win/C#/frmMain/QueryGenerator.cs @@ -79,7 +79,7 @@ namespace Handbrake // Destination tab
if (mainWindow.text_destination.Text != "")
- query += " -o " + '"' + mainWindow.text_destination.Text.Replace(".m", "_sample.m").Replace(".avi", "_sample.avi").Replace(".ogm", "_sample.ogm") + '"';
+ query += " -o " + '"' + mainWindow.text_destination.Text.Replace(".m", "_sample.m") + '"';
query += generateTabbedComponentsQuery(mainWindow);
return query;
@@ -400,7 +400,7 @@ namespace Handbrake string[] destName = mainWindow.text_destination.Text.Split('\\');
string dest_name = destName[destName.Length - 1];
dest_name = dest_name.Replace("\"", "");
- dest_name = dest_name.Replace(".mp4", "").Replace(".m4v", "").Replace(".avi", "").Replace(".mkv", "").Replace(".ogm", "");
+ dest_name = dest_name.Replace(".mp4", "").Replace(".m4v", "").Replace(".mkv", "");
string source_title = mainWindow.drp_dvdtitle.Text;
string[] titlesplit = source_title.Split(' ');
diff --git a/win/C#/frmPreview.cs b/win/C#/frmPreview.cs index e2022ca2b..e5ebd21f6 100644 --- a/win/C#/frmPreview.cs +++ b/win/C#/frmPreview.cs @@ -87,7 +87,7 @@ namespace Handbrake // Get the sample filename
if (mainWindow.text_destination.Text != "")
- currently_playing = mainWindow.text_destination.Text.Replace(".mp4", "_sample.mp4").Replace(".m4v", "_sample.m4v").Replace(".avi", "_sample.avi").Replace(".ogm", "_sample.ogm");
+ currently_playing = mainWindow.text_destination.Text.Replace(".mp4", "_sample.mp4").Replace(".m4v", "_sample.m4v");
// Play back in QT or VLC
if (playerSelection == "QT")
|