mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Fixed bug undo (Ctrl+z invoked very fast after a change)
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@855 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
parent
9c0dcdb4c7
commit
af507a98f4
@ -14,13 +14,13 @@ Subtitle Edit Changelog
|
|||||||
Now includes (some) italic detection + adds support for
|
Now includes (some) italic detection + adds support for
|
||||||
Arabic, Hebrew, Hindi, and Thai
|
Arabic, Hebrew, Hindi, and Thai
|
||||||
* Undo improved so it also works for textbox + redo (Ctrl+Y)
|
* Undo improved so it also works for textbox + redo (Ctrl+Y)
|
||||||
|
* Many new configurable shortcuts
|
||||||
* OCR tweaked a bit + BluRay sup files are processed faster
|
* OCR tweaked a bit + BluRay sup files are processed faster
|
||||||
* TextBox with current subtitle now shows cursor position - thx Leszek
|
* TextBox with current subtitle now shows cursor position - thx Leszek
|
||||||
* Subtitle format PAC much improved
|
* Subtitle format PAC much improved
|
||||||
* Subtitle format FCP Xml improved - thx Ulrik
|
* Subtitle format FCP Xml improved - thx Ulrik
|
||||||
* Subtitle format D-Cinema improved - thx Karam
|
* Subtitle format D-Cinema improved - thx Karam
|
||||||
* Splitting of lines - Thx Trottel
|
* Splitting of lines - Thx Trottel
|
||||||
* More configurable shortcuts
|
|
||||||
* FIXED:
|
* FIXED:
|
||||||
* Fixed crash when setting Options - thx karmazyn
|
* Fixed crash when setting Options - thx karmazyn
|
||||||
* Fixed crash in set color (or set font) - thx LEO33
|
* Fixed crash in set color (or set font) - thx LEO33
|
||||||
|
@ -3682,8 +3682,21 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
UndoToIndex(true);
|
UndoToIndex(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Undo or Redo
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="undo">True equals undo, false triggers redo</param>
|
||||||
private void UndoToIndex(bool undo)
|
private void UndoToIndex(bool undo)
|
||||||
{
|
{
|
||||||
|
// Add latest changes if any (also stop changes from being added while redoing/undoing)
|
||||||
|
timerTextUndo.Stop();
|
||||||
|
timerAlternateTextUndo.Stop();
|
||||||
|
_listViewTextTicks = 0;
|
||||||
|
_listViewAlternateTextTicks = 0;
|
||||||
|
timerTextUndo_Tick(null, null);
|
||||||
|
timerAlternateTextUndo_Tick(null, null);
|
||||||
|
|
||||||
|
|
||||||
int selectedIndex = FirstSelectedIndex;
|
int selectedIndex = FirstSelectedIndex;
|
||||||
string text = string.Empty;
|
string text = string.Empty;
|
||||||
if (undo)
|
if (undo)
|
||||||
@ -3731,9 +3744,6 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
_fileName = _subtitle.UndoHistory(_undoIndex, out subtitleFormatFriendlyName, out _fileDateTime, out _subtitleAlternate, out _subtitleAlternateFileName);
|
_fileName = _subtitle.UndoHistory(_undoIndex, out subtitleFormatFriendlyName, out _fileDateTime, out _subtitleAlternate, out _subtitleAlternateFileName);
|
||||||
if (!undo)
|
if (!undo)
|
||||||
{
|
{
|
||||||
if (_subtitle.HistoryItems[_undoIndex].RedoParagraphs == null) //TODO: why? Fast keypresses?
|
|
||||||
return;
|
|
||||||
|
|
||||||
_subtitle.Paragraphs.Clear();
|
_subtitle.Paragraphs.Clear();
|
||||||
if (Configuration.Settings.General.AllowEditOfOriginalSubtitle && _subtitleAlternate != null)
|
if (Configuration.Settings.General.AllowEditOfOriginalSubtitle && _subtitleAlternate != null)
|
||||||
_subtitleAlternate.Paragraphs.Clear();
|
_subtitleAlternate.Paragraphs.Clear();
|
||||||
@ -3787,8 +3797,10 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
if (_subtitleAlternate != null && _subtitle.HistoryItems[_undoIndex].RedoLineIndex >= 0 && _subtitle.HistoryItems[_undoIndex].RedoLineIndex == FirstSelectedIndex)
|
if (_subtitleAlternate != null && _subtitle.HistoryItems[_undoIndex].RedoLineIndex >= 0 && _subtitle.HistoryItems[_undoIndex].RedoLineIndex == FirstSelectedIndex)
|
||||||
textBoxListViewTextAlternate.SelectionStart = _subtitle.HistoryItems[_undoIndex].RedoLinePositionAlternate;
|
textBoxListViewTextAlternate.SelectionStart = _subtitle.HistoryItems[_undoIndex].RedoLinePositionAlternate;
|
||||||
|
|
||||||
ShowStatus("Redo performed"); //TODO:WORKING ON UNDO
|
ShowStatus("Redo performed"); //TODO: do not hardcode text... SE 3.3
|
||||||
}
|
}
|
||||||
|
timerTextUndo.Start();
|
||||||
|
timerAlternateTextUndo.Start();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void RedoLastAction()
|
private void RedoLastAction()
|
||||||
|
Loading…
Reference in New Issue
Block a user