From 3ef331133ddf64e7b1dbe470191498b02a8f6b2b Mon Sep 17 00:00:00 2001
From: niksedk <nikse.dk@gmail.com>
Date: Tue, 26 Feb 2013 16:27:40 +0000
Subject: [PATCH] Removed hardcoded "Batch convert" shortcut (customizable
 shortcut in settings.xml)

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

diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs
index 8be97cd25..f5a713272 100644
--- a/src/Forms/Main.cs
+++ b/src/Forms/Main.cs
@@ -9483,10 +9483,6 @@ namespace Nikse.SubtitleEdit.Forms
                 MakeAutoDuration();
                 e.SuppressKeyPress = true;
             }
-            else if (e.Modifiers == (Keys.Control | Keys.Shift | Keys.Alt) && e.KeyCode == Keys.C)
-            {
-                toolStripMenuItemBatchConvert_Click(null, null);
-            }
 
             // TABS - MUST BE LAST
             else if (tabControlButtons.SelectedTab == tabPageAdjust)
@@ -12399,6 +12395,7 @@ namespace Nikse.SubtitleEdit.Forms
             removeTextForHearImparedToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainToolsRemoveTextForHI);
             ChangeCasingToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainToolsChangeCasing);
             toolStripMenuItemShowOriginalInPreview.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainEditToggleTranslationOriginalInPreviews);
+            toolStripMenuItemBatchConvert.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainToolsBatchConvert);
 
             showhideVideoToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainVideoShowHideVideo);
             _toggleVideoDockUndock = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
diff --git a/src/Forms/Main.resx b/src/Forms/Main.resx
index 358948049..c5868ae8c 100644
--- a/src/Forms/Main.resx
+++ b/src/Forms/Main.resx
@@ -681,7 +681,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
-        CAAAAk1TRnQBSQFMAgEBAgEAAZABHQGQAR0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAAZgBHQGYAR0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
diff --git a/src/Logic/Settings.cs b/src/Logic/Settings.cs
index 30c76b84f..4e1fdd4ec 100644
--- a/src/Logic/Settings.cs
+++ b/src/Logic/Settings.cs
@@ -631,6 +631,7 @@ namespace Nikse.SubtitleEdit.Logic
         public string MainToolsRemoveTextForHI { get; set; }
         public string MainToolsChangeCasing { get; set; }
         public string MainToolsAutoDuration { get; set; }
+        public string MainToolsBatchConvert { get; set; }
         public string MainToolsBeamer { get; set; }
         public string MainVideoPause { get; set; }
         public string MainVideoPlayPauseToggle { get; set; }
@@ -1777,6 +1778,9 @@ namespace Nikse.SubtitleEdit.Logic
                 subNode = node.SelectSingleNode("MainToolsAutoDuration");
                 if (subNode != null)
                     settings.Shortcuts.MainToolsAutoDuration = subNode.InnerText;
+                subNode = node.SelectSingleNode("MainToolsBatchConvert");
+                if (subNode != null)
+                    settings.Shortcuts.MainToolsBatchConvert = subNode.InnerText;
                 subNode = node.SelectSingleNode("MainToolsBeamer");
                 if (subNode != null)
                     settings.Shortcuts.MainToolsBeamer = subNode.InnerText;
@@ -2362,6 +2366,7 @@ namespace Nikse.SubtitleEdit.Logic
             textWriter.WriteElementString("MainToolsRemoveTextForHI", settings.Shortcuts.MainToolsRemoveTextForHI);
             textWriter.WriteElementString("MainToolsChangeCasing", settings.Shortcuts.MainToolsChangeCasing);
             textWriter.WriteElementString("MainToolsAutoDuration", settings.Shortcuts.MainToolsAutoDuration);
+            textWriter.WriteElementString("MainToolsBatchConvert", settings.Shortcuts.MainToolsBatchConvert);
             textWriter.WriteElementString("MainToolsBeamer", settings.Shortcuts.MainToolsBeamer);
             textWriter.WriteElementString("MainToolsToggleTranslationOriginalInPreviews", settings.Shortcuts.MainEditToggleTranslationOriginalInPreviews);
             textWriter.WriteElementString("MainEditInverseSelection", settings.Shortcuts.MainEditInverseSelection);