From 48546fe0834c38cadbe16da4c6be258e65b6c35e Mon Sep 17 00:00:00 2001
From: niksedk <nikse.dk@gmail.com>
Date: Tue, 22 May 2012 19:02:16 +0000
Subject: [PATCH] Fixed bug when changing format from time based to frame based
 - and ctrl+v can now paste text as new lines in list view

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

diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs
index 8cbc1b55a..eae3b8ccb 100644
--- a/src/Forms/Main.cs
+++ b/src/Forms/Main.cs
@@ -2544,10 +2544,13 @@ namespace Nikse.SubtitleEdit.Forms
                     SubtitleListview1.HideExtraColumn();
                 }
             }
-            ShowSource();
-
-            SubtitleListview1.DisplayExtraFromExtra = false;
             SubtitleFormat format = GetCurrentSubtitleFormat();
+            if (_oldSubtitleFormat != null && !_oldSubtitleFormat.IsFrameBased && format.IsFrameBased)
+                _subtitle.CalculateFrameNumbersFromTimeCodesNoCheck(CurrentFrameRate);
+            else if (_oldSubtitleFormat != null && _oldSubtitleFormat.IsFrameBased && !format.IsFrameBased)
+                _subtitle.CalculateTimeCodesFromFrameNumbers(CurrentFrameRate);
+            ShowSource();
+            SubtitleListview1.DisplayExtraFromExtra = false;
             if (format != null)
             {
                 ShowStatus(string.Format(_language.ConvertedToX, format.FriendlyName));
@@ -8438,7 +8441,17 @@ namespace Nikse.SubtitleEdit.Forms
                         SubtitleListview1.Fill(_subtitle, _subtitleAlternate);
                         SubtitleListview1.SelectIndexAndEnsureVisible(0);
                     }
-
+                    else if (list.Count > 1 && list.Count < 500)
+                    {
+                        foreach (string line in list)
+                        {
+                            if (line.Trim().Length > 0)
+                            {
+                                InsertAfter();
+                                textBoxListViewText.Text = Utilities.AutoBreakLine(line);
+                            }
+                        }                       
+                    }
                 }
                 e.SuppressKeyPress = true;
             }
diff --git a/src/Forms/Main.resx b/src/Forms/Main.resx
index 4836f3b2d..27915ca74 100644
--- a/src/Forms/Main.resx
+++ b/src/Forms/Main.resx
@@ -574,9 +574,6 @@
   <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 +681,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
-        CAAAAk1TRnQBSQFMAgEBAgEAAcgBEgHIARIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAAdABEgHQARIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
diff --git a/src/Logic/Utilities.cs b/src/Logic/Utilities.cs
index cc3ef1af7..a7c798567 100644
--- a/src/Logic/Utilities.cs
+++ b/src/Logic/Utilities.cs
@@ -1341,6 +1341,7 @@ namespace Nikse.SubtitleEdit.Logic
             AddExtension(sb, new CheetahCaption().Extension);
             AddExtension(sb, new CaptionsInc().Extension);
             AddExtension(sb, new Ultech130().Extension);
+            AddExtension(sb, "uld"); // Ultech drop frame
             AddExtension(sb, new SonicScenaristBitmaps().Extension);
             AddExtension(sb, ".mks");
             AddExtension(sb, ".sup");