WinGui:

- Changed the Chapter Markers tab so that it doesn't clear the Chapter names if the feature is disable / re-enabled. It'll now keep user set names for each source.
- Moved the Add/Remove buttons to the top of the audio panel. This should better indicate the work flow.
- Moved the Add/remove subtitle buttons to the top of the subtitle panel for the same reason.

git-svn-id: svn://localhost/HandBrake/trunk@2767 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/Controls/AudioPanel.Designer.cs b/win/C#/Controls/AudioPanel.Designer.cs
index 1758350..b6e2848 100644 (file)
--- 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;\r
             this.lv_audioList.HideSelection = false;\r
             this.lv_audioList.LabelWrap = false;\r
-            this.lv_audioList.Location = new System.Drawing.Point(16, 115);\r
+            this.lv_audioList.Location = new System.Drawing.Point(16, 150);\r
             this.lv_audioList.MultiSelect = false;\r
             this.lv_audioList.Name = "lv_audioList";\r
-            this.lv_audioList.Size = new System.Drawing.Size(689, 147);\r
+            this.lv_audioList.Size = new System.Drawing.Size(689, 153);\r
             this.lv_audioList.TabIndex = 65;\r
             this.lv_audioList.UseCompatibleStateImageBehavior = false;\r
             this.lv_audioList.View = System.Windows.Forms.View.Details;\r
@@ -171,9 +171,9 @@ namespace Handbrake.Controls
             this.btn_RemoveAudioTrack.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_RemoveAudioTrack.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_RemoveAudioTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_RemoveAudioTrack.Location = new System.Drawing.Point(133, 268);\r
+            this.btn_RemoveAudioTrack.Location = new System.Drawing.Point(99, 38);\r
             this.btn_RemoveAudioTrack.Name = "btn_RemoveAudioTrack";\r
-            this.btn_RemoveAudioTrack.Size = new System.Drawing.Size(111, 23);\r
+            this.btn_RemoveAudioTrack.Size = new System.Drawing.Size(71, 23);\r
             this.btn_RemoveAudioTrack.TabIndex = 64;\r
             this.btn_RemoveAudioTrack.Text = "Remove";\r
             this.btn_RemoveAudioTrack.UseVisualStyleBackColor = false;\r
@@ -184,9 +184,9 @@ namespace Handbrake.Controls
             this.btn_addAudioTrack.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_addAudioTrack.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_addAudioTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_addAudioTrack.Location = new System.Drawing.Point(16, 268);\r
+            this.btn_addAudioTrack.Location = new System.Drawing.Point(16, 38);\r
             this.btn_addAudioTrack.Name = "btn_addAudioTrack";\r
-            this.btn_addAudioTrack.Size = new System.Drawing.Size(111, 23);\r
+            this.btn_addAudioTrack.Size = new System.Drawing.Size(77, 23);\r
             this.btn_addAudioTrack.TabIndex = 63;\r
             this.btn_addAudioTrack.Text = "Add Track";\r
             this.btn_addAudioTrack.UseVisualStyleBackColor = false;\r
@@ -384,7 +384,7 @@ namespace Handbrake.Controls
             this.AudioTrackGroup.Controls.Add(this.label67);\r
             this.AudioTrackGroup.Controls.Add(this.label66);\r
             this.AudioTrackGroup.ForeColor = System.Drawing.Color.Black;\r
-            this.AudioTrackGroup.Location = new System.Drawing.Point(16, 32);\r
+            this.AudioTrackGroup.Location = new System.Drawing.Point(16, 67);\r
             this.AudioTrackGroup.Name = "AudioTrackGroup";\r
             this.AudioTrackGroup.Size = new System.Drawing.Size(689, 77);\r
             this.AudioTrackGroup.TabIndex = 66;\r
@@ -401,11 +401,11 @@ namespace Handbrake.Controls
             // \r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;\r
             this.BackColor = System.Drawing.Color.Transparent;\r
-            this.Controls.Add(this.AudioTrackGroup);\r
+            this.Controls.Add(this.label68);\r
+            this.Controls.Add(this.btn_addAudioTrack);\r
             this.Controls.Add(this.lv_audioList);\r
+            this.Controls.Add(this.AudioTrackGroup);\r
             this.Controls.Add(this.btn_RemoveAudioTrack);\r
