WinGui:

- Fix subtitle offset control. Was limited to 100. Changed increment to 10ms jumps.
- Added Import CSV function for the chapter markers tab.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2746 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 12 insertions, 0 deletions

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 97f2cb500..a28597c55 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -1341,6 +1341,7 @@ namespace Handbrake
                     setExtension(".m4v");

                 data_chpt.Rows.Clear();

                 data_chpt.Enabled = true;

+                btn_importChapters.Enabled = true;

                 DataGridView chapterGridView = Main.chapterNaming(data_chpt, drop_chapterFinish.Text);

                 if (chapterGridView != null)

                     data_chpt = chapterGridView;

@@ -1351,6 +1352,17 @@ namespace Handbrake
                     setExtension(".mp4");

                 data_chpt.Rows.Clear();

                 data_chpt.Enabled = false;

+                btn_importChapters.Enabled = false;

+            }

+        }

+        private void btn_importChapters_Click(object sender, EventArgs e)

+        {

+            if (File_ChapterImport.ShowDialog() == DialogResult.OK)

+            {

+                String filename = File_ChapterImport.FileName;

+                DataGridView imported = Main.importChapterNames(data_chpt, filename);

+                if (imported != null)

+                    data_chpt = imported;

             }

         }