diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/C#/Functions/CLI.cs | 2 | ||||
| -rw-r--r-- | win/C#/frmMain.Designer.cs | 114 | ||||
| -rw-r--r-- | win/C#/frmMain.cs | 142 | ||||
| -rw-r--r-- | win/C#/frmOptions.Designer.cs | 376 | ||||
| -rw-r--r-- | win/C#/frmOptions.cs | 4 | ||||
| -rw-r--r-- | win/C#/frmQueue.Designer.cs | 56 | ||||
| -rw-r--r-- | win/C#/frmQueue.cs | 11 | ||||
| -rw-r--r-- | win/C#/frmReadDVD.Designer.cs | 39 | ||||
| -rw-r--r-- | win/C#/frmReadDVD.cs | 2 |
9 files changed, 420 insertions, 326 deletions
diff --git a/win/C#/Functions/CLI.cs b/win/C#/Functions/CLI.cs index 30c8dd988..b3ba60175 100644 --- a/win/C#/Functions/CLI.cs +++ b/win/C#/Functions/CLI.cs @@ -23,7 +23,7 @@ namespace Handbrake.Functions try
{
hbProc = new Process();
- hbProc.StartInfo.FileName = "hbcli.exe";
+ hbProc.StartInfo.FileName = "HandBrakeCLI.exe";
hbProc.StartInfo.Arguments = query;
hbProc.StartInfo.RedirectStandardOutput = stdout;
hbProc.StartInfo.RedirectStandardError = stderr;
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index d91d8fd36..de110b92c 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -60,7 +60,6 @@ namespace Handbrake this.drp_subtitle = new System.Windows.Forms.ComboBox();
this.btn_presets = new System.Windows.Forms.Button();
this.btn_setDefault = new System.Windows.Forms.Button();
- this.ListBox_Presets = new System.Windows.Forms.ListBox();
this.button1 = new System.Windows.Forms.Button();
this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();
this.File_Open = new System.Windows.Forms.OpenFileDialog();
@@ -153,7 +152,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_anamorphicError = new System.Windows.Forms.Label();
this.label24 = new System.Windows.Forms.Label();
this.drp_deNoise = new System.Windows.Forms.ComboBox();
this.label11 = new System.Windows.Forms.Label();
@@ -183,6 +181,8 @@ namespace Handbrake this.label25 = new System.Windows.Forms.Label();
this.groupBox_dest = new System.Windows.Forms.GroupBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.listview_presets = new System.Windows.Forms.ListView();
+ this.presetname = new System.Windows.Forms.ColumnHeader();
Label38 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();
this.frmMainMenu.SuspendLayout();
@@ -363,7 +363,7 @@ namespace Handbrake "H.264",
"H.264 (iPod)",
"H.264 Baseline 1.3"});
- this.drp_videoEncoder.Location = new System.Drawing.Point(104, 21);
+ this.drp_videoEncoder.Location = new System.Drawing.Point(99, 20);
this.drp_videoEncoder.Name = "drp_videoEncoder";
this.drp_videoEncoder.Size = new System.Drawing.Size(156, 21);
this.drp_videoEncoder.TabIndex = 18;
@@ -579,7 +579,7 @@ namespace Handbrake this.btn_setDefault.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_setDefault.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_setDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_setDefault.Location = new System.Drawing.Point(113, 447);
+ this.btn_setDefault.Location = new System.Drawing.Point(113, 446);
this.btn_setDefault.Name = "btn_setDefault";
this.btn_setDefault.Size = new System.Drawing.Size(72, 22);
this.btn_setDefault.TabIndex = 107;
@@ -590,35 +590,6 @@ namespace Handbrake this.btn_setDefault.UseVisualStyleBackColor = false;
this.btn_setDefault.Click += new System.EventHandler(this.btn_setDefault_Click);
//
- // ListBox_Presets
- //
- this.ListBox_Presets.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.ListBox_Presets.FormattingEnabled = true;
- this.ListBox_Presets.Items.AddRange(new object[] {
- "Animation",
- "AppleTV",
- "Bedlam",
- "Blind",
- "Broke",
- "Classic",
- "Constant Quality Rate",
- "Deux Six Quatre",
- "Film",
- "iPhone / iPod Touch",
- "iPod High-Rez",
- "iPod Low-Rez",
- "Normal",
- "PS3",
- "PSP",
- "QuickTime",
- "Television"});
- this.ListBox_Presets.Location = new System.Drawing.Point(11, 21);
- this.ListBox_Presets.Name = "ListBox_Presets";
- this.ListBox_Presets.Size = new System.Drawing.Size(174, 420);
- this.ListBox_Presets.TabIndex = 104;
- this.ToolTip.SetToolTip(this.ListBox_Presets, "To load a preset, simply click the preset you desire.");
- this.ListBox_Presets.SelectedIndexChanged += new System.EventHandler(this.ListBox_Presets_SelectedIndexChanged);
- //
// button1
//
this.button1.BackColor = System.Drawing.SystemColors.ControlLight;
@@ -757,7 +728,6 @@ namespace Handbrake this.mnu_presetReset.Size = new System.Drawing.Size(194, 22);
this.mnu_presetReset.Text = "Update Built-in Presets";
this.mnu_presetReset.ToolTipText = "Resets all presets.";
- this.mnu_presetReset.Visible = false;
this.mnu_presetReset.Click += new System.EventHandler(this.mnu_presetReset_Click);
//
// toolStripSeparator4
@@ -889,7 +859,7 @@ namespace Handbrake this.HelpToolStripMenuItem});
this.frmMainMenu.Location = new System.Drawing.Point(0, 0);
this.frmMainMenu.Name = "frmMainMenu";
- this.frmMainMenu.Size = new System.Drawing.Size(873, 24);
+ this.frmMainMenu.Size = new System.Drawing.Size(874, 24);
this.frmMainMenu.TabIndex = 1;
this.frmMainMenu.Text = "MenuStrip1";
//
@@ -1599,7 +1569,6 @@ namespace Handbrake // TabPage1
//
this.TabPage1.BackColor = System.Drawing.SystemColors.ControlLight;
- this.TabPage1.Controls.Add(this.lbl_anamorphicError);
this.TabPage1.Controls.Add(this.label24);
this.TabPage1.Controls.Add(this.drp_deNoise);
this.TabPage1.Controls.Add(this.label11);
@@ -1629,23 +1598,11 @@ namespace Handbrake this.TabPage1.Size = new System.Drawing.Size(639, 215);
this.TabPage1.TabIndex = 0;
this.TabPage1.Text = "Picture Settings";
- this.TabPage1.UseVisualStyleBackColor = true;
- //
- // lbl_anamorphicError
- //
- this.lbl_anamorphicError.AutoSize = true;
- this.lbl_anamorphicError.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbl_anamorphicError.ForeColor = System.Drawing.Color.Red;
- this.lbl_anamorphicError.Location = new System.Drawing.Point(436, 149);
- this.lbl_anamorphicError.Name = "lbl_anamorphicError";
- this.lbl_anamorphicError.Size = new System.Drawing.Size(176, 24);
- this.lbl_anamorphicError.TabIndex = 52;
- this.lbl_anamorphicError.Text = "Must be disabled to allow width or \r\nheight to be altered";
- this.lbl_anamorphicError.Visible = false;
//
// label24
//
this.label24.AutoSize = true;
+ this.label24.BackColor = System.Drawing.Color.Transparent;
this.label24.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label24.Location = new System.Drawing.Point(314, 13);
this.label24.Name = "label24";
@@ -1672,6 +1629,7 @@ namespace Handbrake // label11
//
this.label11.AutoSize = true;
+ this.label11.BackColor = System.Drawing.Color.Transparent;
this.label11.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label11.Location = new System.Drawing.Point(314, 94);
this.label11.Name = "label11";
@@ -1682,28 +1640,31 @@ namespace Handbrake // check_deblock
//
this.check_deblock.AutoSize = true;
+ this.check_deblock.BackColor = System.Drawing.Color.Transparent;
this.check_deblock.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.check_deblock.Location = new System.Drawing.Point(416, 37);
this.check_deblock.Name = "check_deblock";
this.check_deblock.Size = new System.Drawing.Size(72, 17);
this.check_deblock.TabIndex = 44;
this.check_deblock.Text = "Deblock";
- this.check_deblock.UseVisualStyleBackColor = true;
+ this.check_deblock.UseVisualStyleBackColor = false;
//
// check_detelecine
//
this.check_detelecine.AutoSize = true;
+ this.check_detelecine.BackColor = System.Drawing.Color.Transparent;
this.check_detelecine.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.check_detelecine.Location = new System.Drawing.Point(317, 36);
this.check_detelecine.Name = "check_detelecine";
this.check_detelecine.Size = new System.Drawing.Size(86, 17);
this.check_detelecine.TabIndex = 43;
this.check_detelecine.Text = "Detelecine";
- this.check_detelecine.UseVisualStyleBackColor = true;
+ this.check_detelecine.UseVisualStyleBackColor = false;
//
// label4
//
this.label4.AutoSize = true;
+ this.label4.BackColor = System.Drawing.Color.Transparent;
this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label4.Location = new System.Drawing.Point(314, 66);
this.label4.Name = "label4";
@@ -1731,19 +1692,20 @@ namespace Handbrake // Check_ChapterMarkers
//
this.Check_ChapterMarkers.AutoSize = true;
+ this.Check_ChapterMarkers.BackColor = System.Drawing.Color.Transparent;
this.Check_ChapterMarkers.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Check_ChapterMarkers.Location = new System.Drawing.Point(317, 173);
this.Check_ChapterMarkers.Name = "Check_ChapterMarkers";
this.Check_ChapterMarkers.Size = new System.Drawing.Size(122, 17);
this.Check_ChapterMarkers.TabIndex = 51;
this.Check_ChapterMarkers.Text = "Chapter Markers";
- this.Check_ChapterMarkers.UseVisualStyleBackColor = true;
+ this.Check_ChapterMarkers.UseVisualStyleBackColor = false;
this.Check_ChapterMarkers.CheckedChanged += new System.EventHandler(this.Check_ChapterMarkers_CheckedChanged);
//
// CheckPixelRatio
//
this.CheckPixelRatio.AutoSize = true;
- this.CheckPixelRatio.BackColor = System.Drawing.SystemColors.ControlLight;
+ this.CheckPixelRatio.BackColor = System.Drawing.Color.Transparent;
this.CheckPixelRatio.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.CheckPixelRatio.Location = new System.Drawing.Point(317, 150);
this.CheckPixelRatio.Name = "CheckPixelRatio";
@@ -1756,6 +1718,7 @@ namespace Handbrake // label6
//
this.label6.AutoSize = true;
+ this.label6.BackColor = System.Drawing.Color.Transparent;
this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label6.Location = new System.Drawing.Point(314, 128);
this.label6.Name = "label6";
@@ -1766,6 +1729,7 @@ namespace Handbrake // lbl_RecomendedCrop
//
this.lbl_RecomendedCrop.AutoSize = true;
+ this.lbl_RecomendedCrop.BackColor = System.Drawing.Color.Transparent;
this.lbl_RecomendedCrop.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbl_RecomendedCrop.Location = new System.Drawing.Point(119, 72);
this.lbl_RecomendedCrop.Name = "lbl_RecomendedCrop";
@@ -1776,6 +1740,7 @@ namespace Handbrake // Label8
//
this.Label8.AutoSize = true;
+ this.Label8.BackColor = System.Drawing.Color.Transparent;
this.Label8.Location = new System.Drawing.Point(13, 71);
this.Label8.Name = "Label8";
this.Label8.Size = new System.Drawing.Size(70, 13);
@@ -1785,6 +1750,7 @@ namespace Handbrake // Label1
//
this.Label1.AutoSize = true;
+ this.Label1.BackColor = System.Drawing.Color.Transparent;
this.Label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Label1.Location = new System.Drawing.Point(13, 13);
this.Label1.Name = "Label1";
@@ -1795,6 +1761,7 @@ namespace Handbrake // Label53
//
this.Label53.AutoSize = true;
+ this.Label53.BackColor = System.Drawing.Color.Transparent;
this.Label53.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Label53.Location = new System.Drawing.Point(134, 187);
this.Label53.Name = "Label53";
@@ -1805,6 +1772,7 @@ namespace Handbrake // Label52
//
this.Label52.AutoSize = true;
+ this.Label52.BackColor = System.Drawing.Color.Transparent;
this.Label52.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Label52.Location = new System.Drawing.Point(138, 96);
this.Label52.Name = "Label52";
@@ -1815,6 +1783,7 @@ namespace Handbrake // Label51
//
this.Label51.AutoSize = true;
+ this.Label51.BackColor = System.Drawing.Color.Transparent;
this.Label51.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Label51.Location = new System.Drawing.Point(247, 139);
this.Label51.Name = "Label51";
@@ -1825,6 +1794,7 @@ namespace Handbrake // Label50
//
this.Label50.AutoSize = true;
+ this.Label50.BackColor = System.Drawing.Color.Transparent;
this.Label50.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Label50.Location = new System.Drawing.Point(13, 41);
this.Label50.Name = "Label50";
@@ -1835,6 +1805,7 @@ namespace Handbrake // Label15
//
this.Label15.AutoSize = true;
+ this.Label15.BackColor = System.Drawing.Color.Transparent;
this.Label15.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Label15.Location = new System.Drawing.Point(39, 139);
this.Label15.Name = "Label15";
@@ -1964,8 +1935,8 @@ namespace Handbrake //
// groupBox2
//
+ this.groupBox2.Controls.Add(this.listview_presets);
this.groupBox2.Controls.Add(this.btn_setDefault);
- this.groupBox2.Controls.Add(this.ListBox_Presets);
this.groupBox2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.groupBox2.ForeColor = System.Drawing.Color.Black;
this.groupBox2.Location = new System.Drawing.Point(674, 35);
@@ -1975,12 +1946,41 @@ namespace Handbrake this.groupBox2.TabStop = false;
this.groupBox2.Text = "Presets";
//
+ // listview_presets
+ //
+ this.listview_presets.Alignment = System.Windows.Forms.ListViewAlignment.SnapToGrid;
+ this.listview_presets.AllowColumnReorder = true;
+ this.listview_presets.BackColor = System.Drawing.SystemColors.ControlLightLight;
+ this.listview_presets.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.listview_presets.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+ this.presetname});
+ this.listview_presets.ForeColor = System.Drawing.SystemColors.HotTrack;
+ this.listview_presets.FullRowSelect = true;
+ this.listview_presets.GridLines = true;
+ this.listview_presets.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
+ this.listview_presets.LabelEdit = true;
+ this.listview_presets.LabelWrap = false;
+ this.listview_presets.Location = new System.Drawing.Point(8, 19);
+ this.listview_presets.Margin = new System.Windows.Forms.Padding(5);
+ this.listview_presets.MultiSelect = false;
+ this.listview_presets.Name = "listview_presets";
+ this.listview_presets.Size = new System.Drawing.Size(177, 411);
+ this.listview_presets.TabIndex = 104;
+ this.listview_presets.UseCompatibleStateImageBehavior = false;
+ this.listview_presets.View = System.Windows.Forms.View.Details;
+ this.listview_presets.SelectedIndexChanged += new System.EventHandler(this.listview_presets_SelectedIndexChanged);
+ //
+ // presetname
+ //
+ this.presetname.Text = "Presets";
+ this.presetname.Width = 175;
+ //
// frmMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ControlLight;
- this.ClientSize = new System.Drawing.Size(873, 568);
+ this.ClientSize = new System.Drawing.Size(874, 566);
this.Controls.Add(this.btn_presets);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox_dest);
@@ -2160,7 +2160,6 @@ namespace Handbrake private System.Windows.Forms.Label label23;
internal System.Windows.Forms.Button btn_copy;
private System.Windows.Forms.GroupBox groupBox2;
- private System.Windows.Forms.ListBox ListBox_Presets;
internal System.Windows.Forms.Button btn_presets;
internal System.Windows.Forms.Button btn_setDefault;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
@@ -2170,7 +2169,6 @@ namespace Handbrake private System.Windows.Forms.ToolStripMenuItem mnu_quickStart;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
internal System.Windows.Forms.Button button1;
- private System.Windows.Forms.Label lbl_anamorphicError;
private System.Windows.Forms.TabPage tabPage4;
internal System.Windows.Forms.Label label26;
internal System.Windows.Forms.Label label25;
@@ -2181,6 +2179,8 @@ namespace Handbrake private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripMenuItem mnu_open;
private System.Windows.Forms.ToolStripMenuItem mnu_save;
+ internal System.Windows.Forms.ListView listview_presets;
+ internal System.Windows.Forms.ColumnHeader presetname;
}
}
\ No newline at end of file diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index b7aab968a..3a58827b5 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -24,10 +24,12 @@ namespace Handbrake #region Application Startup
+ // Some stuff that needs to be Initialized.
private Process hbProc;
private Parsing.DVD thisDVD;
private frmQueue queueWindow = new frmQueue();
+ // The main window beings here...
public frmMain()
{
@@ -57,6 +59,9 @@ namespace Handbrake // Hide the preset bar should the user have the option enabled.
hidePresetBar();
+ // Load in all the presets
+ updatePresets();
+
/*
* This code can be used for storing preset and preset name information in future versions.
* Please ignore it for the moment.
@@ -172,8 +177,13 @@ namespace Handbrake }
else
{
- // Load the default preset on lauch
- ListBox_Presets.SelectedItem = "Normal";
+ ListViewItem item = listview_presets.FindItemWithText("Normal");
+
+ if (item != null)
+ {
+ listview_presets.SelectedItems.Clear();
+ item.Selected = true;
+ }
}
}
catch (Exception)
@@ -437,36 +447,21 @@ namespace Handbrake private void mnu_presetReset_Click(object sender, EventArgs e)
{
- ListBox_Presets.Items.Clear();
- ListBox_Presets.Items.Add("Animation");
- ListBox_Presets.Items.Add("AppleTV");
- ListBox_Presets.Items.Add("Bedlam");
- ListBox_Presets.Items.Add("Blind");
- ListBox_Presets.Items.Add("Broke");
- ListBox_Presets.Items.Add("Classic");
- ListBox_Presets.Items.Add("Constant Quality Rate");
- ListBox_Presets.Items.Add("Deux Six Quatre");
- ListBox_Presets.Items.Add("Film");
- ListBox_Presets.Items.Add("iPhone");
- ListBox_Presets.Items.Add("iPod High-Rez");
- ListBox_Presets.Items.Add("iPod Low-Rez");
- ListBox_Presets.Items.Add("Normal");
- ListBox_Presets.Items.Add("PS3");
- ListBox_Presets.Items.Add("PSP");
- ListBox_Presets.Items.Add("QuickTime");
- ListBox_Presets.Items.Add("Television");
-
- if (presetStatus == false)
- {
- this.Width = 881;
- presetStatus = true;
- btn_presets.Text = "Hide Presets";
- }
+ listview_presets.Items.Clear();
+ updatePresets();
+ MessageBox.Show("Presets have been updated", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
private void mnu_SelectDefault_Click(object sender, EventArgs e)
{
- ListBox_Presets.SelectedItem = "Normal";
+ ListViewItem item = listview_presets.FindItemWithText("Normal");
+
+ if (item != null)
+ {
+ listview_presets.SelectedItems.Clear();
+ item.Selected = true;
+ }
+
if (presetStatus == false)
{
this.Width = 881;
@@ -656,6 +651,41 @@ namespace Handbrake #region Preset System
+ // Import Current Presets
+ private void updatePresets()
+ {
+ string[] presets = new string[17];
+ presets[0] = "Animation";
+ presets[1] = "AppleTV";
+ presets[2] = "Bedlam";
+ presets[3] = "Blind";
+ presets[4] = "Broke";
+ presets[5] = "Classic";
+ presets[6] = "Constant Quality Rate";
+ presets[7] = "Deux Six Quatre";
+ presets[8] = "Film";
+ presets[9] = "iPhone / iPod Touch";
+ presets[10] = "iPod High-Rez";
+ presets[11] = "iPod Low-Rez";
+ presets[12] = "Normal";
+ presets[13] = "PS3";
+ presets[14] = "PSP";
+ presets[15] = "QuickTime";
+ presets[16] = "Television";
+
+ ListViewItem preset_listview = new ListViewItem();
+ string[] presetList = new string[1];
+
+ foreach (string preset in presets)
+ {
+ presetList[0] = preset;
+ preset_listview = new ListViewItem(presetList);
+
+ // Now Fill Out List View with Items
+ listview_presets.Items.Add(preset_listview);
+ }
+ }
+
// Varibles
private Boolean presetStatus = false;
@@ -719,35 +749,26 @@ namespace Handbrake //H264 Tab
Properties.Settings.Default.CRF = CheckCRF.CheckState.ToString();
Properties.Settings.Default.H264 = rtf_h264advanced.Text;
- try
- {
- Properties.Settings.Default.selectedPreset = ListBox_Presets.SelectedItem.ToString();
- }
- catch (Exception exc)
- {
- // If the user has not selected an item, then an exception may be thrown. Catch and ignore.
- }
+ //Preset
+ Properties.Settings.Default.selectedPreset = groupBox_output.Text.Replace("Output Settings (Preset: ", "").Replace("\"", "").Replace(")", "");
+ // Save the new default Settings
Properties.Settings.Default.Save();
+ MessageBox.Show("New default settings saved.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
}
- // Preset Seleciton
- private void ListBox_Presets_SelectedIndexChanged(object sender, EventArgs e)
+ // Preset Selection
+ private void listview_presets_SelectedIndexChanged(object sender, EventArgs e)
{
-
string selectedPreset = null;
- if (ListBox_Presets.SelectedItem != null)
- {
- selectedPreset = ListBox_Presets.SelectedItem.ToString();
- }
- else
- {
- selectedPreset = "";
- }
+ ListView.SelectedListViewItemCollection name = null;
+ name = listview_presets.SelectedItems;
+
+ if (listview_presets.SelectedItems.Count != 0)
+ selectedPreset = name[0].SubItems[0].Text;
+
switch (selectedPreset)
{
- //(anamorphic, width, height, vencoder, bitrate, filesize, quality, qpercent, audioBit, chpt, audioSample, h264, deinterlace, twopass, crop, turbo, audioCodec, preset
-
case "Animation":
setGuiSetttings(CheckState.Checked, "", "", "H.264", "1000", "", 0, "0%", "160", CheckState.Checked, "48", "ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2", "Origional (Fast)", CheckState.Checked, "No Crop", CheckState.Checked, "AAC", "Output Settings (Preset: Apple Animation)");
setMkv();
@@ -756,7 +777,7 @@ namespace Handbrake case "AppleTV":
setGuiSetttings(CheckState.Checked, "", "", "H.264", "2500", "", 0, "0%", "160", CheckState.Checked, "48", "bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=2:cabac=0", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: Apple TV)");
break;
-
+
case "Bedlam":
setGuiSetttings(CheckState.Checked, "", "", "H.264", "1800", "", 0, "0%", "160", CheckState.Checked, "48", "ref=16:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:me-range=64:analyse=all:8x8dct:trellis=2:no-fast-pskip:no-dct-decimate:filter=-2,-1", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AC3", "Output Settings (Preset: Bedlam)");
setMkv();
@@ -800,24 +821,24 @@ namespace Handbrake case "iPod Low-Rez":
setGuiSetttings(CheckState.Unchecked, "320", "", "H.264 (iPod)", "700", "", 0, "0%", "160", CheckState.Checked, "48", "keyint=300:keyint-min=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: iPod Low Rez)");
break;
-
+
case "Normal":
setGuiSetttings(CheckState.Checked, "", "", "H.264", "1500", "", 0, "0%", "160", CheckState.Checked, "48", "ref=2:bframes=2:subme=5:me=umh", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AAC", "Output Settings (Preset: Normal)");
break;
-
+
case "PS3":
setGuiSetttings(CheckState.Checked, "", "", "H.264", "2500", "", 0, "0%", "160", CheckState.Checked, "48", "level=41:subme=5:me=umh", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: PS3)");
break;
-
+
case "PSP":
setGuiSetttings(CheckState.Unchecked, "368", "208", "Mpeg 4", "1024", "", 0, "0%", "160", CheckState.Checked, "48", "", "None", CheckState.Unchecked, "No Crop", CheckState.Unchecked, "AAC", "Output Settings (Preset: PSP)");
break;
-
+
case "QuickTime":
setGuiSetttings(CheckState.Checked, "", "", "H.264", "2000", "", 0, "0%", "160", CheckState.Checked, "48", "ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me=umh:subme=5:analyse=all:8x8dct:trellis=1:no-fast-pskip", "None", CheckState.Checked, "No Crop", CheckState.Checked, "AAC", "Output Settings (Preset: Quicktime)");
break;
-
+
case "Television":
setGuiSetttings(CheckState.Unchecked, "", "", "H.264", "1300", "", 0, "0%", "160", CheckState.Checked, "48", "ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyramid:me=umh:subme=6:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip", "Origional (Fast)", CheckState.Checked, "No Crop", CheckState.Checked, "AAC", "Output Settings (Preset: Television)");
setMkv();
@@ -827,6 +848,7 @@ namespace Handbrake }
}
+
// Functions - It's a bit dirty but i'll sort this out later. Simply done to reduce the amount of code above.
private void setGuiSetttings(CheckState anamorphic, string width, string height, string vencoder, string bitrate, string filesize, int quality, string qpercent, string audioBit, CheckState chpt, string audioSample, string h264, string deinterlace, CheckState twopass, string crop, CheckState turbo, string audioCodec, string preset)
{
@@ -1100,7 +1122,7 @@ namespace Handbrake text_width.Text = "";
text_width.BackColor = Color.LightCoral;
CheckPixelRatio.BackColor = Color.LightCoral;
- lbl_anamorphicError.Visible = true;
+
}
else
{
@@ -1149,7 +1171,6 @@ namespace Handbrake text_height.Text = "";
text_height.BackColor = Color.LightCoral;
CheckPixelRatio.BackColor = Color.LightCoral;
- lbl_anamorphicError.Visible = true;
}
else
{
@@ -1221,7 +1242,6 @@ namespace Handbrake text_width.BackColor = Color.White;
text_height.BackColor = Color.White;
CheckPixelRatio.BackColor = TabPage1.BackColor;
- lbl_anamorphicError.Visible = false;
}
private void check_2PassEncode_CheckedChanged(object sender, EventArgs e)
@@ -1834,12 +1854,10 @@ namespace Handbrake query = QueryEditorText.Text;
}
thisQuery = Functions.QueryParser.Parse(query);
- MessageBox.Show(thisQuery.DeTelecine.ToString());
+ MessageBox.Show(thisQuery.Source.ToString());
+ MessageBox.Show(thisQuery.Destination.ToString());
}
-
-
-
// This is the END of the road ------------------------------------------------------------------------------
}
}
diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs index df13a4ac5..0b26ae8dd 100644 --- a/win/C#/frmOptions.Designer.cs +++ b/win/C#/frmOptions.Designer.cs @@ -30,27 +30,35 @@ namespace Handbrake {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmOptions));
this.drp_Priority = new System.Windows.Forms.ComboBox();
- this.GroupBox2 = new System.Windows.Forms.GroupBox();
- this.check_showPreset = new System.Windows.Forms.CheckBox();
- this.check_tooltip = new System.Windows.Forms.CheckBox();
- this.check_updateCheck = new System.Windows.Forms.CheckBox();
- this.check_userDefaultSettings = new System.Windows.Forms.CheckBox();
this.Label4 = new System.Windows.Forms.Label();
this.check_verbose = new System.Windows.Forms.CheckBox();
this.drp_processors = new System.Windows.Forms.ComboBox();
this.File_Save = new System.Windows.Forms.SaveFileDialog();
this.Label11 = new System.Windows.Forms.Label();
- this.GroupBox3 = new System.Windows.Forms.GroupBox();
- this.GroupBox1 = new System.Windows.Forms.GroupBox();
this.check_guiDebug = new System.Windows.Forms.CheckBox();
this.btn_close = new System.Windows.Forms.Button();
- this.groupBox4 = new System.Windows.Forms.GroupBox();
this.drp_completeOption = new System.Windows.Forms.ComboBox();
this.label5 = new System.Windows.Forms.Label();
- this.GroupBox2.SuspendLayout();
- this.GroupBox3.SuspendLayout();
- this.GroupBox1.SuspendLayout();
- this.groupBox4.SuspendLayout();
+ this.tab_options = new System.Windows.Forms.TabControl();
+ this.tab_general = new System.Windows.Forms.TabPage();
+ this.check_showPreset = new System.Windows.Forms.CheckBox();
+ this.check_tooltip = new System.Windows.Forms.CheckBox();
+ this.check_updateCheck = new System.Windows.Forms.CheckBox();
+ this.check_userDefaultSettings = new System.Windows.Forms.CheckBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.tab_debug = new System.Windows.Forms.TabPage();
+ this.label6 = new System.Windows.Forms.Label();
+ this.tab_advanced = new System.Windows.Forms.TabPage();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.pictureBox2 = new System.Windows.Forms.PictureBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.tab_options.SuspendLayout();
+ this.tab_general.SuspendLayout();
+ this.tab_debug.SuspendLayout();
+ this.tab_advanced.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
this.SuspendLayout();
//
// drp_Priority
@@ -65,80 +73,17 @@ namespace Handbrake "Normal",
"Below Normal",
"Low"});
- this.drp_Priority.Location = new System.Drawing.Point(223, 58);
+ this.drp_Priority.Location = new System.Drawing.Point(161, 67);
this.drp_Priority.Name = "drp_Priority";
this.drp_Priority.Size = new System.Drawing.Size(111, 21);
this.drp_Priority.TabIndex = 43;
this.drp_Priority.SelectedIndexChanged += new System.EventHandler(this.drp_Priority_SelectedIndexChanged);
//
- // GroupBox2
- //
- this.GroupBox2.BackColor = System.Drawing.SystemColors.ControlLight;
- this.GroupBox2.Controls.Add(this.check_showPreset);
- this.GroupBox2.Controls.Add(this.check_tooltip);
- this.GroupBox2.Controls.Add(this.check_updateCheck);
- this.GroupBox2.Controls.Add(this.check_userDefaultSettings);
- this.GroupBox2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.GroupBox2.Location = new System.Drawing.Point(12, 11);
- this.GroupBox2.Name = "GroupBox2";
- this.GroupBox2.Size = new System.Drawing.Size(386, 123);
- this.GroupBox2.TabIndex = 55;
- this.GroupBox2.TabStop = false;
- this.GroupBox2.Text = "General Settings";
- //
- // check_showPreset
- //
- this.check_showPreset.AutoSize = true;
- this.check_showPreset.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_showPreset.Location = new System.Drawing.Point(15, 94);
- this.check_showPreset.Name = "check_showPreset";
- this.check_showPreset.Size = new System.Drawing.Size(115, 17);
- this.check_showPreset.TabIndex = 50;
- this.check_showPreset.Text = "Hide Preset Bar";
- this.check_showPreset.UseVisualStyleBackColor = true;
- this.check_showPreset.CheckedChanged += new System.EventHandler(this.check_showPreset_CheckedChanged);
- //
- // check_tooltip
- //
- this.check_tooltip.AutoSize = true;
- this.check_tooltip.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_tooltip.Location = new System.Drawing.Point(15, 71);
- this.check_tooltip.Name = "check_tooltip";
- this.check_tooltip.Size = new System.Drawing.Size(135, 17);
- this.check_tooltip.TabIndex = 49;
- this.check_tooltip.Text = "Enable GUI tooltips";
- this.check_tooltip.UseVisualStyleBackColor = true;
- this.check_tooltip.CheckedChanged += new System.EventHandler(this.check_tooltip_CheckedChanged);
- //
- // check_updateCheck
- //
- this.check_updateCheck.AutoSize = true;
- this.check_updateCheck.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_updateCheck.Location = new System.Drawing.Point(15, 25);
- this.check_updateCheck.Name = "check_updateCheck";
- this.check_updateCheck.Size = new System.Drawing.Size(170, 17);
- this.check_updateCheck.TabIndex = 1;
- this.check_updateCheck.Text = "Update Check on Startup";
- this.check_updateCheck.UseVisualStyleBackColor = true;
- this.check_updateCheck.CheckedChanged += new System.EventHandler(this.check_updateCheck_CheckedChanged);
- //
- // check_userDefaultSettings
- //
- this.check_userDefaultSettings.AutoSize = true;
- this.check_userDefaultSettings.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_userDefaultSettings.Location = new System.Drawing.Point(15, 48);
- this.check_userDefaultSettings.Name = "check_userDefaultSettings";
- this.check_userDefaultSettings.Size = new System.Drawing.Size(248, 17);
- this.check_userDefaultSettings.TabIndex = 47;
- this.check_userDefaultSettings.Text = "Load Users Default Settings on Startup";
- this.check_userDefaultSettings.UseVisualStyleBackColor = true;
- this.check_userDefaultSettings.CheckedChanged += new System.EventHandler(this.check_userDefaultSettings_CheckedChanged);
- //
// Label4
//
this.Label4.AutoSize = true;
this.Label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Label4.Location = new System.Drawing.Point(13, 61);
+ this.Label4.Location = new System.Drawing.Point(13, 70);
this.Label4.Name = "Label4";
this.Label4.Size = new System.Drawing.Size(132, 13);
this.Label4.TabIndex = 42;
@@ -148,7 +93,7 @@ namespace Handbrake //
this.check_verbose.AutoSize = true;
this.check_verbose.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_verbose.Location = new System.Drawing.Point(20, 31);
+ this.check_verbose.Location = new System.Drawing.Point(16, 58);
this.check_verbose.Name = "check_verbose";
this.check_verbose.Size = new System.Drawing.Size(139, 17);
this.check_verbose.TabIndex = 51;
@@ -171,7 +116,7 @@ namespace Handbrake "6",
"7",
"8"});
- this.drp_processors.Location = new System.Drawing.Point(223, 22);
+ this.drp_processors.Location = new System.Drawing.Point(161, 40);
this.drp_processors.Name = "drp_processors";
this.drp_processors.Size = new System.Drawing.Size(111, 21);
this.drp_processors.TabIndex = 41;
@@ -186,45 +131,17 @@ namespace Handbrake //
this.Label11.AutoSize = true;
this.Label11.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Label11.Location = new System.Drawing.Point(12, 25);
+ this.Label11.Location = new System.Drawing.Point(13, 43);
this.Label11.Name = "Label11";
this.Label11.Size = new System.Drawing.Size(142, 13);
this.Label11.TabIndex = 40;
this.Label11.Text = "Number of processors: ";
//
- // GroupBox3
- //
- this.GroupBox3.BackColor = System.Drawing.SystemColors.ControlLight;
- this.GroupBox3.Controls.Add(this.drp_Priority);
- this.GroupBox3.Controls.Add(this.Label4);
- this.GroupBox3.Controls.Add(this.drp_processors);
- this.GroupBox3.Controls.Add(this.Label11);
- this.GroupBox3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.GroupBox3.Location = new System.Drawing.Point(12, 211);
- this.GroupBox3.Name = "GroupBox3";
- this.GroupBox3.Size = new System.Drawing.Size(386, 94);
- this.GroupBox3.TabIndex = 56;
- this.GroupBox3.TabStop = false;
- this.GroupBox3.Text = "Processor Detection";
- //
- // GroupBox1
- //
- this.GroupBox1.BackColor = System.Drawing.SystemColors.ControlLight;
- this.GroupBox1.Controls.Add(this.check_guiDebug);
- this.GroupBox1.Controls.Add(this.check_verbose);
- this.GroupBox1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.GroupBox1.Location = new System.Drawing.Point(12, 311);
- this.GroupBox1.Name = "GroupBox1";
- this.GroupBox1.Size = new System.Drawing.Size(386, 70);
- this.GroupBox1.TabIndex = 54;
- this.GroupBox1.TabStop = false;
- this.GroupBox1.Text = "Verbose && Debug Mode";
- //
// check_guiDebug
//
this.check_guiDebug.AutoSize = true;
this.check_guiDebug.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_guiDebug.Location = new System.Drawing.Point(223, 31);
+ this.check_guiDebug.Location = new System.Drawing.Point(16, 35);
this.check_guiDebug.Name = "check_guiDebug";
this.check_guiDebug.Size = new System.Drawing.Size(131, 17);
this.check_guiDebug.TabIndex = 52;
@@ -239,26 +156,14 @@ namespace Handbrake this.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_close.Location = new System.Drawing.Point(291, 391);
+ this.btn_close.Location = new System.Drawing.Point(287, 287);
this.btn_close.Name = "btn_close";
this.btn_close.Size = new System.Drawing.Size(107, 22);
this.btn_close.TabIndex = 53;
- this.btn_close.Text = "Close";
+ this.btn_close.Text = "Save && Close";
this.btn_close.UseVisualStyleBackColor = false;
this.btn_close.Click += new System.EventHandler(this.btn_close_Click);
//
- // groupBox4
- //
- this.groupBox4.Controls.Add(this.drp_completeOption);
- this.groupBox4.Controls.Add(this.label5);
- this.groupBox4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.groupBox4.Location = new System.Drawing.Point(12, 140);
- this.groupBox4.Name = "groupBox4";
- this.groupBox4.Size = new System.Drawing.Size(386, 65);
- this.groupBox4.TabIndex = 57;
- this.groupBox4.TabStop = false;
- this.groupBox4.Text = "On Completion Options";
- //
// drp_completeOption
//
this.drp_completeOption.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
@@ -272,7 +177,7 @@ namespace Handbrake "Lock System",
"Log Off",
"Quit HandBrake"});
- this.drp_completeOption.Location = new System.Drawing.Point(223, 29);
+ this.drp_completeOption.Location = new System.Drawing.Point(192, 156);
this.drp_completeOption.Name = "drp_completeOption";
this.drp_completeOption.Size = new System.Drawing.Size(111, 21);
this.drp_completeOption.TabIndex = 43;
@@ -282,59 +187,240 @@ namespace Handbrake //
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label5.Location = new System.Drawing.Point(13, 29);
+ this.label5.Location = new System.Drawing.Point(13, 158);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(173, 13);
this.label5.TabIndex = 42;
this.label5.Text = "When the encode completes:";
//
+ // tab_options
+ //
+ this.tab_options.Controls.Add(this.tab_general);
+ this.tab_options.Controls.Add(this.tab_debug);
+ this.tab_options.Controls.Add(this.tab_advanced);
+ this.tab_options.Location = new System.Drawing.Point(12, 63);
+ this.tab_options.Name = "tab_options";
+ this.tab_options.SelectedIndex = 0;
+ this.tab_options.Size = new System.Drawing.Size(382, 218);
+ this.tab_options.TabIndex = 58;
+ //
+ // tab_general
+ //
+ this.tab_general.BackColor = System.Drawing.SystemColors.ControlLight;
+ this.tab_general.Controls.Add(this.drp_completeOption);
+ this.tab_general.Controls.Add(this.label5);
+ this.tab_general.Controls.Add(this.check_showPreset);
+ this.tab_general.Controls.Add(this.check_tooltip);
+ this.tab_general.Controls.Add(this.check_updateCheck);
+ this.tab_general.Controls.Add(this.check_userDefaultSettings);
+ this.tab_general.Controls.Add(this.label2);
+ this.tab_general.Controls.Add(this.label1);
+ this.tab_general.Location = new System.Drawing.Point(4, 22);
+ this.tab_general.Name = "tab_general";
+ this.tab_general.Padding = new System.Windows.Forms.Padding(3);
+ this.tab_general.Size = new System.Drawing.Size(374, 192);
+ this.tab_general.TabIndex = 0;
+ this.tab_general.Text = "General";
+ //
+ // check_showPreset
+ //
+ this.check_showPreset.AutoSize = true;
+ this.check_showPreset.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.check_showPreset.Location = new System.Drawing.Point(16, 56);
+ this.check_showPreset.Name = "check_showPreset";
+ this.check_showPreset.Size = new System.Drawing.Size(136, 17);
+ this.check_showPreset.TabIndex = 58;
+ this.check_showPreset.Text = "Hide the preset bar";
+ this.check_showPreset.UseVisualStyleBackColor = true;
+ this.check_showPreset.CheckedChanged += new System.EventHandler(this.check_showPreset_CheckedChanged);
+ //
+ // check_tooltip
+ //
+ this.check_tooltip.AutoSize = true;
+ this.check_tooltip.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.check_tooltip.Location = new System.Drawing.Point(16, 79);
+ this.check_tooltip.Name = "check_tooltip";
+ this.check_tooltip.Size = new System.Drawing.Size(135, 17);
+ this.check_tooltip.TabIndex = 57;
+ this.check_tooltip.Text = "Enable GUI tooltips";
+ this.check_tooltip.UseVisualStyleBackColor = true;
+ this.check_tooltip.CheckedChanged += new System.EventHandler(this.check_tooltip_CheckedChanged);
+ //
+ // check_updateCheck
+ //
+ this.check_updateCheck.AutoSize = true;
+ this.check_updateCheck.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.check_updateCheck.Location = new System.Drawing.Point(16, 33);
+ this.check_updateCheck.Name = "check_updateCheck";
+ this.check_updateCheck.Size = new System.Drawing.Size(131, 17);
+ this.check_updateCheck.TabIndex = 55;
+ this.check_updateCheck.Text = "Check for updates";
+ this.check_updateCheck.UseVisualStyleBackColor = true;
+ this.check_updateCheck.CheckedChanged += new System.EventHandler(this.check_updateCheck_CheckedChanged);
+ //
+ // check_userDefaultSettings
+ //
+ this.check_userDefaultSettings.AutoSize = true;
+ this.check_userDefaultSettings.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.check_userDefaultSettings.Location = new System.Drawing.Point(16, 104);
+ this.check_userDefaultSettings.Name = "check_userDefaultSettings";
+ this.check_userDefaultSettings.Size = new System.Drawing.Size(166, 17);
+ this.check_userDefaultSettings.TabIndex = 56;
+ this.check_userDefaultSettings.Text = "Load my default settings";
+ this.check_userDefaultSettings.UseVisualStyleBackColor = true;
+ this.check_userDefaultSettings.CheckedChanged += new System.EventHandler(this.check_userDefaultSettings_CheckedChanged);
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label2.Location = new System.Drawing.Point(13, 135);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(80, 13);
+ this.label2.TabIndex = 54;
+ this.label2.Text = "When Done";
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label1.Location = new System.Drawing.Point(13, 13);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(55, 13);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "Startup";
+ //
+ // tab_debug
+ //
+ this.tab_debug.BackColor = System.Drawing.SystemColors.ControlLight;
+ this.tab_debug.Controls.Add(this.check_verbose);
+ this.tab_debug.Controls.Add(this.check_guiDebug);
+ this.tab_debug.Controls.Add(this.label6);
+ this.tab_debug.Location = new System.Drawing.Point(4, 22);
+ this.tab_debug.Name = "tab_debug";
+ this.tab_debug.Size = new System.Drawing.Size(374, 192);
+ this.tab_debug.TabIndex = 2;
+ this.tab_debug.Text = "Debug Options";
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label6.Location = new System.Drawing.Point(13, 13);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(173, 13);
+ this.label6.TabIndex = 1;
+ this.label6.Text = "Verbose and Debug mode";
+ //
+ // tab_advanced
+ //
+ this.tab_advanced.BackColor = System.Drawing.SystemColors.ControlLight;
+ this.tab_advanced.Controls.Add(this.label3);
+ this.tab_advanced.Controls.Add(this.drp_Priority);
+ this.tab_advanced.Controls.Add(this.Label11);
+ this.tab_advanced.Controls.Add(this.Label4);
+ this.tab_advanced.Controls.Add(this.drp_processors);
+ this.tab_advanced.Location = new System.Drawing.Point(4, 22);
+ this.tab_advanced.Name = "tab_advanced";
+ this.tab_advanced.Padding = new System.Windows.Forms.Padding(3);
+ this.tab_advanced.Size = new System.Drawing.Size(374, 192);
+ this.tab_advanced.TabIndex = 1;
+ this.tab_advanced.Text = "Advanced";
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label3.Location = new System.Drawing.Point(13, 13);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(176, 13);
+ this.label3.TabIndex = 44;
+ this.label3.Text = "Process(or) Configuration";
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label8.Location = new System.Drawing.Point(50, 24);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(131, 13);
+ this.label8.TabIndex = 61;
+ this.label8.Text = "Handbrake Options";
+ //
+ // pictureBox2
+ //
+ this.pictureBox2.Image = global::Handbrake.Properties.Resources.General_Preferences;
+ this.pictureBox2.Location = new System.Drawing.Point(12, 12);
+ this.pictureBox2.Name = "pictureBox2";
+ this.pictureBox2.Size = new System.Drawing.Size(32, 32);
+ this.pictureBox2.TabIndex = 60;
+ this.pictureBox2.TabStop = false;
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(50, 39);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(146, 13);
+ this.label7.TabIndex = 59;
+ this.label7.Text = "Modify program options.";
+ //
// frmOptions
//
this.BackColor = System.Drawing.SystemColors.ControlLight;
- this.ClientSize = new System.Drawing.Size(413, 422);
- this.Controls.Add(this.groupBox4);
- this.Controls.Add(this.GroupBox2);
- this.Controls.Add(this.GroupBox3);
- this.Controls.Add(this.GroupBox1);
+ this.ClientSize = new System.Drawing.Size(407, 316);
+ this.Controls.Add(this.label7);
+ this.Controls.Add(this.label8);
+ this.Controls.Add(this.pictureBox2);
+ this.Controls.Add(this.tab_options);
this.Controls.Add(this.btn_close);
this.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "frmOptions";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Options";
- this.GroupBox2.ResumeLayout(false);
- this.GroupBox2.PerformLayout();
- this.GroupBox3.ResumeLayout(false);
- this.GroupBox3.PerformLayout();
- this.GroupBox1.ResumeLayout(false);
- this.GroupBox1.PerformLayout();
- this.groupBox4.ResumeLayout(false);
- this.groupBox4.PerformLayout();
+ this.tab_options.ResumeLayout(false);
+ this.tab_general.ResumeLayout(false);
+ this.tab_general.PerformLayout();
+ this.tab_debug.ResumeLayout(false);
+ this.tab_debug.PerformLayout();
+ this.tab_advanced.ResumeLayout(false);
+ this.tab_advanced.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
this.ResumeLayout(false);
+ this.PerformLayout();
}
#endregion
internal System.Windows.Forms.ComboBox drp_Priority;
- internal System.Windows.Forms.GroupBox GroupBox2;
- internal System.Windows.Forms.CheckBox check_updateCheck;
- internal System.Windows.Forms.CheckBox check_userDefaultSettings;
internal System.Windows.Forms.Label Label4;
internal System.Windows.Forms.CheckBox check_verbose;
internal System.Windows.Forms.ComboBox drp_processors;
internal System.Windows.Forms.SaveFileDialog File_Save;
internal System.Windows.Forms.Label Label11;
- internal System.Windows.Forms.GroupBox GroupBox3;
- internal System.Windows.Forms.GroupBox GroupBox1;
internal System.Windows.Forms.Button btn_close;
internal System.Windows.Forms.CheckBox check_guiDebug;
- internal System.Windows.Forms.CheckBox check_tooltip;
- private System.Windows.Forms.GroupBox groupBox4;
internal System.Windows.Forms.ComboBox drp_completeOption;
internal System.Windows.Forms.Label label5;
+ private System.Windows.Forms.TabControl tab_options;
+ private System.Windows.Forms.TabPage tab_general;
+ private System.Windows.Forms.TabPage tab_advanced;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label1;
internal System.Windows.Forms.CheckBox check_showPreset;
+ internal System.Windows.Forms.CheckBox check_tooltip;
+ internal System.Windows.Forms.CheckBox check_updateCheck;
+ internal System.Windows.Forms.CheckBox check_userDefaultSettings;
+ private System.Windows.Forms.TabPage tab_debug;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.PictureBox pictureBox2;
+ private System.Windows.Forms.Label label7;
}
}
\ No newline at end of file diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs index 5451d6f9b..fda77169f 100644 --- a/win/C#/frmOptions.cs +++ b/win/C#/frmOptions.cs @@ -99,8 +99,8 @@ namespace Handbrake private void check_showPreset_CheckedChanged(object sender, EventArgs e)
{
Properties.Settings.Default.hidePresets = check_showPreset.CheckState.ToString();
- }
-
+ }
+
}
}
\ No newline at end of file diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs index 7a26c8775..12ecd50d0 100644 --- a/win/C#/frmQueue.Designer.cs +++ b/win/C#/frmQueue.Designer.cs @@ -50,7 +50,6 @@ namespace Handbrake this.btn_updateQuery = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
- this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// btn_down
@@ -60,7 +59,7 @@ namespace Handbrake this.btn_down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_down.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_down.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_down.Location = new System.Drawing.Point(656, 91);
+ this.btn_down.Location = new System.Drawing.Point(650, 141);
this.btn_down.Name = "btn_down";
this.btn_down.Size = new System.Drawing.Size(64, 22);
this.btn_down.TabIndex = 33;
@@ -76,7 +75,7 @@ namespace Handbrake this.btn_up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_up.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_up.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_up.Location = new System.Drawing.Point(655, 63);
+ this.btn_up.Location = new System.Drawing.Point(649, 113);
this.btn_up.Name = "btn_up";
this.btn_up.Size = new System.Drawing.Size(64, 22);
this.btn_up.TabIndex = 32;
@@ -92,7 +91,7 @@ namespace Handbrake this.btn_delete.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_delete.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_delete.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_delete.Location = new System.Drawing.Point(656, 137);
+ this.btn_delete.Location = new System.Drawing.Point(650, 187);
this.btn_delete.Name = "btn_delete";
this.btn_delete.Size = new System.Drawing.Size(64, 22);
this.btn_delete.TabIndex = 31;
@@ -108,7 +107,7 @@ namespace Handbrake this.btn_q_encoder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_q_encoder.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_q_encoder.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_q_encoder.Location = new System.Drawing.Point(10, 366);
+ this.btn_q_encoder.Location = new System.Drawing.Point(12, 345);
this.btn_q_encoder.Name = "btn_q_encoder";
this.btn_q_encoder.Size = new System.Drawing.Size(124, 22);
this.btn_q_encoder.TabIndex = 29;
@@ -122,7 +121,7 @@ namespace Handbrake this.list_queue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.list_queue.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.list_queue.HorizontalScrollbar = true;
- this.list_queue.Location = new System.Drawing.Point(19, 19);
+ this.list_queue.Location = new System.Drawing.Point(13, 69);
this.list_queue.Name = "list_queue";
this.list_queue.Size = new System.Drawing.Size(630, 184);
this.list_queue.TabIndex = 28;
@@ -135,7 +134,7 @@ namespace Handbrake this.btn_Close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_Close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_Close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_Close.Location = new System.Drawing.Point(639, 366);
+ this.btn_Close.Location = new System.Drawing.Point(606, 345);
this.btn_Close.Name = "btn_Close";
this.btn_Close.Size = new System.Drawing.Size(108, 22);
this.btn_Close.TabIndex = 27;
@@ -147,16 +146,16 @@ namespace Handbrake // progressBar
//
this.progressBar.BackColor = System.Drawing.SystemColors.ControlLight;
- this.progressBar.Location = new System.Drawing.Point(64, 328);
+ this.progressBar.Location = new System.Drawing.Point(67, 307);
this.progressBar.Name = "progressBar";
- this.progressBar.Size = new System.Drawing.Size(653, 23);
+ this.progressBar.Size = new System.Drawing.Size(608, 23);
this.progressBar.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
this.progressBar.TabIndex = 34;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(7, 334);
+ this.label2.Location = new System.Drawing.Point(10, 313);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(51, 13);
this.label2.TabIndex = 35;
@@ -165,7 +164,7 @@ namespace Handbrake // lbl_progressValue
//
this.lbl_progressValue.AutoSize = true;
- this.lbl_progressValue.Location = new System.Drawing.Point(723, 332);
+ this.lbl_progressValue.Location = new System.Drawing.Point(690, 311);
this.lbl_progressValue.Name = "lbl_progressValue";
this.lbl_progressValue.Size = new System.Drawing.Size(24, 13);
this.lbl_progressValue.TabIndex = 36;
@@ -206,7 +205,7 @@ namespace Handbrake this.btn_cancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_cancel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_cancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_cancel.Location = new System.Drawing.Point(140, 366);
+ this.btn_cancel.Location = new System.Drawing.Point(143, 345);
this.btn_cancel.Name = "btn_cancel";
this.btn_cancel.Size = new System.Drawing.Size(91, 22);
this.btn_cancel.TabIndex = 41;
@@ -222,7 +221,7 @@ namespace Handbrake //
this.lbl_status.AutoSize = true;
this.lbl_status.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbl_status.Location = new System.Drawing.Point(314, 332);
+ this.lbl_status.Location = new System.Drawing.Point(317, 311);
this.lbl_status.Name = "lbl_status";
this.lbl_status.Size = new System.Drawing.Size(176, 13);
this.lbl_status.TabIndex = 42;
@@ -232,9 +231,9 @@ namespace Handbrake // text_edit
//
this.text_edit.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.text_edit.Location = new System.Drawing.Point(119, 209);
+ this.text_edit.Location = new System.Drawing.Point(113, 259);
this.text_edit.Name = "text_edit";
- this.text_edit.Size = new System.Drawing.Size(530, 21);
+ this.text_edit.Size = new System.Drawing.Size(530, 20);
this.text_edit.TabIndex = 43;
this.toolTip1.SetToolTip(this.text_edit, "Avoid using this feature when the encoder is about to start a new task. You may o" +
"verwrite the wrong job");
@@ -243,7 +242,7 @@ namespace Handbrake //
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label4.Location = new System.Drawing.Point(16, 211);
+ this.label4.Location = new System.Drawing.Point(10, 261);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(97, 13);
this.label4.TabIndex = 45;
@@ -256,7 +255,7 @@ namespace Handbrake this.btn_updateQuery.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_updateQuery.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_updateQuery.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_updateQuery.Location = new System.Drawing.Point(655, 207);
+ this.btn_updateQuery.Location = new System.Drawing.Point(649, 257);
this.btn_updateQuery.Name = "btn_updateQuery";
this.btn_updateQuery.Size = new System.Drawing.Size(64, 23);
this.btn_updateQuery.TabIndex = 46;
@@ -267,32 +266,31 @@ namespace Handbrake //
// groupBox1
//
- this.groupBox1.Controls.Add(this.list_queue);
- this.groupBox1.Controls.Add(this.btn_updateQuery);
- this.groupBox1.Controls.Add(this.btn_delete);
- this.groupBox1.Controls.Add(this.label4);
- this.groupBox1.Controls.Add(this.btn_up);
- this.groupBox1.Controls.Add(this.text_edit);
- this.groupBox1.Controls.Add(this.btn_down);
this.groupBox1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.groupBox1.Location = new System.Drawing.Point(12, 73);
+ this.groupBox1.Location = new System.Drawing.Point(14, 285);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(735, 249);
+ this.groupBox1.Size = new System.Drawing.Size(700, 10);
this.groupBox1.TabIndex = 47;
this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Queued Management";
//
// frmQueue
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ControlLight;
- this.ClientSize = new System.Drawing.Size(761, 396);
+ this.ClientSize = new System.Drawing.Size(736, 377);
+ this.Controls.Add(this.list_queue);
+ this.Controls.Add(this.btn_updateQuery);
this.Controls.Add(this.groupBox1);
+ this.Controls.Add(this.btn_delete);
this.Controls.Add(this.lbl_status);
+ this.Controls.Add(this.label4);
this.Controls.Add(this.btn_cancel);
+ this.Controls.Add(this.btn_up);
this.Controls.Add(this.label1);
+ this.Controls.Add(this.text_edit);
this.Controls.Add(this.label3);
+ this.Controls.Add(this.btn_down);
this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.lbl_progressValue);
this.Controls.Add(this.label2);
@@ -305,8 +303,6 @@ namespace Handbrake this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Encode Queue";
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs index d6b502643..eaa8904b1 100644 --- a/win/C#/frmQueue.cs +++ b/win/C#/frmQueue.cs @@ -42,8 +42,8 @@ namespace Handbrake progressBar.Update();
//ThreadPool.QueueUserWorkItem(startProc);
// Testing a new way of launching a thread. Hopefully will fix a random freeze up of the main thread.
- Thread test = new Thread(startProc);
- test.Start();
+ Thread theQ = new Thread(startProc);
+ theQ.Start();
}
}
catch (Exception exc)
@@ -263,12 +263,5 @@ namespace Handbrake base.OnClosing(e);
}
-
-
-
-
-
-
-
}
}
\ No newline at end of file diff --git a/win/C#/frmReadDVD.Designer.cs b/win/C#/frmReadDVD.Designer.cs index 0d3384154..92b545943 100644 --- a/win/C#/frmReadDVD.Designer.cs +++ b/win/C#/frmReadDVD.Designer.cs @@ -30,51 +30,51 @@ namespace Handbrake {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmReadDVD));
this.Label3 = new System.Windows.Forms.Label();
- this.Label2 = new System.Windows.Forms.Label();
this.lbl_status = new System.Windows.Forms.Label();
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout();
//
// Label3
//
this.Label3.AutoSize = true;
this.Label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Label3.Location = new System.Drawing.Point(77, 9);
+ this.Label3.Location = new System.Drawing.Point(68, 19);
this.Label3.Name = "Label3";
- this.Label3.Size = new System.Drawing.Size(222, 26);
+ this.Label3.Size = new System.Drawing.Size(230, 26);
this.Label3.TabIndex = 27;
- this.Label3.Text = "The CLI is about to read the DVD...\r\nThis process can take up to 1 minute.";
- //
- // Label2
- //
- this.Label2.AutoSize = true;
- this.Label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Label2.Location = new System.Drawing.Point(9, 8);
- this.Label2.Name = "Label2";
- this.Label2.Size = new System.Drawing.Size(52, 13);
- this.Label2.TabIndex = 26;
- this.Label2.Text = "Status:";
+ this.Label3.Text = "The CLI is about to read your source...\r\nThis process can take up to 1 minute.";
//
// lbl_status
//
this.lbl_status.AutoSize = true;
this.lbl_status.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbl_status.Location = new System.Drawing.Point(77, 41);
+ this.lbl_status.Location = new System.Drawing.Point(68, 51);
this.lbl_status.Name = "lbl_status";
this.lbl_status.Size = new System.Drawing.Size(178, 13);
this.lbl_status.TabIndex = 31;
this.lbl_status.Text = "Processing.... Please Wait!";
this.lbl_status.Visible = false;
//
+ // pictureBox1
+ //
+ this.pictureBox1.Image = global::Handbrake.Properties.Resources.Movies;
+ this.pictureBox1.Location = new System.Drawing.Point(12, 12);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(33, 33);
+ this.pictureBox1.TabIndex = 32;
+ this.pictureBox1.TabStop = false;
+ //
// frmReadDVD
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ControlLight;
- this.ClientSize = new System.Drawing.Size(357, 74);
+ this.ClientSize = new System.Drawing.Size(360, 81);
this.ControlBox = false;
+ this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.lbl_status);
this.Controls.Add(this.Label3);
- this.Controls.Add(this.Label2);
this.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
@@ -82,8 +82,9 @@ namespace Handbrake this.MaximumSize = new System.Drawing.Size(538, 113);
this.Name = "frmReadDVD";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "Reading DVD...";
+ this.Text = "Reading Source...";
this.TopMost = true;
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -92,7 +93,7 @@ namespace Handbrake #endregion
internal System.Windows.Forms.Label Label3;
- internal System.Windows.Forms.Label Label2;
internal System.Windows.Forms.Label lbl_status;
+ private System.Windows.Forms.PictureBox pictureBox1;
}
}
\ No newline at end of file diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs index 1cf817223..ddc16dbcd 100644 --- a/win/C#/frmReadDVD.cs +++ b/win/C#/frmReadDVD.cs @@ -91,7 +91,7 @@ namespace Handbrake try
{
string appPath = Application.StartupPath.ToString()+ "\\";
- string strCmdLine = "cmd /c " + '"' + '"' + appPath + "hbcli.exe" + '"' + " -i " + '"' + inputFile + '"' + " -t0 >" + '"'+ appPath + "dvdinfo.dat" + '"' + " 2>&1" + '"';
+ string strCmdLine = "cmd /c " + '"' + '"' + appPath + "HandBrakeCLI.exe" + '"' + " -i " + '"' + inputFile + '"' + " -t0 >" + '"' + appPath + "dvdinfo.dat" + '"' + " 2>&1" + '"';
Process hbproc = Process.Start("CMD.exe", strCmdLine);
hbproc.WaitForExit();
hbproc.Dispose();
|