mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Add color picker to "set assa background box" - thx Érico :)
This commit is contained in:
parent
8b94717345
commit
2b0a6475c5
@ -249,6 +249,7 @@ Note: Do check free disk space.</WaveFileMalformed>
|
|||||||
<MarginY>MarginY</MarginY>
|
<MarginY>MarginY</MarginY>
|
||||||
<OnlyDrawing>Only drawing</OnlyDrawing>
|
<OnlyDrawing>Only drawing</OnlyDrawing>
|
||||||
<DrawingFile>Drawing file</DrawingFile>
|
<DrawingFile>Drawing file</DrawingFile>
|
||||||
|
<ColorPickerSetLastColor>Color picker last color is now: {0}</ColorPickerSetLastColor>
|
||||||
</AssaSetBackgroundBox>
|
</AssaSetBackgroundBox>
|
||||||
<AssaSetPosition>
|
<AssaSetPosition>
|
||||||
<SetPosition>Set position</SetPosition>
|
<SetPosition>Set position</SetPosition>
|
||||||
|
120
src/ui/Forms/Assa/AssSetBackground.Designer.cs
generated
120
src/ui/Forms/Assa/AssSetBackground.Designer.cs
generated
@ -91,15 +91,16 @@ namespace Nikse.SubtitleEdit.Forms.Assa
|
|||||||
this.progressBar1 = new System.Windows.Forms.ProgressBar();
|
this.progressBar1 = new System.Windows.Forms.ProgressBar();
|
||||||
this.groupBoxPadding = new System.Windows.Forms.GroupBox();
|
this.groupBoxPadding = new System.Windows.Forms.GroupBox();
|
||||||
this.groupBoxStyle = new System.Windows.Forms.GroupBox();
|
this.groupBoxStyle = new System.Windows.Forms.GroupBox();
|
||||||
|
this.panelCircle = new System.Windows.Forms.Panel();
|
||||||
|
this.labelCircleY = new System.Windows.Forms.Label();
|
||||||
|
this.numericUpDownCircleY = new System.Windows.Forms.NumericUpDown();
|
||||||
this.panelBubbles = new System.Windows.Forms.Panel();
|
this.panelBubbles = new System.Windows.Forms.Panel();
|
||||||
this.numericUpDownBubbleStep = new System.Windows.Forms.NumericUpDown();
|
this.numericUpDownBubbleStep = new System.Windows.Forms.NumericUpDown();
|
||||||
this.labelBubbleHeight = new System.Windows.Forms.Label();
|
this.labelBubbleHeight = new System.Windows.Forms.Label();
|
||||||
this.labelBubbleStep = new System.Windows.Forms.Label();
|
this.labelBubbleStep = new System.Windows.Forms.Label();
|
||||||
this.numericUpDownBubbleHeight = new System.Windows.Forms.NumericUpDown();
|
this.numericUpDownBubbleHeight = new System.Windows.Forms.NumericUpDown();
|
||||||
this.panelCircle = new System.Windows.Forms.Panel();
|
|
||||||
this.labelCircleY = new System.Windows.Forms.Label();
|
|
||||||
this.numericUpDownCircleY = new System.Windows.Forms.NumericUpDown();
|
|
||||||
this.timerFileChange = new System.Windows.Forms.Timer(this.components);
|
this.timerFileChange = new System.Windows.Forms.Timer(this.components);
|
||||||
|
this.buttonPickColor = new System.Windows.Forms.Button();
|
||||||
this.groupBoxPreview.SuspendLayout();
|
this.groupBoxPreview.SuspendLayout();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.pictureBoxPreview)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.pictureBoxPreview)).BeginInit();
|
||||||
this.groupBoxDrawing.SuspendLayout();
|
this.groupBoxDrawing.SuspendLayout();
|
||||||
@ -122,11 +123,11 @@ namespace Nikse.SubtitleEdit.Forms.Assa
|
|||||||
((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpikesStep)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpikesStep)).BeginInit();
|
||||||
this.groupBoxPadding.SuspendLayout();
|
this.groupBoxPadding.SuspendLayout();
|
||||||
this.groupBoxStyle.SuspendLayout();
|
this.groupBoxStyle.SuspendLayout();
|
||||||
|
this.panelCircle.SuspendLayout();
|
||||||
|
((System.ComponentModel.ISupportInitialize)(this.numericUpDownCircleY)).BeginInit();
|
||||||
this.panelBubbles.SuspendLayout();
|
this.panelBubbles.SuspendLayout();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.numericUpDownBubbleStep)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.numericUpDownBubbleStep)).BeginInit();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.numericUpDownBubbleHeight)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.numericUpDownBubbleHeight)).BeginInit();
|
||||||
this.panelCircle.SuspendLayout();
|
|
||||||
((System.ComponentModel.ISupportInitialize)(this.numericUpDownCircleY)).BeginInit();
|
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
//
|
//
|
||||||
// groupBoxPreview
|
// groupBoxPreview
|
||||||
@ -135,9 +136,9 @@ namespace Nikse.SubtitleEdit.Forms.Assa
|
|||||||
| System.Windows.Forms.AnchorStyles.Left)
|
| System.Windows.Forms.AnchorStyles.Left)
|
||||||
| System.Windows.Forms.AnchorStyles.Right)));
|
| System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.groupBoxPreview.Controls.Add(this.pictureBoxPreview);
|
this.groupBoxPreview.Controls.Add(this.pictureBoxPreview);
|
||||||
this.groupBoxPreview.Location = new System.Drawing.Point(12, 195);
|
this.groupBoxPreview.Location = new System.Drawing.Point(12, 211);
|
||||||
this.groupBoxPreview.Name = "groupBoxPreview";
|
this.groupBoxPreview.Name = "groupBoxPreview";
|
||||||
this.groupBoxPreview.Size = new System.Drawing.Size(949, 499);
|
this.groupBoxPreview.Size = new System.Drawing.Size(949, 483);
|
||||||
this.groupBoxPreview.TabIndex = 2;
|
this.groupBoxPreview.TabIndex = 2;
|
||||||
this.groupBoxPreview.TabStop = false;
|
this.groupBoxPreview.TabStop = false;
|
||||||
this.groupBoxPreview.Text = "Preview";
|
this.groupBoxPreview.Text = "Preview";
|
||||||
@ -147,10 +148,12 @@ namespace Nikse.SubtitleEdit.Forms.Assa
|
|||||||
this.pictureBoxPreview.Dock = System.Windows.Forms.DockStyle.Fill;
|
this.pictureBoxPreview.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
this.pictureBoxPreview.Location = new System.Drawing.Point(3, 16);
|
this.pictureBoxPreview.Location = new System.Drawing.Point(3, 16);
|
||||||
this.pictureBoxPreview.Name = "pictureBoxPreview";
|
this.pictureBoxPreview.Name = "pictureBoxPreview";
|
||||||
this.pictureBoxPreview.Size = new System.Drawing.Size(943, 480);
|
this.pictureBoxPreview.Size = new System.Drawing.Size(943, 464);
|
||||||
this.pictureBoxPreview.TabIndex = 0;
|
this.pictureBoxPreview.TabIndex = 0;
|
||||||
this.pictureBoxPreview.TabStop = false;
|
this.pictureBoxPreview.TabStop = false;
|
||||||
this.pictureBoxPreview.Click += new System.EventHandler(this.pictureBoxPreview_Click);
|
this.pictureBoxPreview.Click += new System.EventHandler(this.pictureBoxPreview_Click);
|
||||||
|
this.pictureBoxPreview.MouseLeave += new System.EventHandler(this.pictureBoxPreview_MouseLeave);
|
||||||
|
this.pictureBoxPreview.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pictureBoxPreview_MouseMove);
|
||||||
//
|
//
|
||||||
// buttonOK
|
// buttonOK
|
||||||
//
|
//
|
||||||
@ -904,6 +907,47 @@ namespace Nikse.SubtitleEdit.Forms.Assa
|
|||||||
this.groupBoxStyle.TabStop = false;
|
this.groupBoxStyle.TabStop = false;
|
||||||
this.groupBoxStyle.Text = "Style";
|
this.groupBoxStyle.Text = "Style";
|
||||||
//
|
//
|
||||||
|
// panelCircle
|
||||||
|
//
|
||||||
|
this.panelCircle.Controls.Add(this.labelCircleY);
|
||||||
|
this.panelCircle.Controls.Add(this.numericUpDownCircleY);
|
||||||
|
this.panelCircle.Location = new System.Drawing.Point(0, 60);
|
||||||
|
this.panelCircle.Name = "panelCircle";
|
||||||
|
this.panelCircle.Size = new System.Drawing.Size(167, 58);
|
||||||
|
this.panelCircle.TabIndex = 53;
|
||||||
|
//
|
||||||
|
// labelCircleY
|
||||||
|
//
|
||||||
|
this.labelCircleY.AutoSize = true;
|
||||||
|
this.labelCircleY.Location = new System.Drawing.Point(3, 11);
|
||||||
|
this.labelCircleY.Name = "labelCircleY";
|
||||||
|
this.labelCircleY.Size = new System.Drawing.Size(14, 13);
|
||||||
|
this.labelCircleY.TabIndex = 51;
|
||||||
|
this.labelCircleY.Text = "Y";
|
||||||
|
//
|
||||||
|
// numericUpDownCircleY
|
||||||
|
//
|
||||||
|
this.numericUpDownCircleY.Location = new System.Drawing.Point(31, 9);
|
||||||
|
this.numericUpDownCircleY.Maximum = new decimal(new int[] {
|
||||||
|
500,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0});
|
||||||
|
this.numericUpDownCircleY.Minimum = new decimal(new int[] {
|
||||||
|
1,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0});
|
||||||
|
this.numericUpDownCircleY.Name = "numericUpDownCircleY";
|
||||||
|
this.numericUpDownCircleY.Size = new System.Drawing.Size(52, 20);
|
||||||
|
this.numericUpDownCircleY.TabIndex = 52;
|
||||||
|
this.numericUpDownCircleY.Value = new decimal(new int[] {
|
||||||
|
25,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0});
|
||||||
|
this.numericUpDownCircleY.ValueChanged += new System.EventHandler(this.PreviewValueChanged);
|
||||||
|
//
|
||||||
// panelBubbles
|
// panelBubbles
|
||||||
//
|
//
|
||||||
this.panelBubbles.Controls.Add(this.numericUpDownBubbleStep);
|
this.panelBubbles.Controls.Add(this.numericUpDownBubbleStep);
|
||||||
@ -979,57 +1023,27 @@ namespace Nikse.SubtitleEdit.Forms.Assa
|
|||||||
0});
|
0});
|
||||||
this.numericUpDownBubbleHeight.ValueChanged += new System.EventHandler(this.PreviewValueChanged);
|
this.numericUpDownBubbleHeight.ValueChanged += new System.EventHandler(this.PreviewValueChanged);
|
||||||
//
|
//
|
||||||
// panelCircle
|
|
||||||
//
|
|
||||||
this.panelCircle.Controls.Add(this.labelCircleY);
|
|
||||||
this.panelCircle.Controls.Add(this.numericUpDownCircleY);
|
|
||||||
this.panelCircle.Location = new System.Drawing.Point(0, 60);
|
|
||||||
this.panelCircle.Name = "panelCircle";
|
|
||||||
this.panelCircle.Size = new System.Drawing.Size(167, 58);
|
|
||||||
this.panelCircle.TabIndex = 53;
|
|
||||||
//
|
|
||||||
// labelCircleY
|
|
||||||
//
|
|
||||||
this.labelCircleY.AutoSize = true;
|
|
||||||
this.labelCircleY.Location = new System.Drawing.Point(3, 11);
|
|
||||||
this.labelCircleY.Name = "labelCircleY";
|
|
||||||
this.labelCircleY.Size = new System.Drawing.Size(14, 13);
|
|
||||||
this.labelCircleY.TabIndex = 51;
|
|
||||||
this.labelCircleY.Text = "Y";
|
|
||||||
//
|
|
||||||
// numericUpDownCircleY
|
|
||||||
//
|
|
||||||
this.numericUpDownCircleY.Location = new System.Drawing.Point(31, 9);
|
|
||||||
this.numericUpDownCircleY.Maximum = new decimal(new int[] {
|
|
||||||
500,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0});
|
|
||||||
this.numericUpDownCircleY.Minimum = new decimal(new int[] {
|
|
||||||
1,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0});
|
|
||||||
this.numericUpDownCircleY.Name = "numericUpDownCircleY";
|
|
||||||
this.numericUpDownCircleY.Size = new System.Drawing.Size(52, 20);
|
|
||||||
this.numericUpDownCircleY.TabIndex = 52;
|
|
||||||
this.numericUpDownCircleY.Value = new decimal(new int[] {
|
|
||||||
25,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0});
|
|
||||||
this.numericUpDownCircleY.ValueChanged += new System.EventHandler(this.PreviewValueChanged);
|
|
||||||
//
|
|
||||||
// timerFileChange
|
// timerFileChange
|
||||||
//
|
//
|
||||||
this.timerFileChange.Interval = 250;
|
this.timerFileChange.Interval = 250;
|
||||||
this.timerFileChange.Tick += new System.EventHandler(this.timerFileChange_Tick);
|
this.timerFileChange.Tick += new System.EventHandler(this.timerFileChange_Tick);
|
||||||
//
|
//
|
||||||
|
// buttonPickColor
|
||||||
|
//
|
||||||
|
this.buttonPickColor.Image = global::Nikse.SubtitleEdit.Properties.Resources.color_picker_small2;
|
||||||
|
this.buttonPickColor.Location = new System.Drawing.Point(15, 167);
|
||||||
|
this.buttonPickColor.Name = "buttonPickColor";
|
||||||
|
this.buttonPickColor.Size = new System.Drawing.Size(43, 38);
|
||||||
|
this.buttonPickColor.TabIndex = 32;
|
||||||
|
this.buttonPickColor.UseVisualStyleBackColor = true;
|
||||||
|
this.buttonPickColor.Click += new System.EventHandler(this.button1_Click);
|
||||||
|
//
|
||||||
// AssSetBackground
|
// AssSetBackground
|
||||||
//
|
//
|
||||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
this.ClientSize = new System.Drawing.Size(973, 734);
|
this.ClientSize = new System.Drawing.Size(973, 734);
|
||||||
|
this.Controls.Add(this.buttonPickColor);
|
||||||
this.Controls.Add(this.groupBoxStyle);
|
this.Controls.Add(this.groupBoxStyle);
|
||||||
this.Controls.Add(this.groupBoxPadding);
|
this.Controls.Add(this.groupBoxPadding);
|
||||||
this.Controls.Add(this.labelProgress);
|
this.Controls.Add(this.labelProgress);
|
||||||
@ -1057,7 +1071,6 @@ namespace Nikse.SubtitleEdit.Forms.Assa
|
|||||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
|
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
|
||||||
this.Text = "Generate background box";
|
this.Text = "Generate background box";
|
||||||
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ApplyCustomStyles_FormClosing);
|
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ApplyCustomStyles_FormClosing);
|
||||||
this.Load += new System.EventHandler(this.AssSetBackground_Load);
|
|
||||||
this.Shown += new System.EventHandler(this.AssSetBackground_Shown);
|
this.Shown += new System.EventHandler(this.AssSetBackground_Shown);
|
||||||
this.ResizeEnd += new System.EventHandler(this.SetPosition_ResizeEnd);
|
this.ResizeEnd += new System.EventHandler(this.SetPosition_ResizeEnd);
|
||||||
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.AssSetBackground_KeyDown);
|
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.AssSetBackground_KeyDown);
|
||||||
@ -1089,13 +1102,13 @@ namespace Nikse.SubtitleEdit.Forms.Assa
|
|||||||
this.groupBoxPadding.ResumeLayout(false);
|
this.groupBoxPadding.ResumeLayout(false);
|
||||||
this.groupBoxPadding.PerformLayout();
|
this.groupBoxPadding.PerformLayout();
|
||||||
this.groupBoxStyle.ResumeLayout(false);
|
this.groupBoxStyle.ResumeLayout(false);
|
||||||
|
this.panelCircle.ResumeLayout(false);
|
||||||
|
this.panelCircle.PerformLayout();
|
||||||
|
((System.ComponentModel.ISupportInitialize)(this.numericUpDownCircleY)).EndInit();
|
||||||
this.panelBubbles.ResumeLayout(false);
|
this.panelBubbles.ResumeLayout(false);
|
||||||
this.panelBubbles.PerformLayout();
|
this.panelBubbles.PerformLayout();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.numericUpDownBubbleStep)).EndInit();
|
((System.ComponentModel.ISupportInitialize)(this.numericUpDownBubbleStep)).EndInit();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.numericUpDownBubbleHeight)).EndInit();
|
((System.ComponentModel.ISupportInitialize)(this.numericUpDownBubbleHeight)).EndInit();
|
||||||
this.panelCircle.ResumeLayout(false);
|
|
||||||
this.panelCircle.PerformLayout();
|
|
||||||
((System.ComponentModel.ISupportInitialize)(this.numericUpDownCircleY)).EndInit();
|
|
||||||
this.ResumeLayout(false);
|
this.ResumeLayout(false);
|
||||||
this.PerformLayout();
|
this.PerformLayout();
|
||||||
|
|
||||||
@ -1172,5 +1185,6 @@ namespace Nikse.SubtitleEdit.Forms.Assa
|
|||||||
private System.Windows.Forms.Label labelBubbleHeight;
|
private System.Windows.Forms.Label labelBubbleHeight;
|
||||||
private System.Windows.Forms.Label labelBubbleStep;
|
private System.Windows.Forms.Label labelBubbleStep;
|
||||||
private System.Windows.Forms.NumericUpDown numericUpDownBubbleHeight;
|
private System.Windows.Forms.NumericUpDown numericUpDownBubbleHeight;
|
||||||
|
private System.Windows.Forms.Button buttonPickColor;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -37,6 +37,7 @@ namespace Nikse.SubtitleEdit.Forms.Assa
|
|||||||
private string _mpvTextFileName;
|
private string _mpvTextFileName;
|
||||||
private bool _closing;
|
private bool _closing;
|
||||||
private bool _videoLoaded;
|
private bool _videoLoaded;
|
||||||
|
private string _videoText;
|
||||||
private bool _updatePreview = true;
|
private bool _updatePreview = true;
|
||||||
private bool _updateDrawingFile;
|
private bool _updateDrawingFile;
|
||||||
private readonly string _videoFileName;
|
private readonly string _videoFileName;
|
||||||
@ -211,7 +212,7 @@ namespace Nikse.SubtitleEdit.Forms.Assa
|
|||||||
SetPosition_ResizeEnd(null, null);
|
SetPosition_ResizeEnd(null, null);
|
||||||
buttonAssaDraw.Visible = File.Exists(Path.Combine(Configuration.PluginsDirectory, "AssaDraw.dll"));
|
buttonAssaDraw.Visible = File.Exists(Path.Combine(Configuration.PluginsDirectory, "AssaDraw.dll"));
|
||||||
progressBar1.Visible = false;
|
progressBar1.Visible = false;
|
||||||
labelProgress.Visible = false;
|
labelProgress.Text = string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void SafeNumericUpDownAssign(NumericUpDown numericUpDown, int value)
|
private static void SafeNumericUpDownAssign(NumericUpDown numericUpDown, int value)
|
||||||
@ -515,10 +516,12 @@ namespace Nikse.SubtitleEdit.Forms.Assa
|
|||||||
_videoLoaded = true;
|
_videoLoaded = true;
|
||||||
timerPreview.Start();
|
timerPreview.Start();
|
||||||
|
|
||||||
labelProgress.Text = $"{Path.GetFileName(_videoFileName)} - {string.Format(LanguageSettings.Current.Main.LineNumberX, _subtitleWithNewHeader.GetIndex(p) + 1)} - {p.StartTime}";
|
_videoText = $"{Path.GetFileName(_videoFileName)} - {string.Format(LanguageSettings.Current.Main.LineNumberX, _subtitleWithNewHeader.GetIndex(p) + 1)} - {p.StartTime}";
|
||||||
|
labelProgress.Text = _videoText;
|
||||||
if (p.StartTime.TotalSeconds > _videoInfo.TotalSeconds)
|
if (p.StartTime.TotalSeconds > _videoInfo.TotalSeconds)
|
||||||
{
|
{
|
||||||
labelProgress.Text = "Video position is after end of video - NO PREVIEW!";
|
labelProgress.Text = "Video position is after end of video - NO PREVIEW!";
|
||||||
|
_videoText = string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
labelProgress.Visible = true;
|
labelProgress.Visible = true;
|
||||||
@ -759,11 +762,6 @@ namespace Nikse.SubtitleEdit.Forms.Assa
|
|||||||
timerFileChange.Start();
|
timerFileChange.Start();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void pictureBoxPreview_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
VideoLoaded(null, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void SetPosition_ResizeEnd(object sender, EventArgs e)
|
private void SetPosition_ResizeEnd(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
var aspectRatio = (double)_videoInfo.Width / _videoInfo.Height;
|
var aspectRatio = (double)_videoInfo.Width / _videoInfo.Height;
|
||||||
@ -1384,9 +1382,70 @@ namespace Nikse.SubtitleEdit.Forms.Assa
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void AssSetBackground_Load(object sender, EventArgs e)
|
private void pictureBoxPreview_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
|
if (_colorPickerOn)
|
||||||
|
{
|
||||||
|
ColorChooser.SetLastColor(buttonPickColor.BackColor);
|
||||||
|
pictureBoxPreview_MouseLeave(null, null);
|
||||||
|
labelProgress.Text = string.Format(LanguageSettings.Current.AssaSetBackgroundBox.ColorPickerSetLastColor , Utilities.ColorToHexWithTransparency(buttonPickColor.BackColor));
|
||||||
|
System.Threading.SynchronizationContext.Current.Post(TimeSpan.FromMilliseconds(3500), () =>
|
||||||
|
{
|
||||||
|
labelProgress.Text = _videoText;
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
VideoLoaded(null, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool _colorPickerOn = false;
|
||||||
|
private int _colorPickerX = -1;
|
||||||
|
private int _colorPickerY = -1;
|
||||||
|
private void button1_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
_colorPickerOn = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void pictureBoxPreview_MouseMove(object sender, MouseEventArgs e)
|
||||||
|
{
|
||||||
|
if (!_colorPickerOn)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Cursor.Current = Cursors.Cross;
|
||||||
|
var x = MousePosition.X;
|
||||||
|
var y = MousePosition.Y;
|
||||||
|
if (x != _colorPickerX || y != _colorPickerY)
|
||||||
|
{
|
||||||
|
using (var bmp = new Bitmap(1, 1))
|
||||||
|
{
|
||||||
|
var bounds = new Rectangle(x, y, 1, 1);
|
||||||
|
using (var g = Graphics.FromImage(bmp))
|
||||||
|
{
|
||||||
|
g.CopyFromScreen(bounds.Location, Point.Empty, bounds.Size);
|
||||||
|
}
|
||||||
|
|
||||||
|
buttonPickColor.BackColor = bmp.GetPixel(0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
_colorPickerX = x;
|
||||||
|
_colorPickerY = y;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void pictureBoxPreview_MouseLeave(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (_colorPickerOn)
|
||||||
|
{
|
||||||
|
Cursor.Current = Cursors.Default;
|
||||||
|
_colorPickerOn = false;
|
||||||
|
buttonPickColor.BackColor = buttonOK.BackColor;
|
||||||
|
labelProgress.Text = _videoText;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -849,6 +849,12 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void buttonOK_Click(object sender, EventArgs e)
|
private void buttonOK_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
SetLastColor(Color);
|
||||||
|
DialogResult = DialogResult.OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void SetLastColor(Color color)
|
||||||
{
|
{
|
||||||
var colorList = new List<Color>
|
var colorList = new List<Color>
|
||||||
{
|
{
|
||||||
@ -862,14 +868,14 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
Configuration.Settings.General.LastColorPickerColor7,
|
Configuration.Settings.General.LastColorPickerColor7,
|
||||||
};
|
};
|
||||||
|
|
||||||
colorList = colorList.Where(c => c != Color).ToList();
|
colorList = colorList.Where(c => c != color).ToList();
|
||||||
var random = new Random();
|
var random = new Random();
|
||||||
while (colorList.Count < 7)
|
while (colorList.Count < 7)
|
||||||
{
|
{
|
||||||
colorList.Add(Color.FromArgb(random.Next(byte.MaxValue), random.Next(byte.MaxValue), random.Next(byte.MaxValue)));
|
colorList.Add(Color.FromArgb(random.Next(byte.MaxValue), random.Next(byte.MaxValue), random.Next(byte.MaxValue)));
|
||||||
}
|
}
|
||||||
|
|
||||||
Configuration.Settings.General.LastColorPickerColor = Color;
|
Configuration.Settings.General.LastColorPickerColor = color;
|
||||||
Configuration.Settings.General.LastColorPickerColor1 = colorList[0];
|
Configuration.Settings.General.LastColorPickerColor1 = colorList[0];
|
||||||
Configuration.Settings.General.LastColorPickerColor2 = colorList[1];
|
Configuration.Settings.General.LastColorPickerColor2 = colorList[1];
|
||||||
Configuration.Settings.General.LastColorPickerColor3 = colorList[2];
|
Configuration.Settings.General.LastColorPickerColor3 = colorList[2];
|
||||||
@ -877,8 +883,6 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
Configuration.Settings.General.LastColorPickerColor5 = colorList[4];
|
Configuration.Settings.General.LastColorPickerColor5 = colorList[4];
|
||||||
Configuration.Settings.General.LastColorPickerColor6 = colorList[5];
|
Configuration.Settings.General.LastColorPickerColor6 = colorList[5];
|
||||||
Configuration.Settings.General.LastColorPickerColor7 = colorList[6];
|
Configuration.Settings.General.LastColorPickerColor7 = colorList[6];
|
||||||
|
|
||||||
DialogResult = DialogResult.OK;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buttonCancel_Click(object sender, EventArgs e)
|
private void buttonCancel_Click(object sender, EventArgs e)
|
||||||
|
@ -405,6 +405,7 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
MarginY = "MarginY",
|
MarginY = "MarginY",
|
||||||
OnlyDrawing = "Only drawing",
|
OnlyDrawing = "Only drawing",
|
||||||
DrawingFile = "Drawing file",
|
DrawingFile = "Drawing file",
|
||||||
|
ColorPickerSetLastColor = "Color picker last color is now: {0}",
|
||||||
};
|
};
|
||||||
|
|
||||||
AssaSetPosition = new LanguageStructure.AssaSetPosition
|
AssaSetPosition = new LanguageStructure.AssaSetPosition
|
||||||
|
@ -664,6 +664,9 @@ namespace Nikse.SubtitleEdit.Logic
|
|||||||
case "AssaSetBackgroundBox/DrawingFile":
|
case "AssaSetBackgroundBox/DrawingFile":
|
||||||
language.AssaSetBackgroundBox.DrawingFile = reader.Value;
|
language.AssaSetBackgroundBox.DrawingFile = reader.Value;
|
||||||
break;
|
break;
|
||||||
|
case "AssaSetBackgroundBox/ColorPickerSetLastColor":
|
||||||
|
language.AssaSetBackgroundBox.ColorPickerSetLastColor = reader.Value;
|
||||||
|
break;
|
||||||
case "AssaSetPosition/SetPosition":
|
case "AssaSetPosition/SetPosition":
|
||||||
language.AssaSetPosition.SetPosition = reader.Value;
|
language.AssaSetPosition.SetPosition = reader.Value;
|
||||||
break;
|
break;
|
||||||
|
@ -263,6 +263,7 @@
|
|||||||
public string MarginY { get; set; }
|
public string MarginY { get; set; }
|
||||||
public string OnlyDrawing { get; set; }
|
public string OnlyDrawing { get; set; }
|
||||||
public string DrawingFile { get; set; }
|
public string DrawingFile { get; set; }
|
||||||
|
public string ColorPickerSetLastColor { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class AssaSetPosition
|
public class AssaSetPosition
|
||||||
|
10
src/ui/Properties/Resources.Designer.cs
generated
10
src/ui/Properties/Resources.Designer.cs
generated
@ -70,6 +70,16 @@ namespace Nikse.SubtitleEdit.Properties {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
|
/// </summary>
|
||||||
|
public static System.Drawing.Bitmap color_picker_small2 {
|
||||||
|
get {
|
||||||
|
object obj = ResourceManager.GetObject("color-picker-small2", resourceCulture);
|
||||||
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -118,6 +118,9 @@
|
|||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||||
|
<data name="SEIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\SE2.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
<data name="connect" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="connect" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Icons\connect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Icons\connect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
@ -127,11 +130,11 @@
|
|||||||
<data name="TransparentBackground" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="TransparentBackground" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\Transparent Background.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\Transparent Background.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="ebu" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Icons\Help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\ebu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Donate" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="itt" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Icons\Donate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\itt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Settings" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="Settings" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Icons\Settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Icons\Settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
@ -139,16 +142,16 @@
|
|||||||
<data name="tick" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="tick" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\tick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\tick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="SEIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\SE2.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Icons\Help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="webvtt" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="webvtt" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\webvtt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\webvtt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="itt" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="Donate" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\itt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Icons\Donate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ebu" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="color-picker-small2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\ebu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\color-picker-small2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
</root>
|
</root>
|
BIN
src/ui/Resources/color-picker-small2.png
Normal file
BIN
src/ui/Resources/color-picker-small2.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 754 B |
@ -2042,9 +2042,8 @@
|
|||||||
<None Include="Resources\webvtt.bmp" />
|
<None Include="Resources\webvtt.bmp" />
|
||||||
<None Include="Resources\webvtt.png" />
|
<None Include="Resources\webvtt.png" />
|
||||||
<None Include="Resources\itt.png" />
|
<None Include="Resources\itt.png" />
|
||||||
<None Include="Resources\ebustl.bmp" />
|
|
||||||
<None Include="Resources\ebustl.png" />
|
|
||||||
<None Include="Resources\ebu.png" />
|
<None Include="Resources\ebu.png" />
|
||||||
|
<None Include="Resources\color-picker-small2.png" />
|
||||||
<Content Include="SE2.ico" />
|
<Content Include="SE2.ico" />
|
||||||
<None Include="Resources\SE.ico" />
|
<None Include="Resources\SE.ico" />
|
||||||
<None Include="Hunspellx64.dll">
|
<None Include="Hunspellx64.dll">
|
||||||
|
Loading…
Reference in New Issue
Block a user