-            this.Controls.Add(this.btn_addAudioTrack);\r
-            this.Controls.Add(this.label68);\r
             this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Name = "AudioPanel";\r
             this.Size = new System.Drawing.Size(720, 310);\r

diff --git a/win/C#/Controls/Subtitles.Designer.cs b/win/C#/Controls/Subtitles.Designer.cs
index 6e3be68..451db23 100644 (file)
--- 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();\r
             this.tabPage2 = new System.Windows.Forms.TabPage();\r
             this.SRTGroup = new System.Windows.Forms.GroupBox();\r
+            this.label6 = new System.Windows.Forms.Label();\r
             this.check_default_srt = new System.Windows.Forms.CheckBox();\r
             this.srt_offset = new System.Windows.Forms.NumericUpDown();\r
             this.label5 = new System.Windows.Forms.Label();\r
@@ -66,7 +67,6 @@
             this.srt_lang = new System.Windows.Forms.ComboBox();\r
             this.btn_srtAdd = new System.Windows.Forms.Button();\r
             this.openFileDialog = new System.Windows.Forms.OpenFileDialog();\r
-            this.label6 = new System.Windows.Forms.Label();\r
             this.SubTitlesGroup.SuspendLayout();\r
             this.subMenu.SuspendLayout();\r
             this.tabControl1.SuspendLayout();\r
@@ -149,9 +149,9 @@
             this.btn_addSubTrack.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_addSubTrack.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_addSubTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_addSubTrack.Location = new System.Drawing.Point(16, 274);\r
+            this.btn_addSubTrack.Location = new System.Drawing.Point(15, 39);\r
             this.btn_addSubTrack.Name = "btn_addSubTrack";\r
-            this.btn_addSubTrack.Size = new System.Drawing.Size(111, 23);\r
+            this.btn_addSubTrack.Size = new System.Drawing.Size(78, 23);\r
             this.btn_addSubTrack.TabIndex = 68;\r
             this.btn_addSubTrack.Text = "Add Track";\r
             this.btn_addSubTrack.UseVisualStyleBackColor = false;\r
@@ -162,9 +162,9 @@
             this.btn_RemoveSubTrack.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_RemoveSubTrack.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_RemoveSubTrack.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_RemoveSubTrack.Location = new System.Drawing.Point(263, 274);\r
+            this.btn_RemoveSubTrack.Location = new System.Drawing.Point(229, 39);\r
             this.btn_RemoveSubTrack.Name = "btn_RemoveSubTrack";\r
-            this.btn_RemoveSubTrack.Size = new System.Drawing.Size(111, 23);\r
+            this.btn_RemoveSubTrack.Size = new System.Drawing.Size(73, 23);\r
             this.btn_RemoveSubTrack.TabIndex = 69;\r
             this.btn_RemoveSubTrack.Text = "Remove";\r
             this.btn_RemoveSubTrack.UseVisualStyleBackColor = false;\r
@@ -185,10 +185,10 @@
             this.lv_subList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;\r
             this.lv_subList.HideSelection = false;\r
             this.lv_subList.LabelWrap = false;\r
-            this.lv_subList.Location = new System.Drawing.Point(17, 137);\r
+            this.lv_subList.Location = new System.Drawing.Point(16, 169);\r
             this.lv_subList.MultiSelect = false;\r
             this.lv_subList.Name = "lv_subList";\r
-            this.lv_subList.Size = new System.Drawing.Size(688, 131);\r
+            this.lv_subList.Size = new System.Drawing.Size(688, 114);\r
             this.lv_subList.TabIndex = 70;\r
             this.lv_subList.UseCompatibleStateImageBehavior = false;\r
             this.lv_subList.View = System.Windows.Forms.View.Details;\r
@@ -281,7 +281,7 @@
             // \r
             this.tabControl1.Controls.Add(this.tabPage1);\r
             this.tabControl1.Controls.Add(this.tabPage2);\r
-            this.tabControl1.Location = new System.Drawing.Point(16, 39);\r
+            this.tabControl1.Location = new System.Drawing.Point(15, 71);\r
             this.tabControl1.Name = "tabControl1";\r
             this.tabControl1.SelectedIndex = 0;\r
             this.tabControl1.Size = new System.Drawing.Size(689, 92);\r
