diff --git a/Icons/Black/WaveformCenter.png b/Icons/Black/WaveformCenter.png new file mode 100644 index 000000000..52cfb9690 Binary files /dev/null and b/Icons/Black/WaveformCenter.png differ diff --git a/Icons/Black/WaveformPause.png b/Icons/Black/WaveformPause.png new file mode 100644 index 000000000..a49f8acda Binary files /dev/null and b/Icons/Black/WaveformPause.png differ diff --git a/Icons/Black/WaveformPlay.png b/Icons/Black/WaveformPlay.png new file mode 100644 index 000000000..7a3bfa254 Binary files /dev/null and b/Icons/Black/WaveformPlay.png differ diff --git a/Icons/Black/WaveformPlayPause.png b/Icons/Black/WaveformPlayPause.png new file mode 100644 index 000000000..bc843c02a Binary files /dev/null and b/Icons/Black/WaveformPlayPause.png differ diff --git a/Icons/Black/WaveformPlaybackSpeed.png b/Icons/Black/WaveformPlaybackSpeed.png new file mode 100644 index 000000000..3e7d1c242 Binary files /dev/null and b/Icons/Black/WaveformPlaybackSpeed.png differ diff --git a/Icons/Black/WaveformZoomIn.png b/Icons/Black/WaveformZoomIn.png new file mode 100644 index 000000000..1f4a1fe97 Binary files /dev/null and b/Icons/Black/WaveformZoomIn.png differ diff --git a/Icons/Black/WaveformZoomOut.png b/Icons/Black/WaveformZoomOut.png new file mode 100644 index 000000000..371a14ad6 Binary files /dev/null and b/Icons/Black/WaveformZoomOut.png differ diff --git a/Icons/Black/WebVttProperties.png b/Icons/Black/WebVttProperties.png index 110e5501b..4fa313325 100644 Binary files a/Icons/Black/WebVttProperties.png and b/Icons/Black/WebVttProperties.png differ diff --git a/Icons/Black/WebVttStyle.png b/Icons/Black/WebVttStyle.png new file mode 100644 index 000000000..110e5501b Binary files /dev/null and b/Icons/Black/WebVttStyle.png differ diff --git a/Icons/DarkTheme/WaveformCenter.png b/Icons/DarkTheme/WaveformCenter.png new file mode 100644 index 000000000..31d4b8550 Binary files /dev/null and b/Icons/DarkTheme/WaveformCenter.png differ diff --git a/Icons/DarkTheme/WaveformPause.png b/Icons/DarkTheme/WaveformPause.png new file mode 100644 index 000000000..a899839d6 Binary files /dev/null and b/Icons/DarkTheme/WaveformPause.png differ diff --git a/Icons/DarkTheme/WaveformPlay.png b/Icons/DarkTheme/WaveformPlay.png new file mode 100644 index 000000000..72f2f7590 Binary files /dev/null and b/Icons/DarkTheme/WaveformPlay.png differ diff --git a/Icons/DarkTheme/WaveformPlayPause.png b/Icons/DarkTheme/WaveformPlayPause.png new file mode 100644 index 000000000..4720d7ae0 Binary files /dev/null and b/Icons/DarkTheme/WaveformPlayPause.png differ diff --git a/Icons/DarkTheme/WaveformPlaybackSpeed.png b/Icons/DarkTheme/WaveformPlaybackSpeed.png new file mode 100644 index 000000000..08de6941f Binary files /dev/null and b/Icons/DarkTheme/WaveformPlaybackSpeed.png differ diff --git a/Icons/DarkTheme/WaveformZoomIn.png b/Icons/DarkTheme/WaveformZoomIn.png new file mode 100644 index 000000000..a587854ff Binary files /dev/null and b/Icons/DarkTheme/WaveformZoomIn.png differ diff --git a/Icons/DarkTheme/WaveformZoomOut.png b/Icons/DarkTheme/WaveformZoomOut.png new file mode 100644 index 000000000..a161433d2 Binary files /dev/null and b/Icons/DarkTheme/WaveformZoomOut.png differ diff --git a/Icons/DarkTheme/WebVttProperties.png b/Icons/DarkTheme/WebVttProperties.png index 24c7f1d36..903d3ddae 100644 Binary files a/Icons/DarkTheme/WebVttProperties.png and b/Icons/DarkTheme/WebVttProperties.png differ diff --git a/Icons/DarkTheme/WebVttStyle.png b/Icons/DarkTheme/WebVttStyle.png new file mode 100644 index 000000000..24c7f1d36 Binary files /dev/null and b/Icons/DarkTheme/WebVttStyle.png differ diff --git a/Icons/DefaultTheme/WaveformCenter.png b/Icons/DefaultTheme/WaveformCenter.png new file mode 100644 index 000000000..60a92be13 Binary files /dev/null and b/Icons/DefaultTheme/WaveformCenter.png differ diff --git a/Icons/DefaultTheme/WaveformPause.png b/Icons/DefaultTheme/WaveformPause.png new file mode 100644 index 000000000..076d8c1f8 Binary files /dev/null and b/Icons/DefaultTheme/WaveformPause.png differ diff --git a/Icons/DefaultTheme/WaveformPlay.png b/Icons/DefaultTheme/WaveformPlay.png new file mode 100644 index 000000000..7e092746d Binary files /dev/null and b/Icons/DefaultTheme/WaveformPlay.png differ diff --git a/Icons/DefaultTheme/WaveformPlayPause.png b/Icons/DefaultTheme/WaveformPlayPause.png new file mode 100644 index 000000000..fd4b297dc Binary files /dev/null and b/Icons/DefaultTheme/WaveformPlayPause.png differ diff --git a/Icons/DefaultTheme/WaveformPlaybackSpeed.png b/Icons/DefaultTheme/WaveformPlaybackSpeed.png new file mode 100644 index 000000000..0f92f18c3 Binary files /dev/null and b/Icons/DefaultTheme/WaveformPlaybackSpeed.png differ diff --git a/Icons/DefaultTheme/WaveformZoomIn.png b/Icons/DefaultTheme/WaveformZoomIn.png new file mode 100644 index 000000000..f2908a020 Binary files /dev/null and b/Icons/DefaultTheme/WaveformZoomIn.png differ diff --git a/Icons/DefaultTheme/WaveformZoomOut.png b/Icons/DefaultTheme/WaveformZoomOut.png new file mode 100644 index 000000000..3554a6f49 Binary files /dev/null and b/Icons/DefaultTheme/WaveformZoomOut.png differ diff --git a/Icons/DefaultTheme/WebVttProperties.png b/Icons/DefaultTheme/WebVttProperties.png index 5a2042ec3..a9cb82fd3 100644 Binary files a/Icons/DefaultTheme/WebVttProperties.png and b/Icons/DefaultTheme/WebVttProperties.png differ diff --git a/Icons/DefaultTheme/WebVttStyle.png b/Icons/DefaultTheme/WebVttStyle.png new file mode 100644 index 000000000..5a2042ec3 Binary files /dev/null and b/Icons/DefaultTheme/WebVttStyle.png differ diff --git a/Icons/Legacy/WebVttStyle.png b/Icons/Legacy/WebVttStyle.png new file mode 100644 index 000000000..8e801d048 Binary files /dev/null and b/Icons/Legacy/WebVttStyle.png differ diff --git a/src/ui/Forms/Main.cs b/src/ui/Forms/Main.cs index 89491dde9..c428a29ab 100644 --- a/src/ui/Forms/Main.cs +++ b/src/ui/Forms/Main.cs @@ -5946,7 +5946,7 @@ namespace Nikse.SubtitleEdit.Forms return UiUtil.ShowSubtitle(_subtitle, mediaPlayer, format); } - private static void TryLoadIcon(ToolStripButton button, string iconName) + private static void TryLoadIcon(ToolStripItem button, string iconName) { var theme = Configuration.Settings.General.UseDarkTheme ? "DarkTheme" : "DefaultTheme"; if (!string.IsNullOrEmpty(Configuration.Settings.General.ToolbarIconTheme) && !Configuration.Settings.General.ToolbarIconTheme.Equals("Auto", StringComparison.OrdinalIgnoreCase)) @@ -5995,6 +5995,13 @@ namespace Nikse.SubtitleEdit.Forms TryLoadIcon(toolStripButtonToggleWaveform, "WaveformToggle"); TryLoadIcon(toolStripButtonToggleVideo, "VideoToggle"); TryLoadIcon(toolStripButtonSourceView, "SourceView"); + + TryLoadIcon(toolStripButtonWaveformZoomOut, "WaveformZoomOut"); + TryLoadIcon(toolStripButtonWaveformZoomIn, "WaveformZoomIn"); + TryLoadIcon(toolStripButtonWaveformPause, "WaveformPause"); + TryLoadIcon(toolStripButtonWaveformPlay, "WaveformPlay"); + TryLoadIcon(toolStripButtonLockCenter, "WaveformCenter"); + TryLoadIcon(toolStripSplitButtonPlayRate, "WaveformPlaybackSpeed"); // IttProperties, WebVttProperties, WebVttStyle, EbuProperties } @@ -17712,7 +17719,7 @@ namespace Nikse.SubtitleEdit.Forms { mediaPlayer.VideoPlayer.PlayRate = 1.0; InitializePlayRateDropDown(); - toolStripSplitButtonPlayRate.Image = imageListPlayRate.Images[0]; + //toolStripSplitButtonPlayRate.Image = imageListPlayRate.Images[0]; } } else if (audioVisualizer.Focused && audioVisualizer.NewSelectionParagraph != null && e.KeyData == _shortcuts.WaveformAddTextAtHere) @@ -25236,7 +25243,15 @@ namespace Nikse.SubtitleEdit.Forms if (!playedWithCustomSpeed) { playRateDropDownItem.Checked = true; - toolStripSplitButtonPlayRate.Image = Math.Abs(factor - 1) < 0.01 ? imageListPlayRate.Images[0] : imageListPlayRate.Images[1]; + if (Math.Abs(factor - 1) < 0.01) + { + } + else + { + toolStripSplitButtonPlayRate.Select(); + } + + //toolStripSplitButtonPlayRate.Image = Math.Abs(factor - 1) < 0.01 ? imageListPlayRate.Images[0] : imageListPlayRate.Images[1]; } try diff --git a/src/ui/Forms/Options/Settings.Designer.cs b/src/ui/Forms/Options/Settings.Designer.cs index 276913b76..adcefa531 100644 --- a/src/ui/Forms/Options/Settings.Designer.cs +++ b/src/ui/Forms/Options/Settings.Designer.cs @@ -319,6 +319,7 @@ this.groupBox2 = new System.Windows.Forms.GroupBox(); this.checkBoxShowFrameRate = new System.Windows.Forms.CheckBox(); this.groupBoxShowToolBarButtons = new System.Windows.Forms.GroupBox(); + this.pictureBoxWebVttStyle = new System.Windows.Forms.PictureBox(); this.pictureBoxEbuProperties = new System.Windows.Forms.PictureBox(); this.pictureBoxWebVttProperties = new System.Windows.Forms.PictureBox(); this.pictureBoxIttProperties = new System.Windows.Forms.PictureBox(); @@ -440,7 +441,6 @@ this.labelUpdateFileTypeAssociationsStatus = new System.Windows.Forms.Label(); this.imageListFileTypeAssociations = new System.Windows.Forms.ImageList(this.components); this.toolTipDialogStylePreview = new System.Windows.Forms.ToolTip(this.components); - this.pictureBoxWebVttStyle = new System.Windows.Forms.PictureBox(); this.panelGeneral.SuspendLayout(); this.groupBoxMiscellaneous.SuspendLayout(); this.groupBoxGeneralRules.SuspendLayout(); @@ -486,6 +486,7 @@ this.panelToolBar.SuspendLayout(); this.groupBox2.SuspendLayout(); this.groupBoxShowToolBarButtons.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWebVttStyle)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxEbuProperties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWebVttProperties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxIttProperties)).BeginInit(); @@ -522,7 +523,6 @@ this.groupBoxProxySettings.SuspendLayout(); this.groupBoxProxyAuthentication.SuspendLayout(); this.panelFileTypeAssociations.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWebVttStyle)).BeginInit(); this.SuspendLayout(); // // buttonOK @@ -4094,6 +4094,14 @@ this.groupBoxShowToolBarButtons.TabStop = false; this.groupBoxShowToolBarButtons.Text = "Show toolbar buttons"; // + // pictureBoxWebVttStyle + // + this.pictureBoxWebVttStyle.Location = new System.Drawing.Point(285, 400); + this.pictureBoxWebVttStyle.Name = "pictureBoxWebVttStyle"; + this.pictureBoxWebVttStyle.Size = new System.Drawing.Size(32, 32); + this.pictureBoxWebVttStyle.TabIndex = 60; + this.pictureBoxWebVttStyle.TabStop = false; + // // pictureBoxEbuProperties // this.pictureBoxEbuProperties.Location = new System.Drawing.Point(361, 400); @@ -4104,7 +4112,7 @@ // // pictureBoxWebVttProperties // - this.pictureBoxWebVttProperties.Location = new System.Drawing.Point(285, 400); + this.pictureBoxWebVttProperties.Location = new System.Drawing.Point(324, 400); this.pictureBoxWebVttProperties.Name = "pictureBoxWebVttProperties"; this.pictureBoxWebVttProperties.Size = new System.Drawing.Size(32, 32); this.pictureBoxWebVttProperties.TabIndex = 58; @@ -5284,14 +5292,6 @@ this.toolTipDialogStylePreview.InitialDelay = 500; this.toolTipDialogStylePreview.ReshowDelay = 100; // - // pictureBoxWebVttStyle - // - this.pictureBoxWebVttStyle.Location = new System.Drawing.Point(323, 400); - this.pictureBoxWebVttStyle.Name = "pictureBoxWebVttStyle"; - this.pictureBoxWebVttStyle.Size = new System.Drawing.Size(32, 32); - this.pictureBoxWebVttStyle.TabIndex = 60; - this.pictureBoxWebVttStyle.TabStop = false; - // // Settings // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -5392,6 +5392,7 @@ this.groupBox2.PerformLayout(); this.groupBoxShowToolBarButtons.ResumeLayout(false); this.groupBoxShowToolBarButtons.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWebVttStyle)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxEbuProperties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWebVttProperties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxIttProperties)).EndInit(); @@ -5436,7 +5437,6 @@ this.groupBoxProxyAuthentication.ResumeLayout(false); this.groupBoxProxyAuthentication.PerformLayout(); this.panelFileTypeAssociations.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWebVttStyle)).EndInit(); this.ResumeLayout(false); this.PerformLayout();