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

Now remembers size of controls in mainform better - thx George/Leszek :)

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1626 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2013-02-13 15:54:39 +00:00
parent 87d674964d
commit b5bf292d4a
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Forms/Main.cs
View File

@ -12214,7 +12214,8 @@ namespace Nikse.SubtitleEdit.Forms
toolStripMenuItemSpellCheckFromCurrentLine.Visible = false;
}
if (Configuration.Settings.General.SplitContainerMainSplitterDistance > 0 &&
if (Configuration.Settings.General.StartRememberPositionAndSize &&
Configuration.Settings.General.SplitContainerMainSplitterDistance > 0 &&
Configuration.Settings.General.SplitContainer1SplitterDistance > 0 &&
Configuration.Settings.General.SplitContainerListViewAndTextSplitterDistance > 0)
{

10
src/Forms/VobSubOcr.cs
View File

@ -247,7 +247,8 @@ namespace Nikse.SubtitleEdit.Forms
checkBoxTesseractMusicOn.Text = Configuration.Settings.Language.Settings.MusicSymbol;
checkBoxTesseractMusicOn.Left = checkBoxTesseractItalicsOn.Left + checkBoxTesseractItalicsOn.Width + 15;
_unItalicFactor = Configuration.Settings.VobSubOcr.ItalicFactor;
if (Configuration.Settings.VobSubOcr.ItalicFactor >= 0.1 && Configuration.Settings.VobSubOcr.ItalicFactor < 1)
_unItalicFactor = Configuration.Settings.VobSubOcr.ItalicFactor;
checkBoxShowOnlyForced.Text = language.ShowOnlyForcedSubtitles;
checkBoxUseTimeCodesFromIdx.Text = language.UseTimeCodesFromIdx;
@ -2430,6 +2431,11 @@ namespace Nikse.SubtitleEdit.Forms
if (checkBoxTesseractMusicOn.Checked)
{
if ((line.StartsWith("J' ") || line.StartsWith("♪ ")) && unItalicText.Length > 3 && unItalicText.Substring(1, 2) == "' ")
{
unItalicText = "♪ " + unItalicText.Remove(0, 2).TrimStart();
}
if (unItalicText.StartsWith("J'") && (line.StartsWith("♪") || textWithOutFixes.StartsWith("♪") || textWithOutFixes.StartsWith("<i>♪") || unItalicText.EndsWith("♪")))
{
unItalicText = "♪ " + unItalicText.Remove(0, 2).TrimStart();
@ -2573,6 +2579,8 @@ namespace Nikse.SubtitleEdit.Forms
if (checkBoxTesseractMusicOn.Checked)
{
line = line.Replace(" J' ", " ♪ ");
if (line.StartsWith("J'"))
{
line = "♪ " + line.Remove(0, 2).TrimStart();

4
src/Logic/Settings.cs
View File

@ -1634,7 +1634,7 @@ namespace Nikse.SubtitleEdit.Logic
settings.VobSubOcr.PromptForUnknownWords = Convert.ToBoolean(subNode.InnerText);
subNode = node.SelectSingleNode("ItalicFactor");
if (subNode != null)
settings.VobSubOcr.ItalicFactor = Convert.ToDouble(subNode.InnerText);
settings.VobSubOcr.ItalicFactor = Convert.ToDouble(subNode.InnerText, CultureInfo.InvariantCulture);
foreach (XmlNode listNode in doc.DocumentElement.SelectNodes("MultipleSearchAndReplaceList/MultipleSearchAndReplaceItem"))
{
@ -2268,7 +2268,7 @@ namespace Nikse.SubtitleEdit.Logic
textWriter.WriteElementString("TopToBottom", settings.VobSubOcr.TopToBottom.ToString());
textWriter.WriteElementString("DefaultMillisecondsForUnknownDurations", settings.VobSubOcr.DefaultMillisecondsForUnknownDurations.ToString());
textWriter.WriteElementString("PromptForUnknownWords", settings.VobSubOcr.PromptForUnknownWords.ToString());
textWriter.WriteElementString("ItalicFactor", settings.VobSubOcr.ItalicFactor.ToString());
textWriter.WriteElementString("ItalicFactor", settings.VobSubOcr.ItalicFactor.ToString(CultureInfo.InvariantCulture));
textWriter.WriteEndElement();
textWriter.WriteStartElement("MultipleSearchAndReplaceList", "");