@@ -331,6 +331,15 @@
             this.SRTGroup.TabStop = false;\r
             this.SRTGroup.Text = "Selected Track: New Track";\r
             // \r
+            // label6\r
+            // \r
+            this.label6.AutoSize = true;\r
+            this.label6.Location = new System.Drawing.Point(466, 23);\r
+            this.label6.Name = "label6";\r
+            this.label6.Size = new System.Drawing.Size(20, 13);\r
+            this.label6.TabIndex = 81;\r
+            this.label6.Text = "ms";\r
+            // \r
             // check_default_srt\r
             // \r
             this.check_default_srt.AutoSize = true;\r
@@ -466,7 +475,7 @@
             this.btn_srtAdd.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_srtAdd.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_srtAdd.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_srtAdd.Location = new System.Drawing.Point(133, 274);\r
+            this.btn_srtAdd.Location = new System.Drawing.Point(99, 39);\r
             this.btn_srtAdd.Name = "btn_srtAdd";\r
             this.btn_srtAdd.Size = new System.Drawing.Size(124, 23);\r
             this.btn_srtAdd.TabIndex = 73;\r
@@ -479,24 +488,15 @@
             this.openFileDialog.DefaultExt = "srt";\r
             this.openFileDialog.Filter = "SRT Files |*.srt";\r
             // \r
-            // label6\r
-            // \r
-            this.label6.AutoSize = true;\r
-            this.label6.Location = new System.Drawing.Point(466, 23);\r
-            this.label6.Name = "label6";\r
-            this.label6.Size = new System.Drawing.Size(20, 13);\r
-            this.label6.TabIndex = 81;\r
-            this.label6.Text = "ms";\r
-            // \r
             // Subtitles\r
             // \r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;\r
             this.BackColor = System.Drawing.Color.Transparent;\r
             this.Controls.Add(this.btn_srtAdd);\r
-            this.Controls.Add(this.tabControl1);\r
             this.Controls.Add(this.btn_RemoveSubTrack);\r
-            this.Controls.Add(this.lv_subList);\r
             this.Controls.Add(this.label68);\r
+            this.Controls.Add(this.tabControl1);\r
+            this.Controls.Add(this.lv_subList);\r
             this.Controls.Add(this.btn_addSubTrack);\r
             this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Name = "Subtitles";\r

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index b67dfa9..0fb6248 100644 (file)
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -489,7 +489,7 @@ namespace Handbrake.Functions
             string[] titlesplit = source_title.Split(' ');\r
             source_title = titlesplit[0];\r
 \r
