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

Turn of scaling of waveform icons + use "WaveformPlaybackSpeedSelected"

Browse Source
This commit is contained in:
niksedk 2023-07-02 20:48:31 +02:00
parent ca4a27eed1
commit 81760a818f
3 changed files with 25 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/ui/Forms/Main.Designer.cs generated
View File

@ -62,8 +62,8 @@ namespace Nikse.SubtitleEdit.Forms
this.toolStripButtonVisualSync = new System.Windows.Forms.ToolStripButton();
this.toolStripButtonBurnIn = new System.Windows.Forms.ToolStripButton();
this.toolStripButtonSpellCheck = new System.Windows.Forms.ToolStripButton();
this.toolStripButtonXProperties = new System.Windows.Forms.ToolStripButton();
this.toolStripButtonAssStyleManager = new System.Windows.Forms.ToolStripButton();
this.toolStripButtonXProperties = new System.Windows.Forms.ToolStripButton();
this.toolStripButtonAssProperties = new System.Windows.Forms.ToolStripButton();
this.toolStripButtonAssAttachments = new System.Windows.Forms.ToolStripButton();
this.toolStripButtonAssaDraw = new System.Windows.Forms.ToolStripButton();
@ -571,7 +571,6 @@ namespace Nikse.SubtitleEdit.Forms
this.contextMenuStripEmpty = new System.Windows.Forms.ContextMenuStrip(this.components);
this.insertLineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.aSSStylesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.imageListPlayRate = new System.Windows.Forms.ImageList(this.components);
this.timerTextUndo = new System.Windows.Forms.Timer(this.components);
this.timerOriginalTextUndo = new System.Windows.Forms.Timer(this.components);
this.contextMenuStripShowVideoControls = new System.Windows.Forms.ContextMenuStrip(this.components);
@ -868,18 +867,6 @@ namespace Nikse.SubtitleEdit.Forms
this.toolStripButtonSpellCheck.Text = "Spell check";
this.toolStripButtonSpellCheck.Click += new System.EventHandler(this.SpellCheckToolStripMenuItemClick);
//
// toolStripButtonXProperties
//
this.toolStripButtonXProperties.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButtonXProperties.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
this.toolStripButtonXProperties.Image = global::Nikse.SubtitleEdit.Properties.Resources.itt;
this.toolStripButtonXProperties.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripButtonXProperties.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonXProperties.Name = "toolStripButtonXProperties";
this.toolStripButtonXProperties.Size = new System.Drawing.Size(36, 37);
this.toolStripButtonXProperties.Text = "Properties";
this.toolStripButtonXProperties.Click += new System.EventHandler(this.toolStripMenuItemFileFormatProperties_Click);
//
// toolStripButtonAssStyleManager
//
this.toolStripButtonAssStyleManager.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@ -893,6 +880,18 @@ namespace Nikse.SubtitleEdit.Forms
this.toolStripButtonAssStyleManager.Visible = false;
this.toolStripButtonAssStyleManager.Click += new System.EventHandler(this.toolStripButtonAssStyleManager_Click);
//
// toolStripButtonXProperties
//
this.toolStripButtonXProperties.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButtonXProperties.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
this.toolStripButtonXProperties.Image = global::Nikse.SubtitleEdit.Properties.Resources.itt;
this.toolStripButtonXProperties.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripButtonXProperties.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonXProperties.Name = "toolStripButtonXProperties";
this.toolStripButtonXProperties.Size = new System.Drawing.Size(36, 37);
this.toolStripButtonXProperties.Text = "Properties";
this.toolStripButtonXProperties.Click += new System.EventHandler(this.toolStripMenuItemFileFormatProperties_Click);
//
// toolStripButtonAssProperties
//
this.toolStripButtonAssProperties.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@ -3383,6 +3382,7 @@ namespace Nikse.SubtitleEdit.Forms
//
this.toolStripButtonWaveformZoomOut.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButtonWaveformZoomOut.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonWaveformZoomOut.Image")));
this.toolStripButtonWaveformZoomOut.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripButtonWaveformZoomOut.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonWaveformZoomOut.Name = "toolStripButtonWaveformZoomOut";
this.toolStripButtonWaveformZoomOut.Size = new System.Drawing.Size(23, 22);
@ -3400,6 +3400,7 @@ namespace Nikse.SubtitleEdit.Forms
//
this.toolStripButtonWaveformZoomIn.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButtonWaveformZoomIn.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonWaveformZoomIn.Image")));
this.toolStripButtonWaveformZoomIn.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripButtonWaveformZoomIn.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonWaveformZoomIn.Name = "toolStripButtonWaveformZoomIn";
this.toolStripButtonWaveformZoomIn.Size = new System.Drawing.Size(23, 22);
@ -3416,6 +3417,7 @@ namespace Nikse.SubtitleEdit.Forms
this.toolStripButtonWaveformPause.AutoToolTip = false;
this.toolStripButtonWaveformPause.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButtonWaveformPause.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonWaveformPause.Image")));
this.toolStripButtonWaveformPause.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripButtonWaveformPause.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonWaveformPause.Name = "toolStripButtonWaveformPause";
this.toolStripButtonWaveformPause.Size = new System.Drawing.Size(23, 22);
@ -3428,6 +3430,7 @@ namespace Nikse.SubtitleEdit.Forms
this.toolStripButtonWaveformPlay.AutoToolTip = false;
this.toolStripButtonWaveformPlay.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButtonWaveformPlay.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonWaveformPlay.Image")));
this.toolStripButtonWaveformPlay.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripButtonWaveformPlay.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonWaveformPlay.Name = "toolStripButtonWaveformPlay";
this.toolStripButtonWaveformPlay.Size = new System.Drawing.Size(23, 22);
@ -3438,6 +3441,7 @@ namespace Nikse.SubtitleEdit.Forms
//
this.toolStripButtonLockCenter.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButtonLockCenter.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonLockCenter.Image")));
this.toolStripButtonLockCenter.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripButtonLockCenter.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonLockCenter.Name = "toolStripButtonLockCenter";
this.toolStripButtonLockCenter.Size = new System.Drawing.Size(23, 22);
@ -3448,6 +3452,7 @@ namespace Nikse.SubtitleEdit.Forms
//
this.toolStripSplitButtonPlayRate.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripSplitButtonPlayRate.Image = ((System.Drawing.Image)(resources.GetObject("toolStripSplitButtonPlayRate.Image")));
this.toolStripSplitButtonPlayRate.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripSplitButtonPlayRate.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripSplitButtonPlayRate.Name = "toolStripSplitButtonPlayRate";
this.toolStripSplitButtonPlayRate.Size = new System.Drawing.Size(32, 22);
@ -5599,13 +5604,6 @@ namespace Nikse.SubtitleEdit.Forms
this.aSSStylesToolStripMenuItem.Text = "ASS styles...";
this.aSSStylesToolStripMenuItem.Click += new System.EventHandler(this.aSSStylesToolStripMenuItem_Click);
//
// imageListPlayRate
//
this.imageListPlayRate.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageListPlayRate.ImageStream")));
this.imageListPlayRate.TransparentColor = System.Drawing.Color.Transparent;
this.imageListPlayRate.Images.SetKeyName(0, "FastForward.png");
this.imageListPlayRate.Images.SetKeyName(1, "FastForwardHighLight.png");
//
// timerTextUndo
//
this.timerTextUndo.Interval = 700;
@ -5965,7 +5963,6 @@ namespace Nikse.SubtitleEdit.Forms
private System.Windows.Forms.ToolStripMenuItem openOriginalToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem removeOriginalToolStripMenuItem;
private System.Windows.Forms.ToolStripSplitButton toolStripSplitButtonPlayRate;
private System.Windows.Forms.ImageList imageListPlayRate;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemSetAudioTrack;
private System.Windows.Forms.Button buttonSplitLine;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemChangeFrameRate2;

