From 0dde7bf5a0e3bd0be00692b8215b36287bab1850 Mon Sep 17 00:00:00 2001
From: niksedk <nikse.dk@gmail.com>
Date: Mon, 24 Jan 2011 22:03:08 +0000
Subject: [PATCH] Fixed display times for Matroska/vobsub importing - thx hawk

git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@281 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
---
 src/Forms/Main.Designer.cs | 1 -
 src/Forms/Main.cs          | 3 ++-
 src/Forms/Main.resx        | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Forms/Main.Designer.cs b/src/Forms/Main.Designer.cs
index ccb67e4a0..8b8e1557a 100644
--- a/src/Forms/Main.Designer.cs
+++ b/src/Forms/Main.Designer.cs
@@ -2782,7 +2782,6 @@
             // 
             // videoTimer
             // 
-            this.videoTimer.Interval = 500;
             this.videoTimer.Tick += new System.EventHandler(this.videoTimer_Tick);
             // 
             // timerAutoDuration
diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs
index d96e50e43..e6e8b4e6e 100644
--- a/src/Forms/Main.cs
+++ b/src/Forms/Main.cs
@@ -486,7 +486,7 @@ namespace Nikse.SubtitleEdit.Forms
 
             if (Environment.OSVersion.Version.Major < 6) // 6 == Vista/Win2008Server/Win7
             {
-                string unicodeFontName = "Lucida Sans Unicode";
+                string unicodeFontName = "Times New Roman";
                 Configuration.Settings.General.SubtitleFontName = unicodeFontName;
                 float fontSize = toolStripMenuItemSingleNote.Font.Size;
                 toolStripMenuItemSingleNote.Font = new System.Drawing.Font(unicodeFontName, fontSize);
@@ -4678,6 +4678,7 @@ namespace Nikse.SubtitleEdit.Forms
                     {
                         mergedVobSubPacks.Add(new VobSubMergedPack(p.BinaryData, TimeSpan.FromMilliseconds(p.StartMilliseconds), 32, null));
                     }
+                    mergedVobSubPacks[mergedVobSubPacks.Count - 1].EndTime = TimeSpan.FromMilliseconds(p.EndMilliseconds);
                 }                
 
                 var formSubOcr = new VobSubOcr();
diff --git a/src/Forms/Main.resx b/src/Forms/Main.resx
index 1781f252c..90e941f94 100644
--- a/src/Forms/Main.resx
+++ b/src/Forms/Main.resx
@@ -580,6 +580,9 @@
   <metadata name="toolStripWaveControls.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>208, 56</value>
   </metadata>
+  <metadata name="toolStripWaveControls.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>208, 56</value>
+  </metadata>
   <data name="toolStripButtonWaveFormZoomOut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -684,7 +687,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
-        CAAAAk1TRnQBSQFMAgEBAgEAAbABAAGwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAAcABAAHAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA