Work on shortcuts

LanguageMaster.xml

@@ -2452,6 +2452,7 @@ can edit in same subtitle file (collaboration)</Information>
     <ListViewColumnTextDown>Column, text down</ListViewColumnTextDown>
     <ListViewGoToNextError>Go to next error</ListViewGoToNextError>
     <ListViewListErrors>List errors</ListViewListErrors>
+    <ListViewListSortByX>Sort by {0}</ListViewListSortByX>
     <ShowStyleManager>Show style manager</ShowStyleManager>
     <MainTextBoxMoveLastWordDown>Move last word to next subtitle</MainTextBoxMoveLastWordDown>
     <MainTextBoxMoveFirstWordFromNextUp>Fetch first word from next subtitle</MainTextBoxMoveFirstWordFromNextUp>
@@ -2874,7 +2875,7 @@ Keep changes?</KeepChangesMessage>
     <AllFixes>All fixes</AllFixes>
     <GuessesUsed>Guesses used</GuessesUsed>
     <UnknownWords>Unknown words</UnknownWords>
-    <UnknownWordToGuessInLine>{0} ⇒ {1} via 'OCRFixReplaceList.xml' in line: {2}</UnknownWordToGuessInLine>
+    <UnknownWordToGuessInLine>{0} ⇒ {1} via 'OCRFixReplaceList/WordSplitList' in line: {2}</UnknownWordToGuessInLine>
     <OcrAutoCorrectionSpellChecking>OCR auto correction / spell checking</OcrAutoCorrectionSpellChecking>
     <FixOcrErrors>Fix OCR errors</FixOcrErrors>
     <ImportTextWithMatchingTimeCodes>Import text with matching time codes...</ImportTextWithMatchingTimeCodes>

src/libse/Common/Settings.cs

@@ -2180,6 +2180,12 @@ $HorzAlign          =   Center
         public string MainListViewColumnTextDown { get; set; }
         public string MainListViewGoToNextError { get; set; }
         public string MainListViewListErrors { get; set; }
+        public string MainListViewSortByNumber { get; set; }
+        public string MainListViewSortByStartTime { get; set; }
+        public string MainListViewSortByEndTime { get; set; }
+        public string MainListViewSortByDuration { get; set; }
+        public string MainListViewSortByCps { get; set; }
+        public string MainListViewSortByNumberOfLines { get; set; }
         public string MainListViewRemoveTimeCodes { get; set; }
         public string MainTextBoxSplitAtCursor { get; set; }
         public string MainTextBoxSplitAtCursorAndVideoPos { get; set; }
@@ -8106,6 +8112,42 @@ $HorzAlign          =   Center
                     shortcuts.MainListViewListErrors = subNode.InnerText;
                 }
 
+                subNode = node.SelectSingleNode("MainListViewSortByNumber");
+                if (subNode != null)
+                {
+                    shortcuts.MainListViewSortByNumber = subNode.InnerText;
+                }
+
+                subNode = node.SelectSingleNode("MainListViewSortByStartTime");
+                if (subNode != null)
+                {
+                    shortcuts.MainListViewSortByStartTime = subNode.InnerText;
+                }
+
+                subNode = node.SelectSingleNode("MainListViewSortByEndTime");
+                if (subNode != null)
+                {
+                    shortcuts.MainListViewSortByEndTime = subNode.InnerText;
+                }
+
+                subNode = node.SelectSingleNode("MainListViewSortByDuration");
+                if (subNode != null)
+                {
+                    shortcuts.MainListViewSortByDuration = subNode.InnerText;
+                }
+
+                subNode = node.SelectSingleNode("MainListViewSortByCps");
+                if (subNode != null)
+                {
+                    shortcuts.MainListViewSortByCps = subNode.InnerText;
+                }
+
+                subNode = node.SelectSingleNode("MainListViewSortByNumberOfLines");
+                if (subNode != null)
+                {
+                    shortcuts.MainListViewSortByNumberOfLines = subNode.InnerText;
+                }
+
                 subNode = node.SelectSingleNode("GeneralRemoveBlankLines");
                 if (subNode != null)
                 {
@@ -9860,6 +9902,12 @@ $HorzAlign          =   Center
             textWriter.WriteElementString("MainListViewColumnTextDown", shortcuts.MainListViewColumnTextDown);
             textWriter.WriteElementString("MainListViewGoToNextError", shortcuts.MainListViewGoToNextError);
             textWriter.WriteElementString("MainListViewListErrors", shortcuts.MainListViewListErrors);
+            textWriter.WriteElementString("MainListViewSortByNumber", shortcuts.MainListViewSortByNumber);
+            textWriter.WriteElementString("MainListViewSortByStartTime", shortcuts.MainListViewSortByStartTime);
+            textWriter.WriteElementString("MainListViewSortByEndTime", shortcuts.MainListViewSortByEndTime);
+            textWriter.WriteElementString("MainListViewSortByDuration", shortcuts.MainListViewSortByDuration);
+            textWriter.WriteElementString("MainListViewSortByCps", shortcuts.MainListViewSortByCps);
+            textWriter.WriteElementString("MainListViewSortByNumberOfLines", shortcuts.MainListViewSortByNumberOfLines);
             textWriter.WriteElementString("GeneralRemoveBlankLines", shortcuts.GeneralRemoveBlankLines);
             textWriter.WriteElementString("GeneralApplyAssaOverrideTags", shortcuts.GeneralApplyAssaOverrideTags);
             textWriter.WriteElementString("GeneralSetAssaPosition", shortcuts.GeneralSetAssaPosition);

src/libse/Common/Utilities.cs

@@ -1783,6 +1783,43 @@ namespace Nikse.SubtitleEdit.Core.Common
             return text.Replace("\"\"", "\"");
         }
 
+        public static Color GetColorFromAssa(string text, Color defaultColor)
+        {
+            var start = text.IndexOf(@"\c");
+            if (start < 0)
+            {
+                start = text.IndexOf(@"\1c");
+            }
+
+            if (start < 0 || text.Substring(start).StartsWith(@"\clip", StringComparison.Ordinal))
+            {
+                return defaultColor;
+            }
+
+            var end = text.IndexOf('}', start);
+            if (end < 0)
+            {
+                return defaultColor;
+            }
+
+            var nextTagIdx = text.IndexOf('\\', start + 2);
+            if (nextTagIdx > 0 && nextTagIdx < end)
+            {
+                end = nextTagIdx;
+            }
+
+            if (end > 0)
+            {
+                var color = text.Substring(start, end - start).TrimStart('\\').TrimStart('1').TrimStart('c');
+                color = color.RemoveChar('&').TrimStart('H');
+                color = color.PadLeft(6, '0');
+                return AdvancedSubStationAlpha.GetSsaColor("h" + color, defaultColor);
+                //TODO: alpha
+            }
+
+            return defaultColor;
+        }
+
         public static Color GetColorFromFontString(string text, Color defaultColor)
         {
             string s = text.TrimEnd();

src/ui/Forms/Main.Designer.cs

@@ -40,9 +40,9 @@ namespace Nikse.SubtitleEdit.Forms
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main));
-            Nikse.SubtitleEdit.Core.Common.TimeCode timeCode7 = new Nikse.SubtitleEdit.Core.Common.TimeCode();
+            Nikse.SubtitleEdit.Core.Common.TimeCode timeCode3 = new Nikse.SubtitleEdit.Core.Common.TimeCode();
-            Nikse.SubtitleEdit.Core.Common.TimeCode timeCode8 = new Nikse.SubtitleEdit.Core.Common.TimeCode();
+            Nikse.SubtitleEdit.Core.Common.TimeCode timeCode1 = new Nikse.SubtitleEdit.Core.Common.TimeCode();
-            Nikse.SubtitleEdit.Core.Common.TimeCode timeCode9 = new Nikse.SubtitleEdit.Core.Common.TimeCode();
+            Nikse.SubtitleEdit.Core.Common.TimeCode timeCode2 = new Nikse.SubtitleEdit.Core.Common.TimeCode();
             this.statusStrip1 = new System.Windows.Forms.StatusStrip();
             this.labelStatus = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolStripSelected = new System.Windows.Forms.ToolStripStatusLabel();
@@ -2551,7 +2551,7 @@ namespace Nikse.SubtitleEdit.Forms
             this.toolStripMenuItemSelectedLines,
             this.toolStripMenuItemGoogleMicrosoftTranslateSelLine});
             this.contextMenuStripListView.Name = "contextMenuStripListView";
