Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-23 11:42:36 +01:00
Code Issues Projects Releases Wiki Activity

Export left/right margin is now remembered + allows values up to 999 - thx Samourâle :)

Browse Source
This commit is contained in:
Nikolaj Olsson 2016-10-06 22:49:56 +02:00
parent 35729794d1
commit e8219c56d8
3 changed files with 25 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libse/Settings.cs
View File

@ -149,6 +149,7 @@ namespace Nikse.SubtitleEdit.Core
public Color ExportBorderColor { get; set; }
public Color ExportShadowColor { get; set; }
public int ExportBottomMargin { get; set; }
public int ExportLeftRightMargin { get; set; }
public int ExportHorizontalAlignment { get; set; }
public int ExportBluRayBottomMargin { get; set; }
public int ExportBluRayShadow { get; set; }
@ -224,6 +225,7 @@ namespace Nikse.SubtitleEdit.Core
ExportBorderColor = Color.FromArgb(255, 0, 0, 0);
ExportShadowColor = Color.FromArgb(255, 0, 0, 0);
ExportBottomMargin = 15;
ExportLeftRightMargin = 15;
ExportHorizontalAlignment = 1; // 1=center (0=left, 2=right)
ExportVobSubSimpleRendering = true;
ExportVobAntiAliasingWithTransparency = true;
@ -1834,6 +1836,9 @@ namespace Nikse.SubtitleEdit.Core
subNode = node.SelectSingleNode("ExportBottomMargin");
if (subNode != null)
settings.Tools.ExportBottomMargin = int.Parse(subNode.InnerText);
subNode = node.SelectSingleNode("ExportLeftRightMargin");
if (subNode != null)
settings.Tools.ExportLeftRightMargin = int.Parse(subNode.InnerText);
subNode = node.SelectSingleNode("ExportHorizontalAlignment");
if (subNode != null)
settings.Tools.ExportHorizontalAlignment = int.Parse(subNode.InnerText);
@ -3128,6 +3133,7 @@ namespace Nikse.SubtitleEdit.Core
textWriter.WriteElementString("ExportBorderColor", settings.Tools.ExportBorderColor.ToArgb().ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("ExportShadowColor", settings.Tools.ExportShadowColor.ToArgb().ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("ExportBottomMargin", settings.Tools.ExportBottomMargin.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("ExportLeftRightMargin", settings.Tools.ExportLeftRightMargin.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("ExportHorizontalAlignment", settings.Tools.ExportHorizontalAlignment.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("ExportBluRayBottomMargin", settings.Tools.ExportBluRayBottomMargin.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("ExportBluRayShadow", settings.Tools.ExportBluRayShadow.ToString(CultureInfo.InvariantCulture));

72
src/Forms/ExportPngXml.Designer.cs generated
View File

@ -37,6 +37,7 @@
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
this.progressBar1 = new System.Windows.Forms.ProgressBar();
this.groupBoxImageSettings = new System.Windows.Forms.GroupBox();
this.labelLineHeightStyle = new System.Windows.Forms.Label();
this.panelFullFrameBackground = new System.Windows.Forms.Panel();
this.comboBoxLeftRightMargin = new System.Windows.Forms.ComboBox();
this.labelLeftRightMargin = new System.Windows.Forms.Label();
@ -96,7 +97,6 @@
this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.labelLineHeightStyle = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.contextMenuStrip1.SuspendLayout();
this.groupBoxImageSettings.SuspendLayout();
@ -219,6 +219,15 @@
this.groupBoxImageSettings.TabStop = false;
this.groupBoxImageSettings.Text = "Image settings";
//
// labelLineHeightStyle
//
this.labelLineHeightStyle.AutoSize = true;
this.labelLineHeightStyle.Location = new System.Drawing.Point(775, 153);
this.labelLineHeightStyle.Name = "labelLineHeightStyle";
this.labelLineHeightStyle.Size = new System.Drawing.Size(103, 13);
this.labelLineHeightStyle.TabIndex = 59;
this.labelLineHeightStyle.Text = "labelLineHeightStyle";
//
// panelFullFrameBackground
//
this.panelFullFrameBackground.BackColor = System.Drawing.Color.Transparent;
@ -234,58 +243,6 @@
//
this.comboBoxLeftRightMargin.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxLeftRightMargin.FormattingEnabled = true;
this.comboBoxLeftRightMargin.Items.AddRange(new object[] {
"0",
"1",
"2",
"3",
"4",
"5",
"6",
"7",
"8",
"9",
"10",
"11",
"12",
"13",
"14",
"15",
"16",
"17",
"18",
"19",
"20",
"21",
"22",
"23",
"24",
"25",
"26",
"27",
"28",
"29",
"30",
"31",
"32",
"33",
"34",
"35",
"36",
"37",
"38",
"39",
"40",
"41",
"42",
"43",
"44",
"45",
"46",
"47",
"48",
"49",
"50"});
this.comboBoxLeftRightMargin.Location = new System.Drawing.Point(100, 159);
this.comboBoxLeftRightMargin.Name = "comboBoxLeftRightMargin";
this.comboBoxLeftRightMargin.Size = new System.Drawing.Size(121, 21);
@ -981,15 +938,6 @@
this.subtitleListView1.SelectedIndexChanged += new System.EventHandler(this.subtitleListView1_SelectedIndexChanged);
this.subtitleListView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.subtitleListView1_KeyDown);
//
// labelLineHeightStyle
//
this.labelLineHeightStyle.AutoSize = true;
this.labelLineHeightStyle.Location = new System.Drawing.Point(775, 153);
this.labelLineHeightStyle.Name = "labelLineHeightStyle";
this.labelLineHeightStyle.Size = new System.Drawing.Size(103, 13);
this.labelLineHeightStyle.TabIndex = 59;
this.labelLineHeightStyle.Text = "labelLineHeightStyle";
//
// ExportPngXml
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

10
src/Forms/ExportPngXml.cs
View File

@ -3381,11 +3381,18 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
checkBoxFullFrameImage.Checked = Configuration.Settings.Tools.ExportFullFrame;
panelShadowColor.BackColor = Configuration.Settings.Tools.ExportShadowColor;
comboBoxBottomMargin.Items.Clear();
for (int i = 0; i < 1000; i++)
comboBoxBottomMargin.Items.Add(i);
if (Configuration.Settings.Tools.ExportBottomMargin >= 0 && Configuration.Settings.Tools.ExportBottomMargin < comboBoxBottomMargin.Items.Count)
comboBoxBottomMargin.SelectedIndex = Configuration.Settings.Tools.ExportBottomMargin;
comboBoxLeftRightMargin.Items.Clear();
for (int i = 0; i < 1000; i++)
comboBoxLeftRightMargin.Items.Add(i);
if (Configuration.Settings.Tools.ExportLeftRightMargin >= 0 && Configuration.Settings.Tools.ExportLeftRightMargin < comboBoxBottomMargin.Items.Count)
comboBoxLeftRightMargin.SelectedIndex = Configuration.Settings.Tools.ExportLeftRightMargin;
if (exportType == "BLURAYSUP" || exportType == "IMAGE/FRAME" && Configuration.Settings.Tools.ExportBluRayBottomMargin >= 0 && Configuration.Settings.Tools.ExportBluRayBottomMargin < comboBoxBottomMargin.Items.Count)
comboBoxBottomMargin.SelectedIndex = Configuration.Settings.Tools.ExportBluRayBottomMargin;
@ -3396,7 +3403,6 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
comboBoxLeftRightMargin.Visible = true;
labelLeftRightMargin.Visible = true;
comboBoxLeftRightMargin.SelectedIndex = 10;
}
else
{
@ -3908,6 +3914,8 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
else
Configuration.Settings.Tools.ExportBottomMargin = comboBoxBottomMargin.SelectedIndex;
Configuration.Settings.Tools.ExportLeftRightMargin = comboBoxLeftRightMargin.SelectedIndex;
Configuration.Settings.Tools.ExportHorizontalAlignment = comboBoxHAlign.SelectedIndex;
Configuration.Settings.Tools.Export3DType = comboBox3D.SelectedIndex;
Configuration.Settings.Tools.Export3DDepth = (int)numericUpDownDepth3D.Value;