WinGui:

- Fix for PictureSettings Panel
- Small UI improvements for Audio and Subs panels

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

diff --git a/win/C#/Changelog.html b/win/C#/Changelog.html
index fc6cfe1..4151f97 100644 (file)
--- a/win/C#/Changelog.html
+++ b/win/C#/Changelog.html
@@ -19,15 +19,18 @@ Windows Platform Specific Changlog.<br />
     - Some UI layout changes / improvements<br />\r
     - Added new options: preferred language, "Dub Foreign language audio" and "Use Foreign language audio and Subtitles"<br />\r
     - Remove M4v from format dropdown and add new option "Use iPod/iTunes friendly (.m4v) file extension for MP4<br />\r
-    \r
+    - Chapter Markers tab now resets far less often. It should retain chapter names after being disabled / re-enabled <br />\r
+    - Chapter Markers tab now as import functionality. It can now import a csv file <br />\r
     \r
     <h4>Fixed</h4>\r
     - Re-written the Picture Settings Panel code so it should now work a lot better.<br />\r
     - Issue where the GUI would error if the encode was stopped  too quickly.<br />\r
     - Numerous other fixes including: Quality slider resetting to 0 and other settings lost when a title change occurs.<br />\r
     - Fixes some scaling / quality issues with QuickTime preview. Also added a possible fix for QT not working on 64bit systems.<br />\r
+    - Chaning the x264 Quality granularity now longer requires an application restart to work correctly <br />\r
     \r
     <h2>Changes since 0.9.3</h2>\r
+    \r
     <h4>Major Changes</h4>\r
 \r
     - Video Preview window using QuickTime or VLC. (5 to 60 second preview clips) <br />\r

diff --git a/win/C#/Controls/AudioPanel.Designer.cs b/win/C#/Controls/AudioPanel.Designer.cs
index b6e2848..46a5c29 100644 (file)
--- a/win/C#/Controls/AudioPanel.Designer.cs
+++ b/win/C#/Controls/AudioPanel.Designer.cs
@@ -89,7 +89,7 @@ namespace Handbrake.Controls
             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, 153);\r
+            this.lv_audioList.Size = new System.Drawing.Size(689, 140);\r
             this.lv_audioList.TabIndex = 65;\r
             this.lv_audioList.UseCompatibleStateImageBehavior = false;\r
             this.lv_audioList.View = System.Windows.Forms.View.Details;\r

diff --git a/win/C#/Controls/PictureSettings.cs b/win/C#/Controls/PictureSettings.cs
index 8352f52..e31b682 100644 (file)
--- a/win/C#/Controls/PictureSettings.cs
+++ b/win/C#/Controls/PictureSettings.cs
@@ -58,8 +58,12 @@ namespace Handbrake.Controls
                 }\r
                 else\r
                 {\r
-                    text_width.Value = _SourceTitle.Resolution.Width;\r
-                    text_height.Value = _SourceTitle.Resolution.Height - (int)crop_top.Value - (int)crop_bottom.Value;\r
+                    if (text_width.Value == 0 && text_height.Value ==0)// Only update the values if the fields don't already have values.\r
+                    { \r
+                        text_width.Value = _SourceTitle.Resolution.Width;\r
+                        text_height.Value = _SourceTitle.Resolution.Height - (int) crop_top.Value - (int) crop_bottom.Value;\r
+                    }\r
+\r
                     labelDisplaySize.Text = calculateAnamorphicSizes().Width + "x" + calculateAnamorphicSizes().Height;\r
                 }\r
 \r
@@ -130,7 +134,7 @@ namespace Handbrake.Controls
                         if (preventChangingCustom)\r
                             break;\r
 \r
-                        preventChangingDisplayWidth = true; \r
+                        preventChangingDisplayWidth = true;\r
                         updownDisplayWidth.Value = text_width.Value * updownParWidth.Value / updownParHeight.Value;\r
                         preventChangingDisplayWidth = false;\r
 \r
@@ -235,7 +239,7 @@ namespace Handbrake.Controls
                 preventChangingCustom = false;\r
             }\r
 \r
-            if (preventChangingDisplayWidth == false  && check_KeepAR.CheckState == CheckState.Checked)\r
+            if (preventChangingDisplayWidth == false && check_KeepAR.CheckState == CheckState.Checked)\r
             {\r
                 // - Changes HEIGHT to keep DAR\r
                 // - Changes PIXEL WIDTH to new DISPLAY WIDTH\r
@@ -246,7 +250,7 @@ namespace Handbrake.Controls
                 int modulus = 16;\r
                 int.TryParse(drp_modulus.SelectedItem.ToString(), out modulus);\r
 \r
-                int rawCalculatedHeight = (int) ((int)updownDisplayWidth.Value/cachedDar);\r
+                int rawCalculatedHeight = (int)((int)updownDisplayWidth.Value / cachedDar);\r
                 int modulusHeight = rawCalculatedHeight - (rawCalculatedHeight % modulus);\r
 \r
                 // Update value\r
@@ -254,9 +258,9 @@ namespace Handbrake.Controls
                 text_height.Value = (decimal)modulusHeight;\r
                 updownParWidth.Value = updownDisplayWidth.Value;\r
                 updownParHeight.Value = text_width.Value;\r
-                preventChangingHeight = false;  \r
+                preventChangingHeight = false;\r
             }\r
