mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Added list view "Italic" shortcut to ocr form
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@478 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
parent
1b2d5017a8
commit
114546e6d3
@ -8163,23 +8163,23 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
|
|
||||||
private void SetShortcuts()
|
private void SetShortcuts()
|
||||||
{
|
{
|
||||||
newToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainFileNew);
|
newToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainFileNew);
|
||||||
openToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainFileOpen);
|
openToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainFileOpen);
|
||||||
saveToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainFileSave);
|
saveToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainFileSave);
|
||||||
saveAsToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainFileSaveAs);
|
saveAsToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainFileSaveAs);
|
||||||
findToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainEditFind);
|
findToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainEditFind);
|
||||||
findNextToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainEditFindNext);
|
findNextToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainEditFindNext);
|
||||||
replaceToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainEditReplace);
|
replaceToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainEditReplace);
|
||||||
gotoLineNumberToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainEditGoToLineNumber);
|
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);
|
showhideVideoToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainVideoShowHideVideo);
|
||||||
_toggleVideoDockUndock = GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
|
_toggleVideoDockUndock = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
|
||||||
|
|
||||||
toolStripMenuItemAdjustAllTimes.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainSynchronizationAdjustTimes);
|
toolStripMenuItemAdjustAllTimes.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainSynchronizationAdjustTimes);
|
||||||
italicToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainListViewItalic);
|
italicToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainListViewItalic);
|
||||||
italicToolStripMenuItem1.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainTextBoxItalic);
|
italicToolStripMenuItem1.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainTextBoxItalic);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void LoadPlugins()
|
private void LoadPlugins()
|
||||||
@ -8220,7 +8220,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
|
|
||||||
pi = pluginType.GetProperty("ShortCut");
|
pi = pluginType.GetProperty("ShortCut");
|
||||||
if (pi != null)
|
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)
|
if (string.Compare(actionType, "File", true) == 0)
|
||||||
{
|
{
|
||||||
@ -8305,26 +8305,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
{
|
{
|
||||||
MessageBox.Show(exception.Message);
|
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)
|
void TimerAutoSaveTick(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
@ -8462,6 +8443,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
addWaveForm.WavePeak.WritePeakSamples(peakWaveFileName);
|
addWaveForm.WavePeak.WritePeakSamples(peakWaveFileName);
|
||||||
var audioPeakWave = new WavePeakGenerator(peakWaveFileName);
|
var audioPeakWave = new WavePeakGenerator(peakWaveFileName);
|
||||||
audioPeakWave.GenerateAllSamples();
|
audioPeakWave.GenerateAllSamples();
|
||||||
|
audioPeakWave.Close();
|
||||||
audioVisualizer.WavePeaks = audioPeakWave;
|
audioVisualizer.WavePeaks = audioPeakWave;
|
||||||
if (addWaveForm.SpectrogramBitmaps != null)
|
if (addWaveForm.SpectrogramBitmaps != null)
|
||||||
audioVisualizer.InitializeSpectrogram(addWaveForm.SpectrogramBitmaps, spectrogramFolder);
|
audioVisualizer.InitializeSpectrogram(addWaveForm.SpectrogramBitmaps, spectrogramFolder);
|
||||||
@ -9784,12 +9766,12 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
{
|
{
|
||||||
if (_isVideoControlsUnDocked)
|
if (_isVideoControlsUnDocked)
|
||||||
{
|
{
|
||||||
redockVideoControlsToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
|
redockVideoControlsToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
|
||||||
undockVideoControlsToolStripMenuItem.ShortcutKeys = Keys.None;
|
undockVideoControlsToolStripMenuItem.ShortcutKeys = Keys.None;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
undockVideoControlsToolStripMenuItem.ShortcutKeys = GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
|
undockVideoControlsToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
|
||||||
redockVideoControlsToolStripMenuItem.ShortcutKeys = Keys.None;
|
redockVideoControlsToolStripMenuItem.ShortcutKeys = Keys.None;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
_mainForm = mainForm;
|
_mainForm = mainForm;
|
||||||
this.Icon = (Icon)mainForm.Icon.Clone();
|
this.Icon = (Icon)mainForm.Icon.Clone();
|
||||||
_positionsAndSizes = positionsAndSizes;
|
_positionsAndSizes = positionsAndSizes;
|
||||||
_redockKeys = _mainForm.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
|
_redockKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
|
||||||
}
|
}
|
||||||
|
|
||||||
public VideoControlsUndocked()
|
public VideoControlsUndocked()
|
||||||
|
@ -27,7 +27,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
this.Icon = (Icon)_mainForm.Icon.Clone();
|
this.Icon = (Icon)_mainForm.Icon.Clone();
|
||||||
_positionsAndSizes = positionsAndSizes;
|
_positionsAndSizes = positionsAndSizes;
|
||||||
_videoPlayerContainer = videoPlayerContainer;
|
_videoPlayerContainer = videoPlayerContainer;
|
||||||
_redockKeys = _mainForm.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
|
_redockKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
|
||||||
}
|
}
|
||||||
|
|
||||||
public VideoPlayerUnDocked()
|
public VideoPlayerUnDocked()
|
||||||
|
@ -190,6 +190,8 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
Utilities.InitializeSubtitleFont(subtitleListView1);
|
Utilities.InitializeSubtitleFont(subtitleListView1);
|
||||||
subtitleListView1.AutoSizeAllColumns(this);
|
subtitleListView1.AutoSizeAllColumns(this);
|
||||||
|
|
||||||
|
italicToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainListViewItalic);
|
||||||
|
|
||||||
FixLargeFonts();
|
FixLargeFonts();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
_mainForm = mainForm;
|
_mainForm = mainForm;
|
||||||
this.Icon = (Icon)mainForm.Icon.Clone();
|
this.Icon = (Icon)mainForm.Icon.Clone();
|
||||||
_positionsAndSizes = positionsAndSizes;
|
_positionsAndSizes = positionsAndSizes;
|
||||||
_redockKeys = _mainForm.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
|
_redockKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainVideoToggleVideoControls);
|
||||||
}
|
}
|
||||||
|
|
||||||
public WaveFormUnDocked()
|
public WaveFormUnDocked()
|
||||||
|
@ -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;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user