-            if (mainWindow.Check_ChapterMarkers.Checked)\r
+            if (mainWindow.Check_ChapterMarkers.Checked && mainWindow.Check_ChapterMarkers.Enabled)\r
             {\r
                 if (dest_name.Trim() != String.Empty)\r
                 {\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index cca4514..46c3f2a 100644 (file)
--- 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();\r
             this.tab_subtitles = new System.Windows.Forms.TabPage();\r
             this.tab_chapters = new System.Windows.Forms.TabPage();\r
+            this.btn_importChapters = new System.Windows.Forms.Button();\r
             this.label31 = new System.Windows.Forms.Label();\r
             this.tab_advanced = new System.Windows.Forms.TabPage();\r
             this.tab_query = new System.Windows.Forms.TabPage();\r
@@ -165,13 +166,12 @@ namespace Handbrake
             this.labelStaticSource = new System.Windows.Forms.Label();\r
             this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();\r
             this.openPreset = new System.Windows.Forms.OpenFileDialog();\r
-            this.btn_importChapters = new System.Windows.Forms.Button();\r
+            this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();\r
             this.PictureSettings = new Handbrake.Controls.PictureSettings();\r
             this.Filters = new Handbrake.Controls.Filters();\r
             this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
             this.Subtitles = new Handbrake.Controls.Subtitles();\r
             this.x264Panel = new Handbrake.Controls.x264Panel();\r
-            this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
@@ -529,7 +529,7 @@ namespace Handbrake
             // mnu_killCLI\r
             // \r
             this.mnu_killCLI.Name = "mnu_killCLI";\r
-            this.mnu_killCLI.Size = new System.Drawing.Size(143, 22);\r
+            this.mnu_killCLI.Size = new System.Drawing.Size(152, 22);\r
             this.mnu_killCLI.Text = "Cancel Scan";\r
             this.mnu_killCLI.Visible = false;\r
             this.mnu_killCLI.Click += new System.EventHandler(this.mnu_killCLI_Click);\r
@@ -537,7 +537,7 @@ namespace Handbrake
             // mnu_exit\r
             // \r
             this.mnu_exit.Name = "mnu_exit";\r
-            this.mnu_exit.Size = new System.Drawing.Size(143, 22);\r
+            this.mnu_exit.Size = new System.Drawing.Size(152, 22);\r
             this.mnu_exit.Text = "E&xit";\r
             this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);\r
             // \r
@@ -963,6 +963,19 @@ namespace Handbrake
             this.tab_chapters.Text = "Chapters";\r
             this.tab_chapters.UseVisualStyleBackColor = true;\r
             // \r
+            // btn_importChapters\r
+            // \r
+            this.btn_importChapters.AutoSize = true;\r
+            this.btn_importChapters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_importChapters.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.btn_importChapters.Location = new System.Drawing.Point(625, 26);\r
+            this.btn_importChapters.Name = "btn_importChapters";\r
+            this.btn_importChapters.Size = new System.Drawing.Size(75, 23);\r
+            this.btn_importChapters.TabIndex = 14;\r
+            this.btn_importChapters.Text = "Import";\r
+            this.btn_importChapters.UseVisualStyleBackColor = true;\r
+            this.btn_importChapters.Click += new System.EventHandler(this.btn_importChapters_Click);\r
+            // \r
             // label31\r
             // \r
             this.label31.AutoSize = true;\r
@@ -1541,18 +1554,9 @@ namespace Handbrake
             this.openPreset.DefaultExt = "plist";\r
             this.openPreset.Filter = "Plist Files|*.plist";\r
             // \r
-            // btn_importChapters\r
+            // File_ChapterImport\r
             // \r
-            this.btn_importChapters.AutoSize = true;\r
-            this.btn_importChapters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_importChapters.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_importChapters.Location = new System.Drawing.Point(625, 26);\r
-            this.btn_importChapters.Name = "btn_importChapters";\r
-            this.btn_importChapters.Size = new System.Drawing.Size(75, 23);\r
-            this.btn_importChapters.TabIndex = 14;\r
-            this.btn_importChapters.Text = "Import";\r
-            this.btn_importChapters.UseVisualStyleBackColor = true;\r
-            this.btn_importChapters.Click += new System.EventHandler(this.btn_importChapters_Click);\r
+            this.File_ChapterImport.Filter = "CSV Files|*.csv";\r
             // \r
             // PictureSettings\r
             // \r
@@ -1601,10 +1605,6 @@ namespace Handbrake
             this.x264Panel.TabIndex = 0;\r
             this.x264Panel.x264Query = "";\r
             // \r
-            // File_ChapterImport\r
-            // \r
-            this.File_ChapterImport.Filter = "CSV Files|*.csv";\r
-            // \r
             // frmMain\r
             // \r
             this.AllowDrop = true;\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 91fb789..b80ae3b 100644 (file)
--- 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.\r
             if (chapterStart == chapterEnd)\r
             {\r
-                Check_ChapterMarkers.Checked = false;\r
+                btn_importChapters.Enabled = false;\r
                 Check_ChapterMarkers.Enabled = false;\r
             }\r
             else\r
-                Check_ChapterMarkers.Enabled = true;  \r
+            {\r
+                btn_importChapters.Enabled = true;\r
+                Check_ChapterMarkers.Enabled = true;\r
+            }\r
         }\r
 \r
         //Destination\r

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index eae25cf..e3d7259 100644 (file)
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -351,7 +351,7 @@ namespace Handbrake
             this.list_queue.Name = "list_queue";\r
             this.list_queue.Size = new System.Drawing.Size(761, 219);\r
             this.list_queue.TabIndex = 72;\r
-            //this.list_queue.UseCompatibleStateImageBehavior = false;\r
+            this.list_queue.UseCompatibleStateImageBehavior = false;\r
             this.list_queue.View = System.Windows.Forms.View.Details;\r
             this.list_queue.KeyUp += new System.Windows.Forms.KeyEventHandler(this.list_queue_deleteKey);\r
             // \r