mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Working on shortcuts
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@338 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
parent
c5611ea611
commit
d1ff81b077
4
src/Forms/Main.Designer.cs
generated
4
src/Forms/Main.Designer.cs
generated
@ -1571,6 +1571,7 @@
|
|||||||
// italicToolStripMenuItem1
|
// italicToolStripMenuItem1
|
||||||
//
|
//
|
||||||
this.italicToolStripMenuItem1.Name = "italicToolStripMenuItem1";
|
this.italicToolStripMenuItem1.Name = "italicToolStripMenuItem1";
|
||||||
|
this.italicToolStripMenuItem1.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I)));
|
||||||
this.italicToolStripMenuItem1.Size = new System.Drawing.Size(162, 22);
|
this.italicToolStripMenuItem1.Size = new System.Drawing.Size(162, 22);
|
||||||
this.italicToolStripMenuItem1.Text = "Italic";
|
this.italicToolStripMenuItem1.Text = "Italic";
|
||||||
this.italicToolStripMenuItem1.Click += new System.EventHandler(this.italicToolStripMenuItem1_Click);
|
this.italicToolStripMenuItem1.Click += new System.EventHandler(this.italicToolStripMenuItem1_Click);
|
||||||
@ -1629,7 +1630,7 @@
|
|||||||
this.fixCommonErrorsInSelectedLinesToolStripMenuItem,
|
this.fixCommonErrorsInSelectedLinesToolStripMenuItem,
|
||||||
this.changeCasingForSelectedLinesToolStripMenuItem});
|
this.changeCasingForSelectedLinesToolStripMenuItem});
|
||||||
this.contextMenuStripListview.Name = "contextMenuStripListview";
|
this.contextMenuStripListview.Name = "contextMenuStripListview";
|
||||||
this.contextMenuStripListview.Size = new System.Drawing.Size(276, 562);
|
this.contextMenuStripListview.Size = new System.Drawing.Size(276, 584);
|
||||||
this.contextMenuStripListview.Opening += new System.ComponentModel.CancelEventHandler(this.ContextMenuStripListviewOpening);
|
this.contextMenuStripListview.Opening += new System.ComponentModel.CancelEventHandler(this.ContextMenuStripListviewOpening);
|
||||||
//
|
//
|
||||||
// toolStripMenuItemDelete
|
// toolStripMenuItemDelete
|
||||||
@ -1717,6 +1718,7 @@
|
|||||||
// italicToolStripMenuItem
|
// italicToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.italicToolStripMenuItem.Name = "italicToolStripMenuItem";
|
this.italicToolStripMenuItem.Name = "italicToolStripMenuItem";
|
||||||
|
this.italicToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I)));
|
||||||
this.italicToolStripMenuItem.Size = new System.Drawing.Size(275, 22);
|
this.italicToolStripMenuItem.Size = new System.Drawing.Size(275, 22);
|
||||||
this.italicToolStripMenuItem.Text = "Italic";
|
this.italicToolStripMenuItem.Text = "Italic";
|
||||||
this.italicToolStripMenuItem.Click += new System.EventHandler(this.ItalicToolStripMenuItemClick);
|
this.italicToolStripMenuItem.Click += new System.EventHandler(this.ItalicToolStripMenuItemClick);
|
||||||
|
@ -7486,6 +7486,35 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
textBoxSource.Focus();
|
textBoxSource.Focus();
|
||||||
else
|
else
|
||||||
SubtitleListview1.Focus();
|
SubtitleListview1.Focus();
|
||||||
|
|
||||||
|
newToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainFileNew);
|
||||||
|
openToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainFileOpen);
|
||||||
|
saveToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainFileSave);
|
||||||
|
findToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainEditFind);
|
||||||
|
findNextToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainEditFindNext);
|
||||||
|
replaceToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainEditReplace);
|
||||||
|
gotoLineNumberToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainEditGoToLineNumber);
|
||||||
|
italicToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainListViewItalic);
|
||||||
|
italicToolStripMenuItem1.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainTextBoxItalic);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Keys GetKeys(string keysInString)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(keysInString))
|
||||||
|
return Keys.None;
|
||||||
|
|
||||||
|
string[] parts = keysInString.ToLower().Split("+".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
|
||||||
|
Keys resultKeys = Keys.None;
|
||||||
|
foreach (string k in parts)
|
||||||
|
{
|
||||||
|
foreach (Keys val in Enum.GetValues(typeof(Keys)))
|
||||||
|
{
|
||||||
|
if (k == val.ToString().ToLower())
|
||||||
|
resultKeys = resultKeys | val;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return resultKeys;
|
||||||
}
|
}
|
||||||
|
|
||||||
void TimerAutoSaveTick(object sender, EventArgs e)
|
void TimerAutoSaveTick(object sender, EventArgs e)
|
||||||
|
@ -684,7 +684,7 @@
|
|||||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
|
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
|
||||||
CAAAAk1TRnQBSQFMAgEBAgEAAbgBAgG4AQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
CAAAAk1TRnQBSQFMAgEBAgEAAegBAgHoAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||||
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||||
@ -725,6 +725,9 @@
|
|||||||
AccGAAHzAc8GAAL/BgAC/wYACw==
|
AccGAAHzAc8GAAL/BgAC/wYACw==
|
||||||
</value>
|
</value>
|
||||||
</data>
|
</data>
|
||||||
|
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>175</value>
|
||||||
|
</metadata>
|
||||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
<value>
|
<value>
|
||||||
AAABAAkAMDAQAAEABABoBgAAlgAAACAgEAABAAQA6AIAAP4GAAAQEBAAAQAEACgBAADmCQAAMDAAAAEA
|
AAABAAkAMDAQAAEABABoBgAAlgAAACAgEAABAAQA6AIAAP4GAAAQEBAAAQAEACgBAADmCQAAMDAAAAEA
|
||||||
|
@ -373,6 +373,33 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class Shortcuts
|
||||||
|
{
|
||||||
|
public string MainFileNew { get; set; }
|
||||||
|
public string MainFileOpen { get; set; }
|
||||||
|
public string MainFileSave { get; set; }
|
||||||
|
public string MainEditFind { get; set; }
|
||||||
|
public string MainEditFindNext { get; set; }
|
||||||
|
public string MainEditReplace { get; set; }
|
||||||
|
public string MainEditGoToLineNumber { get; set; }
|
||||||
|
public string MainListViewItalic { get; set; }
|
||||||
|
public string MainTextBoxItalic { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
public Shortcuts()
|
||||||
|
{
|
||||||
|
MainFileNew = "Control+N";
|
||||||
|
MainFileOpen = "Control+O";
|
||||||
|
MainFileSave = "Control+S";
|
||||||
|
MainEditFind = "Control+F";
|
||||||
|
MainEditFindNext = "F3";
|
||||||
|
MainEditReplace = "Control+H";
|
||||||
|
MainEditGoToLineNumber = "Control+G";
|
||||||
|
MainListViewItalic = "Control+I";
|
||||||
|
MainTextBoxItalic = "Control+I";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public class Settings
|
public class Settings
|
||||||
{
|
{
|
||||||
public RecentFilesSettings RecentFiles { get; set; }
|
public RecentFilesSettings RecentFiles { get; set; }
|
||||||
@ -385,6 +412,7 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
public VobSubOcrSettings VobSubOcr { get; set; }
|
public VobSubOcrSettings VobSubOcr { get; set; }
|
||||||
public VideoControlsSettings VideoControls { get; set; }
|
public VideoControlsSettings VideoControls { get; set; }
|
||||||
public NetworkSettings NetworkSettings { get; set; }
|
public NetworkSettings NetworkSettings { get; set; }
|
||||||
|
public Shortcuts Shortcuts { get; set; }
|
||||||
|
|
||||||
[XmlArrayItem("MultipleSearchAndReplaceItem")]
|
[XmlArrayItem("MultipleSearchAndReplaceItem")]
|
||||||
public List<MultipleSearchAndReplaceSetting> MultipleSearchAndReplaceList { get; set; }
|
public List<MultipleSearchAndReplaceSetting> MultipleSearchAndReplaceList { get; set; }
|
||||||
@ -406,6 +434,7 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
NetworkSettings = new Logic.NetworkSettings();
|
NetworkSettings = new Logic.NetworkSettings();
|
||||||
MultipleSearchAndReplaceList = new List<MultipleSearchAndReplaceSetting>();
|
MultipleSearchAndReplaceList = new List<MultipleSearchAndReplaceSetting>();
|
||||||
Language = new Language();
|
Language = new Language();
|
||||||
|
Shortcuts = new Shortcuts();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Save()
|
public void Save()
|
||||||
@ -474,6 +503,8 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
settings.MultipleSearchAndReplaceList = new List<MultipleSearchAndReplaceSetting>();
|
settings.MultipleSearchAndReplaceList = new List<MultipleSearchAndReplaceSetting>();
|
||||||
if (settings.NetworkSettings == null)
|
if (settings.NetworkSettings == null)
|
||||||
settings.NetworkSettings = new NetworkSettings();
|
settings.NetworkSettings = new NetworkSettings();
|
||||||
|
if (settings.Shortcuts == null)
|
||||||
|
settings.Shortcuts = new Shortcuts();
|
||||||
|
|
||||||
return settings;
|
return settings;
|
||||||
}
|
}
|
||||||
@ -908,6 +939,36 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
settings.MultipleSearchAndReplaceList.Add(item);
|
settings.MultipleSearchAndReplaceList.Add(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
settings.Shortcuts = new Shortcuts();
|
||||||
|
node = doc.DocumentElement.SelectSingleNode("Shortcuts");
|
||||||
|
subNode = node.SelectSingleNode("MainFileNew");
|
||||||
|
if (subNode != null)
|
||||||
|
settings.Shortcuts.MainFileNew = subNode.InnerText;
|
||||||
|
subNode = node.SelectSingleNode("MainFileOpen");
|
||||||
|
if (subNode != null)
|
||||||
|
settings.Shortcuts.MainFileOpen = subNode.InnerText;
|
||||||
|
subNode = node.SelectSingleNode("MainFileSave");
|
||||||
|
if (subNode != null)
|
||||||
|
settings.Shortcuts.MainFileSave = subNode.InnerText;
|
||||||
|
subNode = node.SelectSingleNode("MainEditFind");
|
||||||
|
if (subNode != null)
|
||||||
|
settings.Shortcuts.MainEditFind = subNode.InnerText;
|
||||||
|
subNode = node.SelectSingleNode("MainEditFindNext");
|
||||||
|
if (subNode != null)
|
||||||
|
settings.Shortcuts.MainEditFindNext = subNode.InnerText;
|
||||||
|
subNode = node.SelectSingleNode("MainEditReplace");
|
||||||
|
if (subNode != null)
|
||||||
|
settings.Shortcuts.MainEditReplace = subNode.InnerText;
|
||||||
|
subNode = node.SelectSingleNode("MainEditGoToLineNumber");
|
||||||
|
if (subNode != null)
|
||||||
|
settings.Shortcuts.MainEditGoToLineNumber = subNode.InnerText;
|
||||||
|
subNode = node.SelectSingleNode("MainListViewItalic");
|
||||||
|
if (subNode != null)
|
||||||
|
settings.Shortcuts.MainListViewItalic = subNode.InnerText;
|
||||||
|
subNode = node.SelectSingleNode("MainTextBoxItalic");
|
||||||
|
if (subNode != null)
|
||||||
|
settings.Shortcuts.MainTextBoxItalic = subNode.InnerText;
|
||||||
|
|
||||||
return settings;
|
return settings;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1090,6 +1151,18 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
}
|
}
|
||||||
textWriter.WriteEndElement();
|
textWriter.WriteEndElement();
|
||||||
|
|
||||||
|
textWriter.WriteStartElement("Shortcuts", "");
|
||||||
|
textWriter.WriteElementString("MainFileNew", settings.Shortcuts.MainFileNew);
|
||||||
|
textWriter.WriteElementString("MainFileOpen", settings.Shortcuts.MainFileOpen);
|
||||||
|
textWriter.WriteElementString("MainFileSave", settings.Shortcuts.MainFileSave);
|
||||||
|
textWriter.WriteElementString("MainEditFind", settings.Shortcuts.MainEditFind);
|
||||||
|
textWriter.WriteElementString("MainEditFindNext", settings.Shortcuts.MainEditFindNext);
|
||||||
|
textWriter.WriteElementString("MainEditReplace", settings.Shortcuts.MainEditReplace);
|
||||||
|
textWriter.WriteElementString("MainEditGoToLineNumber", settings.Shortcuts.MainEditGoToLineNumber);
|
||||||
|
textWriter.WriteElementString("MainListViewItalic", settings.Shortcuts.MainEditGoToLineNumber);
|
||||||
|
textWriter.WriteElementString("MainTextBoxItalic", settings.Shortcuts.MainTextBoxItalic);
|
||||||
|
textWriter.WriteEndElement();
|
||||||
|
|
||||||
textWriter.WriteEndElement();
|
textWriter.WriteEndElement();
|
||||||
|
|
||||||
textWriter.WriteEndDocument();
|
textWriter.WriteEndDocument();
|
||||||
|
Loading…
Reference in New Issue
Block a user