12
src/ui/Forms/Main.cs
View File

@ -6002,7 +6002,8 @@ namespace Nikse.SubtitleEdit.Forms
TryLoadIcon(toolStripButtonWaveformPlay, "WaveformPlay");
TryLoadIcon(toolStripButtonLockCenter, "WaveformCenter");
TryLoadIcon(toolStripSplitButtonPlayRate, "WaveformPlaybackSpeed");
// IttProperties, WebVttProperties, WebVttStyle, EbuProperties
// Other images: IttProperties, WebVttProperties, WebVttStyle, EbuProperties
}
toolStripButtonFileNew.Visible = gs.ShowToolbarNew;
@ -17719,7 +17720,7 @@ namespace Nikse.SubtitleEdit.Forms
{
mediaPlayer.VideoPlayer.PlayRate = 1.0;
InitializePlayRateDropDown();
//toolStripSplitButtonPlayRate.Image = imageListPlayRate.Images[0];
TryLoadIcon(toolStripSplitButtonPlayRate, "WaveformPlaybackSpeed");
}
}
else if (audioVisualizer.Focused && audioVisualizer.NewSelectionParagraph != null && e.KeyData == _shortcuts.WaveformAddTextAtHere)
@ -25245,13 +25246,12 @@ namespace Nikse.SubtitleEdit.Forms
playRateDropDownItem.Checked = true;
if (Math.Abs(factor - 1) < 0.01)
{
TryLoadIcon(toolStripSplitButtonPlayRate, "WaveformPlaybackSpeed");
}
else
{
toolStripSplitButtonPlayRate.Select();
TryLoadIcon(toolStripSplitButtonPlayRate, "WaveformPlaybackSpeedSelected");
}
//toolStripSplitButtonPlayRate.Image = Math.Abs(factor - 1) < 0.01 ? imageListPlayRate.Images[0] : imageListPlayRate.Images[1];
}
try
@ -33075,7 +33075,7 @@ namespace Nikse.SubtitleEdit.Forms
TryLoadIcon(toolStripButtonXProperties, "WebVttProperties");
toolStripButtonAssStyleManager.Visible = true;
toolStripButtonAssStyleManager.ToolTipText = string.Format(LanguageSettings.Current.WebVttStyleManager.Title, new WebVTT().Name);
toolStripButtonAssStyleManager.ToolTipText = string.Format(LanguageSettings.Current.WebVttStyleManager.Title, new WebVTT().Name);
toolStripButtonAssStyleManager.Image = Properties.Resources.webvtt;
TryLoadIcon(toolStripButtonAssStyleManager, "WebVttStyle");

