mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-11-25 20:52:44 +01:00
Add/use MpvPreviewTextMarginVertical
This commit is contained in:
parent
f95222876b
commit
0bc0941f49
@ -1354,7 +1354,6 @@ $HorzAlign = Center
|
|||||||
public string VideoPlayerPreviewFontName { get; set; }
|
public string VideoPlayerPreviewFontName { get; set; }
|
||||||
public int VideoPlayerPreviewFontSize { get; set; }
|
public int VideoPlayerPreviewFontSize { get; set; }
|
||||||
public bool VideoPlayerPreviewFontBold { get; set; }
|
public bool VideoPlayerPreviewFontBold { get; set; }
|
||||||
public int VideoPlayerPreviewVerticalMargin { get; set; }
|
|
||||||
public bool VideoPlayerShowStopButton { get; set; }
|
public bool VideoPlayerShowStopButton { get; set; }
|
||||||
public bool VideoPlayerShowFullscreenButton { get; set; }
|
public bool VideoPlayerShowFullscreenButton { get; set; }
|
||||||
public bool VideoPlayerShowMuteButton { get; set; }
|
public bool VideoPlayerShowMuteButton { get; set; }
|
||||||
@ -1563,7 +1562,6 @@ $HorzAlign = Center
|
|||||||
VideoPlayerPreviewFontName = "Tahoma";
|
VideoPlayerPreviewFontName = "Tahoma";
|
||||||
VideoPlayerPreviewFontSize = 12;
|
VideoPlayerPreviewFontSize = 12;
|
||||||
VideoPlayerPreviewFontBold = true;
|
VideoPlayerPreviewFontBold = true;
|
||||||
VideoPlayerPreviewVerticalMargin = 12;
|
|
||||||
VideoPlayerShowStopButton = true;
|
VideoPlayerShowStopButton = true;
|
||||||
VideoPlayerShowMuteButton = true;
|
VideoPlayerShowMuteButton = true;
|
||||||
VideoPlayerShowFullscreenButton = true;
|
VideoPlayerShowFullscreenButton = true;
|
||||||
@ -3816,12 +3814,6 @@ $HorzAlign = Center
|
|||||||
settings.General.VideoPlayerPreviewFontBold = Convert.ToBoolean(subNode.InnerText, CultureInfo.InvariantCulture);
|
settings.General.VideoPlayerPreviewFontBold = Convert.ToBoolean(subNode.InnerText, CultureInfo.InvariantCulture);
|
||||||
}
|
}
|
||||||
|
|
||||||
subNode = node.SelectSingleNode("VideoPlayerPreviewVerticalMargin");
|
|
||||||
if (subNode != null)
|
|
||||||
{
|
|
||||||
settings.General.VideoPlayerPreviewVerticalMargin = Convert.ToInt32(subNode.InnerText, CultureInfo.InvariantCulture);
|
|
||||||
}
|
|
||||||
|
|
||||||
subNode = node.SelectSingleNode("VideoPlayerShowStopButton");
|
subNode = node.SelectSingleNode("VideoPlayerShowStopButton");
|
||||||
if (subNode != null)
|
if (subNode != null)
|
||||||
{
|
{
|
||||||
@ -4205,6 +4197,7 @@ $HorzAlign = Center
|
|||||||
{
|
{
|
||||||
settings.General.MpvPreviewTextMarginVertical = Convert.ToInt32(subNode.InnerText.Trim());
|
settings.General.MpvPreviewTextMarginVertical = Convert.ToInt32(subNode.InnerText.Trim());
|
||||||
}
|
}
|
||||||
|
|
||||||
subNode = node.SelectSingleNode("MpcHcLocation");
|
subNode = node.SelectSingleNode("MpcHcLocation");
|
||||||
if (subNode != null)
|
if (subNode != null)
|
||||||
{
|
{
|
||||||
@ -10381,7 +10374,6 @@ $HorzAlign = Center
|
|||||||
textWriter.WriteElementString("VideoPlayerPreviewFontName", settings.General.VideoPlayerPreviewFontName);
|
textWriter.WriteElementString("VideoPlayerPreviewFontName", settings.General.VideoPlayerPreviewFontName);
|
||||||
textWriter.WriteElementString("VideoPlayerPreviewFontSize", settings.General.VideoPlayerPreviewFontSize.ToString(CultureInfo.InvariantCulture));
|
textWriter.WriteElementString("VideoPlayerPreviewFontSize", settings.General.VideoPlayerPreviewFontSize.ToString(CultureInfo.InvariantCulture));
|
||||||
textWriter.WriteElementString("VideoPlayerPreviewFontBold", settings.General.VideoPlayerPreviewFontBold.ToString(CultureInfo.InvariantCulture));
|
textWriter.WriteElementString("VideoPlayerPreviewFontBold", settings.General.VideoPlayerPreviewFontBold.ToString(CultureInfo.InvariantCulture));
|
||||||
textWriter.WriteElementString("VideoPlayerPreviewVerticalMargin", settings.General.VideoPlayerPreviewVerticalMargin.ToString(CultureInfo.InvariantCulture));
|
|
||||||
textWriter.WriteElementString("VideoPlayerShowStopButton", settings.General.VideoPlayerShowStopButton.ToString(CultureInfo.InvariantCulture));
|
textWriter.WriteElementString("VideoPlayerShowStopButton", settings.General.VideoPlayerShowStopButton.ToString(CultureInfo.InvariantCulture));
|
||||||
textWriter.WriteElementString("VideoPlayerShowMuteButton", settings.General.VideoPlayerShowMuteButton.ToString(CultureInfo.InvariantCulture));
|
textWriter.WriteElementString("VideoPlayerShowMuteButton", settings.General.VideoPlayerShowMuteButton.ToString(CultureInfo.InvariantCulture));
|
||||||
textWriter.WriteElementString("VideoPlayerShowFullscreenButton", settings.General.VideoPlayerShowFullscreenButton.ToString(CultureInfo.InvariantCulture));
|
textWriter.WriteElementString("VideoPlayerShowFullscreenButton", settings.General.VideoPlayerShowFullscreenButton.ToString(CultureInfo.InvariantCulture));
|
||||||
|
@ -266,7 +266,7 @@ namespace Nikse.SubtitleEdit.Forms.Options
|
|||||||
comboBoxlVideoPlayerPreviewFontSize.SelectedIndex = 3;
|
comboBoxlVideoPlayerPreviewFontSize.SelectedIndex = 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
var verticalMargin = gs.VideoPlayerPreviewVerticalMargin;
|
var verticalMargin = gs.MpvPreviewTextMarginVertical;
|
||||||
if (verticalMargin >= numericUpDownMarginVertical.Minimum && verticalMargin <= numericUpDownMarginVertical.Maximum)
|
if (verticalMargin >= numericUpDownMarginVertical.Minimum && verticalMargin <= numericUpDownMarginVertical.Maximum)
|
||||||
{
|
{
|
||||||
numericUpDownMarginVertical.Value = verticalMargin;
|
numericUpDownMarginVertical.Value = verticalMargin;
|
||||||
@ -2033,7 +2033,7 @@ namespace Nikse.SubtitleEdit.Forms.Options
|
|||||||
gs.VideoPlayerShowFullscreenButton = checkBoxVideoPlayerShowFullscreenButton.Checked;
|
gs.VideoPlayerShowFullscreenButton = checkBoxVideoPlayerShowFullscreenButton.Checked;
|
||||||
gs.VideoPlayerPreviewFontName = comboBoxVideoPlayerPreviewFontName.SelectedItem.ToString();
|
gs.VideoPlayerPreviewFontName = comboBoxVideoPlayerPreviewFontName.SelectedItem.ToString();
|
||||||
gs.VideoPlayerPreviewFontSize = int.Parse(comboBoxlVideoPlayerPreviewFontSize.Items[0].ToString()) + comboBoxlVideoPlayerPreviewFontSize.SelectedIndex;
|
gs.VideoPlayerPreviewFontSize = int.Parse(comboBoxlVideoPlayerPreviewFontSize.Items[0].ToString()) + comboBoxlVideoPlayerPreviewFontSize.SelectedIndex;
|
||||||
gs.VideoPlayerPreviewVerticalMargin = (int)numericUpDownMarginVertical.Value;
|
gs.MpvPreviewTextMarginVertical = (int)numericUpDownMarginVertical.Value;
|
||||||
gs.VideoPlayerPreviewFontBold = checkBoxVideoPlayerPreviewFontBold.Checked;
|
gs.VideoPlayerPreviewFontBold = checkBoxVideoPlayerPreviewFontBold.Checked;
|
||||||
gs.MpvPreviewTextPrimaryColor = panelMpvPrimaryColor.BackColor;
|
gs.MpvPreviewTextPrimaryColor = panelMpvPrimaryColor.BackColor;
|
||||||
gs.MpvPreviewTextOutlineColor = panelMpvOutlineColor.BackColor;
|
gs.MpvPreviewTextOutlineColor = panelMpvOutlineColor.BackColor;
|
||||||
|
Loading…
Reference in New Issue
Block a user