-            this.contextMenuStripListView.Size = new System.Drawing.Size(285, 776);
+            this.contextMenuStripListView.Size = new System.Drawing.Size(285, 798);
             this.contextMenuStripListView.Closed += new System.Windows.Forms.ToolStripDropDownClosedEventHandler(this.MenuClosed);
             this.contextMenuStripListView.Opening += new System.ComponentModel.CancelEventHandler(this.ContextMenuStripListViewOpening);
             this.contextMenuStripListView.Opened += new System.EventHandler(this.MenuOpened);
@@ -5273,14 +5273,14 @@ namespace Nikse.SubtitleEdit.Forms
             this.timeUpDownStartTime.Name = "timeUpDownStartTime";
             this.timeUpDownStartTime.Size = new System.Drawing.Size(113, 27);
             this.timeUpDownStartTime.TabIndex = 0;
-            timeCode7.Hours = 0;
+            timeCode3.Hours = 0;
-            timeCode7.Milliseconds = 0;
+            timeCode3.Milliseconds = 0;
-            timeCode7.Minutes = 0;
+            timeCode3.Minutes = 0;
-            timeCode7.Seconds = 0;
+            timeCode3.Seconds = 0;
-            timeCode7.TimeSpan = System.TimeSpan.Parse("00:00:00");
+            timeCode3.TimeSpan = System.TimeSpan.Parse("00:00:00");
-            timeCode7.TotalMilliseconds = 0D;
+            timeCode3.TotalMilliseconds = 0D;
-            timeCode7.TotalSeconds = 0D;
+            timeCode3.TotalSeconds = 0D;
-            this.timeUpDownStartTime.TimeCode = timeCode7;
+            this.timeUpDownStartTime.TimeCode = timeCode3;
             this.timeUpDownStartTime.UseVideoOffset = false;
             // 
             // textBoxListViewText
@@ -5406,14 +5406,14 @@ namespace Nikse.SubtitleEdit.Forms
             this.timeUpDownVideoPosition.Name = "timeUpDownVideoPosition";
             this.timeUpDownVideoPosition.Size = new System.Drawing.Size(113, 27);
             this.timeUpDownVideoPosition.TabIndex = 12;
-            timeCode8.Hours = 0;
+            timeCode1.Hours = 0;
-            timeCode8.Milliseconds = 0;
+            timeCode1.Milliseconds = 0;
-            timeCode8.Minutes = 0;
+            timeCode1.Minutes = 0;
-            timeCode8.Seconds = 0;
+            timeCode1.Seconds = 0;
-            timeCode8.TimeSpan = System.TimeSpan.Parse("00:00:00");
+            timeCode1.TimeSpan = System.TimeSpan.Parse("00:00:00");
-            timeCode8.TotalMilliseconds = 0D;
+            timeCode1.TotalMilliseconds = 0D;
-            timeCode8.TotalSeconds = 0D;
+            timeCode1.TotalSeconds = 0D;
-            this.timeUpDownVideoPosition.TimeCode = timeCode8;
+            this.timeUpDownVideoPosition.TimeCode = timeCode1;
             this.timeUpDownVideoPosition.UseVideoOffset = false;
             // 
             // timeUpDownVideoPositionAdjust
@@ -5426,14 +5426,14 @@ namespace Nikse.SubtitleEdit.Forms
             this.timeUpDownVideoPositionAdjust.Name = "timeUpDownVideoPositionAdjust";
             this.timeUpDownVideoPositionAdjust.Size = new System.Drawing.Size(113, 27);
             this.timeUpDownVideoPositionAdjust.TabIndex = 13;
-            timeCode9.Hours = 0;
+            timeCode2.Hours = 0;
-            timeCode9.Milliseconds = 0;
+            timeCode2.Milliseconds = 0;
-            timeCode9.Minutes = 0;
+            timeCode2.Minutes = 0;
-            timeCode9.Seconds = 0;
+            timeCode2.Seconds = 0;
-            timeCode9.TimeSpan = System.TimeSpan.Parse("00:00:00");
+            timeCode2.TimeSpan = System.TimeSpan.Parse("00:00:00");
-            timeCode9.TotalMilliseconds = 0D;
+            timeCode2.TotalMilliseconds = 0D;
-            timeCode9.TotalSeconds = 0D;
+            timeCode2.TotalSeconds = 0D;
-            this.timeUpDownVideoPositionAdjust.TimeCode = timeCode9;
+            this.timeUpDownVideoPositionAdjust.TimeCode = timeCode2;
             this.timeUpDownVideoPositionAdjust.UseVideoOffset = false;
             // 
             // Main