-           \r
+\r
         }\r
 \r
         // Anamorphic Controls\r

diff --git a/win/C#/Controls/Subtitles.Designer.cs b/win/C#/Controls/Subtitles.Designer.cs
index 451db23..6be9312 100644 (file)
--- a/win/C#/Controls/Subtitles.Designer.cs
+++ b/win/C#/Controls/Subtitles.Designer.cs
@@ -149,7 +149,7 @@
             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(15, 39);\r
+            this.btn_addSubTrack.Location = new System.Drawing.Point(16, 38);\r
             this.btn_addSubTrack.Name = "btn_addSubTrack";\r
             this.btn_addSubTrack.Size = new System.Drawing.Size(78, 23);\r
             this.btn_addSubTrack.TabIndex = 68;\r
@@ -162,7 +162,7 @@
             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(229, 39);\r
+            this.btn_RemoveSubTrack.Location = new System.Drawing.Point(230, 38);\r
             this.btn_RemoveSubTrack.Name = "btn_RemoveSubTrack";\r
             this.btn_RemoveSubTrack.Size = new System.Drawing.Size(73, 23);\r
             this.btn_RemoveSubTrack.TabIndex = 69;\r
@@ -475,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(99, 39);\r
+            this.btn_srtAdd.Location = new System.Drawing.Point(100, 38);\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

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 87e3620..63d7c00 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -167,13 +167,15 @@ namespace Handbrake
             this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();\r
             this.openPreset = new System.Windows.Forms.OpenFileDialog();\r
             this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();\r
+            this.ChaptersMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
+            this.mnu_resetChapters = new System.Windows.Forms.ToolStripMenuItem();\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.ChaptersMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
-            this.mnu_resetChapters = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.pmnu_import = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
@@ -1128,10 +1130,12 @@ namespace Handbrake
             this.pmnu_expandAll,\r
             this.pmnu_collapse,\r
             this.sep1,\r
+            this.pmnu_import,\r
+            this.toolStripSeparator2,\r
             this.pmnu_saveChanges,\r
             this.pmnu_delete});\r
             this.presets_menu.Name = "presets_menu";\r
-            this.presets_menu.Size = new System.Drawing.Size(155, 98);\r
+            this.presets_menu.Size = new System.Drawing.Size(155, 148);\r
             this.presets_menu.Text = ";";\r
             this.presets_menu.Opening += new System.ComponentModel.CancelEventHandler(this.presets_menu_Opening);\r
             // \r
@@ -1562,6 +1566,21 @@ namespace Handbrake
             // \r
             this.File_ChapterImport.Filter = "CSV Files|*.csv";\r
             // \r
+            // ChaptersMenu\r
+            // \r
+            this.ChaptersMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.mnu_resetChapters});\r
+            this.ChaptersMenu.Name = "presets_menu";\r
+            this.ChaptersMenu.Size = new System.Drawing.Size(191, 26);\r
+            this.ChaptersMenu.Text = ";";\r
+            // \r
+            // mnu_resetChapters\r
+            // \r
+            this.mnu_resetChapters.Name = "mnu_resetChapters";\r
+            this.mnu_resetChapters.Size = new System.Drawing.Size(190, 22);\r
+            this.mnu_resetChapters.Text = "Reset Chapter Names";\r
+            this.mnu_resetChapters.Click += new System.EventHandler(this.mnu_resetChapters_Click);\r
+            // \r
             // PictureSettings\r
             // \r
             this.PictureSettings.BackColor = System.Drawing.Color.Transparent;\r
@@ -1609,20 +1628,17 @@ namespace Handbrake
             this.x264Panel.TabIndex = 0;\r
             this.x264Panel.x264Query = "";\r
             // \r
-            // ChaptersMenu\r
+            // pmnu_import\r
             // \r
-            this.ChaptersMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.mnu_resetChapters});\r
-            this.ChaptersMenu.Name = "presets_menu";\r
-            this.ChaptersMenu.Size = new System.Drawing.Size(191, 26);\r
-            this.ChaptersMenu.Text = ";";\r
+            this.pmnu_import.Name = "pmnu_import";\r
+            this.pmnu_import.Size = new System.Drawing.Size(154, 22);\r
+            this.pmnu_import.Text = "Import";\r
+            this.pmnu_import.Click += new System.EventHandler(this.pmnu_import_Click);\r
             // \r
-            // mnu_resetChapters\r
+            // toolStripSeparator2\r
             // \r
