diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/C#/EncodeQueue/Encode.cs | 5 | ||||
| -rw-r--r-- | win/C#/Functions/Main.cs | 20 | ||||
| -rw-r--r-- | win/C#/Functions/QueryGenerator.cs | 8 | ||||
| -rw-r--r-- | win/C#/Presets/PresetsHandler.cs | 2 | ||||
| -rw-r--r-- | win/C#/frmMain.Designer.cs | 319 | ||||
| -rw-r--r-- | win/C#/frmMain.cs | 49 | ||||
| -rw-r--r-- | win/C#/frmOptions.Designer.cs | 116 | ||||
| -rw-r--r-- | win/C#/frmOptions.cs | 17 |
8 files changed, 290 insertions, 246 deletions
diff --git a/win/C#/EncodeQueue/Encode.cs b/win/C#/EncodeQueue/Encode.cs index 29d8bf874..248624064 100644 --- a/win/C#/EncodeQueue/Encode.cs +++ b/win/C#/EncodeQueue/Encode.cs @@ -162,9 +162,8 @@ namespace Handbrake.EncodeQueue string tempLogFile = Path.Combine(logDir, "last_encode_log.txt");
string encodeDestinationPath = Path.GetDirectoryName(destination);
- String[] destName = destination.Split('\\');
- string destinationFile = destName[destName.Length - 1];
- string encodeLogFile = DateTime.Now.ToString().Replace("/", "-").Replace(":", "-") + " " + destinationFile + ".txt";
+ String destinationFile = Path.GetFileName(destination);
+ string encodeLogFile = destinationFile + " " + DateTime.Now.ToString().Replace("/", "-").Replace(":", "-") + ".txt";
// Make sure the log directory exists.
if (!Directory.Exists(logDir))
diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs index 95a17cfb3..04d4d16b4 100644 --- a/win/C#/Functions/Main.cs +++ b/win/C#/Functions/Main.cs @@ -350,5 +350,25 @@ namespace Handbrake.Functions return -1;
}
+ /// <summary>
+ /// Clear all the encode log files.
+ /// </summary>
+ public static void clearLogs()
+ {
+ string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";
+ if (Directory.Exists(logDir))
+ {
+ DirectoryInfo info = new DirectoryInfo(logDir);
+ FileInfo[] logFiles = info.GetFiles("*.txt");
+ foreach (FileInfo file in logFiles)
+ {
+ if (!file.Name.Contains("last_scan_log") && !file.Name.Contains("last_encode_log") && !file.Name.Contains("tmp_appReadable_log.txt"))
+ {
+ File.Delete(file.FullName);
+ }
+ }
+ }
+ }
+
}
}
diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs index 373041107..0394df6cf 100644 --- a/win/C#/Functions/QueryGenerator.cs +++ b/win/C#/Functions/QueryGenerator.cs @@ -24,8 +24,8 @@ namespace Handbrake.Functions // Source tab
string query = "";
- if ((mainWindow.text_source.Text != "") && (mainWindow.text_source.Text.Trim() != "Click 'Source' to continue"))
- query = " -i " + '"' + mainWindow.text_source.Text + '"';
+ if ((mainWindow.sourcePath != "") && (mainWindow.sourcePath.Trim() != "Click 'Source' to continue"))
+ query = " -i " + '"' + mainWindow.sourcePath + '"';
if (mainWindow.drp_dvdtitle.Text != "Automatic")
{
@@ -68,8 +68,8 @@ namespace Handbrake.Functions // Source tab
string query = "";
- if ((mainWindow.text_source.Text != "") && (mainWindow.text_source.Text.Trim() != "Click 'Source' to continue"))
- query = " -i " + '"' + mainWindow.text_source.Text + '"';
+ if ((mainWindow.sourcePath != "") && (mainWindow.sourcePath.Trim() != "Click 'Source' to continue"))
+ query = " -i " + '"' + mainWindow.sourcePath + '"';
if (mainWindow.drp_dvdtitle.Text != "Automatic")
{
diff --git a/win/C#/Presets/PresetsHandler.cs b/win/C#/Presets/PresetsHandler.cs index 2e1401fbd..bd756c08d 100644 --- a/win/C#/Presets/PresetsHandler.cs +++ b/win/C#/Presets/PresetsHandler.cs @@ -19,7 +19,7 @@ namespace Handbrake.Presets List<Preset> presets = new List<Preset>();
List<Preset> user_presets = new List<Preset>();
private static readonly XmlSerializer ser = new XmlSerializer(typeof(List<Preset>));
- String userPresetFile = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\user_presets.xml";
+ string userPresetFile = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\user_presets.xml";
string hbPresetFile = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\presets.xml";
/// <summary>
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index b500e3648..b201b475c 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 dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = 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();
@@ -65,7 +65,6 @@ namespace Handbrake this.btn_addPreset = new System.Windows.Forms.Button();
this.btn_removePreset = new System.Windows.Forms.Button();
this.drop_format = new System.Windows.Forms.ComboBox();
- this.text_source = new System.Windows.Forms.TextBox();
this.drop_angle = new System.Windows.Forms.ComboBox();
this.lbl_duration = new System.Windows.Forms.Label();
this.label_duration = new System.Windows.Forms.Label();
@@ -96,18 +95,14 @@ namespace Handbrake this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.mnu_about = new System.Windows.Forms.ToolStripMenuItem();
this.frmMainMenu = new System.Windows.Forms.MenuStrip();
- this.gb_source = new System.Windows.Forms.GroupBox();
this.lbl_angle = new System.Windows.Forms.Label();
this.Label13 = new System.Windows.Forms.Label();
- this.Label17 = new System.Windows.Forms.Label();
this.Label9 = new System.Windows.Forms.Label();
this.Label10 = new System.Windows.Forms.Label();
- this.groupBox_output = new System.Windows.Forms.GroupBox();
this.label5 = new System.Windows.Forms.Label();
this.Label47 = new System.Windows.Forms.Label();
this.Label3 = new System.Windows.Forms.Label();
this.tab_audio = new System.Windows.Forms.TabPage();
- this.AudioSettings = new Handbrake.Controls.AudioPanel();
this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);
this.tab_video = new System.Windows.Forms.TabPage();
this.radio_cq = new System.Windows.Forms.RadioButton();
@@ -119,23 +114,19 @@ namespace Handbrake this.SliderValue = new System.Windows.Forms.Label();
this.Label46 = new System.Windows.Forms.Label();
this.tab_picture = new System.Windows.Forms.TabPage();
- this.PictureSettings = new Handbrake.Controls.PictureSettings();
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.tab_subtitles = new System.Windows.Forms.TabPage();
- this.Subtitles = new Handbrake.Controls.Subtitles();
this.tab_chapters = new System.Windows.Forms.TabPage();
this.label31 = new System.Windows.Forms.Label();
this.tab_advanced = 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();
this.btn_generate_Query = new System.Windows.Forms.Button();
this.label33 = new System.Windows.Forms.Label();
this.rtf_query = new System.Windows.Forms.RichTextBox();
- this.groupBox_dest = new System.Windows.Forms.GroupBox();
this.btn_destBrowse = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
@@ -163,14 +154,20 @@ namespace Handbrake this.StatusStrip = new System.Windows.Forms.StatusStrip();
this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();
this.hbproc = new System.Diagnostics.Process();
+ this.label1 = new System.Windows.Forms.Label();
+ this.lbl_source = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.groupBox_output = new System.Windows.Forms.Label();
+ this.PictureSettings = new Handbrake.Controls.PictureSettings();
this.Filters = new Handbrake.Controls.Filters();
+ this.AudioSettings = new Handbrake.Controls.AudioPanel();
+ this.Subtitles = new Handbrake.Controls.Subtitles();
+ this.x264Panel = new Handbrake.Controls.x264Panel();
notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
notifyIconMenu.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.data_chpt)).BeginInit();
this.frmMainMenu.SuspendLayout();
- this.gb_source.SuspendLayout();
- this.groupBox_output.SuspendLayout();
this.tab_audio.SuspendLayout();
this.tab_video.SuspendLayout();
this.tab_picture.SuspendLayout();
@@ -180,7 +177,6 @@ namespace Handbrake this.tab_chapters.SuspendLayout();
this.tab_advanced.SuspendLayout();
this.tab_query.SuspendLayout();
- this.groupBox_dest.SuspendLayout();
this.groupBox2.SuspendLayout();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -226,7 +222,7 @@ namespace Handbrake //
this.drop_chapterFinish.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.drop_chapterFinish.FormattingEnabled = true;
- this.drop_chapterFinish.Location = new System.Drawing.Point(503, 52);
+ this.drop_chapterFinish.Location = new System.Drawing.Point(506, 96);
this.drop_chapterFinish.Name = "drop_chapterFinish";
this.drop_chapterFinish.Size = new System.Drawing.Size(69, 21);
this.drop_chapterFinish.TabIndex = 10;
@@ -238,7 +234,7 @@ namespace Handbrake //
this.drop_chapterStart.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.drop_chapterStart.FormattingEnabled = true;
- this.drop_chapterStart.Location = new System.Drawing.Point(371, 52);
+ this.drop_chapterStart.Location = new System.Drawing.Point(374, 96);
this.drop_chapterStart.Name = "drop_chapterStart";
this.drop_chapterStart.Size = new System.Drawing.Size(69, 21);
this.drop_chapterStart.TabIndex = 9;
@@ -252,7 +248,7 @@ namespace Handbrake this.drp_dvdtitle.FormattingEnabled = true;
this.drp_dvdtitle.Items.AddRange(new object[] {
"Automatic"});
- this.drp_dvdtitle.Location = new System.Drawing.Point(75, 52);
+ this.drp_dvdtitle.Location = new System.Drawing.Point(78, 96);
this.drp_dvdtitle.Name = "drp_dvdtitle";
this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21);
this.drp_dvdtitle.TabIndex = 7;
@@ -265,7 +261,7 @@ namespace Handbrake // text_destination
//
this.text_destination.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.text_destination.Location = new System.Drawing.Point(75, 19);
+ this.text_destination.Location = new System.Drawing.Point(78, 153);
this.text_destination.Name = "text_destination";
this.text_destination.Size = new System.Drawing.Size(549, 21);
this.text_destination.TabIndex = 1;
@@ -293,7 +289,7 @@ namespace Handbrake this.check_largeFile.AutoSize = true;
this.check_largeFile.BackColor = System.Drawing.Color.Transparent;
this.check_largeFile.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_largeFile.Location = new System.Drawing.Point(193, 22);
+ this.check_largeFile.Location = new System.Drawing.Point(196, 218);
this.check_largeFile.Name = "check_largeFile";
this.check_largeFile.Size = new System.Drawing.Size(105, 17);
this.check_largeFile.TabIndex = 4;
@@ -391,7 +387,7 @@ namespace Handbrake this.check_optimiseMP4.AutoSize = true;
this.check_optimiseMP4.BackColor = System.Drawing.Color.Transparent;
this.check_optimiseMP4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_optimiseMP4.Location = new System.Drawing.Point(304, 22);
+ this.check_optimiseMP4.Location = new System.Drawing.Point(307, 218);
this.check_optimiseMP4.Name = "check_optimiseMP4";
this.check_optimiseMP4.Size = new System.Drawing.Size(110, 17);
this.check_optimiseMP4.TabIndex = 25;
@@ -406,7 +402,7 @@ namespace Handbrake this.check_iPodAtom.AutoSize = true;
this.check_iPodAtom.BackColor = System.Drawing.Color.Transparent;
this.check_iPodAtom.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_iPodAtom.Location = new System.Drawing.Point(420, 22);
+ this.check_iPodAtom.Location = new System.Drawing.Point(423, 218);
this.check_iPodAtom.Name = "check_iPodAtom";
this.check_iPodAtom.Size = new System.Drawing.Size(117, 17);
this.check_iPodAtom.TabIndex = 26;
@@ -428,15 +424,15 @@ namespace Handbrake this.data_chpt.MultiSelect = false;
this.data_chpt.Name = "data_chpt";
this.data_chpt.RowHeadersVisible = false;
- this.data_chpt.Size = new System.Drawing.Size(684, 234);
+ this.data_chpt.Size = new System.Drawing.Size(684, 236);
this.data_chpt.TabIndex = 3;
this.ToolTip.SetToolTip(this.data_chpt, resources.GetString("data_chpt.ToolTip"));
//
// number
//
- dataGridViewCellStyle3.Format = "N0";
- dataGridViewCellStyle3.NullValue = null;
- this.number.DefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle1.Format = "N0";
+ dataGridViewCellStyle1.NullValue = null;
+ this.number.DefaultCellStyle = dataGridViewCellStyle1;
this.number.Frozen = true;
this.number.HeaderText = "Chapter Number";
this.number.MaxInputLength = 3;
@@ -489,30 +485,19 @@ namespace Handbrake "MP4 File",
"M4V File",
"MKV File"});
- this.drop_format.Location = new System.Drawing.Point(75, 19);
+ this.drop_format.Location = new System.Drawing.Point(78, 215);
this.drop_format.Name = "drop_format";
this.drop_format.Size = new System.Drawing.Size(106, 21);
this.drop_format.TabIndex = 28;
this.ToolTip.SetToolTip(this.drop_format, "Select the file container format.");
this.drop_format.SelectedIndexChanged += new System.EventHandler(this.drop_format_SelectedIndexChanged);
//
- // text_source
- //
- this.text_source.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.text_source.Location = new System.Drawing.Point(75, 19);
- this.text_source.Name = "text_source";
- this.text_source.ReadOnly = true;
- this.text_source.Size = new System.Drawing.Size(642, 21);
- this.text_source.TabIndex = 1;
- this.text_source.Text = "Click \'Source\' to continue";
- this.ToolTip.SetToolTip(this.text_source, "Location of the source input file, folder or dvd.");
- //
// drop_angle
//
this.drop_angle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.drop_angle.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.drop_angle.FormattingEnabled = true;
- this.drop_angle.Location = new System.Drawing.Point(250, 52);
+ this.drop_angle.Location = new System.Drawing.Point(253, 96);
this.drop_angle.Name = "drop_angle";
this.drop_angle.Size = new System.Drawing.Size(45, 21);
this.drop_angle.TabIndex = 45;
@@ -523,7 +508,7 @@ namespace Handbrake this.lbl_duration.AutoSize = true;
this.lbl_duration.BackColor = System.Drawing.Color.Transparent;
this.lbl_duration.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbl_duration.Location = new System.Drawing.Point(645, 56);
+ this.lbl_duration.Location = new System.Drawing.Point(648, 100);
this.lbl_duration.Name = "lbl_duration";
this.lbl_duration.Size = new System.Drawing.Size(72, 12);
this.lbl_duration.TabIndex = 43;
@@ -534,7 +519,7 @@ namespace Handbrake this.label_duration.AutoSize = true;
this.label_duration.BackColor = System.Drawing.Color.Transparent;
this.label_duration.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label_duration.Location = new System.Drawing.Point(578, 55);
+ this.label_duration.Location = new System.Drawing.Point(581, 99);
this.label_duration.Name = "label_duration";
this.label_duration.Size = new System.Drawing.Size(61, 13);
this.label_duration.TabIndex = 42;
@@ -751,35 +736,12 @@ namespace Handbrake this.frmMainMenu.TabIndex = 0;
this.frmMainMenu.Text = "MenuStrip";
//
- // gb_source
- //
- this.gb_source.Controls.Add(this.drop_angle);
- this.gb_source.Controls.Add(this.lbl_angle);
- this.gb_source.Controls.Add(this.lbl_duration);
- this.gb_source.Controls.Add(this.label_duration);
- this.gb_source.Controls.Add(this.Label13);
- this.gb_source.Controls.Add(this.drop_chapterFinish);
- this.gb_source.Controls.Add(this.drop_chapterStart);
- this.gb_source.Controls.Add(this.drp_dvdtitle);
- this.gb_source.Controls.Add(this.Label17);
- this.gb_source.Controls.Add(this.text_source);
- this.gb_source.Controls.Add(this.Label9);
- this.gb_source.Controls.Add(this.Label10);
- this.gb_source.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.gb_source.ForeColor = System.Drawing.Color.Black;
- this.gb_source.Location = new System.Drawing.Point(9, 70);
- this.gb_source.Name = "gb_source";
- this.gb_source.Size = new System.Drawing.Size(732, 87);
- this.gb_source.TabIndex = 2;
- this.gb_source.TabStop = false;
- this.gb_source.Text = "Source";
- //
// lbl_angle
//
this.lbl_angle.AutoSize = true;
this.lbl_angle.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbl_angle.ForeColor = System.Drawing.Color.Black;
- this.lbl_angle.Location = new System.Drawing.Point(200, 55);
+ this.lbl_angle.Location = new System.Drawing.Point(203, 99);
this.lbl_angle.Name = "lbl_angle";
this.lbl_angle.Size = new System.Drawing.Size(44, 13);
this.lbl_angle.TabIndex = 44;
@@ -789,29 +751,18 @@ namespace Handbrake //
this.Label13.AutoSize = true;
this.Label13.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Label13.Location = new System.Drawing.Point(446, 55);
+ this.Label13.Location = new System.Drawing.Point(449, 99);
this.Label13.Name = "Label13";
this.Label13.Size = new System.Drawing.Size(51, 13);
this.Label13.TabIndex = 10;
this.Label13.Text = "through";
//
- // Label17
- //
- this.Label17.AutoSize = true;
- this.Label17.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Label17.ForeColor = System.Drawing.Color.Black;
- this.Label17.Location = new System.Drawing.Point(17, 22);
- this.Label17.Name = "Label17";
- this.Label17.Size = new System.Drawing.Size(52, 13);
- this.Label17.TabIndex = 0;
- this.Label17.Text = "Source:";
- //
// Label9
//
this.Label9.AutoSize = true;
this.Label9.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Label9.ForeColor = System.Drawing.Color.Black;
- this.Label9.Location = new System.Drawing.Point(301, 55);
+ this.Label9.Location = new System.Drawing.Point(304, 99);
this.Label9.Name = "Label9";
this.Label9.Size = new System.Drawing.Size(64, 13);
this.Label9.TabIndex = 8;
@@ -822,34 +773,18 @@ namespace Handbrake this.Label10.AutoSize = true;
this.Label10.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Label10.ForeColor = System.Drawing.Color.Black;
- this.Label10.Location = new System.Drawing.Point(17, 55);
+ this.Label10.Location = new System.Drawing.Point(20, 99);
this.Label10.Name = "Label10";
this.Label10.Size = new System.Drawing.Size(36, 13);
this.Label10.TabIndex = 6;
this.Label10.Text = "Title:";
//
- // groupBox_output
- //
- this.groupBox_output.Controls.Add(this.drop_format);
- this.groupBox_output.Controls.Add(this.label5);
- this.groupBox_output.Controls.Add(this.check_largeFile);
- this.groupBox_output.Controls.Add(this.check_iPodAtom);
- this.groupBox_output.Controls.Add(this.check_optimiseMP4);
- this.groupBox_output.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.groupBox_output.ForeColor = System.Drawing.Color.Black;
- this.groupBox_output.Location = new System.Drawing.Point(9, 214);
- this.groupBox_output.Name = "groupBox_output";
- this.groupBox_output.Size = new System.Drawing.Size(732, 50);
- this.groupBox_output.TabIndex = 4;
- this.groupBox_output.TabStop = false;
- this.groupBox_output.Text = "Output Settings (Preset: None)";
- //
// label5
//
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.ForeColor = System.Drawing.Color.Black;
- this.label5.Location = new System.Drawing.Point(17, 23);
+ this.label5.Location = new System.Drawing.Point(20, 219);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(52, 13);
this.label5.TabIndex = 27;
@@ -871,7 +806,7 @@ namespace Handbrake 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.ForeColor = System.Drawing.Color.Black;
- this.Label3.Location = new System.Drawing.Point(17, 21);
+ this.Label3.Location = new System.Drawing.Point(20, 155);
this.Label3.Name = "Label3";
this.Label3.Size = new System.Drawing.Size(31, 13);
this.Label3.TabIndex = 0;
@@ -884,19 +819,11 @@ namespace Handbrake this.tab_audio.Location = new System.Drawing.Point(4, 22);
this.tab_audio.Name = "tab_audio";
this.tab_audio.Padding = new System.Windows.Forms.Padding(3);
- this.tab_audio.Size = new System.Drawing.Size(724, 316);
+ this.tab_audio.Size = new System.Drawing.Size(724, 308);
this.tab_audio.TabIndex = 3;
this.tab_audio.Text = "Audio";
this.tab_audio.UseVisualStyleBackColor = true;
//
- // AudioSettings
- //
- this.AudioSettings.BackColor = System.Drawing.Color.Transparent;
- this.AudioSettings.Location = new System.Drawing.Point(0, 0);
- this.AudioSettings.Name = "AudioSettings";
- this.AudioSettings.Size = new System.Drawing.Size(715, 310);
- this.AudioSettings.TabIndex = 0;
- //
// AudioMenuRowHeightHack
//
this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
@@ -924,7 +851,7 @@ namespace Handbrake this.tab_video.Location = new System.Drawing.Point(4, 22);
this.tab_video.Name = "tab_video";
this.tab_video.Padding = new System.Windows.Forms.Padding(3);
- this.tab_video.Size = new System.Drawing.Size(724, 316);
+ this.tab_video.Size = new System.Drawing.Size(724, 308);
this.tab_video.TabIndex = 2;
this.tab_video.Text = "Video";
this.tab_video.UseVisualStyleBackColor = true;
@@ -1028,18 +955,11 @@ namespace Handbrake this.tab_picture.Location = new System.Drawing.Point(4, 22);
this.tab_picture.Name = "tab_picture";
this.tab_picture.Padding = new System.Windows.Forms.Padding(3);
- this.tab_picture.Size = new System.Drawing.Size(724, 316);
+ this.tab_picture.Size = new System.Drawing.Size(724, 308);
this.tab_picture.TabIndex = 0;
this.tab_picture.Text = "Picture Settings";
this.tab_picture.UseVisualStyleBackColor = true;
//
- // PictureSettings
- //
- this.PictureSettings.Location = new System.Drawing.Point(0, 0);
- this.PictureSettings.Name = "PictureSettings";
- this.PictureSettings.Size = new System.Drawing.Size(713, 310);
- this.PictureSettings.TabIndex = 0;
- //
// Check_ChapterMarkers
//
this.Check_ChapterMarkers.AutoSize = true;
@@ -1064,10 +984,10 @@ namespace Handbrake this.tabs_panel.Controls.Add(this.tab_advanced);
this.tabs_panel.Controls.Add(this.tab_query);
this.tabs_panel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tabs_panel.Location = new System.Drawing.Point(9, 274);
+ this.tabs_panel.Location = new System.Drawing.Point(9, 251);
this.tabs_panel.Name = "tabs_panel";
this.tabs_panel.SelectedIndex = 0;
- this.tabs_panel.Size = new System.Drawing.Size(732, 342);
+ this.tabs_panel.Size = new System.Drawing.Size(732, 334);
this.tabs_panel.TabIndex = 5;
this.tabs_panel.TabStop = false;
//
@@ -1076,7 +996,7 @@ namespace Handbrake this.tab_filters.Controls.Add(this.Filters);
this.tab_filters.Location = new System.Drawing.Point(4, 22);
this.tab_filters.Name = "tab_filters";
- this.tab_filters.Size = new System.Drawing.Size(724, 316);
+ this.tab_filters.Size = new System.Drawing.Size(724, 308);
this.tab_filters.TabIndex = 9;
this.tab_filters.Text = "Video Filters";
this.tab_filters.UseVisualStyleBackColor = true;
@@ -1087,19 +1007,11 @@ namespace Handbrake this.tab_subtitles.Location = new System.Drawing.Point(4, 22);
this.tab_subtitles.Name = "tab_subtitles";
this.tab_subtitles.Padding = new System.Windows.Forms.Padding(3);
- this.tab_subtitles.Size = new System.Drawing.Size(724, 316);
+ this.tab_subtitles.Size = new System.Drawing.Size(724, 308);
this.tab_subtitles.TabIndex = 10;
this.tab_subtitles.Text = "Subtitles";
this.tab_subtitles.UseVisualStyleBackColor = true;
//
- // Subtitles
- //
- this.Subtitles.BackColor = System.Drawing.Color.Transparent;
- this.Subtitles.Location = new System.Drawing.Point(0, 0);
- this.Subtitles.Name = "Subtitles";
- this.Subtitles.Size = new System.Drawing.Size(722, 310);
- this.Subtitles.TabIndex = 0;
- //
// tab_chapters
//
this.tab_chapters.BackColor = System.Drawing.Color.Transparent;
@@ -1108,7 +1020,7 @@ namespace Handbrake this.tab_chapters.Controls.Add(this.Check_ChapterMarkers);
this.tab_chapters.Location = new System.Drawing.Point(4, 22);
this.tab_chapters.Name = "tab_chapters";
- this.tab_chapters.Size = new System.Drawing.Size(724, 316);
+ this.tab_chapters.Size = new System.Drawing.Size(724, 308);
this.tab_chapters.TabIndex = 6;
this.tab_chapters.Text = "Chapters";
this.tab_chapters.UseVisualStyleBackColor = true;
@@ -1132,19 +1044,11 @@ namespace Handbrake 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(724, 316);
+ this.tab_advanced.Size = new System.Drawing.Size(724, 308);
this.tab_advanced.TabIndex = 8;
this.tab_advanced.Text = "Advanced";
this.tab_advanced.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);
@@ -1154,7 +1058,7 @@ namespace Handbrake this.tab_query.Controls.Add(this.rtf_query);
this.tab_query.Location = new System.Drawing.Point(4, 22);
this.tab_query.Name = "tab_query";
- this.tab_query.Size = new System.Drawing.Size(724, 316);
+ this.tab_query.Size = new System.Drawing.Size(724, 308);
this.tab_query.TabIndex = 7;
this.tab_query.Text = "Query Editor";
this.tab_query.UseVisualStyleBackColor = true;
@@ -1211,28 +1115,15 @@ namespace Handbrake this.rtf_query.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.rtf_query.Location = new System.Drawing.Point(16, 103);
this.rtf_query.Name = "rtf_query";
- this.rtf_query.Size = new System.Drawing.Size(693, 194);
+ this.rtf_query.Size = new System.Drawing.Size(693, 190);
this.rtf_query.TabIndex = 5;
this.rtf_query.Text = "";
//
- // groupBox_dest
- //
- this.groupBox_dest.Controls.Add(this.btn_destBrowse);
- this.groupBox_dest.Controls.Add(this.Label3);
- this.groupBox_dest.Controls.Add(this.text_destination);
- this.groupBox_dest.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.groupBox_dest.ForeColor = System.Drawing.Color.Black;
- this.groupBox_dest.Location = new System.Drawing.Point(9, 160);
- this.groupBox_dest.Name = "groupBox_dest";
- this.groupBox_dest.Size = new System.Drawing.Size(732, 50);
- this.groupBox_dest.TabIndex = 3;
- this.groupBox_dest.TabStop = false;
- this.groupBox_dest.Text = "Destination";
- //
// btn_destBrowse
//
+ this.btn_destBrowse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_destBrowse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_destBrowse.Location = new System.Drawing.Point(642, 18);
+ this.btn_destBrowse.Location = new System.Drawing.Point(645, 152);
this.btn_destBrowse.Name = "btn_destBrowse";
this.btn_destBrowse.Size = new System.Drawing.Size(75, 23);
this.btn_destBrowse.TabIndex = 13;
@@ -1247,7 +1138,7 @@ namespace Handbrake this.groupBox2.ForeColor = System.Drawing.Color.Black;
this.groupBox2.Location = new System.Drawing.Point(751, 70);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(245, 546);
+ this.groupBox2.Size = new System.Drawing.Size(245, 515);
this.groupBox2.TabIndex = 6;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Presets";
@@ -1268,8 +1159,8 @@ namespace Handbrake this.splitContainer1.Panel2.Controls.Add(this.btn_addPreset);
this.splitContainer1.Panel2.Controls.Add(this.btn_removePreset);
this.splitContainer1.Panel2.Controls.Add(this.btn_setDefault);
- this.splitContainer1.Size = new System.Drawing.Size(239, 526);
- this.splitContainer1.SplitterDistance = 485;
+ this.splitContainer1.Size = new System.Drawing.Size(239, 495);
+ this.splitContainer1.SplitterDistance = 456;
this.splitContainer1.TabIndex = 1;
//
// treeView_presets
@@ -1283,7 +1174,7 @@ namespace Handbrake this.treeView_presets.Location = new System.Drawing.Point(0, 0);
this.treeView_presets.Name = "treeView_presets";
this.treeView_presets.ShowLines = false;
- this.treeView_presets.Size = new System.Drawing.Size(239, 485);
+ this.treeView_presets.Size = new System.Drawing.Size(239, 456);
this.treeView_presets.TabIndex = 0;
this.treeView_presets.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeview_presets_mouseUp);
this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect);
@@ -1481,7 +1372,7 @@ namespace Handbrake //
this.StatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.lbl_encode});
- this.StatusStrip.Location = new System.Drawing.Point(0, 623);
+ this.StatusStrip.Location = new System.Drawing.Point(0, 599);
this.StatusStrip.Name = "StatusStrip";
this.StatusStrip.Size = new System.Drawing.Size(1000, 22);
this.StatusStrip.TabIndex = 7;
@@ -1504,26 +1395,117 @@ namespace Handbrake this.hbproc.StartInfo.UserName = "";
this.hbproc.SynchronizingObject = this;
//
+ // 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, 74);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(56, 13);
+ this.label1.TabIndex = 8;
+ this.label1.Text = "Source:";
+ //
+ // lbl_source
+ //
+ this.lbl_source.AutoSize = true;
+ this.lbl_source.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbl_source.Location = new System.Drawing.Point(75, 74);
+ this.lbl_source.Name = "lbl_source";
+ this.lbl_source.Size = new System.Drawing.Size(152, 13);
+ this.lbl_source.TabIndex = 9;
+ this.lbl_source.Text = "Click \'Source\' to continue";
+ //
+ // label4
+ //
+ 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(13, 130);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(81, 13);
+ this.label4.TabIndex = 46;
+ this.label4.Text = "Destination";
+ //
+ // groupBox_output
+ //
+ this.groupBox_output.AutoSize = true;
+ this.groupBox_output.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.groupBox_output.Location = new System.Drawing.Point(13, 189);
+ this.groupBox_output.Name = "groupBox_output";
+ this.groupBox_output.Size = new System.Drawing.Size(210, 13);
+ this.groupBox_output.TabIndex = 47;
+ this.groupBox_output.Text = "Output Settings: (Preset: None)";
+ //
+ // PictureSettings
+ //
+ this.PictureSettings.Location = new System.Drawing.Point(0, 0);
+ this.PictureSettings.Name = "PictureSettings";
+ this.PictureSettings.Size = new System.Drawing.Size(713, 310);
+ this.PictureSettings.TabIndex = 0;
+ //
// Filters
//
+ this.Filters.BackColor = System.Drawing.Color.Transparent;
this.Filters.Location = new System.Drawing.Point(0, 0);
this.Filters.Name = "Filters";
- this.Filters.Size = new System.Drawing.Size(519, 275);
+ this.Filters.Size = new System.Drawing.Size(713, 310);
this.Filters.TabIndex = 0;
//
+ // AudioSettings
+ //
+ this.AudioSettings.BackColor = System.Drawing.Color.Transparent;
+ this.AudioSettings.Location = new System.Drawing.Point(0, 0);
+ this.AudioSettings.Name = "AudioSettings";
+ this.AudioSettings.Size = new System.Drawing.Size(715, 310);
+ this.AudioSettings.TabIndex = 0;
+ //
+ // Subtitles
+ //
+ this.Subtitles.BackColor = System.Drawing.Color.Transparent;
+ this.Subtitles.Location = new System.Drawing.Point(0, 0);
+ this.Subtitles.Name = "Subtitles";
+ this.Subtitles.Size = new System.Drawing.Size(722, 310);
+ this.Subtitles.TabIndex = 0;
+ //
+ // 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;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScroll = true;
- this.ClientSize = new System.Drawing.Size(1000, 645);
- this.Controls.Add(this.gb_source);
- this.Controls.Add(this.groupBox_dest);
+ this.ClientSize = new System.Drawing.Size(1000, 621);
this.Controls.Add(this.groupBox_output);
+ this.Controls.Add(this.drop_format);
+ this.Controls.Add(this.label5);
+ this.Controls.Add(this.btn_destBrowse);
+ this.Controls.Add(this.check_largeFile);
+ this.Controls.Add(this.label4);
+ this.Controls.Add(this.check_iPodAtom);
+ this.Controls.Add(this.Label3);
+ this.Controls.Add(this.check_optimiseMP4);
+ this.Controls.Add(this.drop_angle);
+ this.Controls.Add(this.text_destination);
+ this.Controls.Add(this.lbl_source);
+ this.Controls.Add(this.lbl_angle);
+ this.Controls.Add(this.lbl_duration);
+ this.Controls.Add(this.label_duration);
+ this.Controls.Add(this.label1);
+ this.Controls.Add(this.Label13);
+ this.Controls.Add(this.drop_chapterFinish);
this.Controls.Add(this.groupBox2);
+ this.Controls.Add(this.drop_chapterStart);
this.Controls.Add(this.toolStrip1);
+ this.Controls.Add(this.drp_dvdtitle);
+ this.Controls.Add(this.Label9);
this.Controls.Add(this.tabs_panel);
+ this.Controls.Add(this.Label10);
this.Controls.Add(this.frmMainMenu);
this.Controls.Add(this.StatusStrip);
this.DoubleBuffered = true;
@@ -1536,10 +1518,6 @@ namespace Handbrake ((System.ComponentModel.ISupportInitialize)(this.data_chpt)).EndInit();
this.frmMainMenu.ResumeLayout(false);
this.frmMainMenu.PerformLayout();
- this.gb_source.ResumeLayout(false);
- this.gb_source.PerformLayout();
- this.groupBox_output.ResumeLayout(false);
- this.groupBox_output.PerformLayout();
this.tab_audio.ResumeLayout(false);
this.tab_video.ResumeLayout(false);
this.tab_video.PerformLayout();
@@ -1552,8 +1530,6 @@ namespace Handbrake this.tab_advanced.ResumeLayout(false);
this.tab_query.ResumeLayout(false);
this.tab_query.PerformLayout();
- this.groupBox_dest.ResumeLayout(false);
- this.groupBox_dest.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
@@ -1585,15 +1561,12 @@ namespace Handbrake internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator3;
internal System.Windows.Forms.ToolStripMenuItem mnu_about;
internal System.Windows.Forms.MenuStrip frmMainMenu;
- internal System.Windows.Forms.GroupBox gb_source;
internal System.Windows.Forms.Label Label13;
internal System.Windows.Forms.ComboBox drop_chapterFinish;
internal System.Windows.Forms.ComboBox drop_chapterStart;
internal System.Windows.Forms.ComboBox drp_dvdtitle;
- internal System.Windows.Forms.Label Label17;
internal System.Windows.Forms.Label Label9;
internal System.Windows.Forms.Label Label10;
- internal System.Windows.Forms.GroupBox groupBox_output;
internal System.Windows.Forms.Label Label3;
internal System.Windows.Forms.ComboBox drp_videoEncoder;
internal System.Windows.Forms.Label Label47;
@@ -1613,7 +1586,6 @@ namespace Handbrake internal System.Windows.Forms.CheckBox Check_ChapterMarkers;
internal System.Windows.Forms.TabControl tabs_panel;
internal System.Windows.Forms.Label Label46;
- private System.Windows.Forms.GroupBox groupBox_dest;
private System.Windows.Forms.GroupBox groupBox2;
internal System.Windows.Forms.Button btn_setDefault;
private System.Windows.Forms.ToolStripMenuItem mnu_SelectDefault;
@@ -1684,7 +1656,6 @@ namespace Handbrake private System.Windows.Forms.ToolStripButton tb_preview;
private System.Windows.Forms.DataGridViewTextBoxColumn number;
private System.Windows.Forms.DataGridViewTextBoxColumn name;
- internal TextBox text_source;
private System.Diagnostics.Process hbproc;
internal ComboBox drop_angle;
internal Label lbl_angle;
@@ -1693,6 +1664,10 @@ namespace Handbrake internal Handbrake.Controls.PictureSettings PictureSettings;
internal Handbrake.Controls.Subtitles Subtitles;
internal Handbrake.Controls.Filters Filters;
+ private Label label1;
+ internal Label lbl_source;
+ private Label label4;
+ internal Label groupBox_output;
}
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index d9789b5db..69e429c4b 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -31,6 +31,7 @@ namespace Handbrake private frmQueue queueWindow;
private frmPreview qtpreview;
private Form splash;
+ public string sourcePath;
// Delegates **********************************************************
private delegate void UpdateWindowHandler();
@@ -209,7 +210,7 @@ namespace Handbrake startScan(fileList[0]);
}
else
- text_source.Text = "Click 'Source' to continue";
+ lbl_source.Text = "Click 'Source' to continue";
}
}
}
@@ -540,7 +541,7 @@ namespace Handbrake }
else
{
- if (encodeQueue.count() != 0 || (text_source.Text != string.Empty && text_source.Text != "Click 'Source' to continue" && text_destination.Text != string.Empty))
+ if (encodeQueue.count() != 0 || (lbl_source.Text != string.Empty && lbl_source.Text != "Click 'Source' to continue" && text_destination.Text != string.Empty))
{
String query = rtf_query.Text != "" ? rtf_query.Text : queryGen.generateTheQuery(this);
@@ -552,7 +553,7 @@ namespace Handbrake if (overwrite == DialogResult.Yes)
{
if (encodeQueue.count() == 0)
- encodeQueue.add(query, text_source.Text, text_destination.Text);
+ encodeQueue.add(query, lbl_source.Text, text_destination.Text);
queueWindow.setQueue();
if (encodeQueue.count() > 1)
@@ -564,14 +565,14 @@ namespace Handbrake }
this.Focus();
}
- else if (text_source.Text == string.Empty || text_source.Text == "Click 'Source' to continue" || text_destination.Text == string.Empty)
+ else if (lbl_source.Text == string.Empty || lbl_source.Text == "Click 'Source' to continue" || text_destination.Text == string.Empty)
MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
}
private void btn_add2Queue_Click(object sender, EventArgs e)
{
- if (text_source.Text == string.Empty || text_source.Text == "Click 'Source' to continue" || text_destination.Text == string.Empty)
+ if (lbl_source.Text == string.Empty || lbl_source.Text == "Click 'Source' to continue" || text_destination.Text == string.Empty)
MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
else
{
@@ -584,11 +585,11 @@ namespace Handbrake DialogResult result = MessageBox.Show("There is already a queue item for this destination path. \n\n If you continue, the encode will be overwritten. Do you wish to continue?",
"Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
if (result == DialogResult.Yes)
- encodeQueue.add(query, text_source.Text, text_destination.Text);
+ encodeQueue.add(query, lbl_source.Text, text_destination.Text);
}
else
- encodeQueue.add(query, text_source.Text, text_destination.Text);
+ encodeQueue.add(query, lbl_source.Text, text_destination.Text);
queueWindow.Show();
}
@@ -599,7 +600,7 @@ namespace Handbrake }
private void tb_preview_Click(object sender, EventArgs e)
{
- if (text_source.Text == "" || text_source.Text == "Click 'Source' to continue" || text_destination.Text == "")
+ if (lbl_source.Text == "" || lbl_source.Text == "Click 'Source' to continue" || text_destination.Text == "")
MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
else
{
@@ -664,7 +665,7 @@ namespace Handbrake // Set the last action to scan.
// This is used for tracking which file to load in the activity window
lastAction = "scan";
- text_source.Text = "";
+ lbl_source.Text = "";
if (DVD_Open.ShowDialog() == DialogResult.OK)
{
@@ -676,22 +677,23 @@ namespace Handbrake {
if (filename != "")
{
+ lbl_source.Text = Path.GetFullPath(filename);
setupGUIforScan(filename);
startScan(filename);
}
else
- text_source.Text = "Click 'Source' to continue";
+ lbl_source.Text = "Click 'Source' to continue";
}
}
else
- text_source.Text = "Click 'Source' to continue";
+ lbl_source.Text = "Click 'Source' to continue";
}
private void btn_file_source_Click(object sender, EventArgs e)
{
// Set the last action to scan.
// This is used for tracking which file to load in the activity window
lastAction = "scan";
- text_source.Text = "";
+ lbl_source.Text = "";
if (ISO_Open.ShowDialog() == DialogResult.OK)
{
@@ -704,15 +706,16 @@ namespace Handbrake {
if (filename != "")
{
+ lbl_source.Text = Path.GetFileName(filename);
setupGUIforScan(filename);
startScan(filename);
}
else
- text_source.Text = "Click 'Source' to continue";
+ lbl_source.Text = "Click 'Source' to continue";
}
}
else
- text_source.Text = "Click 'Source' to continue";
+ lbl_source.Text = "Click 'Source' to continue";
}
private void mnu_dvd_drive_Click(object sender, EventArgs e)
{
@@ -727,6 +730,7 @@ namespace Handbrake {
string[] path = mnu_dvd_drive.Text.Split(' ');
String filename = path[0];
+ lbl_source.Text = Path.GetFullPath(filename);
setupGUIforScan(filename);
startScan(filename);
}
@@ -799,7 +803,7 @@ namespace Handbrake // Run the autoName & chapterNaming functions
if (Properties.Settings.Default.autoNaming)
{
- string autoPath = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, text_source.Text, text_destination.Text, drop_format.SelectedIndex);
+ string autoPath = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, lbl_source.Text, text_destination.Text, drop_format.SelectedIndex);
if (autoPath != null)
text_destination.Text = autoPath;
else
@@ -843,7 +847,7 @@ namespace Handbrake // Run the Autonaming function
if (Properties.Settings.Default.autoNaming)
- text_destination.Text = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, text_source.Text, text_destination.Text, drop_format.SelectedIndex);
+ text_destination.Text = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, lbl_source.Text, text_destination.Text, drop_format.SelectedIndex);
// Disable chapter markers if only 1 chapter is selected.
if (c_start == c_end)
@@ -874,7 +878,7 @@ namespace Handbrake // Run the Autonaming function
if (Properties.Settings.Default.autoNaming)
- text_destination.Text = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, text_source.Text, text_destination.Text, drop_format.SelectedIndex);
+ text_destination.Text = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, lbl_source.Text, text_destination.Text, drop_format.SelectedIndex);
// Add more rows to the Chapter menu if needed.
if (Check_ChapterMarkers.Checked)
@@ -1211,8 +1215,7 @@ namespace Handbrake private static int scanProcessID { get; set; }
private void setupGUIforScan(String filename)
{
- text_source.Text = filename;
-
+ sourcePath = filename;
foreach (Control ctrl in Controls)
{
if (!(ctrl is StatusStrip || ctrl is MenuStrip || ctrl is ToolStrip))
@@ -1220,7 +1223,7 @@ namespace Handbrake }
lbl_encode.Visible = true;
lbl_encode.Text = "Scanning ...";
- gb_source.Text = "Source: Scanning ...";
+ //gb_source.Text = "Source: Scanning ...";
btn_source.Enabled = false;
btn_start.Enabled = false;
btn_showQueue.Enabled = false;
@@ -1320,7 +1323,7 @@ namespace Handbrake drp_dvdtitle.SelectedItem = Main.selectLongestTitle(drp_dvdtitle);
// Enable the creation of chapter markers if the file is an image of a dvd.
- if (text_source.Text.ToLower().Contains(".iso") || text_source.Text.ToLower().Contains("VIDEO_TS"))
+ if (lbl_source.Text.ToLower().Contains(".iso") || lbl_source.Text.ToLower().Contains("VIDEO_TS"))
Check_ChapterMarkers.Enabled = true;
else
{
@@ -1349,7 +1352,7 @@ namespace Handbrake if (InvokeRequired)
BeginInvoke(new UpdateWindowHandler(enableGUI));
lbl_encode.Text = "Scan Completed";
- gb_source.Text = "Source";
+ //gb_source.Text = "Source";
foreach (Control ctrl in Controls)
ctrl.Enabled = true;
btn_start.Enabled = true;
@@ -1398,7 +1401,7 @@ namespace Handbrake lbl_duration.Text = "Select a Title";
PictureSettings.lbl_src_res.Text = "Select a Title";
PictureSettings.lbl_Aspect.Text = "Select a Title";
- text_source.Text = "Click 'Source' to continue";
+ lbl_source.Text = "Click 'Source' to continue";
text_destination.Text = "";
thisDVD = null;
selectedTitle = null;
diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs index dfe1350b6..edb2fe5ef 100644 --- a/win/C#/frmOptions.Designer.cs +++ b/win/C#/frmOptions.Designer.cs @@ -58,6 +58,8 @@ namespace Handbrake this.txt_vlcPath = new System.Windows.Forms.TextBox();
this.label29 = new System.Windows.Forms.Label();
this.tab_cli = new System.Windows.Forms.TabPage();
+ this.btn_viewLogs = new System.Windows.Forms.Button();
+ this.btn_clearLogs = new System.Windows.Forms.Button();
this.check_logsInSpecifiedLocation = new System.Windows.Forms.CheckBox();
this.cb_logVerboseLvl = new System.Windows.Forms.ComboBox();
this.label3 = new System.Windows.Forms.Label();
@@ -73,6 +75,8 @@ namespace Handbrake this.drp_processors = new System.Windows.Forms.ComboBox();
this.Label4 = new System.Windows.Forms.Label();
this.tab_advanced = new System.Windows.Forms.TabPage();
+ this.label31 = new System.Windows.Forms.Label();
+ this.label15 = new System.Windows.Forms.Label();
this.numeric_updateCheckDays = new System.Windows.Forms.NumericUpDown();
this.check_trayStatusAlerts = new System.Windows.Forms.CheckBox();
this.check_inGuiStatus = new System.Windows.Forms.CheckBox();
@@ -119,8 +123,6 @@ namespace Handbrake this.label26 = new System.Windows.Forms.Label();
this.label27 = new System.Windows.Forms.Label();
this.openFile_vlc = new System.Windows.Forms.OpenFileDialog();
- this.label15 = new System.Windows.Forms.Label();
- this.label31 = new System.Windows.Forms.Label();
this.tab_options.SuspendLayout();
this.tab_general.SuspendLayout();
this.tab_picture.SuspendLayout();
@@ -136,7 +138,7 @@ namespace Handbrake this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black;
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(430, 382);
+ this.btn_close.Location = new System.Drawing.Point(437, 382);
this.btn_close.Name = "btn_close";
this.btn_close.Size = new System.Drawing.Size(72, 22);
this.btn_close.TabIndex = 53;
@@ -173,7 +175,7 @@ namespace Handbrake this.tab_options.Location = new System.Drawing.Point(12, 55);
this.tab_options.Name = "tab_options";
this.tab_options.SelectedIndex = 0;
- this.tab_options.Size = new System.Drawing.Size(490, 321);
+ this.tab_options.Size = new System.Drawing.Size(497, 321);
this.tab_options.TabIndex = 58;
//
// tab_general
@@ -194,7 +196,7 @@ namespace Handbrake this.tab_general.Controls.Add(this.drp_completeOption);
this.tab_general.Location = new System.Drawing.Point(4, 22);
this.tab_general.Name = "tab_general";
- this.tab_general.Size = new System.Drawing.Size(482, 295);
+ this.tab_general.Size = new System.Drawing.Size(489, 295);
this.tab_general.TabIndex = 3;
this.tab_general.Text = "General";
this.tab_general.UseVisualStyleBackColor = true;
@@ -356,7 +358,7 @@ namespace Handbrake this.tab_picture.Controls.Add(this.label29);
this.tab_picture.Location = new System.Drawing.Point(4, 22);
this.tab_picture.Name = "tab_picture";
- this.tab_picture.Size = new System.Drawing.Size(482, 295);
+ this.tab_picture.Size = new System.Drawing.Size(489, 295);
this.tab_picture.TabIndex = 5;
this.tab_picture.Text = "Picture";
this.tab_picture.UseVisualStyleBackColor = true;
@@ -396,6 +398,8 @@ namespace Handbrake //
// tab_cli
//
+ this.tab_cli.Controls.Add(this.btn_viewLogs);
+ this.tab_cli.Controls.Add(this.btn_clearLogs);
this.tab_cli.Controls.Add(this.check_logsInSpecifiedLocation);
this.tab_cli.Controls.Add(this.cb_logVerboseLvl);
this.tab_cli.Controls.Add(this.label3);
@@ -412,20 +416,44 @@ namespace Handbrake this.tab_cli.Controls.Add(this.Label4);
this.tab_cli.Location = new System.Drawing.Point(4, 22);
this.tab_cli.Name = "tab_cli";
- this.tab_cli.Size = new System.Drawing.Size(482, 295);
+ this.tab_cli.Size = new System.Drawing.Size(489, 295);
this.tab_cli.TabIndex = 2;
this.tab_cli.Text = "CLI";
this.tab_cli.UseVisualStyleBackColor = true;
//
+ // btn_viewLogs
+ //
+ this.btn_viewLogs.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.btn_viewLogs.ForeColor = System.Drawing.Color.DarkOrange;
+ this.btn_viewLogs.Location = new System.Drawing.Point(71, 238);
+ this.btn_viewLogs.Name = "btn_viewLogs";
+ this.btn_viewLogs.Size = new System.Drawing.Size(139, 23);
+ this.btn_viewLogs.TabIndex = 89;
+ this.btn_viewLogs.Text = "View Log Directory";
+ this.btn_viewLogs.UseVisualStyleBackColor = true;
+ this.btn_viewLogs.Click += new System.EventHandler(this.btn_viewLogs_Click);
+ //
+ // btn_clearLogs
+ //
+ this.btn_clearLogs.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.btn_clearLogs.ForeColor = System.Drawing.Color.DarkOrange;
+ this.btn_clearLogs.Location = new System.Drawing.Point(216, 238);
+ this.btn_clearLogs.Name = "btn_clearLogs";
+ this.btn_clearLogs.Size = new System.Drawing.Size(135, 23);
+ this.btn_clearLogs.TabIndex = 88;
+ this.btn_clearLogs.Text = "Clear Log History";
+ this.btn_clearLogs.UseVisualStyleBackColor = true;
+ this.btn_clearLogs.Click += new System.EventHandler(this.btn_clearLogs_Click);
+ //
// check_logsInSpecifiedLocation
//
this.check_logsInSpecifiedLocation.AutoSize = true;
this.check_logsInSpecifiedLocation.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_logsInSpecifiedLocation.Location = new System.Drawing.Point(71, 201);
+ this.check_logsInSpecifiedLocation.Location = new System.Drawing.Point(71, 187);
this.check_logsInSpecifiedLocation.Name = "check_logsInSpecifiedLocation";
- this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(306, 17);
+ this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(363, 17);
this.check_logsInSpecifiedLocation.TabIndex = 87;
- this.check_logsInSpecifiedLocation.Text = "Put individual encode logs in a specified location:";
+ this.check_logsInSpecifiedLocation.Text = "Put a copy of individual encode logs in a specified location:";
this.ToolTip.SetToolTip(this.check_logsInSpecifiedLocation, "Place a copy of the encode log in the same folder as the encoded movie.");
this.check_logsInSpecifiedLocation.UseVisualStyleBackColor = true;
this.check_logsInSpecifiedLocation.CheckedChanged += new System.EventHandler(this.check_logsInSpecifiedLocation_CheckedChanged);
@@ -439,7 +467,7 @@ namespace Handbrake "0",
"1",
"2"});
- this.cb_logVerboseLvl.Location = new System.Drawing.Point(198, 133);
+ this.cb_logVerboseLvl.Location = new System.Drawing.Point(198, 119);
this.cb_logVerboseLvl.Name = "cb_logVerboseLvl";
this.cb_logVerboseLvl.Size = new System.Drawing.Size(111, 21);
this.cb_logVerboseLvl.TabIndex = 86;
@@ -451,7 +479,7 @@ namespace Handbrake this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
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(68, 136);
+ this.label3.Location = new System.Drawing.Point(68, 122);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(124, 13);
this.label3.TabIndex = 85;
@@ -461,11 +489,11 @@ namespace Handbrake //
this.check_saveLogWithVideo.AutoSize = true;
this.check_saveLogWithVideo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_saveLogWithVideo.Location = new System.Drawing.Point(71, 178);
+ this.check_saveLogWithVideo.Location = new System.Drawing.Point(71, 164);
this.check_saveLogWithVideo.Name = "check_saveLogWithVideo";
- this.check_saveLogWithVideo.Size = new System.Drawing.Size(349, 17);
+ this.check_saveLogWithVideo.Size = new System.Drawing.Size(406, 17);
this.check_saveLogWithVideo.TabIndex = 83;
- this.check_saveLogWithVideo.Text = "Put individual encode logs in the same location as movie";
+ this.check_saveLogWithVideo.Text = "Put a copy of individual encode logs in the same location as movie";
this.ToolTip.SetToolTip(this.check_saveLogWithVideo, "Place a copy of the encode log in the same folder as the encoded movie.");
this.check_saveLogWithVideo.UseVisualStyleBackColor = true;
this.check_saveLogWithVideo.CheckedChanged += new System.EventHandler(this.check_saveLogWithVideo_CheckedChanged);
@@ -475,7 +503,7 @@ namespace Handbrake this.btn_saveLog.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.btn_saveLog.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_saveLog.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_saveLog.Location = new System.Drawing.Point(343, 225);
+ this.btn_saveLog.Location = new System.Drawing.Point(343, 211);
this.btn_saveLog.Name = "btn_saveLog";
this.btn_saveLog.Size = new System.Drawing.Size(68, 22);
this.btn_saveLog.TabIndex = 82;
@@ -487,7 +515,7 @@ namespace Handbrake //
this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label14.Location = new System.Drawing.Point(68, 228);
+ this.label14.Location = new System.Drawing.Point(68, 214);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(61, 13);
this.label14.TabIndex = 81;
@@ -495,7 +523,7 @@ namespace Handbrake //
// text_logPath
//
- this.text_logPath.Location = new System.Drawing.Point(135, 225);
+ this.text_logPath.Location = new System.Drawing.Point(135, 211);
this.text_logPath.Name = "text_logPath";
this.text_logPath.Size = new System.Drawing.Size(202, 21);
this.text_logPath.TabIndex = 80;
@@ -506,7 +534,7 @@ namespace Handbrake //
this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label9.Location = new System.Drawing.Point(12, 136);
+ this.label9.Location = new System.Drawing.Point(12, 122);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(41, 13);
this.label9.TabIndex = 77;
@@ -620,11 +648,30 @@ namespace Handbrake 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(482, 295);
+ this.tab_advanced.Size = new System.Drawing.Size(489, 295);
this.tab_advanced.TabIndex = 4;
this.tab_advanced.Text = "Advanced / Other";
this.tab_advanced.UseVisualStyleBackColor = true;
//
+ // label31
+ //
+ this.label31.AutoSize = true;
+ this.label31.Location = new System.Drawing.Point(73, 168);
+ this.label31.Name = "label31";
+ this.label31.Size = new System.Drawing.Size(241, 13);
+ this.label31.TabIndex = 96;
+ this.label31.Text = "Number of days between update checks:";
+ //
+ // label15
+ //
+ this.label15.AutoSize = true;
+ this.label15.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label15.Location = new System.Drawing.Point(6, 168);
+ this.label15.Name = "label15";
+ this.label15.Size = new System.Drawing.Size(64, 13);
+ this.label15.TabIndex = 95;
+ this.label15.Text = "Updates:";
+ //
// numeric_updateCheckDays
//
this.numeric_updateCheckDays.Location = new System.Drawing.Point(323, 166);
@@ -710,11 +757,11 @@ namespace Handbrake //
this.label32.AutoSize = true;
this.label32.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label32.Location = new System.Drawing.Point(38, 247);
+ this.label32.Location = new System.Drawing.Point(34, 248);
this.label32.Name = "label32";
- this.label32.Size = new System.Drawing.Size(32, 13);
+ this.label32.Size = new System.Drawing.Size(36, 13);
this.label32.TabIndex = 89;
- this.label32.Text = "CLI:";
+ this.label32.Text = "Dvd:";
//
// label30
//
@@ -1163,28 +1210,9 @@ namespace Handbrake this.openFile_vlc.DefaultExt = "exe";
this.openFile_vlc.Filter = "exe|*.exe";
//
- // label15
- //
- this.label15.AutoSize = true;
- this.label15.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label15.Location = new System.Drawing.Point(6, 168);
- this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(64, 13);
- this.label15.TabIndex = 95;
- this.label15.Text = "Updates:";
- //
- // label31
- //
- this.label31.AutoSize = true;
- this.label31.Location = new System.Drawing.Point(73, 168);
- this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(241, 13);
- this.label31.TabIndex = 96;
- this.label31.Text = "Number of days between update checks:";
- //
// frmOptions
//
- this.ClientSize = new System.Drawing.Size(514, 413);
+ this.ClientSize = new System.Drawing.Size(521, 413);
this.Controls.Add(this.label8);
this.Controls.Add(this.pictureBox2);
this.Controls.Add(this.tab_options);
@@ -1300,5 +1328,7 @@ namespace Handbrake private System.Windows.Forms.NumericUpDown numeric_updateCheckDays;
private System.Windows.Forms.Label label15;
private System.Windows.Forms.Label label31;
+ private System.Windows.Forms.Button btn_viewLogs;
+ private System.Windows.Forms.Button btn_clearLogs;
}
}
\ No newline at end of file diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs index 2f4496a1e..de739781b 100644 --- a/win/C#/frmOptions.cs +++ b/win/C#/frmOptions.cs @@ -6,6 +6,7 @@ using System;
using System.Windows.Forms;
+using Handbrake.Functions;
namespace Handbrake
{
@@ -229,6 +230,22 @@ namespace Handbrake Properties.Settings.Default.saveLogPath = text_logPath.Text;
}
+ private void btn_viewLogs_Click(object sender, EventArgs e)
+ {
+ string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";
+ string windir = Environment.GetEnvironmentVariable("WINDIR");
+ System.Diagnostics.Process prc = new System.Diagnostics.Process();
+ prc.StartInfo.FileName = windir + @"\explorer.exe";
+ prc.StartInfo.Arguments = logDir;
+ prc.Start();
+ }
+
+ private void btn_clearLogs_Click(object sender, EventArgs e)
+ {
+ Main.clearLogs();
+ MessageBox.Show(this, "HandBrake's Log file directory has been cleared!", "Notice", MessageBoxButtons.OK,
+ MessageBoxIcon.Information);
+ }
#endregion
#region Advanced
|