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

"Fix common errors" - delete/merge line only, still enables "OK" button

Browse Source
This commit is contained in:
Nikolaj Olsson 2017-01-27 22:49:06 +01:00
parent d5eafbe2bd
commit 632aee864f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -25,6 +25,7 @@
* Fixed bug in image export - thx marb99
* Word spell check does not change format - thx Yamato-ua
* Better reading of top alignment in dfxp - thx Plazik
* "Fix common errors" - delete/merge line only still enables "OK" button
3.5.1 (13th December 2016)

6
src/Forms/FixCommonErrors.cs
View File

@ -94,6 +94,7 @@ namespace Nikse.SubtitleEdit.Forms
private int _numberOfImportantLogMessages;
private List<int> _deleteIndices = new List<int>();
private HashSet<string> _allowedFixes;
private bool _linesDeletedOrMerged;
public SubtitleFormat Format
{
@ -615,7 +616,7 @@ namespace Nikse.SubtitleEdit.Forms
buttonBack.Enabled = true;
buttonNextFinish.Text = _languageGeneral.Ok;
buttonNextFinish.Enabled = _hasFixesBeenMade;
buttonNextFinish.Enabled = _hasFixesBeenMade || _linesDeletedOrMerged;
groupBoxStep1.Visible = false;
groupBox2.Visible = true;
listViewFixes.Sort();
@ -1331,8 +1332,8 @@ namespace Nikse.SubtitleEdit.Forms
{
if (_originalSubtitle.Paragraphs.Count > 0 && subtitleListView1.SelectedItems.Count > 0)
{
_linesDeletedOrMerged = true;
_subtitleListViewIndex = -1;
var indexes = new List<int>();
foreach (ListViewItem item in subtitleListView1.SelectedItems)
indexes.Add(item.Index);
@ -1385,6 +1386,7 @@ namespace Nikse.SubtitleEdit.Forms
{
if (_originalSubtitle.Paragraphs.Count > 0 && subtitleListView1.SelectedItems.Count > 0)
{
_linesDeletedOrMerged = true;
int startNumber = _originalSubtitle.Paragraphs[0].Number;
int firstSelectedIndex = subtitleListView1.SelectedItems[0].Index;