49
src/ui/Forms/Main.resx
View File

@ -849,55 +849,6 @@
<metadata name="contextMenuStripEmpty.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 95</value>
</metadata>
<metadata name="imageListPlayRate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 56</value>
</metadata>
<data name="imageListPlayRate.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
CAAAAk1TRnQBSQFMAgEBAgEAAeQBLgHkAS4BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/xEAEHUwABB1MAAQdSQA
AewB9AQAAewB9AQABHUB7AV1AewFdSQAAewBDwHyAwAB7AEPAfIDAAR1AewBDwR1AewBDwR1JAAB7AFJ
AQ8B8gIAAewBSQEPAfICAAR1AewBSQEPA3UB7AFJAQ8DdSAAAewBEQFDARUBFAFyAUkBDwEHAesBFAFy
AUkBDwHyAQAB7AERAUMBFQEUAXIBSQEPAQcB6wEUAXIBSQEPAnUgAAHtAQgBeARyAUkBDwRyAUkBDwHy
Ae0BCAF4BHIBSQEPBHIBSQEPAXUgAAGSAQgDmAJ4AnIBbQGYAngCcgFtAZIBCAOYAngCcgFtAZgCeAJy
AW0gAAEcAcIECAJ4AewBmQIIAngB7AHzARwBwgQIAngB7AGZAggCeAHsAXUgAAGYARwBkgHtAewBCAGY
AewB8AHvAewBCAGYAewB8wEAAZgBHAGSAe0B7AEIAZgB7AHwAe8B7AEIAZgB7AJ1JAAB7QEIAewB8wIA
Ae0BCAHsAfMCAAR1Ae0BCAHsA3UB7QEIAewDdSQAAZIB7AHzAwABkgHsAfMDAAR1AZIB7AR1AZIB7AR1
JAABHAH0BAABHAH0BAAEdQEcBXUBHAV1MAAQdTAAEHUgAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEB
AQABAQUAAYAXAAP/AQAC/wYAAv8GAAL/BgAB8wHPBgAB8QHHBgAB8AHDBwABAR8AAQEGAAHwAcMGAAHx
AccGAAHzAc8GAAL/BgAC/wYACw==
</value>
</data>
<metadata name="timerTextUndo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>339, 89</value>
</metadata>