mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Now saves all settings in "Remove text for HI"
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@899 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
parent
ddf50c9073
commit
d38a8dec1e
@ -16,8 +16,16 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
||||||
checkBoxRemoveTextBeforeColon.Checked = Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBeforeColor;
|
checkBoxRemoveTextBetweenSquares.Checked = Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBetweenBrackets;
|
||||||
checkBoxRemoveTextBeforeColonOnlyUppercase.Checked = Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBeforeColorOnlyIfUppercase;
|
checkBoxRemoveTextBetweenParentheses.Checked = Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBetweenParentheses;
|
||||||
|
checkBoxRemoveTextBetweenBrackets.Checked = Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBetweenCurlyBrackets;
|
||||||
|
checkBoxRemoveTextBetweenQuestionMarks.Checked = Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBetweenQuestionMarks;
|
||||||
|
checkBoxRemoveTextBetweenCustomTags.Checked = Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBetweenCustom;
|
||||||
|
comboBoxCustomStart.Text = Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBetweenCustomBefore;
|
||||||
|
comboBoxCustomEnd.Text = Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBetweenCustomAfter;
|
||||||
|
checkBoxOnlyIfInSeparateLine.Checked = Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBetweenOnlySeperateLines;
|
||||||
|
checkBoxRemoveTextBeforeColon.Checked = Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBeforeColon;
|
||||||
|
checkBoxRemoveTextBeforeColonOnlyUppercase.Checked = Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBeforeColonOnlyIfUppercase;
|
||||||
checkBoxRemoveInterjections.Checked = Configuration.Settings.RemoveTextForHearingImpaired.RemoveInterjections;
|
checkBoxRemoveInterjections.Checked = Configuration.Settings.RemoveTextForHearingImpaired.RemoveInterjections;
|
||||||
checkBoxRemoveWhereContains.Checked = Configuration.Settings.RemoveTextForHearingImpaired.RemoveIfContains;
|
checkBoxRemoveWhereContains.Checked = Configuration.Settings.RemoveTextForHearingImpaired.RemoveIfContains;
|
||||||
comboBoxRemoveIfTextContains.Text = Configuration.Settings.RemoveTextForHearingImpaired.RemoveIfContainsText;
|
comboBoxRemoveIfTextContains.Text = Configuration.Settings.RemoveTextForHearingImpaired.RemoveIfContainsText;
|
||||||
@ -792,8 +800,16 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
|
|
||||||
private void FormRemoveTextForHearImpaired_FormClosing(object sender, FormClosingEventArgs e)
|
private void FormRemoveTextForHearImpaired_FormClosing(object sender, FormClosingEventArgs e)
|
||||||
{
|
{
|
||||||
Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBeforeColor = checkBoxRemoveTextBeforeColon.Checked;
|
Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBetweenBrackets = checkBoxRemoveTextBetweenSquares.Checked;
|
||||||
Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBeforeColorOnlyIfUppercase = checkBoxRemoveTextBeforeColonOnlyUppercase.Checked;
|
Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBetweenParentheses = checkBoxRemoveTextBetweenParentheses.Checked;
|
||||||
|
Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBetweenCurlyBrackets = checkBoxRemoveTextBetweenBrackets.Checked;
|
||||||
|
Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBetweenQuestionMarks = checkBoxRemoveTextBetweenQuestionMarks.Checked;
|
||||||
|
Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBetweenCustom = checkBoxRemoveTextBetweenCustomTags.Checked;
|
||||||
|
Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBetweenCustomBefore = comboBoxCustomStart.Text;
|
||||||
|
Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBetweenCustomAfter = comboBoxCustomEnd.Text;
|
||||||
|
Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBetweenOnlySeperateLines = checkBoxOnlyIfInSeparateLine.Checked;
|
||||||
|
Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBeforeColon = checkBoxRemoveTextBeforeColon.Checked;
|
||||||
|
Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBeforeColonOnlyIfUppercase = checkBoxRemoveTextBeforeColonOnlyUppercase.Checked;
|
||||||
Configuration.Settings.RemoveTextForHearingImpaired.RemoveInterjections = checkBoxRemoveInterjections.Checked;
|
Configuration.Settings.RemoveTextForHearingImpaired.RemoveInterjections = checkBoxRemoveInterjections.Checked;
|
||||||
Configuration.Settings.RemoveTextForHearingImpaired.RemoveIfContains = checkBoxRemoveWhereContains.Checked;
|
Configuration.Settings.RemoveTextForHearingImpaired.RemoveIfContains = checkBoxRemoveWhereContains.Checked;
|
||||||
Configuration.Settings.RemoveTextForHearingImpaired.RemoveIfContainsText = comboBoxRemoveIfTextContains.Text;
|
Configuration.Settings.RemoveTextForHearingImpaired.RemoveIfContainsText = comboBoxRemoveIfTextContains.Text;
|
||||||
|
@ -534,15 +534,30 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
|
|
||||||
public class RemoveTextForHearingImpairedSettings
|
public class RemoveTextForHearingImpairedSettings
|
||||||
{
|
{
|
||||||
public bool RemoveTextBeforeColor { get; set; }
|
public bool RemoveTextBetweenBrackets { get; set; }
|
||||||
public bool RemoveTextBeforeColorOnlyIfUppercase { get; set; }
|
public bool RemoveTextBetweenParentheses { get; set; }
|
||||||
|
public bool RemoveTextBetweenCurlyBrackets { get; set; }
|
||||||
|
public bool RemoveTextBetweenQuestionMarks { get; set; }
|
||||||
|
public bool RemoveTextBetweenCustom { get; set; }
|
||||||
|
public string RemoveTextBetweenCustomBefore { get; set; }
|
||||||
|
public string RemoveTextBetweenCustomAfter { get; set; }
|
||||||
|
public bool RemoveTextBetweenOnlySeperateLines { get; set; }
|
||||||
|
public bool RemoveTextBeforeColon { get; set; }
|
||||||
|
public bool RemoveTextBeforeColonOnlyIfUppercase { get; set; }
|
||||||
public bool RemoveInterjections { get; set; }
|
public bool RemoveInterjections { get; set; }
|
||||||
public bool RemoveIfContains { get; set; }
|
public bool RemoveIfContains { get; set; }
|
||||||
public string RemoveIfContainsText { get; set; }
|
public string RemoveIfContainsText { get; set; }
|
||||||
|
|
||||||
public RemoveTextForHearingImpairedSettings()
|
public RemoveTextForHearingImpairedSettings()
|
||||||
{
|
{
|
||||||
RemoveTextBeforeColor = true;
|
RemoveTextBetweenBrackets = true;
|
||||||
|
RemoveTextBetweenParentheses = true;
|
||||||
|
RemoveTextBetweenCurlyBrackets = true;
|
||||||
|
RemoveTextBetweenQuestionMarks = true;
|
||||||
|
RemoveTextBetweenCustom = false;
|
||||||
|
RemoveTextBetweenCustomBefore = "¶";
|
||||||
|
RemoveTextBetweenCustomAfter = "¶";
|
||||||
|
RemoveTextBeforeColon = true;
|
||||||
RemoveIfContainsText = "¶";
|
RemoveIfContainsText = "¶";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1368,12 +1383,36 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
node = doc.DocumentElement.SelectSingleNode("RemoveTextForHearingImpaired");
|
node = doc.DocumentElement.SelectSingleNode("RemoveTextForHearingImpaired");
|
||||||
if (node != null)
|
if (node != null)
|
||||||
{
|
{
|
||||||
subNode = node.SelectSingleNode("RemoveTextBeforeColor");
|
subNode = node.SelectSingleNode("RemoveTextBetweenBrackets");
|
||||||
if (subNode != null)
|
if (subNode != null)
|
||||||
settings.RemoveTextForHearingImpaired.RemoveTextBeforeColor = Convert.ToBoolean(subNode.InnerText);
|
settings.RemoveTextForHearingImpaired.RemoveTextBetweenBrackets = Convert.ToBoolean(subNode.InnerText);
|
||||||
subNode = node.SelectSingleNode("RemoveTextBeforeColorOnlyIfUppercase");
|
subNode = node.SelectSingleNode("RemoveTextBetweenParentheses");
|
||||||
if (subNode != null)
|
if (subNode != null)
|
||||||
settings.RemoveTextForHearingImpaired.RemoveTextBeforeColorOnlyIfUppercase = Convert.ToBoolean(subNode.InnerText);
|
settings.RemoveTextForHearingImpaired.RemoveTextBetweenParentheses = Convert.ToBoolean(subNode.InnerText);
|
||||||
|
subNode = node.SelectSingleNode("RemoveTextBetweenCurlyBrackets");
|
||||||
|
if (subNode != null)
|
||||||
|
settings.RemoveTextForHearingImpaired.RemoveTextBetweenCurlyBrackets = Convert.ToBoolean(subNode.InnerText);
|
||||||
|
subNode = node.SelectSingleNode("RemoveTextBetweenQuestionMarks");
|
||||||
|
if (subNode != null)
|
||||||
|
settings.RemoveTextForHearingImpaired.RemoveTextBetweenQuestionMarks = Convert.ToBoolean(subNode.InnerText);
|
||||||
|
subNode = node.SelectSingleNode("RemoveTextBetweenCustom");
|
||||||
|
if (subNode != null)
|
||||||
|
settings.RemoveTextForHearingImpaired.RemoveTextBetweenCustom = Convert.ToBoolean(subNode.InnerText);
|
||||||
|
subNode = node.SelectSingleNode("RemoveTextBetweenCustomBefore");
|
||||||
|
if (subNode != null)
|
||||||
|
settings.RemoveTextForHearingImpaired.RemoveTextBetweenCustomBefore = subNode.InnerText;
|
||||||
|
subNode = node.SelectSingleNode("RemoveTextBetweenCustomAfter");
|
||||||
|
if (subNode != null)
|
||||||
|
settings.RemoveTextForHearingImpaired.RemoveTextBetweenCustomAfter = subNode.InnerText;
|
||||||
|
subNode = node.SelectSingleNode("RemoveTextBetweenOnlySeperateLines");
|
||||||
|
if (subNode != null)
|
||||||
|
settings.RemoveTextForHearingImpaired.RemoveTextBetweenOnlySeperateLines = Convert.ToBoolean(subNode.InnerText);
|
||||||
|
subNode = node.SelectSingleNode("RemoveTextBeforeColon");
|
||||||
|
if (subNode != null)
|
||||||
|
settings.RemoveTextForHearingImpaired.RemoveTextBeforeColon = Convert.ToBoolean(subNode.InnerText);
|
||||||
|
subNode = node.SelectSingleNode("RemoveTextBeforeColonOnlyIfUppercase");
|
||||||
|
if (subNode != null)
|
||||||
|
settings.RemoveTextForHearingImpaired.RemoveTextBeforeColonOnlyIfUppercase = Convert.ToBoolean(subNode.InnerText);
|
||||||
subNode = node.SelectSingleNode("RemoveInterjections");
|
subNode = node.SelectSingleNode("RemoveInterjections");
|
||||||
if (subNode != null)
|
if (subNode != null)
|
||||||
settings.RemoveTextForHearingImpaired.RemoveInterjections = Convert.ToBoolean(subNode.InnerText);
|
settings.RemoveTextForHearingImpaired.RemoveInterjections = Convert.ToBoolean(subNode.InnerText);
|
||||||
@ -1675,8 +1714,16 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
textWriter.WriteEndElement();
|
textWriter.WriteEndElement();
|
||||||
|
|
||||||
textWriter.WriteStartElement("RemoveTextForHearingImpaired", "");
|
textWriter.WriteStartElement("RemoveTextForHearingImpaired", "");
|
||||||
textWriter.WriteElementString("RemoveTextBeforeColor", settings.RemoveTextForHearingImpaired.RemoveTextBeforeColor.ToString());
|
textWriter.WriteElementString("RemoveTextBetweenBrackets", settings.RemoveTextForHearingImpaired.RemoveTextBetweenBrackets.ToString());
|
||||||
textWriter.WriteElementString("RemoveTextBeforeColorOnlyIfUppercase", settings.RemoveTextForHearingImpaired.RemoveTextBeforeColorOnlyIfUppercase.ToString());
|
textWriter.WriteElementString("RemoveTextBetweenParentheses", settings.RemoveTextForHearingImpaired.RemoveTextBetweenParentheses.ToString());
|
||||||
|
textWriter.WriteElementString("RemoveTextBetweenCurlyBrackets", settings.RemoveTextForHearingImpaired.RemoveTextBetweenCurlyBrackets.ToString());
|
||||||
|
textWriter.WriteElementString("RemoveTextBetweenQuestionMarks", settings.RemoveTextForHearingImpaired.RemoveTextBetweenQuestionMarks.ToString());
|
||||||
|
textWriter.WriteElementString("RemoveTextBetweenCustom", settings.RemoveTextForHearingImpaired.RemoveTextBetweenCustom.ToString());
|
||||||
|
textWriter.WriteElementString("RemoveTextBetweenCustomBefore", settings.RemoveTextForHearingImpaired.RemoveTextBetweenCustomBefore);
|
||||||
|
textWriter.WriteElementString("RemoveTextBetweenCustomAfter", settings.RemoveTextForHearingImpaired.RemoveTextBetweenCustomAfter);
|
||||||
|
textWriter.WriteElementString("RemoveTextBetweenOnlySeperateLines", settings.RemoveTextForHearingImpaired.RemoveTextBetweenOnlySeperateLines.ToString());
|
||||||
|
textWriter.WriteElementString("RemoveTextBeforeColon", settings.RemoveTextForHearingImpaired.RemoveTextBeforeColon.ToString());
|
||||||
|
textWriter.WriteElementString("RemoveTextBeforeColonOnlyIfUppercase", settings.RemoveTextForHearingImpaired.RemoveTextBeforeColonOnlyIfUppercase.ToString());
|
||||||
textWriter.WriteElementString("RemoveInterjections", settings.RemoveTextForHearingImpaired.RemoveInterjections.ToString());
|
textWriter.WriteElementString("RemoveInterjections", settings.RemoveTextForHearingImpaired.RemoveInterjections.ToString());
|
||||||
textWriter.WriteElementString("RemoveIfContains", settings.RemoveTextForHearingImpaired.RemoveIfContains.ToString());
|
textWriter.WriteElementString("RemoveIfContains", settings.RemoveTextForHearingImpaired.RemoveIfContains.ToString());
|
||||||
textWriter.WriteElementString("RemoveIfContainsText", settings.RemoveTextForHearingImpaired.RemoveIfContainsText);
|
textWriter.WriteElementString("RemoveIfContainsText", settings.RemoveTextForHearingImpaired.RemoveIfContainsText);
|
||||||
|
@ -70,7 +70,7 @@ namespace Test
|
|||||||
[TestMethod()]
|
[TestMethod()]
|
||||||
[DeploymentItem("SubtitleEdit.exe")]
|
[DeploymentItem("SubtitleEdit.exe")]
|
||||||
public void RemoveColonTest()
|
public void RemoveColonTest()
|
||||||
{
|
{
|
||||||
FormRemoveTextForHearImpaired_Accessor target = new FormRemoveTextForHearImpaired_Accessor();
|
FormRemoveTextForHearImpaired_Accessor target = new FormRemoveTextForHearImpaired_Accessor();
|
||||||
string text = "Man over P.A.:\r\nGive back our homes.";
|
string text = "Man over P.A.:\r\nGive back our homes.";
|
||||||
string expected = "Give back our homes.";
|
string expected = "Give back our homes.";
|
||||||
|
Loading…
Reference in New Issue
Block a user