src/ui/Forms/Main.cs

@@ -12870,7 +12870,7 @@ namespace Nikse.SubtitleEdit.Forms
                 var formatType = GetCurrentSubtitleFormat().GetType();
                 if (formatType == typeof(AdvancedSubStationAlpha))
                 {
-                    using (var form = new ColorChooser { Color = Color.White })
+                    using (var form = new ColorChooser { Color = GetColorFromFirstLine(Color.White) })
                     {
                         if (form.ShowDialog(this) != DialogResult.OK)
                         {
@@ -12906,19 +12906,40 @@ namespace Nikse.SubtitleEdit.Forms
                 }
                 else
                 {
-                    if (colorDialog1.ShowDialog(this) != DialogResult.OK)
+                    using (var form = new ColorChooser { Color = GetColorFromFirstLine(Color.White) })
                     {
-                        return;
+                        if (form.ShowDialog(this) != DialogResult.OK)
-                    }
+                        {
+                            return;
+                        }
 
-                    color = Utilities.ColorToHex(colorDialog1.Color);
+                        color = Utilities.ColorToHex(colorDialog1.Color);
+                    }
                 }
 
-                SetColor(color);
+                SetColor(color, false, false);
             }
         }
 
-        private void SetColor(string color, bool selectedText = false)
+        private Color GetColorFromFirstLine(Color defaultColor)
+        {
+            var p = _subtitle.GetParagraphOrDefault(FirstSelectedIndex);
+            if (p != null)
+            {
+                if (p.Text.IndexOf("<font ") >= 0)
+                {
+                    return Utilities.GetColorFromFontString(p.Text, defaultColor);
+                }
+                else
+                {
+                    return Utilities.GetColorFromAssa(p.Text, defaultColor);
+                }
+            }
+
+            return defaultColor;
+        }
+
+        private void SetColor(string color, bool selectedText = false, bool allowRemove = true)
         {
             var isAssa = IsAssa();
             if (selectedText)
@@ -12928,8 +12949,8 @@ namespace Nikse.SubtitleEdit.Forms
             else
             {
                 MakeHistoryForUndo(_language.BeforeSettingColor);
-                var remove = true;
+                var remove = allowRemove;
-                var removeOriginal = true;
+                var removeOriginal = allowRemove;
 
                 var assaColor = string.Empty;
                 if (isAssa)
@@ -23500,6 +23521,12 @@ namespace Nikse.SubtitleEdit.Forms
             toolStripMenuItemGoToSourceView.ShortcutKeys = UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralToggleView);
             toolStripMenuItemEmptyGoToSourceView.ShortcutKeys = UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralToggleView);
             toolStripMenuItemGoToListView.ShortcutKeys = UiUtil.GetKeys(Configuration.Settings.Shortcuts.GeneralToggleView);
+            sortNumberToolStripMenuItem.ShortcutKeys = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainListViewSortByNumber);
+            sortStartTimeToolStripMenuItem.ShortcutKeys = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainListViewSortByStartTime);
+            sortEndTimeToolStripMenuItem.ShortcutKeys = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainListViewSortByEndTime);
+            sortDisplayTimeToolStripMenuItem.ShortcutKeys = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainListViewSortByDuration);
+            textCharssecToolStripMenuItem.ShortcutKeys = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainListViewSortByCps);
+            sortTextNumberOfLinesToolStripMenuItem.ShortcutKeys = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainListViewSortByNumberOfLines);
 
             spellCheckToolStripMenuItem.ShortcutKeys = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainSpellCheck);
             findDoubleWordsToolStripMenuItem.ShortcutKeys = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainSpellCheckFindDoubleWords);

src/ui/Forms/Main.resx

@@ -682,9 +682,6 @@
   <metadata name="toolStripWaveControls.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>652, 56</value>
   </metadata>
-  <metadata name="toolStripWaveControls.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>652, 56</value>
-  </metadata>
   <data name="toolStripButtonWaveformZoomOut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -780,12 +777,12 @@
   <metadata name="imageListBookmarks.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>981, 56</value>
   </metadata>