-            this.mnu_resetChapters.Name = "mnu_resetChapters";\r
-            this.mnu_resetChapters.Size = new System.Drawing.Size(190, 22);\r
-            this.mnu_resetChapters.Text = "Reset Chapter Names";\r
-            this.mnu_resetChapters.Click += new System.EventHandler(this.mnu_resetChapters_Click);\r
+            this.toolStripSeparator2.Name = "toolStripSeparator2";\r
+            this.toolStripSeparator2.Size = new System.Drawing.Size(151, 6);\r
             // \r
             // frmMain\r
             // \r
@@ -1822,5 +1838,7 @@ namespace Handbrake
         private OpenFileDialog File_ChapterImport;\r
         private ContextMenuStrip ChaptersMenu;\r
         private ToolStripMenuItem mnu_resetChapters;\r
+        private ToolStripMenuItem pmnu_import;\r
+        private ToolStripSeparator toolStripSeparator2;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index c000818..224c077 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -371,33 +371,7 @@ namespace Handbrake
         }\r
         private void mnu_importMacPreset_Click(object sender, EventArgs e)\r
         {\r
-            Import imp = new Import();\r
-            if (openPreset.ShowDialog() == DialogResult.OK)\r
-            {\r
-                QueryParser parsed = imp.importMacPreset(openPreset.FileName);\r
-                if (presetHandler.checkIfUserPresetExists(parsed.PresetName + " (Imported)"))\r
-                {\r
-                    DialogResult result = MessageBox.Show("This preset appears to already exist. Would you like to overwrite it?", "Overwrite preset?",\r
-                                                           MessageBoxButtons.YesNo, MessageBoxIcon.Warning);\r
-                    if (result == DialogResult.Yes)\r
-                    {\r
-                        PresetLoader.presetLoader(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);\r
-                        presetHandler.updatePreset(parsed.PresetName + " (Imported)", queryGen.generateCLIQuery(this, 0, null),\r
-                                                   parsed.UsesPictureSettings);\r
-                    }\r
-                }\r
-                else\r
-                {\r
-                    PresetLoader.presetLoader(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);\r
-                    presetHandler.addPreset(parsed.PresetName, queryGen.generateCLIQuery(this, 0, null), parsed.UsesPictureSettings);\r
-\r
-                    if (presetHandler.addPreset(parsed.PresetName + " (Imported)", queryGen.generateCLIQuery(this, 0, null), parsed.UsesPictureSettings))\r
-                    {\r
-                        TreeNode preset_treeview = new TreeNode(parsed.PresetName + " (Imported)") { ForeColor = Color.Black };\r
-                        treeView_presets.Nodes.Add(preset_treeview);\r
-                    }\r
-                }\r
-            }\r
+            importPreset();\r
         }\r
         private void btn_new_preset_Click(object sender, EventArgs e)\r
         {\r
@@ -473,6 +447,10 @@ namespace Handbrake
         {\r
             treeView_presets.CollapseAll();\r
         }\r
+        private void pmnu_import_Click(object sender, EventArgs e)\r
+        {\r
+            importPreset();\r
+        }\r
         private void pmnu_saveChanges_Click(object sender, EventArgs e)\r
         {\r
             DialogResult result = MessageBox.Show("Do you wish to include picture settings when updating the preset: " + treeView_presets.SelectedNode.Text, "Update Preset", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);\r
@@ -626,6 +604,36 @@ namespace Handbrake
                 }\r
             }\r
         }\r
+        private void importPreset()\r
+        {\r
+            Import imp = new Import();\r
+            if (openPreset.ShowDialog() == DialogResult.OK)\r
+            {\r
+                QueryParser parsed = imp.importMacPreset(openPreset.FileName);\r
+                if (presetHandler.checkIfUserPresetExists(parsed.PresetName + " (Imported)"))\r
+                {\r
+                    DialogResult result = MessageBox.Show("This preset appears to already exist. Would you like to overwrite it?", "Overwrite preset?",\r
+                                                           MessageBoxButtons.YesNo, MessageBoxIcon.Warning);\r
+                    if (result == DialogResult.Yes)\r
+                    {\r
+                        PresetLoader.presetLoader(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);\r
+                        presetHandler.updatePreset(parsed.PresetName + " (Imported)", queryGen.generateCLIQuery(this, 0, null),\r
+                                                   parsed.UsesPictureSettings);\r
+                    }\r
+                }\r
+                else\r
+                {\r
+                    PresetLoader.presetLoader(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);\r
+                    presetHandler.addPreset(parsed.PresetName, queryGen.generateCLIQuery(this, 0, null), parsed.UsesPictureSettings);\r
+\r
+                    if (presetHandler.addPreset(parsed.PresetName + " (Imported)", queryGen.generateCLIQuery(this, 0, null), parsed.UsesPictureSettings))\r
+                    {\r
+                        TreeNode preset_treeview = new TreeNode(parsed.PresetName + " (Imported)") { ForeColor = Color.Black };\r
+                        treeView_presets.Nodes.Add(preset_treeview);\r
+                    }\r
+                }\r
+            }\r
+        }\r
         #endregion\r
 \r
         #region ToolStrip\r