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

Fix updating of main list view after "Remove text for HI" + "Apply" button - thx Henry :)

Browse Source
This commit is contained in:
Nikolaj Olsson 2016-03-28 22:25:11 +02:00
parent 0370107346
commit adcff52906
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Forms/Main.cs
View File

@ -4980,6 +4980,8 @@ namespace Nikse.SubtitleEdit.Forms
removeTextFromHearImpaired.Initialize(_subtitle);
if (removeTextFromHearImpaired.ShowDialog(this) == DialogResult.OK)
{
_subtitle.Paragraphs.Clear();
_subtitle.Paragraphs.AddRange(removeTextFromHearImpaired.Subtitle.Paragraphs);
int count = removeTextFromHearImpaired.RemoveTextFromHearImpaired();
if (count > 0)
{

24
src/Forms/RemoveTextFromHearImpaired.cs
View File

@ -11,10 +11,12 @@ namespace Nikse.SubtitleEdit.Forms
{
public sealed partial class FormRemoveTextForHearImpaired : PositionAndSizeForm
{
private Subtitle _subtitle;
public Subtitle Subtitle;
private readonly LanguageStructure.RemoveTextFromHearImpaired _language;
private readonly RemoveTextForHI _removeTextForHiLib;
private Dictionary<Paragraph, string> _fixes;
private int _removeCount;
public FormRemoveTextForHearImpaired()
{
@ -78,7 +80,7 @@ namespace Nikse.SubtitleEdit.Forms
}
comboBoxRemoveIfTextContains.Left = checkBoxRemoveWhereContains.Left + checkBoxRemoveWhereContains.Width;
_subtitle = subtitle;
Subtitle = new Subtitle(subtitle);
GeneratePreview();
}
@ -93,7 +95,7 @@ namespace Nikse.SubtitleEdit.Forms
private void GeneratePreview()
{
if (_subtitle == null)
if (Subtitle == null)
return;
_removeTextForHiLib.Settings = GetSettings();
@ -102,9 +104,9 @@ namespace Nikse.SubtitleEdit.Forms
listViewFixes.Items.Clear();
int count = 0;
_fixes = new Dictionary<Paragraph, string>();
for (int index = 0; index < _subtitle.Paragraphs.Count; index++)
for (int index = 0; index < Subtitle.Paragraphs.Count; index++)
{
Paragraph p = _subtitle.Paragraphs[index];
Paragraph p = Subtitle.Paragraphs[index];
_removeTextForHiLib.WarningIndex = index - 1;
string newText = _removeTextForHiLib.RemoveTextFromHearImpaired(p.Text);
if (p.Text.Replace(" ", string.Empty) != newText.Replace(" ", string.Empty))
@ -147,7 +149,6 @@ namespace Nikse.SubtitleEdit.Forms
public int RemoveTextFromHearImpaired()
{
int count = 0;
for (int i = listViewFixes.Items.Count - 1; i >= 0; i--)
{
var item = listViewFixes.Items[i];
@ -157,16 +158,16 @@ namespace Nikse.SubtitleEdit.Forms
string newText = _fixes[p];
if (string.IsNullOrWhiteSpace(newText))
{
_subtitle.Paragraphs.Remove(p);
Subtitle.Paragraphs.Remove(p);
}
else
{
p.Text = newText;
}
count++;
_removeCount++;
}
}
return count;
return _removeCount;
}
private void CheckBoxRemoveTextBetweenCheckedChanged(object sender, EventArgs e)
@ -302,11 +303,12 @@ namespace Nikse.SubtitleEdit.Forms
private void buttonApply_Click(object sender, EventArgs e)
{
if (_subtitle == null)
if (Subtitle == null)
return;
RemoveTextFromHearImpaired();
_subtitle.Renumber();
Subtitle.Renumber();
GeneratePreview();
}
}
}