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

Added option for "Focus on mouse-over" to waveform/spectrogram in main window - thx lansing :)

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@2395 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2014-01-18 08:59:34 +00:00
parent 5dfa061366
commit 30f6328831
9 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Changelog.txt
View File

@ -4,6 +4,7 @@
* NEW:
* Compare window now has an option to "ignore line breaks" - thx Krystian
* Bridge gap in durations now have minimum display time - thx Krystian
* Option for "Focus on mouse-over" for waveform/spectrogram - thx lansing
* IMPROVED:
* Updated Korean language file - thx domddol
* Updated Chinese language file - thx Leon

17
src/Forms/Main.Designer.cs generated
View File

@ -94,6 +94,7 @@
this.matroskaImportStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItemManualAnsi = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItemImportText = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItemImportImages = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItemImportTimeCodes = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItemExport = new System.Windows.Forms.ToolStripMenuItem();
@ -443,7 +444,6 @@
this.imageListPlayRate = new System.Windows.Forms.ImageList(this.components);
this.timerTextUndo = new System.Windows.Forms.Timer(this.components);
this.timerAlternateTextUndo = new System.Windows.Forms.Timer(this.components);
this.toolStripMenuItemImportImages = new System.Windows.Forms.ToolStripMenuItem();
this.statusStrip1.SuspendLayout();
this.toolStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
@ -1091,6 +1091,13 @@
this.toolStripMenuItemImportText.Text = "Import text...";
this.toolStripMenuItemImportText.Click += new System.EventHandler(this.ToolStripMenuItemImportTextClick);
//
// toolStripMenuItemImportImages
//
this.toolStripMenuItemImportImages.Name = "toolStripMenuItemImportImages";
this.toolStripMenuItemImportImages.Size = new System.Drawing.Size(337, 22);
this.toolStripMenuItemImportImages.Text = "Import images...";
this.toolStripMenuItemImportImages.Click += new System.EventHandler(this.toolStripMenuItemImportImages_Click);
//
// toolStripMenuItemImportTimeCodes
//
this.toolStripMenuItemImportTimeCodes.Name = "toolStripMenuItemImportTimeCodes";
@ -2711,6 +2718,7 @@
this.audioVisualizer.Click += new System.EventHandler(this.AudioWaveForm_Click);
this.audioVisualizer.DragDrop += new System.Windows.Forms.DragEventHandler(this.AudioWaveFormDragDrop);
this.audioVisualizer.DragEnter += new System.Windows.Forms.DragEventHandler(this.AudioWaveFormDragEnter);
this.audioVisualizer.MouseEnter += new System.EventHandler(this.audioVisualizer_MouseEnter);
//
// tabControlButtons
//
@ -4348,13 +4356,6 @@
this.timerAlternateTextUndo.Interval = 700;
this.timerAlternateTextUndo.Tick += new System.EventHandler(this.TimerAlternateTextUndoTick);
//
// toolStripMenuItemImportImages
//
this.toolStripMenuItemImportImages.Name = "toolStripMenuItemImportImages";
this.toolStripMenuItemImportImages.Size = new System.Drawing.Size(337, 22);
this.toolStripMenuItemImportImages.Text = "Import images...";
this.toolStripMenuItemImportImages.Click += new System.EventHandler(this.toolStripMenuItemImportImages_Click);
//
// Main
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

6
src/Forms/Main.cs
View File

@ -18584,5 +18584,11 @@ namespace Nikse.SubtitleEdit.Forms
_formPositionsAndSizes.SavePositionAndSize(form);
}
private void audioVisualizer_MouseEnter(object sender, EventArgs e)
{
if (Configuration.Settings.VideoControls.WaveFormFocusOnMouseOver && !audioVisualizer.Focused && audioVisualizer.CanFocus)
audioVisualizer.Focus();
}
}
}

2
src/Forms/Main.resx
View File

@ -690,7 +690,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
CAAAAk1TRnQBSQFMAgEBAgEAAaABIAGgASABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAagBIAGoASABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

19
src/Forms/Settings.Designer.cs generated
View File

