Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-27 22:42:38 +01:00
Code Issues Projects Releases Wiki Activity

Added list view "Italic" shortcut to ocr form

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@478 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2011-06-09 06:37:54 +00:00
parent 1b2d5017a8
commit 114546e6d3
6 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/Forms/Main.cs
View File

@ -8163,23 +8163,23 @@ namespace Nikse.SubtitleEdit.Forms
private void SetShortcuts()
{
newToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainFileNew);
openToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainFileOpen);
saveToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainFileSave);
saveAsToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainFileSaveAs);
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);
newToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainFileNew);
openToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainFileOpen);
saveToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainFileSave);
saveAsToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainFileSaveAs);
findToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainEditFind);
findNextToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainEditFindNext);
replaceToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainEditReplace);
gotoLineNumberToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainEditGoToLineNumber);
fixToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainToolsFixCommonErrors);
fixToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainToolsFixCommonErrors);
showhideVideoToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainVideoShowHideVideo);
_toggleVideoDockUndock = GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
showhideVideoToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainVideoShowHideVideo);
_toggleVideoDockUndock = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
toolStripMenuItemAdjustAllTimes.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainSynchronizationAdjustTimes);
italicToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainListViewItalic);
italicToolStripMenuItem1.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainTextBoxItalic);
toolStripMenuItemAdjustAllTimes.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainSynchronizationAdjustTimes);
italicToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainListViewItalic);
italicToolStripMenuItem1.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainTextBoxItalic);
}
private void LoadPlugins()
@ -8220,7 +8220,7 @@ namespace Nikse.SubtitleEdit.Forms
pi = pluginType.GetProperty("ShortCut");
if (pi != null)
item.ShortcutKeys = GetKeys((string)pi.GetValue(pluginObject, null));
item.ShortcutKeys = Utilities.GetKeys((string)pi.GetValue(pluginObject, null));
if (string.Compare(actionType, "File", true) == 0)
{
@ -8305,26 +8305,7 @@ namespace Nikse.SubtitleEdit.Forms
{
MessageBox.Show(exception.Message);
}
}
public 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)
{
@ -8462,6 +8443,7 @@ namespace Nikse.SubtitleEdit.Forms
addWaveForm.WavePeak.WritePeakSamples(peakWaveFileName);
var audioPeakWave = new WavePeakGenerator(peakWaveFileName);
audioPeakWave.GenerateAllSamples();
audioPeakWave.Close();
audioVisualizer.WavePeaks = audioPeakWave;
if (addWaveForm.SpectrogramBitmaps != null)
audioVisualizer.InitializeSpectrogram(addWaveForm.SpectrogramBitmaps, spectrogramFolder);
@ -9784,12 +9766,12 @@ namespace Nikse.SubtitleEdit.Forms
{
if (_isVideoControlsUnDocked)
{
redockVideoControlsToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
redockVideoControlsToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
undockVideoControlsToolStripMenuItem.ShortcutKeys = Keys.None;
}
else
{
undockVideoControlsToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
undockVideoControlsToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
redockVideoControlsToolStripMenuItem.ShortcutKeys = Keys.None;
}

2
src/Forms/VideoControlsUndocked.cs
View File

@ -29,7 +29,7 @@ namespace Nikse.SubtitleEdit.Forms
_mainForm = mainForm;
this.Icon = (Icon)mainForm.Icon.Clone();
_positionsAndSizes = positionsAndSizes;
_redockKeys = _mainForm.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
_redockKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
}
public VideoControlsUndocked()

2
src/Forms/VideoPlayerUnDocked.cs
View File

@ -27,7 +27,7 @@ namespace Nikse.SubtitleEdit.Forms
this.Icon = (Icon)_mainForm.Icon.Clone();
_positionsAndSizes = positionsAndSizes;
_videoPlayerContainer = videoPlayerContainer;
_redockKeys = _mainForm.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
_redockKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
}
public VideoPlayerUnDocked()

2
src/Forms/VobSubOcr.cs
View File

@ -190,6 +190,8 @@ namespace Nikse.SubtitleEdit.Forms
Utilities.InitializeSubtitleFont(subtitleListView1);
subtitleListView1.AutoSizeAllColumns(this);
italicToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainListViewItalic);
FixLargeFonts();
}

2
src/Forms/WaveFormUnDocked.cs
View File

@ -29,7 +29,7 @@ namespace Nikse.SubtitleEdit.Forms
_mainForm = mainForm;
this.Icon = (Icon)mainForm.Icon.Clone();
_positionsAndSizes = positionsAndSizes;
_redockKeys = _mainForm.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
_redockKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
}
public WaveFormUnDocked()

19
src/Logic/Utilities.cs
View File

@ -2138,6 +2138,25 @@ namespace Nikse.SubtitleEdit.Logic
}
}
}
public static 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;
}
}
}