diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/C#/Controls/AudioPanel.Designer.cs | 20 | ||||
| -rw-r--r-- | win/C#/Controls/Subtitles.Designer.cs | 40 | ||||
| -rw-r--r-- | win/C#/Functions/QueryGenerator.cs | 2 | ||||
| -rw-r--r-- | win/C#/frmMain.Designer.cs | 38 | ||||
| -rw-r--r-- | win/C#/frmMain.cs | 7 | ||||
| -rw-r--r-- | win/C#/frmQueue.Designer.cs | 2 |
6 files changed, 56 insertions, 53 deletions
diff --git a/win/C#/Controls/AudioPanel.Designer.cs b/win/C#/Controls/AudioPanel.Designer.cs index 17583502d..b6e284895 100644 --- a/win/C#/Controls/AudioPanel.Designer.cs +++ b/win/C#/Controls/AudioPanel.Designer.cs @@ -86,10 +86,10 @@ namespace Handbrake.Controls this.lv_audioList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.lv_audioList.HideSelection = false;
this.lv_audioList.LabelWrap = false;
- this.lv_audioList.Location = new System.Drawing.Point(16, 115);
+ this.lv_audioList.Location = new System.Drawing.Point(16, 150);
this.lv_audioList.MultiSelect = false;
this.lv_audioList.Name = "lv_audioList";
- this.lv_audioList.Size = new System.Drawing.Size(689, 147);
+ this.lv_audioList.Size = new System.Drawing.Size(689, 153);
this.lv_audioList.TabIndex = 65;
this.lv_audioList.UseCompatibleStateImageBehavior = false;
this.lv_audioList.View = System.Windows.Forms.View.Details;
@@ -171,9 +171,9 @@ namespace Handbrake.Controls this.btn_RemoveAudioTrack.BackColor = System.Drawing.Color.Transparent;
this.btn_RemoveAudioTrack.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_RemoveAudioTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_RemoveAudioTrack.Location = new System.Drawing.Point(133, 268);
+ this.btn_RemoveAudioTrack.Location = new System.Drawing.Point(99, 38);
this.btn_RemoveAudioTrack.Name = "btn_RemoveAudioTrack";
- this.btn_RemoveAudioTrack.Size = new System.Drawing.Size(111, 23);
+ this.btn_RemoveAudioTrack.Size = new System.Drawing.Size(71, 23);
this.btn_RemoveAudioTrack.TabIndex = 64;
this.btn_RemoveAudioTrack.Text = "Remove";
this.btn_RemoveAudioTrack.UseVisualStyleBackColor = false;
@@ -184,9 +184,9 @@ namespace Handbrake.Controls this.btn_addAudioTrack.BackColor = System.Drawing.Color.Transparent;
this.btn_addAudioTrack.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_addAudioTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_addAudioTrack.Location = new System.Drawing.Point(16, 268);
+ this.btn_addAudioTrack.Location = new System.Drawing.Point(16, 38);
this.btn_addAudioTrack.Name = "btn_addAudioTrack";
- this.btn_addAudioTrack.Size = new System.Drawing.Size(111, 23);
+ this.btn_addAudioTrack.Size = new System.Drawing.Size(77, 23);
this.btn_addAudioTrack.TabIndex = 63;
this.btn_addAudioTrack.Text = "Add Track";
this.btn_addAudioTrack.UseVisualStyleBackColor = false;
@@ -384,7 +384,7 @@ namespace Handbrake.Controls this.AudioTrackGroup.Controls.Add(this.label67);
this.AudioTrackGroup.Controls.Add(this.label66);
this.AudioTrackGroup.ForeColor = System.Drawing.Color.Black;
- this.AudioTrackGroup.Location = new System.Drawing.Point(16, 32);
+ this.AudioTrackGroup.Location = new System.Drawing.Point(16, 67);
this.AudioTrackGroup.Name = "AudioTrackGroup";
this.AudioTrackGroup.Size = new System.Drawing.Size(689, 77);
this.AudioTrackGroup.TabIndex = 66;
@@ -401,11 +401,11 @@ namespace Handbrake.Controls //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.Transparent;
- this.Controls.Add(this.AudioTrackGroup);
+ this.Controls.Add(this.label68);
+ this.Controls.Add(this.btn_addAudioTrack);
this.Controls.Add(this.lv_audioList);
+ this.Controls.Add(this.AudioTrackGroup);
this.Controls.Add(this.btn_RemoveAudioTrack);
- this.Controls.Add(this.btn_addAudioTrack);
- this.Controls.Add(this.label68);
this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Name = "AudioPanel";
this.Size = new System.Drawing.Size(720, 310);
diff --git a/win/C#/Controls/Subtitles.Designer.cs b/win/C#/Controls/Subtitles.Designer.cs index 6e3be689b..451db23f8 100644 --- a/win/C#/Controls/Subtitles.Designer.cs +++ b/win/C#/Controls/Subtitles.Designer.cs @@ -55,6 +55,7 @@ this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.SRTGroup = new System.Windows.Forms.GroupBox();
+ this.label6 = new System.Windows.Forms.Label();
this.check_default_srt = new System.Windows.Forms.CheckBox();
this.srt_offset = new System.Windows.Forms.NumericUpDown();
this.label5 = new System.Windows.Forms.Label();
@@ -66,7 +67,6 @@ this.srt_lang = new System.Windows.Forms.ComboBox();
this.btn_srtAdd = new System.Windows.Forms.Button();
this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
- this.label6 = new System.Windows.Forms.Label();
this.SubTitlesGroup.SuspendLayout();
this.subMenu.SuspendLayout();
this.tabControl1.SuspendLayout();
@@ -149,9 +149,9 @@ this.btn_addSubTrack.BackColor = System.Drawing.Color.Transparent;
this.btn_addSubTrack.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_addSubTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_addSubTrack.Location = new System.Drawing.Point(16, 274);
+ this.btn_addSubTrack.Location = new System.Drawing.Point(15, 39);
this.btn_addSubTrack.Name = "btn_addSubTrack";
- this.btn_addSubTrack.Size = new System.Drawing.Size(111, 23);
+ this.btn_addSubTrack.Size = new System.Drawing.Size(78, 23);
this.btn_addSubTrack.TabIndex = 68;
this.btn_addSubTrack.Text = "Add Track";
this.btn_addSubTrack.UseVisualStyleBackColor = false;
@@ -162,9 +162,9 @@ this.btn_RemoveSubTrack.BackColor = System.Drawing.Color.Transparent;
this.btn_RemoveSubTrack.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_RemoveSubTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_RemoveSubTrack.Location = new System.Drawing.Point(263, 274);
+ this.btn_RemoveSubTrack.Location = new System.Drawing.Point(229, 39);
this.btn_RemoveSubTrack.Name = "btn_RemoveSubTrack";
- this.btn_RemoveSubTrack.Size = new System.Drawing.Size(111, 23);
+ this.btn_RemoveSubTrack.Size = new System.Drawing.Size(73, 23);
this.btn_RemoveSubTrack.TabIndex = 69;
this.btn_RemoveSubTrack.Text = "Remove";
this.btn_RemoveSubTrack.UseVisualStyleBackColor = false;
@@ -185,10 +185,10 @@ this.lv_subList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.lv_subList.HideSelection = false;
this.lv_subList.LabelWrap = false;
- this.lv_subList.Location = new System.Drawing.Point(17, 137);
+ this.lv_subList.Location = new System.Drawing.Point(16, 169);
this.lv_subList.MultiSelect = false;
this.lv_subList.Name = "lv_subList";
- this.lv_subList.Size = new System.Drawing.Size(688, 131);
+ this.lv_subList.Size = new System.Drawing.Size(688, 114);
this.lv_subList.TabIndex = 70;
this.lv_subList.UseCompatibleStateImageBehavior = false;
this.lv_subList.View = System.Windows.Forms.View.Details;
@@ -281,7 +281,7 @@ //
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
- this.tabControl1.Location = new System.Drawing.Point(16, 39);
+ this.tabControl1.Location = new System.Drawing.Point(15, 71);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(689, 92);
@@ -331,6 +331,15 @@ this.SRTGroup.TabStop = false;
this.SRTGroup.Text = "Selected Track: New Track";
//
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(466, 23);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(20, 13);
+ this.label6.TabIndex = 81;
+ this.label6.Text = "ms";
+ //
// check_default_srt
//
this.check_default_srt.AutoSize = true;
@@ -466,7 +475,7 @@ this.btn_srtAdd.BackColor = System.Drawing.Color.Transparent;
this.btn_srtAdd.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_srtAdd.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_srtAdd.Location = new System.Drawing.Point(133, 274);
+ this.btn_srtAdd.Location = new System.Drawing.Point(99, 39);
this.btn_srtAdd.Name = "btn_srtAdd";
this.btn_srtAdd.Size = new System.Drawing.Size(124, 23);
this.btn_srtAdd.TabIndex = 73;
@@ -479,24 +488,15 @@ this.openFileDialog.DefaultExt = "srt";
this.openFileDialog.Filter = "SRT Files |*.srt";
//
- // label6
- //
- this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(466, 23);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(20, 13);
- this.label6.TabIndex = 81;
- this.label6.Text = "ms";
- //
// Subtitles
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.Transparent;
this.Controls.Add(this.btn_srtAdd);
- this.Controls.Add(this.tabControl1);
this.Controls.Add(this.btn_RemoveSubTrack);
- this.Controls.Add(this.lv_subList);
this.Controls.Add(this.label68);
+ this.Controls.Add(this.tabControl1);
+ this.Controls.Add(this.lv_subList);
this.Controls.Add(this.btn_addSubTrack);
this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Name = "Subtitles";
diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs index b67dfa918..0fb6248e6 100644 --- a/win/C#/Functions/QueryGenerator.cs +++ b/win/C#/Functions/QueryGenerator.cs @@ -489,7 +489,7 @@ namespace Handbrake.Functions string[] titlesplit = source_title.Split(' ');
source_title = titlesplit[0];
- if (mainWindow.Check_ChapterMarkers.Checked)
+ if (mainWindow.Check_ChapterMarkers.Checked && mainWindow.Check_ChapterMarkers.Enabled)
{
if (dest_name.Trim() != String.Empty)
{
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index cca451404..46c3f2a9d 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -113,6 +113,7 @@ namespace Handbrake this.tab_filters = new System.Windows.Forms.TabPage();
this.tab_subtitles = new System.Windows.Forms.TabPage();
this.tab_chapters = new System.Windows.Forms.TabPage();
+ this.btn_importChapters = new System.Windows.Forms.Button();
this.label31 = new System.Windows.Forms.Label();
this.tab_advanced = new System.Windows.Forms.TabPage();
this.tab_query = new System.Windows.Forms.TabPage();
@@ -165,13 +166,12 @@ namespace Handbrake this.labelStaticSource = new System.Windows.Forms.Label();
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.openPreset = new System.Windows.Forms.OpenFileDialog();
- this.btn_importChapters = new System.Windows.Forms.Button();
+ this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();
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();
- this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();
notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
notifyIconMenu.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();
@@ -529,7 +529,7 @@ namespace Handbrake // mnu_killCLI
//
this.mnu_killCLI.Name = "mnu_killCLI";
- this.mnu_killCLI.Size = new System.Drawing.Size(143, 22);
+ this.mnu_killCLI.Size = new System.Drawing.Size(152, 22);
this.mnu_killCLI.Text = "Cancel Scan";
this.mnu_killCLI.Visible = false;
this.mnu_killCLI.Click += new System.EventHandler(this.mnu_killCLI_Click);
@@ -537,7 +537,7 @@ namespace Handbrake // mnu_exit
//
this.mnu_exit.Name = "mnu_exit";
- this.mnu_exit.Size = new System.Drawing.Size(143, 22);
+ this.mnu_exit.Size = new System.Drawing.Size(152, 22);
this.mnu_exit.Text = "E&xit";
this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);
//
@@ -963,6 +963,19 @@ namespace Handbrake this.tab_chapters.Text = "Chapters";
this.tab_chapters.UseVisualStyleBackColor = true;
//
+ // btn_importChapters
+ //
+ this.btn_importChapters.AutoSize = true;
+ this.btn_importChapters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.btn_importChapters.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
+ this.btn_importChapters.Location = new System.Drawing.Point(625, 26);
+ this.btn_importChapters.Name = "btn_importChapters";
+ this.btn_importChapters.Size = new System.Drawing.Size(75, 23);
+ this.btn_importChapters.TabIndex = 14;
+ this.btn_importChapters.Text = "Import";
+ this.btn_importChapters.UseVisualStyleBackColor = true;
+ this.btn_importChapters.Click += new System.EventHandler(this.btn_importChapters_Click);
+ //
// label31
//
this.label31.AutoSize = true;
@@ -1541,18 +1554,9 @@ namespace Handbrake this.openPreset.DefaultExt = "plist";
this.openPreset.Filter = "Plist Files|*.plist";
//
- // btn_importChapters
+ // File_ChapterImport
//
- this.btn_importChapters.AutoSize = true;
- this.btn_importChapters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.btn_importChapters.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_importChapters.Location = new System.Drawing.Point(625, 26);
- this.btn_importChapters.Name = "btn_importChapters";
- this.btn_importChapters.Size = new System.Drawing.Size(75, 23);
- this.btn_importChapters.TabIndex = 14;
- this.btn_importChapters.Text = "Import";
- this.btn_importChapters.UseVisualStyleBackColor = true;
- this.btn_importChapters.Click += new System.EventHandler(this.btn_importChapters_Click);
+ this.File_ChapterImport.Filter = "CSV Files|*.csv";
//
// PictureSettings
//
@@ -1601,10 +1605,6 @@ namespace Handbrake this.x264Panel.TabIndex = 0;
this.x264Panel.x264Query = "";
//
- // File_ChapterImport
- //
- this.File_ChapterImport.Filter = "CSV Files|*.csv";
- //
// frmMain
//
this.AllowDrop = true;
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 91fb789c8..b80ae3b10 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -1011,11 +1011,14 @@ namespace Handbrake // Disable chapter markers if only 1 chapter is selected.
if (chapterStart == chapterEnd)
{
- Check_ChapterMarkers.Checked = false;
+ btn_importChapters.Enabled = false;
Check_ChapterMarkers.Enabled = false;
}
else
- Check_ChapterMarkers.Enabled = true;
+ {
+ btn_importChapters.Enabled = true;
+ Check_ChapterMarkers.Enabled = true;
+ }
}
//Destination
diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs index eae25cffb..e3d72597d 100644 --- a/win/C#/frmQueue.Designer.cs +++ b/win/C#/frmQueue.Designer.cs @@ -351,7 +351,7 @@ namespace Handbrake this.list_queue.Name = "list_queue";
this.list_queue.Size = new System.Drawing.Size(761, 219);
this.list_queue.TabIndex = 72;
- //this.list_queue.UseCompatibleStateImageBehavior = false;
+ this.list_queue.UseCompatibleStateImageBehavior = false;
this.list_queue.View = System.Windows.Forms.View.Details;
this.list_queue.KeyUp += new System.Windows.Forms.KeyEventHandler(this.list_queue_deleteKey);
//
|