@ -266,6 +266,7 @@
this.fontDialogSSAStyle = new System.Windows.Forms.FontDialog();
this.labelStatus = new System.Windows.Forms.Label();
this.openFileDialogFFMPEG = new System.Windows.Forms.OpenFileDialog();
this.checkBoxWaveformHoverFocus = new System.Windows.Forms.CheckBox();
this.tabControlSettings.SuspendLayout();
this.tabPageGenerel.SuspendLayout();
this.groupBoxMiscellaneous.SuspendLayout();
@ -1843,6 +1844,7 @@
//
// groupBoxWaveFormAppearence
//
this.groupBoxWaveFormAppearence.Controls.Add(this.checkBoxWaveformHoverFocus);
this.groupBoxWaveFormAppearence.Controls.Add(this.labelWaveformBorderHitMs2);
this.groupBoxWaveFormAppearence.Controls.Add(this.numericUpDownWaveformBorderHitMs);
this.groupBoxWaveFormAppearence.Controls.Add(this.labelWaveformBorderHitMs1);
@ -1869,7 +1871,7 @@
// labelWaveformBorderHitMs2
//
this.labelWaveformBorderHitMs2.AutoSize = true;
this.labelWaveformBorderHitMs2.Location = new System.Drawing.Point(454, 93);
this.labelWaveformBorderHitMs2.Location = new System.Drawing.Point(454, 115);
this.labelWaveformBorderHitMs2.Name = "labelWaveformBorderHitMs2";
this.labelWaveformBorderHitMs2.Size = new System.Drawing.Size(62, 13);
this.labelWaveformBorderHitMs2.TabIndex = 14;
@ -1877,7 +1879,7 @@
//
// numericUpDownWaveformBorderHitMs
//
this.numericUpDownWaveformBorderHitMs.Location = new System.Drawing.Point(392, 91);
this.numericUpDownWaveformBorderHitMs.Location = new System.Drawing.Point(392, 113);
this.numericUpDownWaveformBorderHitMs.Minimum = new decimal(new int[] {
10,
0,
@ -1895,7 +1897,7 @@
// labelWaveformBorderHitMs1
//
this.labelWaveformBorderHitMs1.AutoSize = true;
this.labelWaveformBorderHitMs1.Location = new System.Drawing.Point(259, 93);
this.labelWaveformBorderHitMs1.Location = new System.Drawing.Point(259, 115);
this.labelWaveformBorderHitMs1.Name = "labelWaveformBorderHitMs1";
this.labelWaveformBorderHitMs1.Size = new System.Drawing.Size(127, 13);
this.labelWaveformBorderHitMs1.TabIndex = 13;
@ -3086,6 +3088,16 @@
//
this.openFileDialogFFMPEG.FileName = "openFileDialog1";
//
// checkBoxWaveformHoverFocus
//
this.checkBoxWaveformHoverFocus.AutoSize = true;
this.checkBoxWaveformHoverFocus.Location = new System.Drawing.Point(262, 78);
this.checkBoxWaveformHoverFocus.Name = "checkBoxWaveformHoverFocus";
this.checkBoxWaveformHoverFocus.Size = new System.Drawing.Size(143, 17);
this.checkBoxWaveformHoverFocus.TabIndex = 15;
this.checkBoxWaveformHoverFocus.Text = "Set focus at mouse over";
this.checkBoxWaveformHoverFocus.UseVisualStyleBackColor = true;
//
// Settings
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -3427,5 +3439,6 @@
private System.Windows.Forms.Label labelFFMPEGPath;
private System.Windows.Forms.CheckBox checkBoxUseFFMPEG;
private System.Windows.Forms.OpenFileDialog openFileDialogFFMPEG;
private System.Windows.Forms.CheckBox checkBoxWaveformHoverFocus;
}
}

3
src/Forms/Settings.cs
View File

