Move titlebar asterisk to before file name -

(configurable... still possible to have after file name) - related to #4131
This commit is contained in:
Nikolaj Olsson 2020-04-22 07:00:23 +02:00
parent 2fb27aca26
commit 6e522234fd
2 changed files with 32 additions and 4 deletions

View File

@ -860,6 +860,7 @@ $HorzAlign = Center
public bool ShowProgress { get; set; }
public bool ShowNegativeDurationInfoOnSave { get; set; }
public long CurrentVideoOffsetInMs { get; set; }
public string TitleBarAsterisk { get; set; } // "before", "after", "none"
public bool UseDarkTheme { get; set; }
public bool ShowBetaStuff { get; set; }
@ -983,6 +984,7 @@ $HorzAlign = Center
ShowProgress = false;
ShowNegativeDurationInfoOnSave = true;
UseDarkTheme = false;
TitleBarAsterisk = "before";
PreviewAssaText = "ABCDEFGHIJKL abcdefghijkl 123";
ShowBetaStuff = false;
NewEmptyDefaultMs = 2000;
@ -3035,6 +3037,12 @@ $HorzAlign = Center
settings.General.ShowNegativeDurationInfoOnSave = Convert.ToBoolean(subNode.InnerText.Trim());
}
subNode = node.SelectSingleNode("TitleBarAsterisk");
if (subNode != null)
{
settings.General.TitleBarAsterisk = subNode.InnerText.Trim();
}
subNode = node.SelectSingleNode("UseDarkTheme");
if (subNode != null)
{
@ -6872,6 +6880,7 @@ $HorzAlign = Center
textWriter.WriteElementString("PreviewAssaText", settings.General.PreviewAssaText);
textWriter.WriteElementString("ShowProgress", settings.General.ShowProgress.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("ShowNegativeDurationInfoOnSave", settings.General.ShowNegativeDurationInfoOnSave.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("TitleBarAsterisk", settings.General.TitleBarAsterisk);
textWriter.WriteElementString("UseDarkTheme", settings.General.UseDarkTheme.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("ShowBetaStuff", settings.General.ShowBetaStuff.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("NewEmptyDefaultMs", settings.General.NewEmptyDefaultMs.ToString(CultureInfo.InvariantCulture));

View File

@ -18010,21 +18010,40 @@ namespace Nikse.SubtitleEdit.Forms
if (_changeSubtitleHash != _subtitle.GetFastHashCode(GetCurrentEncoding().BodyName))
{
if (!Text.EndsWith('*'))
if (!Text.Contains('*'))
{
Text = Text.TrimEnd() + "*";
AddTitleBarChangeAsterisk();
}
AutoSave();
}
else if (Text.EndsWith('*'))
else if (Text.Contains('*'))
{
Text = Text.TrimEnd('*').TrimEnd();
Text = Text.RemoveChar('*').TrimEnd();
}
ShowSubtitleTimer.Start();
}
private void AddTitleBarChangeAsterisk()
{
if (Configuration.Settings.General.TitleBarAsterisk.Equals("before", StringComparison.Ordinal))
{
if (Text.Length > Title.Length + 3)
{
Text = Text.Insert(Title.Length + 3, "*");
}
else
{
Text = Text.TrimEnd() + "*";
}
}
else if (Configuration.Settings.General.TitleBarAsterisk.Equals("after", StringComparison.Ordinal))
{
Text = Text.TrimEnd() + "*";
}
}
private void HideVideoPlayer()
{
mediaPlayer.Pause();