mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Work on rich text box
This commit is contained in:
parent
de116602fe
commit
afb21eaddc
@ -1018,12 +1018,12 @@ $HorzAlign = Center
|
||||
public int SystemSubtitleFontSizeOverride { get; set; }
|
||||
|
||||
public string SubtitleFontName { get; set; }
|
||||
public int SubtitleFontSize { get; set; }
|
||||
public int SubtitleTextBoxFontSize { get; set; }
|
||||
public bool SubtitleTextBoxSyntaxColor { get; set; }
|
||||
public Color SubtitleTextBoxHtmlColor { get; set; }
|
||||
public Color SubtitleTextBoxAssColor { get; set; }
|
||||
public int SubtitleListViewFontSize { get; set; }
|
||||
public bool SubtitleFontBold { get; set; }
|
||||
public bool SubtitleTextBoxFontBold { get; set; }
|
||||
public bool SubtitleListViewFontBold { get; set; }
|
||||
public Color SubtitleFontColor { get; set; }
|
||||
public Color SubtitleBackgroundColor { get; set; }
|
||||
@ -1183,12 +1183,12 @@ $HorzAlign = Center
|
||||
SubtitleFontName = "Times New Roman";
|
||||
}
|
||||
|
||||
SubtitleFontSize = 14;
|
||||
SubtitleTextBoxFontSize = 14;
|
||||
SubtitleListViewFontSize = 10;
|
||||
SubtitleTextBoxSyntaxColor = true;
|
||||
SubtitleTextBoxHtmlColor = Color.CornflowerBlue;
|
||||
SubtitleTextBoxAssColor = Color.BlueViolet;
|
||||
SubtitleFontBold = true;
|
||||
SubtitleTextBoxFontBold = true;
|
||||
SubtitleFontColor = Color.Black;
|
||||
MeasureFontName = "Arial";
|
||||
MeasureFontSize = 24;
|
||||
@ -2319,13 +2319,6 @@ $HorzAlign = Center
|
||||
settings.Shortcuts.MainTranslateGoogleTranslate = "Control+Shift+G";
|
||||
settings.Tools.MicrosoftTranslatorTokenEndpoint = "https://api.cognitive.microsoft.com/sts/v1.0/issueToken";
|
||||
}
|
||||
|
||||
if (settings.Version.StartsWith("3.5", StringComparison.Ordinal) ||
|
||||
string.IsNullOrEmpty(settings.Version))
|
||||
{
|
||||
settings.General.SubtitleFontSize = 14;
|
||||
settings.General.SubtitleFontBold = true;
|
||||
}
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
@ -2736,10 +2729,10 @@ $HorzAlign = Center
|
||||
settings.General.SubtitleFontName = subNode.InnerText;
|
||||
}
|
||||
|
||||
subNode = node.SelectSingleNode("SubtitleFontSize");
|
||||
subNode = node.SelectSingleNode("SubtitleTextBoxFontSize");
|
||||
if (subNode != null)
|
||||
{
|
||||
settings.General.SubtitleFontSize = Convert.ToInt32(subNode.InnerText, CultureInfo.InvariantCulture);
|
||||
settings.General.SubtitleTextBoxFontSize = Convert.ToInt32(subNode.InnerText, CultureInfo.InvariantCulture);
|
||||
}
|
||||
|
||||
subNode = node.SelectSingleNode("SubtitleListViewFontSize");
|
||||
@ -2748,10 +2741,10 @@ $HorzAlign = Center
|
||||
settings.General.SubtitleListViewFontSize = Convert.ToInt32(subNode.InnerText, CultureInfo.InvariantCulture);
|
||||
}
|
||||
|
||||
subNode = node.SelectSingleNode("SubtitleFontBold");
|
||||
subNode = node.SelectSingleNode("SubtitleTextBoxFontBold");
|
||||
if (subNode != null)
|
||||
{
|
||||
settings.General.SubtitleFontBold = Convert.ToBoolean(subNode.InnerText);
|
||||
settings.General.SubtitleTextBoxFontBold = Convert.ToBoolean(subNode.InnerText);
|
||||
}
|
||||
|
||||
subNode = node.SelectSingleNode("SubtitleListViewFontBold");
|
||||
@ -7663,9 +7656,9 @@ $HorzAlign = Center
|
||||
textWriter.WriteElementString("SystemSubtitleFontNameOverride", settings.General.SystemSubtitleFontNameOverride);
|
||||
textWriter.WriteElementString("SystemSubtitleFontSizeOverride", settings.General.SystemSubtitleFontSizeOverride.ToString(CultureInfo.InvariantCulture));
|
||||
textWriter.WriteElementString("SubtitleFontName", settings.General.SubtitleFontName);
|
||||
textWriter.WriteElementString("SubtitleFontSize", settings.General.SubtitleFontSize.ToString(CultureInfo.InvariantCulture));
|
||||
textWriter.WriteElementString("SubtitleTextBoxFontSize", settings.General.SubtitleTextBoxFontSize.ToString(CultureInfo.InvariantCulture));
|
||||
textWriter.WriteElementString("SubtitleListViewFontSize", settings.General.SubtitleListViewFontSize.ToString(CultureInfo.InvariantCulture));
|
||||
textWriter.WriteElementString("SubtitleFontBold", settings.General.SubtitleFontBold.ToString(CultureInfo.InvariantCulture));
|
||||
textWriter.WriteElementString("SubtitleTextBoxFontBold", settings.General.SubtitleTextBoxFontBold.ToString(CultureInfo.InvariantCulture));
|
||||
textWriter.WriteElementString("SubtitleListViewFontBold", settings.General.SubtitleListViewFontBold.ToString(CultureInfo.InvariantCulture));
|
||||
textWriter.WriteElementString("SubtitleTextBoxSyntaxColor", settings.General.SubtitleTextBoxSyntaxColor.ToString(CultureInfo.InvariantCulture));
|
||||
textWriter.WriteElementString("SubtitleTextBoxHtmlColor", settings.General.SubtitleTextBoxHtmlColor.ToArgb().ToString(CultureInfo.InvariantCulture));
|
||||
|
@ -107,7 +107,7 @@ namespace Nikse.SubtitleEdit.Controls
|
||||
|
||||
try
|
||||
{
|
||||
textBox.Font = gs.SubtitleFontBold ? new Font(gs.SubtitleFontName, gs.SubtitleFontSize, FontStyle.Bold) : new Font(gs.SubtitleFontName, gs.SubtitleFontSize);
|
||||
textBox.Font = gs.SubtitleTextBoxFontBold ? new Font(gs.SubtitleFontName, gs.SubtitleTextBoxFontSize, FontStyle.Bold) : new Font(gs.SubtitleFontName, gs.SubtitleTextBoxFontSize);
|
||||
textBox.ForeColor = gs.SubtitleFontColor;
|
||||
textBox.BackColor = gs.SubtitleBackgroundColor;
|
||||
}
|
||||
|
@ -4523,9 +4523,9 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
string oldListViewLineSeparatorString = Configuration.Settings.General.ListViewLineSeparatorString;
|
||||
var oldCpsWhiteSpaceSetting = Configuration.Settings.General.CharactersPerSecondsIgnoreWhiteSpace;
|
||||
string oldSubtitleFontSettings = Configuration.Settings.General.SubtitleFontName +
|
||||
Configuration.Settings.General.SubtitleFontBold +
|
||||
Configuration.Settings.General.SubtitleTextBoxFontBold +
|
||||
Configuration.Settings.General.CenterSubtitleInTextBox +
|
||||
Configuration.Settings.General.SubtitleFontSize +
|
||||
Configuration.Settings.General.SubtitleTextBoxFontSize +
|
||||
Configuration.Settings.General.SubtitleFontColor.ToArgb() +
|
||||
Configuration.Settings.General.SubtitleBackgroundColor.ToArgb() +
|
||||
Configuration.Settings.General.SubtitleListViewFontBold.ToString() +
|
||||
@ -4548,6 +4548,9 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
var oldShowColumnCharsPerSec = Configuration.Settings.Tools.ListViewShowColumnCharsPerSec;
|
||||
var oldShowWordsMinColumn = Configuration.Settings.Tools.ListViewShowColumnWordsPerMin;
|
||||
var oldSubtitleTextBoxSyntaxColor = Configuration.Settings.General.SubtitleTextBoxSyntaxColor;
|
||||
var oldSubtitleFontSize = Configuration.Settings.General.SubtitleTextBoxFontSize;
|
||||
var oldSubtitleTextBoxHtmlColor = Configuration.Settings.General.SubtitleTextBoxHtmlColor.ToArgb().ToString();
|
||||
var oldSubtitleTextBoxAssaColor = Configuration.Settings.General.SubtitleTextBoxAssColor.ToArgb().ToString();
|
||||
using (var settings = new Settings())
|
||||
{
|
||||
settings.Initialize(Icon, toolStripButtonFileNew.Image, toolStripButtonFileOpen.Image, toolStripButtonSave.Image, toolStripButtonSaveAs.Image, toolStripButtonFind.Image,
|
||||
@ -4590,9 +4593,9 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
Configuration.Settings.Tools.ListViewSyntaxErrorColor.ToArgb();
|
||||
|
||||
if (oldSubtitleFontSettings != Configuration.Settings.General.SubtitleFontName +
|
||||
Configuration.Settings.General.SubtitleFontBold +
|
||||
Configuration.Settings.General.SubtitleTextBoxFontBold +
|
||||
Configuration.Settings.General.CenterSubtitleInTextBox +
|
||||
Configuration.Settings.General.SubtitleFontSize +
|
||||
Configuration.Settings.General.SubtitleTextBoxFontSize +
|
||||
Configuration.Settings.General.SubtitleFontColor.ToArgb() +
|
||||
Configuration.Settings.General.SubtitleBackgroundColor.ToArgb() +
|
||||
Configuration.Settings.General.SubtitleListViewFontBold.ToString() +
|
||||
@ -4730,10 +4733,15 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
RefreshTimeCodeMode();
|
||||
}
|
||||
|
||||
if (oldSubtitleTextBoxSyntaxColor != Configuration.Settings.General.SubtitleTextBoxSyntaxColor)
|
||||
if (oldSubtitleTextBoxSyntaxColor != Configuration.Settings.General.SubtitleTextBoxSyntaxColor ||
|
||||
oldSubtitleFontSize != Configuration.Settings.General.SubtitleTextBoxFontSize ||
|
||||
oldSubtitleTextBoxHtmlColor != Configuration.Settings.General.SubtitleTextBoxHtmlColor.ToArgb().ToString() ||
|
||||
oldSubtitleTextBoxAssaColor != Configuration.Settings.General.SubtitleTextBoxAssColor.ToArgb().ToString())
|
||||
{
|
||||
textBoxListViewText.Initialize(Configuration.Settings.General.SubtitleTextBoxSyntaxColor);
|
||||
textBoxListViewTextAlternate.Initialize(Configuration.Settings.General.SubtitleTextBoxSyntaxColor);
|
||||
textBoxListViewText.BackColor = SystemColors.ActiveBorder;
|
||||
textBoxListViewTextAlternate.BackColor = SystemColors.ActiveBorder;
|
||||
RefreshSelectedParagraph();
|
||||
}
|
||||
|
||||
|
@ -142,9 +142,9 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
UiUtil.InitializeTextEncodingComboBox(comboBoxEncoding);
|
||||
|
||||
checkBoxAutoDetectAnsiEncoding.Checked = gs.AutoGuessAnsiEncoding;
|
||||
comboBoxSubtitleFontSize.Text = gs.SubtitleFontSize.ToString(CultureInfo.InvariantCulture);
|
||||
comboBoxSubtitleFontSize.Text = gs.SubtitleTextBoxFontSize.ToString(CultureInfo.InvariantCulture);
|
||||
comboBoxSubtitleListViewFontSize.Text = gs.SubtitleListViewFontSize.ToString(CultureInfo.InvariantCulture);
|
||||
checkBoxSubtitleFontBold.Checked = gs.SubtitleFontBold;
|
||||
checkBoxSubtitleFontBold.Checked = gs.SubtitleTextBoxFontBold;
|
||||
checkBoxSubtitleTextBoxSyntaxColor.Checked = gs.SubtitleTextBoxSyntaxColor;
|
||||
panelTextBoxHtmlColor.BackColor = gs.SubtitleTextBoxHtmlColor;
|
||||
panelTextBoxAssColor.BackColor = gs.SubtitleTextBoxAssColor;
|
||||
@ -1665,9 +1665,9 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
gs.DefaultEncoding = ((TextEncoding)comboBoxEncoding.Items[comboBoxEncoding.SelectedIndex]).ToString();
|
||||
|
||||
gs.AutoGuessAnsiEncoding = checkBoxAutoDetectAnsiEncoding.Checked;
|
||||
gs.SubtitleFontSize = int.Parse(comboBoxSubtitleFontSize.Text);
|
||||
gs.SubtitleTextBoxFontSize = int.Parse(comboBoxSubtitleFontSize.Text);
|
||||
gs.SubtitleListViewFontSize = int.Parse(comboBoxSubtitleListViewFontSize.Text);
|
||||
gs.SubtitleFontBold = checkBoxSubtitleFontBold.Checked;
|
||||
gs.SubtitleTextBoxFontBold = checkBoxSubtitleFontBold.Checked;
|
||||
gs.SubtitleTextBoxSyntaxColor = checkBoxSubtitleTextBoxSyntaxColor.Checked;
|
||||
gs.SubtitleTextBoxHtmlColor = panelTextBoxHtmlColor.BackColor;
|
||||
gs.SubtitleTextBoxAssColor = panelTextBoxAssColor.BackColor;
|
||||
|
@ -471,15 +471,15 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
control.Font = new Font(gs.SubtitleFontName, gs.SubtitleListViewFontSize);
|
||||
}
|
||||
}
|
||||
else
|
||||
else if (control is SETextBox || control is TextBox)
|
||||
{
|
||||
if (gs.SubtitleFontBold)
|
||||
if (gs.SubtitleTextBoxFontBold)
|
||||
{
|
||||
control.Font = new Font(gs.SubtitleFontName, gs.SubtitleFontSize, FontStyle.Bold);
|
||||
control.Font = new Font(gs.SubtitleFontName, gs.SubtitleTextBoxFontSize, FontStyle.Bold);
|
||||
}
|
||||
else
|
||||
{
|
||||
control.Font = new Font(gs.SubtitleFontName, gs.SubtitleFontSize);
|
||||
control.Font = new Font(gs.SubtitleFontName, gs.SubtitleTextBoxFontSize);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user