@ -296,6 +296,7 @@ namespace Nikse.SubtitleEdit.Forms
checkBoxWaveFormShowGrid.Text = language.WaveFormShowGridLines;
checkBoxReverseMouseWheelScrollDirection.Text = language.ReverseMouseWheelScrollDirection;
checkBoxAllowOverlap.Text = language.WaveFormAllowOverlap;
checkBoxWaveformHoverFocus.Text = language.WaveFormFocusMouseOver;
labelWaveformBorderHitMs1.Text = language.WaveformBorderHitMs1;
labelWaveformBorderHitMs2.Text = language.WaveformBorderHitMs2;
numericUpDownWaveformBorderHitMs.Left = labelWaveformBorderHitMs1.Left + labelWaveformBorderHitMs1.Width;
@ -534,6 +535,7 @@ namespace Nikse.SubtitleEdit.Forms
comboBoxSpectrogramAppearance.SelectedIndex = 1;
checkBoxReverseMouseWheelScrollDirection.Checked = Configuration.Settings.VideoControls.WaveFormMouseWheelScrollUpIsForward;
checkBoxAllowOverlap.Checked = Configuration.Settings.VideoControls.WaveFormAllowOverlap;
checkBoxWaveformHoverFocus.Checked = Configuration.Settings.VideoControls.WaveFormFocusOnMouseOver;
if (Configuration.Settings.VideoControls.WaveformBorderHitMs >= numericUpDownWaveformBorderHitMs.Minimum &&
Configuration.Settings.VideoControls.WaveformBorderHitMs <= numericUpDownWaveformBorderHitMs.Maximum)
numericUpDownWaveformBorderHitMs.Value = Configuration.Settings.VideoControls.WaveformBorderHitMs;
@ -1088,6 +1090,7 @@ namespace Nikse.SubtitleEdit.Forms
Configuration.Settings.VideoControls.SpectrogramAppearance = "Classic";
Configuration.Settings.VideoControls.WaveFormMouseWheelScrollUpIsForward = checkBoxReverseMouseWheelScrollDirection.Checked;
Configuration.Settings.VideoControls.WaveFormAllowOverlap = checkBoxAllowOverlap.Checked;
Configuration.Settings.VideoControls.WaveFormFocusOnMouseOver = checkBoxWaveformHoverFocus.Checked;
Configuration.Settings.VideoControls.WaveformBorderHitMs = Convert.ToInt32(numericUpDownWaveformBorderHitMs.Value);
Configuration.Settings.General.UseFFMPEGForWaveExtraction = checkBoxUseFFMPEG.Checked;
Configuration.Settings.General.FFMPEGLocation = textBoxFFMPEGPath.Text;

1
src/Logic/Language.cs
View File

@ -1710,6 +1710,7 @@ can edit in same subtitle file (collaboration)",
WaveFormShowGridLines = "Show grid lines",
ReverseMouseWheelScrollDirection = "Reverse mouse wheel scroll direction",
WaveFormAllowOverlap = "Allow overlap (when moving/resizing)",
WaveFormFocusMouseOver = "Set focus on mouse over",
WaveformBorderHitMs1 = "Border marker hit must be within",
WaveformBorderHitMs2 = "milliseconds",
WaveFormColor = "Color",

1
src/Logic/LanguageStructure.cs
View File

@ -1605,6 +1605,7 @@
public string WaveFormShowGridLines { get; set; }
public string ReverseMouseWheelScrollDirection { get; set; }
public string WaveFormAllowOverlap { get; set; }
public string WaveFormFocusMouseOver { get; set; }
public string WaveformBorderHitMs1 { get; set; }
public string WaveformBorderHitMs2 { get; set; }
public string WaveFormColor { get; set; }

5
src/Logic/Settings.cs
View File

@ -577,6 +577,7 @@ namespace Nikse.SubtitleEdit.Logic
public string LastActiveTab { get; set; }
public bool WaveFormDrawGrid { get; set; }
public bool WaveFormAllowOverlap { get; set; }
public bool WaveFormFocusOnMouseOver { get; set; }
public int WaveformBorderHitMs { get; set; }
public Color WaveFormGridColor { get; set; }
public Color WaveFormColor { get; set; }
@ -1818,6 +1819,9 @@ namespace Nikse.SubtitleEdit.Logic
subNode = node.SelectSingleNode("WaveFormAllowOverlap");
if (subNode != null)
settings.VideoControls.WaveFormAllowOverlap = Convert.ToBoolean(subNode.InnerText);
subNode = node.SelectSingleNode("WaveFormFocusOnMouseOver");
if (subNode != null)
settings.VideoControls.WaveFormFocusOnMouseOver = Convert.ToBoolean(subNode.InnerText);
subNode = node.SelectSingleNode("WaveformBorderHitMs");
if (subNode != null)
settings.VideoControls.WaveformBorderHitMs = Convert.ToInt32(subNode.InnerText);
@ -2650,6 +2654,7 @@ namespace Nikse.SubtitleEdit.Logic
textWriter.WriteElementString("LastActiveTab", settings.VideoControls.LastActiveTab);
textWriter.WriteElementString("WaveFormDrawGrid", settings.VideoControls.WaveFormDrawGrid.ToString());
textWriter.WriteElementString("WaveFormAllowOverlap", settings.VideoControls.WaveFormAllowOverlap.ToString());
textWriter.WriteElementString("WaveFormFocusOnMouseOver", settings.VideoControls.WaveFormFocusOnMouseOver.ToString());
textWriter.WriteElementString("WaveformBorderHitMs", settings.VideoControls.WaveformBorderHitMs.ToString());
textWriter.WriteElementString("WaveFormGridColor", settings.VideoControls.WaveFormGridColor.ToArgb().ToString());
textWriter.WriteElementString("WaveFormColor", settings.VideoControls.WaveFormColor.ToArgb().ToString());