-  <metadata name="contextMenuStripTextBoxSourceView.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>193, 17</value>
-  </metadata>
   <metadata name="contextMenuStripTextBoxListView.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>668, 17</value>
   </metadata>
+  <metadata name="contextMenuStripTextBoxSourceView.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>193, 17</value>
+  </metadata>
   <metadata name="contextMenuStripEmpty.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 95</value>
   </metadata>
@@ -797,7 +794,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
-        CAAAAk1TRnQBSQFMAgEBAgEAAXwBLAF8ASwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAAZwBLAGcASwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -848,6 +845,6 @@
     <value>676, 92</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>171</value>
+    <value>54</value>
   </metadata>
 </root>

src/ui/Forms/Options/Settings.cs

@@ -1466,6 +1466,12 @@ namespace Nikse.SubtitleEdit.Forms.Options
             AddNode(listViewNode, language.ListViewColumnTextDown, nameof(Configuration.Settings.Shortcuts.MainListViewColumnTextDown), true);
             AddNode(listViewNode, language.ListViewGoToNextError, nameof(Configuration.Settings.Shortcuts.MainListViewGoToNextError));
             AddNode(listViewNode, language.ListViewListErrors, nameof(Configuration.Settings.Shortcuts.MainListViewListErrors), true);
+            AddNode(listViewNode, string.Format(language.ListViewListSortByX, LanguageSettings.Current.General.Number), nameof(Configuration.Settings.Shortcuts.MainListViewSortByNumber), true);
+            AddNode(listViewNode, string.Format(language.ListViewListSortByX, LanguageSettings.Current.General.StartTime), nameof(Configuration.Settings.Shortcuts.MainListViewSortByStartTime), true);
+            AddNode(listViewNode, string.Format(language.ListViewListSortByX, LanguageSettings.Current.General.EndTime), nameof(Configuration.Settings.Shortcuts.MainListViewSortByEndTime), true);
+            AddNode(listViewNode, string.Format(language.ListViewListSortByX, LanguageSettings.Current.General.Duration), nameof(Configuration.Settings.Shortcuts.MainListViewSortByDuration), true);
+            AddNode(listViewNode, string.Format(language.ListViewListSortByX, LanguageSettings.Current.General.CharsPerSec), nameof(Configuration.Settings.Shortcuts.MainListViewSortByCps), true);
+            AddNode(listViewNode, string.Format(language.ListViewListSortByX, LanguageSettings.Current.Main.Menu.Tools.TextNumberOfLines), nameof(Configuration.Settings.Shortcuts.MainListViewSortByNumberOfLines), true);
             _shortcuts.Nodes.Add(listViewNode);
 
             var textBoxNode = new ShortcutNode(language.TextBox);

src/ui/Logic/Language.cs

@@ -2779,6 +2779,7 @@ can edit in same subtitle file (collaboration)",
                 ListViewColumnTextDown = "Column, text down",
                 ListViewGoToNextError = "Go to next error",
                 ListViewListErrors = "List errors",
+                ListViewListSortByX = "Sort by {0}",
                 ShowStyleManager = "Show style manager",
                 MainTextBoxMoveLastWordDown = "Move last word to next subtitle",
                 MainTextBoxMoveFirstWordFromNextUp = "Fetch first word from next subtitle",

src/ui/Logic/LanguageDeserializer.cs

@@ -6733,6 +6733,9 @@ namespace Nikse.SubtitleEdit.Logic
                 case "Settings/ListViewListErrors":
                     language.Settings.ListViewListErrors = reader.Value;
                     break;
+                case "Settings/ListViewListSortByX":
+                    language.Settings.ListViewListSortByX = reader.Value;
+                    break;
                 case "Settings/ShowStyleManager":
                     language.Settings.ShowStyleManager = reader.Value;
                     break;

src/ui/Logic/LanguageStructure.cs

@@ -2634,6 +2634,7 @@
             public string ListViewColumnTextDown { get; set; }
             public string ListViewGoToNextError { get; set; }
             public string ListViewListErrors { get; set; }
+            public string ListViewListSortByX { get; set; }
             public string ShowStyleManager { get; set; }
             public string MainTextBoxMoveLastWordDown { get; set; }
             public string MainTextBoxMoveFirstWordFromNextUp { get; set; }