From 5b5d306bbde45aa396872d11819555e920964c09 Mon Sep 17 00:00:00 2001 From: Nikolaj Olsson Date: Tue, 16 Apr 2024 19:00:59 +0200 Subject: [PATCH] Fix unwanted text box color change - thx Leon :) Fix #8197 --- src/ui/Forms/Main.Designer.cs | 36 ++++++------- src/ui/Forms/Options/Settings.Designer.cs | 64 ++++++----------------- 2 files changed, 31 insertions(+), 69 deletions(-) diff --git a/src/ui/Forms/Main.Designer.cs b/src/ui/Forms/Main.Designer.cs index f75d0c412..a2d3efba1 100644 --- a/src/ui/Forms/Main.Designer.cs +++ b/src/ui/Forms/Main.Designer.cs @@ -1,4 +1,5 @@ -using Nikse.SubtitleEdit.Controls; +using System.Windows.Forms; +using Nikse.SubtitleEdit.Controls; namespace Nikse.SubtitleEdit.Forms { @@ -246,6 +247,7 @@ namespace Nikse.SubtitleEdit.Forms this.generateVideoWithHardcodedSubtitleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.audioToTextWhisperTolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.videoaudioToTextToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.textToSpeechAndAddToVideoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.undockVideoControlsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.redockVideoControlsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -383,7 +385,7 @@ namespace Nikse.SubtitleEdit.Forms this.buttonCustomUrl1 = new System.Windows.Forms.Button(); this.buttonGoogleTranslateIt = new System.Windows.Forms.Button(); this.buttonGoogleIt = new System.Windows.Forms.Button(); - this.textBoxSearchWord = new Nikse.SubtitleEdit.Controls.SETextBox(); + this.textBoxSearchWord = new Nikse.SubtitleEdit.Controls.NikseTextBox(); this.groupBoxAutoContinue = new System.Windows.Forms.GroupBox(); this.comboBoxAutoContinue = new Nikse.SubtitleEdit.Controls.NikseComboBox(); this.labelAutoContinueDelay = new System.Windows.Forms.Label(); @@ -580,7 +582,6 @@ namespace Nikse.SubtitleEdit.Forms this.timerOriginalTextUndo = new System.Windows.Forms.Timer(this.components); this.contextMenuStripShowVideoControls = new System.Windows.Forms.ContextMenuStrip(this.components); this.toolStripMenuItemShowVideoControls = new System.Windows.Forms.ToolStripMenuItem(); - this.textToSpeechAndAddToVideoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.statusStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -2426,6 +2427,13 @@ namespace Nikse.SubtitleEdit.Forms this.videoaudioToTextToolStripMenuItem.Text = "Audio to text (Vosk/Kaldi)..."; this.videoaudioToTextToolStripMenuItem.Click += new System.EventHandler(this.VideoaudioToTextToolStripMenuItemClick); // + // textToSpeechAndAddToVideoToolStripMenuItem + // + this.textToSpeechAndAddToVideoToolStripMenuItem.Name = "textToSpeechAndAddToVideoToolStripMenuItem"; + this.textToSpeechAndAddToVideoToolStripMenuItem.Size = new System.Drawing.Size(295, 22); + this.textToSpeechAndAddToVideoToolStripMenuItem.Text = "Text to speech and add to video..."; + this.textToSpeechAndAddToVideoToolStripMenuItem.Click += new System.EventHandler(this.textToSpeechAndAddToVideoToolStripMenuItem_Click); + // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; @@ -3638,28 +3646,21 @@ namespace Nikse.SubtitleEdit.Forms // // textBoxSearchWord // - this.textBoxSearchWord.BackColor = System.Drawing.SystemColors.WindowFrame; - this.textBoxSearchWord.CurrentLanguage = ""; - this.textBoxSearchWord.CurrentLineIndex = 0; + this.textBoxSearchWord.BackColor = System.Drawing.SystemColors.Window; this.textBoxSearchWord.HideSelection = true; - this.textBoxSearchWord.IsDictionaryDownloaded = true; - this.textBoxSearchWord.IsSpellCheckerInitialized = false; - this.textBoxSearchWord.IsSpellCheckRequested = false; - this.textBoxSearchWord.IsWrongWord = false; - this.textBoxSearchWord.LanguageChanged = false; this.textBoxSearchWord.Location = new System.Drawing.Point(6, 18); this.textBoxSearchWord.MaxLength = 32767; this.textBoxSearchWord.Multiline = true; this.textBoxSearchWord.Name = "textBoxSearchWord"; this.textBoxSearchWord.Padding = new System.Windows.Forms.Padding(1); this.textBoxSearchWord.ReadOnly = false; - this.textBoxSearchWord.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; + this.textBoxSearchWord.ScrollBars = ScrollBars.None; this.textBoxSearchWord.SelectedText = ""; this.textBoxSearchWord.SelectionLength = 0; this.textBoxSearchWord.SelectionStart = 0; this.textBoxSearchWord.Size = new System.Drawing.Size(244, 39); this.textBoxSearchWord.TabIndex = 0; - this.textBoxSearchWord.TextBoxFont = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold); + this.textBoxSearchWord.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold); this.textBoxSearchWord.UseSystemPasswordChar = false; // // groupBoxAutoContinue @@ -5890,13 +5891,6 @@ namespace Nikse.SubtitleEdit.Forms this.toolStripMenuItemShowVideoControls.Text = "Show video controls"; this.toolStripMenuItemShowVideoControls.Click += new System.EventHandler(this.ToolStripMenuItemShowVideoControlsClick); // - // textToSpeechAndAddToVideoToolStripMenuItem - // - this.textToSpeechAndAddToVideoToolStripMenuItem.Name = "textToSpeechAndAddToVideoToolStripMenuItem"; - this.textToSpeechAndAddToVideoToolStripMenuItem.Size = new System.Drawing.Size(295, 22); - this.textToSpeechAndAddToVideoToolStripMenuItem.Text = "Text to speech and add to video..."; - this.textToSpeechAndAddToVideoToolStripMenuItem.Click += new System.EventHandler(this.textToSpeechAndAddToVideoToolStripMenuItem_Click); - // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -6122,7 +6116,7 @@ namespace Nikse.SubtitleEdit.Forms private System.Windows.Forms.GroupBox groupBoxTranslateSearch; private System.Windows.Forms.Button buttonGoogleTranslateIt; private System.Windows.Forms.Button buttonGoogleIt; - private Nikse.SubtitleEdit.Controls.SETextBox textBoxSearchWord; + private Nikse.SubtitleEdit.Controls.NikseTextBox textBoxSearchWord; private System.Windows.Forms.GroupBox groupBoxAutoContinue; private Nikse.SubtitleEdit.Controls.NikseComboBox comboBoxAutoContinue; private System.Windows.Forms.Label labelAutoContinueDelay; diff --git a/src/ui/Forms/Options/Settings.Designer.cs b/src/ui/Forms/Options/Settings.Designer.cs index bf83b3599..fc32c6357 100644 --- a/src/ui/Forms/Options/Settings.Designer.cs +++ b/src/ui/Forms/Options/Settings.Designer.cs @@ -109,7 +109,7 @@ this.labelFavoriteSubtitleFormatsNote = new System.Windows.Forms.Label(); this.listBoxSubtitleFormats = new Nikse.SubtitleEdit.Controls.NikseListBox(); this.buttonFormatsSearchClear = new System.Windows.Forms.Button(); - this.textBoxFormatsSearch = new Nikse.SubtitleEdit.Controls.SETextBox(); + this.textBoxFormatsSearch = new Nikse.SubtitleEdit.Controls.NikseTextBox(); this.labelFormatsSearch = new System.Windows.Forms.Label(); this.labelFormats = new System.Windows.Forms.Label(); this.buttonRemoveFromFavoriteFormats = new System.Windows.Forms.Button(); @@ -134,7 +134,7 @@ this.labelShortcutsFilter = new System.Windows.Forms.Label(); this.buttonShortcutsClear = new System.Windows.Forms.Button(); this.labelShortcutsSearch = new System.Windows.Forms.Label(); - this.textBoxShortcutSearch = new Nikse.SubtitleEdit.Controls.SETextBox(); + this.textBoxShortcutSearch = new Nikse.SubtitleEdit.Controls.NikseTextBox(); this.buttonClearShortcut = new System.Windows.Forms.Button(); this.comboBoxShortcutKey = new Nikse.SubtitleEdit.Controls.NikseComboBox(); this.labelShortcutKey = new System.Windows.Forms.Label(); @@ -227,7 +227,7 @@ this.checkBoxFfmpegUseCenterChannel = new System.Windows.Forms.CheckBox(); this.buttonDownloadFfmpeg = new System.Windows.Forms.Button(); this.buttonBrowseToFFmpeg = new System.Windows.Forms.Button(); - this.textBoxFFmpegPath = new Nikse.SubtitleEdit.Controls.SETextBox(); + this.textBoxFFmpegPath = new Nikse.SubtitleEdit.Controls.NikseTextBox(); this.labelFFmpegPath = new System.Windows.Forms.Label(); this.checkBoxUseFFmpeg = new System.Windows.Forms.CheckBox(); this.groupBoxSpectrogram = new System.Windows.Forms.GroupBox(); @@ -430,7 +430,7 @@ this.panelNetwork = new System.Windows.Forms.Panel(); this.groupBoxNetworkSession = new System.Windows.Forms.GroupBox(); this.buttonNetworkSessionNewMessageSound = new System.Windows.Forms.Button(); - this.textBoxNetworkSessionNewMessageSound = new Nikse.SubtitleEdit.Controls.SETextBox(); + this.textBoxNetworkSessionNewMessageSound = new Nikse.SubtitleEdit.Controls.NikseTextBox(); this.labelNetworkSessionNewMessageSound = new System.Windows.Forms.Label(); this.groupBoxProxySettings = new System.Windows.Forms.GroupBox(); this.groupBoxProxyAuthentication = new System.Windows.Forms.GroupBox(); @@ -1941,28 +1941,20 @@ // // textBoxFormatsSearch // - this.textBoxFormatsSearch.BackColor = System.Drawing.SystemColors.WindowFrame; - this.textBoxFormatsSearch.CurrentLanguage = ""; - this.textBoxFormatsSearch.CurrentLineIndex = 0; + this.textBoxFormatsSearch.BackColor = System.Drawing.SystemColors.Window; this.textBoxFormatsSearch.HideSelection = true; - this.textBoxFormatsSearch.IsDictionaryDownloaded = true; - this.textBoxFormatsSearch.IsSpellCheckerInitialized = false; - this.textBoxFormatsSearch.IsSpellCheckRequested = false; - this.textBoxFormatsSearch.IsWrongWord = false; - this.textBoxFormatsSearch.LanguageChanged = false; this.textBoxFormatsSearch.Location = new System.Drawing.Point(529, 52); this.textBoxFormatsSearch.MaxLength = 32767; this.textBoxFormatsSearch.Multiline = true; this.textBoxFormatsSearch.Name = "textBoxFormatsSearch"; this.textBoxFormatsSearch.Padding = new System.Windows.Forms.Padding(1); this.textBoxFormatsSearch.ReadOnly = false; - this.textBoxFormatsSearch.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; this.textBoxFormatsSearch.SelectedText = ""; this.textBoxFormatsSearch.SelectionLength = 0; this.textBoxFormatsSearch.SelectionStart = 0; this.textBoxFormatsSearch.Size = new System.Drawing.Size(151, 21); this.textBoxFormatsSearch.TabIndex = 6; - this.textBoxFormatsSearch.TextBoxFont = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBoxFormatsSearch.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.textBoxFormatsSearch.UseSystemPasswordChar = false; this.textBoxFormatsSearch.TextChanged += new System.EventHandler(this.textBoxFormatsSearch_TextChanged); // @@ -2262,27 +2254,19 @@ // textBoxShortcutSearch // this.textBoxShortcutSearch.BackColor = System.Drawing.SystemColors.Window; - this.textBoxShortcutSearch.CurrentLanguage = ""; - this.textBoxShortcutSearch.CurrentLineIndex = 0; this.textBoxShortcutSearch.HideSelection = true; - this.textBoxShortcutSearch.IsDictionaryDownloaded = true; - this.textBoxShortcutSearch.IsSpellCheckerInitialized = false; - this.textBoxShortcutSearch.IsSpellCheckRequested = false; - this.textBoxShortcutSearch.IsWrongWord = false; - this.textBoxShortcutSearch.LanguageChanged = false; this.textBoxShortcutSearch.Location = new System.Drawing.Point(64, 20); this.textBoxShortcutSearch.MaxLength = 32767; this.textBoxShortcutSearch.Multiline = true; this.textBoxShortcutSearch.Name = "textBoxShortcutSearch"; this.textBoxShortcutSearch.Padding = new System.Windows.Forms.Padding(1); this.textBoxShortcutSearch.ReadOnly = false; - this.textBoxShortcutSearch.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; this.textBoxShortcutSearch.SelectedText = ""; this.textBoxShortcutSearch.SelectionLength = 0; this.textBoxShortcutSearch.SelectionStart = 0; this.textBoxShortcutSearch.Size = new System.Drawing.Size(151, 21); this.textBoxShortcutSearch.TabIndex = 0; - this.textBoxShortcutSearch.TextBoxFont = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBoxShortcutSearch.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.textBoxShortcutSearch.UseSystemPasswordChar = false; this.textBoxShortcutSearch.TextChanged += new System.EventHandler(this.textBoxShortcutSearch_TextChanged); // @@ -3710,28 +3694,20 @@ // // textBoxFFmpegPath // - this.textBoxFFmpegPath.BackColor = System.Drawing.SystemColors.WindowFrame; - this.textBoxFFmpegPath.CurrentLanguage = ""; - this.textBoxFFmpegPath.CurrentLineIndex = 0; + this.textBoxFFmpegPath.BackColor = System.Drawing.SystemColors.Window; this.textBoxFFmpegPath.HideSelection = true; - this.textBoxFFmpegPath.IsDictionaryDownloaded = true; - this.textBoxFFmpegPath.IsSpellCheckerInitialized = false; - this.textBoxFFmpegPath.IsSpellCheckRequested = false; - this.textBoxFFmpegPath.IsWrongWord = false; - this.textBoxFFmpegPath.LanguageChanged = false; this.textBoxFFmpegPath.Location = new System.Drawing.Point(9, 65); this.textBoxFFmpegPath.MaxLength = 1000; this.textBoxFFmpegPath.Multiline = true; this.textBoxFFmpegPath.Name = "textBoxFFmpegPath"; this.textBoxFFmpegPath.Padding = new System.Windows.Forms.Padding(1); this.textBoxFFmpegPath.ReadOnly = false; - this.textBoxFFmpegPath.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; this.textBoxFFmpegPath.SelectedText = ""; this.textBoxFFmpegPath.SelectionLength = 0; this.textBoxFFmpegPath.SelectionStart = 0; this.textBoxFFmpegPath.Size = new System.Drawing.Size(366, 21); this.textBoxFFmpegPath.TabIndex = 22; - this.textBoxFFmpegPath.TextBoxFont = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBoxFFmpegPath.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.textBoxFFmpegPath.UseSystemPasswordChar = false; // // labelFFmpegPath @@ -6225,28 +6201,20 @@ // // textBoxNetworkSessionNewMessageSound // - this.textBoxNetworkSessionNewMessageSound.BackColor = System.Drawing.SystemColors.WindowFrame; - this.textBoxNetworkSessionNewMessageSound.CurrentLanguage = ""; - this.textBoxNetworkSessionNewMessageSound.CurrentLineIndex = 0; + this.textBoxNetworkSessionNewMessageSound.BackColor = System.Drawing.SystemColors.Window; this.textBoxNetworkSessionNewMessageSound.HideSelection = true; - this.textBoxNetworkSessionNewMessageSound.IsDictionaryDownloaded = true; - this.textBoxNetworkSessionNewMessageSound.IsSpellCheckerInitialized = false; - this.textBoxNetworkSessionNewMessageSound.IsSpellCheckRequested = false; - this.textBoxNetworkSessionNewMessageSound.IsWrongWord = false; - this.textBoxNetworkSessionNewMessageSound.LanguageChanged = false; this.textBoxNetworkSessionNewMessageSound.Location = new System.Drawing.Point(28, 50); this.textBoxNetworkSessionNewMessageSound.MaxLength = 32767; this.textBoxNetworkSessionNewMessageSound.Multiline = true; this.textBoxNetworkSessionNewMessageSound.Name = "textBoxNetworkSessionNewMessageSound"; this.textBoxNetworkSessionNewMessageSound.Padding = new System.Windows.Forms.Padding(1); this.textBoxNetworkSessionNewMessageSound.ReadOnly = false; - this.textBoxNetworkSessionNewMessageSound.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; this.textBoxNetworkSessionNewMessageSound.SelectedText = ""; this.textBoxNetworkSessionNewMessageSound.SelectionLength = 0; this.textBoxNetworkSessionNewMessageSound.SelectionStart = 0; this.textBoxNetworkSessionNewMessageSound.Size = new System.Drawing.Size(318, 21); this.textBoxNetworkSessionNewMessageSound.TabIndex = 20; - this.textBoxNetworkSessionNewMessageSound.TextBoxFont = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBoxNetworkSessionNewMessageSound.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.textBoxNetworkSessionNewMessageSound.UseSystemPasswordChar = false; // // labelNetworkSessionNewMessageSound @@ -7020,9 +6988,9 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1092, 574); + this.Controls.Add(this.panelShortcuts); this.Controls.Add(this.panelToolBar); this.Controls.Add(this.panelAutoTranslate); - this.Controls.Add(this.panelShortcuts); this.Controls.Add(this.panelVideoPlayer); this.Controls.Add(this.labelUpdateFileTypeAssociationsStatus); this.Controls.Add(this.panelGeneral); @@ -7362,7 +7330,7 @@ private System.Windows.Forms.CheckBox checkBoxTreatINQuoteAsING; private System.Windows.Forms.GroupBox groupBoxFfmpeg; private System.Windows.Forms.Button buttonBrowseToFFmpeg; - private Nikse.SubtitleEdit.Controls.SETextBox textBoxFFmpegPath; + private Nikse.SubtitleEdit.Controls.NikseTextBox textBoxFFmpegPath; private System.Windows.Forms.Label labelFFmpegPath; private System.Windows.Forms.CheckBox checkBoxUseFFmpeg; private System.Windows.Forms.OpenFileDialog openFileDialogFFmpeg; @@ -7388,7 +7356,7 @@ private Nikse.SubtitleEdit.Controls.NikseComboBox comboBoxWaveformTextSize; private System.Windows.Forms.GroupBox groupBoxNetworkSession; private System.Windows.Forms.Button buttonNetworkSessionNewMessageSound; - private Nikse.SubtitleEdit.Controls.SETextBox textBoxNetworkSessionNewMessageSound; + private Nikse.SubtitleEdit.Controls.NikseTextBox textBoxNetworkSessionNewMessageSound; private System.Windows.Forms.Label labelNetworkSessionNewMessageSound; private System.Windows.Forms.CheckBox checkBoxFceSkipStep1; private System.Windows.Forms.Button buttonMpvSettings; @@ -7443,7 +7411,7 @@ private System.Windows.Forms.Button buttonDownloadFfmpeg; private System.Windows.Forms.Button buttonShortcutsClear; private System.Windows.Forms.Label labelShortcutsSearch; - private Nikse.SubtitleEdit.Controls.SETextBox textBoxShortcutSearch; + private Nikse.SubtitleEdit.Controls.NikseTextBox textBoxShortcutSearch; private System.Windows.Forms.GroupBox groupBoxGoogleTranslate; private System.Windows.Forms.Label labelGoogleTranslateApiKey; private Nikse.SubtitleEdit.Controls.NikseTextBox textBoxGoogleTransleApiKey; @@ -7513,7 +7481,7 @@ private System.Windows.Forms.Button buttonRemoveFromFavoriteFormats; private System.Windows.Forms.Label labelFormats; private System.Windows.Forms.Label labelFormatsSearch; - private Nikse.SubtitleEdit.Controls.SETextBox textBoxFormatsSearch; + private Nikse.SubtitleEdit.Controls.NikseTextBox textBoxFormatsSearch; private System.Windows.Forms.Button buttonFormatsSearchClear; private Nikse.SubtitleEdit.Controls.NikseListBox listBoxSubtitleFormats; private System.Windows.Forms.Label labelFavoriteSubtitleFormatsNote;