From 08357ffa2563e97e670d8ea924a5fa0be292bc94 Mon Sep 17 00:00:00 2001 From: Nikolaj Olsson Date: Mon, 3 May 2021 08:44:36 +0200 Subject: [PATCH] Work on resize and textbox - thx AbsenceJam/darnn :) Related to #5013 --- src/ui/Forms/Main.Designer.cs | 513 +++++++++++++++++----------------- src/ui/Forms/Main.cs | 50 ++++ src/ui/Forms/Main.resx | 162 +++++------ 3 files changed, 389 insertions(+), 336 deletions(-) diff --git a/src/ui/Forms/Main.Designer.cs b/src/ui/Forms/Main.Designer.cs index 6d34e0cf2..08825cc12 100644 --- a/src/ui/Forms/Main.Designer.cs +++ b/src/ui/Forms/Main.Designer.cs @@ -40,9 +40,9 @@ namespace Nikse.SubtitleEdit.Forms { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main)); - Nikse.SubtitleEdit.Core.Common.TimeCode timeCode3 = new Nikse.SubtitleEdit.Core.Common.TimeCode(); Nikse.SubtitleEdit.Core.Common.TimeCode timeCode1 = new Nikse.SubtitleEdit.Core.Common.TimeCode(); Nikse.SubtitleEdit.Core.Common.TimeCode timeCode2 = new Nikse.SubtitleEdit.Core.Common.TimeCode(); + Nikse.SubtitleEdit.Core.Common.TimeCode timeCode3 = new Nikse.SubtitleEdit.Core.Common.TimeCode(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.labelStatus = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripSelected = new System.Windows.Forms.ToolStripStatusLabel(); @@ -253,6 +253,7 @@ namespace Nikse.SubtitleEdit.Forms this.autotranslateViaCopypasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator26 = new System.Windows.Forms.ToolStripSeparator(); this.mergeSentencesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.breaksplitLongLinesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.changeLanguageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -341,6 +342,7 @@ namespace Nikse.SubtitleEdit.Forms this.colorDialog1 = new System.Windows.Forms.ColorDialog(); this.groupBoxVideo = new System.Windows.Forms.GroupBox(); this.labelNextWord = new System.Windows.Forms.Label(); + this.audioVisualizer = new Nikse.SubtitleEdit.Controls.AudioVisualizer(); this.checkBoxSyncListViewWithVideoWhilePlaying = new System.Windows.Forms.CheckBox(); this.labelVideoInfo = new System.Windows.Forms.Label(); this.trackBarWaveformPosition = new System.Windows.Forms.TrackBar(); @@ -376,6 +378,7 @@ namespace Nikse.SubtitleEdit.Forms this.buttonPlayCurrent = new System.Windows.Forms.Button(); this.buttonPlayNext = new System.Windows.Forms.Button(); this.tabPageCreate = new System.Windows.Forms.TabPage(); + this.timeUpDownVideoPosition = new Nikse.SubtitleEdit.Controls.TimeUpDown(); this.buttonGotoSub = new System.Windows.Forms.Button(); this.buttonBeforeText = new System.Windows.Forms.Button(); this.buttonSetEnd = new System.Windows.Forms.Button(); @@ -393,6 +396,7 @@ namespace Nikse.SubtitleEdit.Forms this.labelVideoPosition = new System.Windows.Forms.Label(); this.buttonSecBack1 = new System.Windows.Forms.Button(); this.tabPageAdjust = new System.Windows.Forms.TabPage(); + this.timeUpDownVideoPositionAdjust = new Nikse.SubtitleEdit.Controls.TimeUpDown(); this.buttonAdjustSetEndTime = new System.Windows.Forms.Button(); this.buttonSetEndAndGoToNext = new System.Windows.Forms.Button(); this.buttonSetStartAndOffsetRest = new System.Windows.Forms.Button(); @@ -444,6 +448,7 @@ namespace Nikse.SubtitleEdit.Forms this.splitContainerMain = new System.Windows.Forms.SplitContainer(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainerListViewAndText = new System.Windows.Forms.SplitContainer(); + this.SubtitleListview1 = new Nikse.SubtitleEdit.Controls.SubtitleListView(); this.imageListBookmarks = new System.Windows.Forms.ImageList(this.components); this.groupBoxEdit = new System.Windows.Forms.GroupBox(); this.labelOriginalSingleLinePixels = new System.Windows.Forms.Label(); @@ -461,6 +466,7 @@ namespace Nikse.SubtitleEdit.Forms this.labelTextOriginalLineLengths = new System.Windows.Forms.Label(); this.labelOriginalText = new System.Windows.Forms.Label(); this.labelText = new System.Windows.Forms.Label(); + this.textBoxListViewTextOriginal = new Nikse.SubtitleEdit.Controls.SETextBox(); this.contextMenuStripTextBoxListView = new System.Windows.Forms.ContextMenuStrip(this.components); this.toolStripSeparatorSpellCheckSuggestions = new System.Windows.Forms.ToolStripSeparator(); this.toolStripMenuItemSpellCheckSkipOnce = new System.Windows.Forms.ToolStripMenuItem(); @@ -515,10 +521,12 @@ namespace Nikse.SubtitleEdit.Forms this.labelTextLineTotal = new System.Windows.Forms.Label(); this.labelCharactersPerSecond = new System.Windows.Forms.Label(); this.buttonUnBreak = new System.Windows.Forms.Button(); + this.timeUpDownStartTime = new Nikse.SubtitleEdit.Controls.TimeUpDown(); this.numericUpDownDuration = new System.Windows.Forms.NumericUpDown(); this.buttonPrevious = new System.Windows.Forms.Button(); this.buttonNext = new System.Windows.Forms.Button(); this.labelStartTime = new System.Windows.Forms.Label(); + this.textBoxListViewText = new Nikse.SubtitleEdit.Controls.SETextBox(); this.labelDuration = new System.Windows.Forms.Label(); this.labelAutoDuration = new System.Windows.Forms.Label(); this.textBoxSource = new System.Windows.Forms.TextBox(); @@ -541,21 +549,13 @@ namespace Nikse.SubtitleEdit.Forms this.startOfLefttorightOverrideLROToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.startOfRighttoleftOverrideRLOToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panelVideoPlayer = new System.Windows.Forms.Panel(); + this.mediaPlayer = new Nikse.SubtitleEdit.Controls.VideoPlayerContainer(); 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.breaksplitLongLinesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SubtitleListview1 = new Nikse.SubtitleEdit.Controls.SubtitleListView(); - this.textBoxListViewTextOriginal = new Nikse.SubtitleEdit.Controls.SETextBox(); - this.timeUpDownStartTime = new Nikse.SubtitleEdit.Controls.TimeUpDown(); - this.textBoxListViewText = new Nikse.SubtitleEdit.Controls.SETextBox(); - this.mediaPlayer = new Nikse.SubtitleEdit.Controls.VideoPlayerContainer(); - this.audioVisualizer = new Nikse.SubtitleEdit.Controls.AudioVisualizer(); - this.timeUpDownVideoPosition = new Nikse.SubtitleEdit.Controls.TimeUpDown(); - this.timeUpDownVideoPositionAdjust = new Nikse.SubtitleEdit.Controls.TimeUpDown(); this.statusStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -2405,6 +2405,13 @@ namespace Nikse.SubtitleEdit.Forms this.mergeSentencesToolStripMenuItem.Text = "Merge sentences..."; this.mergeSentencesToolStripMenuItem.Click += new System.EventHandler(this.mergeSentencesToolStripMenuItem_Click); // + // breaksplitLongLinesToolStripMenuItem + // + this.breaksplitLongLinesToolStripMenuItem.Name = "breaksplitLongLinesToolStripMenuItem"; + this.breaksplitLongLinesToolStripMenuItem.Size = new System.Drawing.Size(238, 22); + this.breaksplitLongLinesToolStripMenuItem.Text = "Break/split long lines..."; + this.breaksplitLongLinesToolStripMenuItem.Click += new System.EventHandler(this.breaksplitLongLinesToolStripMenuItem_Click); + // // optionsToolStripMenuItem // this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -3086,6 +3093,54 @@ namespace Nikse.SubtitleEdit.Forms this.labelNextWord.Text = "Next: xxx"; this.labelNextWord.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // audioVisualizer + // + this.audioVisualizer.AllowDrop = true; + this.audioVisualizer.AllowNewSelection = true; + this.audioVisualizer.AllowOverlap = false; + this.audioVisualizer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.audioVisualizer.BackColor = System.Drawing.Color.Black; + this.audioVisualizer.BackgroundColor = System.Drawing.Color.Black; + this.audioVisualizer.Chapters = null; + this.audioVisualizer.ChaptersColor = System.Drawing.Color.Empty; + this.audioVisualizer.ClosenessForBorderSelection = 15; + this.audioVisualizer.Color = System.Drawing.Color.GreenYellow; + this.audioVisualizer.CursorColor = System.Drawing.Color.Empty; + this.audioVisualizer.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); + this.audioVisualizer.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(18))))); + this.audioVisualizer.InsertAtVideoPositionShortcut = System.Windows.Forms.Keys.Insert; + this.audioVisualizer.Location = new System.Drawing.Point(472, 32); + this.audioVisualizer.Margin = new System.Windows.Forms.Padding(0); + this.audioVisualizer.MouseWheelScrollUpIsForward = true; + this.audioVisualizer.Move100MsLeft = System.Windows.Forms.Keys.None; + this.audioVisualizer.Move100MsRight = System.Windows.Forms.Keys.None; + this.audioVisualizer.MoveOneSecondLeft = System.Windows.Forms.Keys.None; + this.audioVisualizer.MoveOneSecondRight = System.Windows.Forms.Keys.None; + this.audioVisualizer.Name = "audioVisualizer"; + this.audioVisualizer.NewSelectionParagraph = null; + this.audioVisualizer.ParagraphColor = System.Drawing.Color.LimeGreen; + this.audioVisualizer.SceneChanges = ((System.Collections.Generic.List)(resources.GetObject("audioVisualizer.SceneChanges"))); + this.audioVisualizer.SelectedColor = System.Drawing.Color.Red; + this.audioVisualizer.ShowGridLines = true; + this.audioVisualizer.ShowSpectrogram = false; + this.audioVisualizer.ShowWaveform = true; + this.audioVisualizer.Size = new System.Drawing.Size(499, 229); + this.audioVisualizer.StartPositionSeconds = 0D; + this.audioVisualizer.TabIndex = 6; + this.audioVisualizer.TextBold = true; + this.audioVisualizer.TextColor = System.Drawing.Color.Gray; + this.audioVisualizer.TextSize = 9F; + this.audioVisualizer.VerticalZoomFactor = 1D; + this.audioVisualizer.WaveformNotLoadedText = "Click to add waveform"; + this.audioVisualizer.WavePeaks = null; + this.audioVisualizer.ZoomFactor = 1D; + 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); + // // checkBoxSyncListViewWithVideoWhilePlaying // this.checkBoxSyncListViewWithVideoWhilePlaying.AutoSize = true; @@ -3510,6 +3565,26 @@ namespace Nikse.SubtitleEdit.Forms this.tabPageCreate.Text = "Create"; this.tabPageCreate.UseVisualStyleBackColor = true; // + // timeUpDownVideoPosition + // + this.timeUpDownVideoPosition.AutoSize = true; + this.timeUpDownVideoPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.timeUpDownVideoPosition.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); + this.timeUpDownVideoPosition.Location = new System.Drawing.Point(90, 190); + this.timeUpDownVideoPosition.Margin = new System.Windows.Forms.Padding(4); + this.timeUpDownVideoPosition.Name = "timeUpDownVideoPosition"; + this.timeUpDownVideoPosition.Size = new System.Drawing.Size(111, 27); + this.timeUpDownVideoPosition.TabIndex = 12; + timeCode1.Hours = 0; + timeCode1.Milliseconds = 0; + timeCode1.Minutes = 0; + timeCode1.Seconds = 0; + timeCode1.TimeSpan = System.TimeSpan.Parse("00:00:00"); + timeCode1.TotalMilliseconds = 0D; + timeCode1.TotalSeconds = 0D; + this.timeUpDownVideoPosition.TimeCode = timeCode1; + this.timeUpDownVideoPosition.UseVideoOffset = false; + // // buttonGotoSub // this.buttonGotoSub.Location = new System.Drawing.Point(6, 58); @@ -3730,6 +3805,26 @@ namespace Nikse.SubtitleEdit.Forms this.tabPageAdjust.Text = "Adjust"; this.tabPageAdjust.UseVisualStyleBackColor = true; // + // timeUpDownVideoPositionAdjust + // + this.timeUpDownVideoPositionAdjust.AutoSize = true; + this.timeUpDownVideoPositionAdjust.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.timeUpDownVideoPositionAdjust.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); + this.timeUpDownVideoPositionAdjust.Location = new System.Drawing.Point(90, 215); + this.timeUpDownVideoPositionAdjust.Margin = new System.Windows.Forms.Padding(4); + this.timeUpDownVideoPositionAdjust.Name = "timeUpDownVideoPositionAdjust"; + this.timeUpDownVideoPositionAdjust.Size = new System.Drawing.Size(111, 27); + this.timeUpDownVideoPositionAdjust.TabIndex = 13; + timeCode2.Hours = 0; + timeCode2.Milliseconds = 0; + timeCode2.Minutes = 0; + timeCode2.Seconds = 0; + timeCode2.TimeSpan = System.TimeSpan.Parse("00:00:00"); + timeCode2.TotalMilliseconds = 0D; + timeCode2.TotalSeconds = 0D; + this.timeUpDownVideoPositionAdjust.TimeCode = timeCode2; + this.timeUpDownVideoPositionAdjust.UseVideoOffset = false; + // // buttonAdjustSetEndTime // this.buttonAdjustSetEndTime.Location = new System.Drawing.Point(6, 84); @@ -4220,6 +4315,37 @@ namespace Nikse.SubtitleEdit.Forms this.splitContainerListViewAndText.TabIndex = 2; this.splitContainerListViewAndText.VisibleChanged += new System.EventHandler(this.ListViewVisibleChanged); // + // SubtitleListview1 + // + this.SubtitleListview1.AllowColumnReorder = true; + this.SubtitleListview1.AllowDrop = true; + this.SubtitleListview1.ContextMenuStrip = this.contextMenuStripListView; + this.SubtitleListview1.Dock = System.Windows.Forms.DockStyle.Fill; + this.SubtitleListview1.FirstVisibleIndex = -1; + this.SubtitleListview1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.SubtitleListview1.FullRowSelect = true; + this.SubtitleListview1.GridLines = true; + this.SubtitleListview1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; + this.SubtitleListview1.HideSelection = false; + this.SubtitleListview1.Location = new System.Drawing.Point(0, 0); + this.SubtitleListview1.Name = "SubtitleListview1"; + this.SubtitleListview1.OwnerDraw = true; + this.SubtitleListview1.Size = new System.Drawing.Size(740, 105); + this.SubtitleListview1.StateImageList = this.imageListBookmarks; + this.SubtitleListview1.SubtitleFontBold = false; + this.SubtitleListview1.SubtitleFontName = "Tahoma"; + this.SubtitleListview1.SubtitleFontSize = 8; + this.SubtitleListview1.TabIndex = 0; + this.SubtitleListview1.UseCompatibleStateImageBehavior = false; + this.SubtitleListview1.UseSyntaxColoring = true; + this.SubtitleListview1.View = System.Windows.Forms.View.Details; + this.SubtitleListview1.SelectedIndexChanged += new System.EventHandler(this.SubtitleListview1_SelectedIndexChanged); + this.SubtitleListview1.DragDrop += new System.Windows.Forms.DragEventHandler(this.SubtitleListview1_DragDrop); + this.SubtitleListview1.DragEnter += new System.Windows.Forms.DragEventHandler(this.SubtitleListview1_DragEnter); + this.SubtitleListview1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SubtitleListview1KeyDown); + this.SubtitleListview1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.SubtitleListview1_MouseDoubleClick); + this.SubtitleListview1.MouseEnter += new System.EventHandler(this.SubtitleListview1_MouseEnter); + // // imageListBookmarks // this.imageListBookmarks.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit; @@ -4416,6 +4542,41 @@ namespace Nikse.SubtitleEdit.Forms this.labelText.TabIndex = 5; this.labelText.Text = "Text"; // + // textBoxListViewTextOriginal + // + this.textBoxListViewTextOriginal.AllowDrop = true; + this.textBoxListViewTextOriginal.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxListViewTextOriginal.BackColor = System.Drawing.SystemColors.WindowFrame; + this.textBoxListViewTextOriginal.ContextMenuStrip = this.contextMenuStripTextBoxListView; + this.textBoxListViewTextOriginal.CurrentLanguage = ""; + this.textBoxListViewTextOriginal.CurrentLineIndex = 0; + this.textBoxListViewTextOriginal.Enabled = false; + this.textBoxListViewTextOriginal.HideSelection = false; + this.textBoxListViewTextOriginal.IsDictionaryDownloaded = true; + this.textBoxListViewTextOriginal.IsSpellCheckerInitialized = false; + this.textBoxListViewTextOriginal.IsSpellCheckRequested = false; + this.textBoxListViewTextOriginal.IsWrongWord = false; + this.textBoxListViewTextOriginal.LanguageChanged = false; + this.textBoxListViewTextOriginal.Location = new System.Drawing.Point(946, 28); + this.textBoxListViewTextOriginal.Multiline = true; + this.textBoxListViewTextOriginal.Name = "textBoxListViewTextOriginal"; + this.textBoxListViewTextOriginal.Padding = new System.Windows.Forms.Padding(1); + this.textBoxListViewTextOriginal.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; + this.textBoxListViewTextOriginal.SelectedText = ""; + this.textBoxListViewTextOriginal.SelectionLength = 0; + this.textBoxListViewTextOriginal.SelectionStart = 0; + this.textBoxListViewTextOriginal.Size = new System.Drawing.Size(16, 84); + this.textBoxListViewTextOriginal.TabIndex = 33; + this.textBoxListViewTextOriginal.Visible = false; + this.textBoxListViewTextOriginal.TextChanged += new System.EventHandler(this.textBoxListViewTextOriginal_TextChanged); + this.textBoxListViewTextOriginal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBoxListViewTextOriginalKeyDown); + this.textBoxListViewTextOriginal.MouseClick += new System.Windows.Forms.MouseEventHandler(this.TextBoxListViewTextOriginalMouseClick); + this.textBoxListViewTextOriginal.Enter += new System.EventHandler(this.TextBoxListViewTextOriginalEnter); + this.textBoxListViewTextOriginal.KeyUp += new System.Windows.Forms.KeyEventHandler(this.TextBoxListViewTextOriginalKeyUp); + this.textBoxListViewTextOriginal.MouseMove += new System.Windows.Forms.MouseEventHandler(this.TextBoxListViewTextOriginalMouseMove); + // // contextMenuStripTextBoxListView // this.contextMenuStripTextBoxListView.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -4858,6 +5019,26 @@ namespace Nikse.SubtitleEdit.Forms this.buttonUnBreak.UseVisualStyleBackColor = true; this.buttonUnBreak.Click += new System.EventHandler(this.ButtonUnBreakClick); // + // timeUpDownStartTime + // + this.timeUpDownStartTime.AutoSize = true; + this.timeUpDownStartTime.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.timeUpDownStartTime.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); + this.timeUpDownStartTime.Location = new System.Drawing.Point(8, 26); + this.timeUpDownStartTime.Margin = new System.Windows.Forms.Padding(4); + this.timeUpDownStartTime.Name = "timeUpDownStartTime"; + this.timeUpDownStartTime.Size = new System.Drawing.Size(111, 27); + this.timeUpDownStartTime.TabIndex = 0; + timeCode3.Hours = 0; + timeCode3.Milliseconds = 0; + timeCode3.Minutes = 0; + timeCode3.Seconds = 0; + timeCode3.TimeSpan = System.TimeSpan.Parse("00:00:00"); + timeCode3.TotalMilliseconds = 0D; + timeCode3.TotalSeconds = 0D; + this.timeUpDownStartTime.TimeCode = timeCode3; + this.timeUpDownStartTime.UseVideoOffset = false; + // // numericUpDownDuration // this.numericUpDownDuration.DecimalPlaces = 3; @@ -4911,6 +5092,41 @@ namespace Nikse.SubtitleEdit.Forms this.labelStartTime.TabIndex = 3; this.labelStartTime.Text = "Start time"; // + // textBoxListViewText + // + this.textBoxListViewText.AllowDrop = true; + this.textBoxListViewText.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxListViewText.BackColor = System.Drawing.SystemColors.WindowFrame; + this.textBoxListViewText.ContextMenuStrip = this.contextMenuStripTextBoxListView; + this.textBoxListViewText.CurrentLanguage = ""; + this.textBoxListViewText.CurrentLineIndex = 0; + this.textBoxListViewText.Enabled = false; + this.textBoxListViewText.HideSelection = false; + this.textBoxListViewText.IsDictionaryDownloaded = true; + this.textBoxListViewText.IsSpellCheckerInitialized = false; + this.textBoxListViewText.IsSpellCheckRequested = false; + this.textBoxListViewText.IsWrongWord = false; + this.textBoxListViewText.LanguageChanged = false; + this.textBoxListViewText.Location = new System.Drawing.Point(236, 28); + this.textBoxListViewText.Multiline = true; + this.textBoxListViewText.Name = "textBoxListViewText"; + this.textBoxListViewText.Padding = new System.Windows.Forms.Padding(1); + this.textBoxListViewText.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; + this.textBoxListViewText.SelectedText = ""; + this.textBoxListViewText.SelectionLength = 0; + this.textBoxListViewText.SelectionStart = 0; + this.textBoxListViewText.Size = new System.Drawing.Size(378, 84); + this.textBoxListViewText.TabIndex = 5; + this.textBoxListViewText.TextChanged += new System.EventHandler(this.TextBoxListViewTextTextChanged); + this.textBoxListViewText.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBoxListViewTextKeyDown); + this.textBoxListViewText.MouseClick += new System.Windows.Forms.MouseEventHandler(this.TextBoxListViewTextMouseClick); + this.textBoxListViewText.Enter += new System.EventHandler(this.TextBoxListViewTextEnter); + this.textBoxListViewText.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBoxListViewText_KeyUp); + this.textBoxListViewText.Leave += new System.EventHandler(this.textBoxListViewText_Leave); + this.textBoxListViewText.MouseMove += new System.Windows.Forms.MouseEventHandler(this.textBoxListViewText_MouseMove); + // // labelDuration // this.labelDuration.AutoSize = true; @@ -5105,6 +5321,35 @@ namespace Nikse.SubtitleEdit.Forms this.panelVideoPlayer.Size = new System.Drawing.Size(220, 246); this.panelVideoPlayer.TabIndex = 5; // + // mediaPlayer + // + this.mediaPlayer.AllowDrop = true; + this.mediaPlayer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.mediaPlayer.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); + this.mediaPlayer.Chapters = null; + this.mediaPlayer.CurrentPosition = 0D; + this.mediaPlayer.FontSizeFactor = 1F; + this.mediaPlayer.LastParagraph = null; + this.mediaPlayer.Location = new System.Drawing.Point(0, 0); + this.mediaPlayer.Margin = new System.Windows.Forms.Padding(0); + this.mediaPlayer.Name = "mediaPlayer"; + this.mediaPlayer.ShowFullscreenButton = true; + this.mediaPlayer.ShowMuteButton = true; + this.mediaPlayer.ShowStopButton = true; + this.mediaPlayer.Size = new System.Drawing.Size(219, 246); + this.mediaPlayer.SmpteMode = false; + this.mediaPlayer.SubtitleText = ""; + this.mediaPlayer.TabIndex = 5; + this.mediaPlayer.TextRightToLeft = System.Windows.Forms.RightToLeft.No; + this.mediaPlayer.VideoHeight = 0; + this.mediaPlayer.VideoPlayer = null; + this.mediaPlayer.VideoWidth = 0; + this.mediaPlayer.Volume = 0D; + this.mediaPlayer.DragDrop += new System.Windows.Forms.DragEventHandler(this.mediaPlayer_DragDrop); + this.mediaPlayer.DragEnter += new System.Windows.Forms.DragEventHandler(this.mediaPlayer_DragEnter); + // // contextMenuStripEmpty // this.contextMenuStripEmpty.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -5146,251 +5391,6 @@ namespace Nikse.SubtitleEdit.Forms this.timerOriginalTextUndo.Interval = 700; this.timerOriginalTextUndo.Tick += new System.EventHandler(this.TimerOriginalTextUndoTick); // - // breaksplitLongLinesToolStripMenuItem - // - this.breaksplitLongLinesToolStripMenuItem.Name = "breaksplitLongLinesToolStripMenuItem"; - this.breaksplitLongLinesToolStripMenuItem.Size = new System.Drawing.Size(238, 22); - this.breaksplitLongLinesToolStripMenuItem.Text = "Break/split long lines..."; - this.breaksplitLongLinesToolStripMenuItem.Click += new System.EventHandler(this.breaksplitLongLinesToolStripMenuItem_Click); - // - // SubtitleListview1 - // - this.SubtitleListview1.AllowColumnReorder = true; - this.SubtitleListview1.AllowDrop = true; - this.SubtitleListview1.ContextMenuStrip = this.contextMenuStripListView; - this.SubtitleListview1.Dock = System.Windows.Forms.DockStyle.Fill; - this.SubtitleListview1.FirstVisibleIndex = -1; - this.SubtitleListview1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.SubtitleListview1.FullRowSelect = true; - this.SubtitleListview1.GridLines = true; - this.SubtitleListview1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; - this.SubtitleListview1.HideSelection = false; - this.SubtitleListview1.Location = new System.Drawing.Point(0, 0); - this.SubtitleListview1.Name = "SubtitleListview1"; - this.SubtitleListview1.OwnerDraw = true; - this.SubtitleListview1.Size = new System.Drawing.Size(740, 105); - this.SubtitleListview1.StateImageList = this.imageListBookmarks; - this.SubtitleListview1.SubtitleFontBold = false; - this.SubtitleListview1.SubtitleFontName = "Tahoma"; - this.SubtitleListview1.SubtitleFontSize = 8; - this.SubtitleListview1.TabIndex = 0; - this.SubtitleListview1.UseCompatibleStateImageBehavior = false; - this.SubtitleListview1.UseSyntaxColoring = true; - this.SubtitleListview1.View = System.Windows.Forms.View.Details; - this.SubtitleListview1.SelectedIndexChanged += new System.EventHandler(this.SubtitleListview1_SelectedIndexChanged); - this.SubtitleListview1.DragDrop += new System.Windows.Forms.DragEventHandler(this.SubtitleListview1_DragDrop); - this.SubtitleListview1.DragEnter += new System.Windows.Forms.DragEventHandler(this.SubtitleListview1_DragEnter); - this.SubtitleListview1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SubtitleListview1KeyDown); - this.SubtitleListview1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.SubtitleListview1_MouseDoubleClick); - this.SubtitleListview1.MouseEnter += new System.EventHandler(this.SubtitleListview1_MouseEnter); - // - // textBoxListViewTextOriginal - // - this.textBoxListViewTextOriginal.AllowDrop = true; - this.textBoxListViewTextOriginal.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.textBoxListViewTextOriginal.BackColor = System.Drawing.SystemColors.WindowFrame; - this.textBoxListViewTextOriginal.ContextMenuStrip = this.contextMenuStripTextBoxListView; - this.textBoxListViewTextOriginal.CurrentLanguage = ""; - this.textBoxListViewTextOriginal.CurrentLineIndex = 0; - this.textBoxListViewTextOriginal.Enabled = false; - this.textBoxListViewTextOriginal.HideSelection = false; - this.textBoxListViewTextOriginal.IsDictionaryDownloaded = true; - this.textBoxListViewTextOriginal.IsSpellCheckerInitialized = false; - this.textBoxListViewTextOriginal.IsSpellCheckRequested = false; - this.textBoxListViewTextOriginal.IsWrongWord = false; - this.textBoxListViewTextOriginal.LanguageChanged = false; - this.textBoxListViewTextOriginal.Location = new System.Drawing.Point(946, 28); - this.textBoxListViewTextOriginal.Multiline = true; - this.textBoxListViewTextOriginal.Name = "textBoxListViewTextOriginal"; - this.textBoxListViewTextOriginal.Padding = new System.Windows.Forms.Padding(1); - this.textBoxListViewTextOriginal.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; - this.textBoxListViewTextOriginal.SelectedText = ""; - this.textBoxListViewTextOriginal.SelectionLength = 0; - this.textBoxListViewTextOriginal.SelectionStart = 0; - this.textBoxListViewTextOriginal.Size = new System.Drawing.Size(16, 84); - this.textBoxListViewTextOriginal.TabIndex = 33; - this.textBoxListViewTextOriginal.Visible = false; - this.textBoxListViewTextOriginal.TextChanged += new System.EventHandler(this.textBoxListViewTextOriginal_TextChanged); - this.textBoxListViewTextOriginal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBoxListViewTextOriginalKeyDown); - this.textBoxListViewTextOriginal.MouseClick += new System.Windows.Forms.MouseEventHandler(this.TextBoxListViewTextOriginalMouseClick); - this.textBoxListViewTextOriginal.Enter += new System.EventHandler(this.TextBoxListViewTextOriginalEnter); - this.textBoxListViewTextOriginal.KeyUp += new System.Windows.Forms.KeyEventHandler(this.TextBoxListViewTextOriginalKeyUp); - this.textBoxListViewTextOriginal.MouseMove += new System.Windows.Forms.MouseEventHandler(this.TextBoxListViewTextOriginalMouseMove); - // - // timeUpDownStartTime - // - this.timeUpDownStartTime.AutoSize = true; - this.timeUpDownStartTime.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.timeUpDownStartTime.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); - this.timeUpDownStartTime.Location = new System.Drawing.Point(8, 26); - this.timeUpDownStartTime.Margin = new System.Windows.Forms.Padding(4); - this.timeUpDownStartTime.Name = "timeUpDownStartTime"; - this.timeUpDownStartTime.Size = new System.Drawing.Size(111, 27); - this.timeUpDownStartTime.TabIndex = 0; - timeCode3.Hours = 0; - timeCode3.Milliseconds = 0; - timeCode3.Minutes = 0; - timeCode3.Seconds = 0; - timeCode3.TimeSpan = System.TimeSpan.Parse("00:00:00"); - timeCode3.TotalMilliseconds = 0D; - timeCode3.TotalSeconds = 0D; - this.timeUpDownStartTime.TimeCode = timeCode3; - this.timeUpDownStartTime.UseVideoOffset = false; - // - // textBoxListViewText - // - this.textBoxListViewText.AllowDrop = true; - this.textBoxListViewText.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.textBoxListViewText.BackColor = System.Drawing.SystemColors.WindowFrame; - this.textBoxListViewText.ContextMenuStrip = this.contextMenuStripTextBoxListView; - this.textBoxListViewText.CurrentLanguage = ""; - this.textBoxListViewText.CurrentLineIndex = 0; - this.textBoxListViewText.Enabled = false; - this.textBoxListViewText.HideSelection = false; - this.textBoxListViewText.IsDictionaryDownloaded = true; - this.textBoxListViewText.IsSpellCheckerInitialized = false; - this.textBoxListViewText.IsSpellCheckRequested = false; - this.textBoxListViewText.IsWrongWord = false; - this.textBoxListViewText.LanguageChanged = false; - this.textBoxListViewText.Location = new System.Drawing.Point(236, 28); - this.textBoxListViewText.Multiline = true; - this.textBoxListViewText.Name = "textBoxListViewText"; - this.textBoxListViewText.Padding = new System.Windows.Forms.Padding(1); - this.textBoxListViewText.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; - this.textBoxListViewText.SelectedText = ""; - this.textBoxListViewText.SelectionLength = 0; - this.textBoxListViewText.SelectionStart = 0; - this.textBoxListViewText.Size = new System.Drawing.Size(378, 84); - this.textBoxListViewText.TabIndex = 5; - this.textBoxListViewText.TextChanged += new System.EventHandler(this.TextBoxListViewTextTextChanged); - this.textBoxListViewText.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBoxListViewTextKeyDown); - this.textBoxListViewText.MouseClick += new System.Windows.Forms.MouseEventHandler(this.TextBoxListViewTextMouseClick); - this.textBoxListViewText.Enter += new System.EventHandler(this.TextBoxListViewTextEnter); - this.textBoxListViewText.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBoxListViewText_KeyUp); - this.textBoxListViewText.Leave += new System.EventHandler(this.textBoxListViewText_Leave); - this.textBoxListViewText.MouseMove += new System.Windows.Forms.MouseEventHandler(this.textBoxListViewText_MouseMove); - // - // mediaPlayer - // - this.mediaPlayer.AllowDrop = true; - this.mediaPlayer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.mediaPlayer.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); - this.mediaPlayer.Chapters = null; - this.mediaPlayer.CurrentPosition = 0D; - this.mediaPlayer.FontSizeFactor = 1F; - this.mediaPlayer.LastParagraph = null; - this.mediaPlayer.Location = new System.Drawing.Point(0, 0); - this.mediaPlayer.Margin = new System.Windows.Forms.Padding(0); - this.mediaPlayer.Name = "mediaPlayer"; - this.mediaPlayer.ShowFullscreenButton = true; - this.mediaPlayer.ShowMuteButton = true; - this.mediaPlayer.ShowStopButton = true; - this.mediaPlayer.Size = new System.Drawing.Size(219, 246); - this.mediaPlayer.SmpteMode = false; - this.mediaPlayer.SubtitleText = ""; - this.mediaPlayer.TabIndex = 5; - this.mediaPlayer.TextRightToLeft = System.Windows.Forms.RightToLeft.No; - this.mediaPlayer.VideoHeight = 0; - this.mediaPlayer.VideoPlayer = null; - this.mediaPlayer.VideoWidth = 0; - this.mediaPlayer.Volume = 0D; - this.mediaPlayer.DragDrop += new System.Windows.Forms.DragEventHandler(this.mediaPlayer_DragDrop); - this.mediaPlayer.DragEnter += new System.Windows.Forms.DragEventHandler(this.mediaPlayer_DragEnter); - // - // audioVisualizer - // - this.audioVisualizer.AllowDrop = true; - this.audioVisualizer.AllowNewSelection = true; - this.audioVisualizer.AllowOverlap = false; - this.audioVisualizer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.audioVisualizer.BackColor = System.Drawing.Color.Black; - this.audioVisualizer.BackgroundColor = System.Drawing.Color.Black; - this.audioVisualizer.Chapters = null; - this.audioVisualizer.ChaptersColor = System.Drawing.Color.Empty; - this.audioVisualizer.ClosenessForBorderSelection = 15; - this.audioVisualizer.Color = System.Drawing.Color.GreenYellow; - this.audioVisualizer.CursorColor = System.Drawing.Color.Empty; - this.audioVisualizer.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); - this.audioVisualizer.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(18))))); - this.audioVisualizer.InsertAtVideoPositionShortcut = System.Windows.Forms.Keys.Insert; - this.audioVisualizer.Location = new System.Drawing.Point(472, 32); - this.audioVisualizer.Margin = new System.Windows.Forms.Padding(0); - this.audioVisualizer.MouseWheelScrollUpIsForward = true; - this.audioVisualizer.Move100MsLeft = System.Windows.Forms.Keys.None; - this.audioVisualizer.Move100MsRight = System.Windows.Forms.Keys.None; - this.audioVisualizer.MoveOneSecondLeft = System.Windows.Forms.Keys.None; - this.audioVisualizer.MoveOneSecondRight = System.Windows.Forms.Keys.None; - this.audioVisualizer.Name = "audioVisualizer"; - this.audioVisualizer.NewSelectionParagraph = null; - this.audioVisualizer.ParagraphColor = System.Drawing.Color.LimeGreen; - this.audioVisualizer.SceneChanges = ((System.Collections.Generic.List)(resources.GetObject("audioVisualizer.SceneChanges"))); - this.audioVisualizer.SelectedColor = System.Drawing.Color.Red; - this.audioVisualizer.ShowGridLines = true; - this.audioVisualizer.ShowSpectrogram = false; - this.audioVisualizer.ShowWaveform = true; - this.audioVisualizer.Size = new System.Drawing.Size(499, 229); - this.audioVisualizer.StartPositionSeconds = 0D; - this.audioVisualizer.TabIndex = 6; - this.audioVisualizer.TextBold = true; - this.audioVisualizer.TextColor = System.Drawing.Color.Gray; - this.audioVisualizer.TextSize = 9F; - this.audioVisualizer.VerticalZoomFactor = 1D; - this.audioVisualizer.WaveformNotLoadedText = "Click to add waveform"; - this.audioVisualizer.WavePeaks = null; - this.audioVisualizer.ZoomFactor = 1D; - 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); - // - // timeUpDownVideoPosition - // - this.timeUpDownVideoPosition.AutoSize = true; - this.timeUpDownVideoPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.timeUpDownVideoPosition.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); - this.timeUpDownVideoPosition.Location = new System.Drawing.Point(90, 190); - this.timeUpDownVideoPosition.Margin = new System.Windows.Forms.Padding(4); - this.timeUpDownVideoPosition.Name = "timeUpDownVideoPosition"; - this.timeUpDownVideoPosition.Size = new System.Drawing.Size(111, 27); - this.timeUpDownVideoPosition.TabIndex = 12; - timeCode1.Hours = 0; - timeCode1.Milliseconds = 0; - timeCode1.Minutes = 0; - timeCode1.Seconds = 0; - timeCode1.TimeSpan = System.TimeSpan.Parse("00:00:00"); - timeCode1.TotalMilliseconds = 0D; - timeCode1.TotalSeconds = 0D; - this.timeUpDownVideoPosition.TimeCode = timeCode1; - this.timeUpDownVideoPosition.UseVideoOffset = false; - // - // timeUpDownVideoPositionAdjust - // - this.timeUpDownVideoPositionAdjust.AutoSize = true; - this.timeUpDownVideoPositionAdjust.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.timeUpDownVideoPositionAdjust.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); - this.timeUpDownVideoPositionAdjust.Location = new System.Drawing.Point(90, 215); - this.timeUpDownVideoPositionAdjust.Margin = new System.Windows.Forms.Padding(4); - this.timeUpDownVideoPositionAdjust.Name = "timeUpDownVideoPositionAdjust"; - this.timeUpDownVideoPositionAdjust.Size = new System.Drawing.Size(111, 27); - this.timeUpDownVideoPositionAdjust.TabIndex = 13; - timeCode2.Hours = 0; - timeCode2.Milliseconds = 0; - timeCode2.Minutes = 0; - timeCode2.Seconds = 0; - timeCode2.TimeSpan = System.TimeSpan.Parse("00:00:00"); - timeCode2.TotalMilliseconds = 0D; - timeCode2.TotalSeconds = 0D; - this.timeUpDownVideoPositionAdjust.TimeCode = timeCode2; - this.timeUpDownVideoPositionAdjust.UseVideoOffset = false; - // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -5408,9 +5408,12 @@ namespace Nikse.SubtitleEdit.Forms this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormMain_FormClosing); this.Load += new System.EventHandler(this.Main_Load); this.Shown += new System.EventHandler(this.Main_Shown); + this.ResizeBegin += new System.EventHandler(this.Main_ResizeBegin); this.ResizeEnd += new System.EventHandler(this.Main_ResizeEnd); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MainKeyDown); this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.MainKeyUp); + this.MouseClick += new System.Windows.Forms.MouseEventHandler(this.Main_MouseClick); + this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Main_MouseDown); this.Resize += new System.EventHandler(this.Main_Resize); this.statusStrip1.ResumeLayout(false); this.statusStrip1.PerformLayout(); diff --git a/src/ui/Forms/Main.cs b/src/ui/Forms/Main.cs index ea17b3d34..f3015c1af 100644 --- a/src/ui/Forms/Main.cs +++ b/src/ui/Forms/Main.cs @@ -20030,6 +20030,7 @@ namespace Nikse.SubtitleEdit.Forms private void ShowVideoPlayer() { + int textHeight = splitContainerListViewAndText.Height - splitContainerListViewAndText.SplitterDistance; if (_isVideoControlsUndocked) { ShowHideUndockedVideoControls(); @@ -20078,6 +20079,11 @@ namespace Nikse.SubtitleEdit.Forms } Main_Resize(null, null); + + if (!_isVideoControlsUndocked) + { + splitContainerListViewAndText.SplitterDistance = splitContainerListViewAndText.Height - textHeight; + } } private void ShowHideUndockedVideoControls() @@ -20228,11 +20234,20 @@ namespace Nikse.SubtitleEdit.Forms return; } + if (_textHeightResize >= 1) + { + splitContainerListViewAndText.SplitterDistance = splitContainerListViewAndText.Height - _textHeightResize; + } + SubtitleListview1.AutoSizeAllColumns(this); if (WindowState == FormWindowState.Maximized) { Main_ResizeEnd(sender, e); _lastFormWindowState = WindowState; + if (_textHeightResize >= 1) + { + splitContainerListViewAndText.SplitterDistance = splitContainerListViewAndText.Height - _textHeightResize; + } return; } else if (WindowState == FormWindowState.Normal && _lastFormWindowState == FormWindowState.Maximized) @@ -20240,6 +20255,10 @@ namespace Nikse.SubtitleEdit.Forms System.Threading.SynchronizationContext.Current.Post(TimeSpan.FromMilliseconds(25), () => { MainResize(); + if (_textHeightResize >= 1) + { + splitContainerListViewAndText.SplitterDistance = splitContainerListViewAndText.Height - _textHeightResize; + } }); } @@ -20247,8 +20266,19 @@ namespace Nikse.SubtitleEdit.Forms panelVideoPlayer.Invalidate(); } + + private int _textHeightResize = -1; + private bool _textHeightResizeIgnoreUpdate = false; + + private void Main_ResizeBegin(object sender, EventArgs e) + { + _textHeightResizeIgnoreUpdate = true; + _textHeightResize = splitContainerListViewAndText.Height - splitContainerListViewAndText.SplitterDistance; + } + private void Main_ResizeEnd(object sender, EventArgs e) { + _textHeightResizeIgnoreUpdate = false; if (_loading) { return; @@ -20257,6 +20287,11 @@ namespace Nikse.SubtitleEdit.Forms SuspendLayout(); MainResize(); + if (_textHeightResize >= 1) + { + splitContainerListViewAndText.SplitterDistance = splitContainerListViewAndText.Height - _textHeightResize; + } + // Due to strange bug in listview when maximizing SaveSubtitleListviewIndices(); SubtitleListview1.Fill(_subtitle, _subtitleOriginal); @@ -30150,6 +30185,11 @@ namespace Nikse.SubtitleEdit.Forms { splitContainerListViewAndText.SplitterDistance = splitContainerListViewAndText.Height - Configuration.Settings.General.SubtitleTextBoxMaxHeight; } + + if (!_textHeightResizeIgnoreUpdate && WindowState == _lastFormWindowState) + { + _textHeightResize = splitContainerListViewAndText.Height - splitContainerListViewAndText.SplitterDistance; + } } private void splitContainerListViewAndText_SizeChanged(object sender, EventArgs e) @@ -30454,5 +30494,15 @@ namespace Nikse.SubtitleEdit.Forms { toolStripMenuItemAutoSplitLongLines_Click(sender, e); } + + private void Main_MouseDown(object sender, MouseEventArgs e) + { + _textHeightResize = splitContainerListViewAndText.Height - splitContainerListViewAndText.SplitterDistance; + } + + private void Main_MouseClick(object sender, MouseEventArgs e) + { + _textHeightResize = splitContainerListViewAndText.Height - splitContainerListViewAndText.SplitterDistance; + } } } diff --git a/src/ui/Forms/Main.resx b/src/ui/Forms/Main.resx index 8a43d6deb..867a7b2c2 100644 --- a/src/ui/Forms/Main.resx +++ b/src/ui/Forms/Main.resx @@ -127,27 +127,27 @@ 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 @@ -464,75 +464,75 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAOiSURBVFhH7VddSBVBFN7KfiyoSMwMvTO7W2ZSVEgQBEkQ - URQEvVQIYgSXwnvd2ZVCiLCniB56CIR+sJ7SvLtoCRHUg9VbEUYYIVFU7t4bJdFDf0Tkdk4ddZ3Rutef - tz74uOyeb+Z8nJk9M1f7j4ng4e5dp31bdEaZtkVLqGkzSDJ98Bgrv7y6bNC3kmHaEaMpxHaSTR9cM3be - M3nYs3ePYiBwrFskmx50lC8vuGryL2jg5ro1ioFeRwxmGhoqSD718Ex2HJMP8Wn1AcVExhEXST61SFVU - zLlm8kzUwJ1NGxUDaefQ10wyWUjDpg4pk9dEkyOvmSXvAtvqlU1AFU7QsKmDp/Me2YBrspOw8WplA4Fl - vX2eTM6loZMHrP1WOTnwW6uuF2EiTKiYsOsP0vDJI2WwrjEMtFBYC6DksgFoTE8oPDm06XoZJPsZTX7J - 5IPtur6WJBpuOtx8solAiG0kmThcgzdHkyNh7W9TeBhQhYuKAce6SeGJob2kZIln8M+KAYPtJMkwsAFh - I4oa6LUteHbKSZI7PIM1qsn5s/EOHWzFUQNIqMx5CueGC5WVs12dB7IBYJwkCvAwkg30OeJL0FhXQJLs - kdJj1XJyl7EBWJZ8kijAygS2UBoTVOY4SbKHa/JHsoErjP1oM/nHv7G7quq7aqAu87SpaQ5N/W94nG+R - k2fLjpVm+LruyCgDSN+2amj6fyOl886xJs+WD3btUAykLauHpv87OlaUmlD+UY0nV96oWBX6ol4x4dvJ - rZRmfLg6O6dMGou9h37wOBf2HtgXyAbSdn0XpRkbnYwthjvfJ9mAq+u7SZI1+m17rdKYamt+Bo5TRhIV - 4PyonNwzS/uaNG0mSXKCL8TtqAGkb1nNFB4N+HzyINkbxYDOjpAkZ2QarJ2ygReHD3+G6iwhyQjgyN2v - JDf4h67i4vkkyRlhGM7wHfFMNgHvGkkyArhuP5ANQN8/ReEJI9Mg4rKBwEkEYTw+myS49rHNcnKvsPD7 - 9VWly0kSBR5E41EBlDv/VSIxIJvod0Q1SX5vvmNw5+t2jdjdlBG7126w+606OwOhBcCFQFyzpcBiYAkw - BmRATr/4jO8xjjrULwLi+Hkv6xO2byfuwZlwF25K3Ui4zJ6FmALc7VgaPHCGEhcBcXIdiJ8Q/vHA29B6 - 4Ab6xWd8j3EDWApcBsRTEOfBfYRnQU5f01BZcdAsIBrDSZB4450XIT4jMYa6PCCOQ465NH+gab8Aq2RO - lOf37BEAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAOiSURBVFhH7VddSBVBFN7KfiyoKKwUvTO7W2pSVEQQBEUQ + USQVvZQIUQSieK87u1IIEvYUUeBDEFgQPVV6d9ESJKgH+3kywogiIorK3XujInpIi4jczqljrTNq9/rz + 1gcfl93zzZyPM7Nn5mr/MR7cL991yrdFR5QpW1wMNW0aSaYOHmOlzSuLB30rEaYcMZxCbCfZ1ME1Yy2e + ycPefXsUA4Fj3SDZ1KC9tGDxZZMPoIGuNasUA/ccMZiury8j+eTDM1kjJh/ik8oKxUTaERdIPrlIlpXN + ajV5Omrg1sYNioGUc+RLOpHIo2GTh6TJD0aTI1vNwneBbT2WTUAVjtOwyYOn817ZgGuyE7DxDskGAst6 + +zyRmE1DJw5Y+61ycuDXK7q+FBNhQsWEXXeYhk8cSYN1jmDgIoW1AEouG4DG9IjCE8NVXS+GZD+iyc+Y + fLBN11eTRMNNh5tPNhEIsY0k44dr8HPR5EhY+5sU/gOowgXFgGN1UXh8aCssXOQZvF8xYLCdJPkDbEDY + iKIG7tkWPDulJMkensEa1OT86WiHDrbiqAEkVKaFwtnh/Pr1M12dB7IBYBVJFOBhJBt45oiBoKF2MUky + R1KPVcrJXcY+wLLkkkQBViawhdKYoDKNJMkcrskfyAYuMfb9qsk/jcXuLVu+qQZq00+ammbR1P+Gx/lm + OXmmbF9hhq9ra4YZQPq2dZCm/zeSOu8YafJM2bNrh2IgZVm9NP3YaF9eZEL5hzWebHm9rCT0RZ1iwrcT + WynN6HB1dlaZNBZ7D/3gYTZ8XLE/kA2k7LpOSjMyOhhbCHe+z7IBV9fLSZIx+mx7tdKY9u7+EThOMUlU + gPOjcnLPLHrWpGnTSZIVfCFuRg0gfcs6R+HhgM8nB5K9UQzorIYkWSNdb+2UDbyoru6H6iwiyV/AkXtA + SW7wj535+XNJkjXCMJzmO+KpbALeNZDkL+C63SMbgL5/ksLjRrpeVMkGAicehFVVM0mCax/bJCf38vK+ + XSspKiBJFHgQjUYFUO7cV/H4B9lEnyMqSfJr8x2DO1+3a8RuJ43YnTaD3b2is9MQmgecD8Q1WwLMBxYC + Y0AG5PSLz/ge46hD/QIgjp/zsi5u+3b8DpwJt+Gm1I2Ey2wzxBTgbsfS4IEzlHgpECfXgfgJ4R8PvA2t + Ba6jX3zG9xg3gEXAZUA8BXEe3Ed4FmT1NQ2VFQfNAKIxnASJN945EeIzEmOoywHiOOSIS/MbmvYTMmhO + BGGS7ikAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQeSURBVFhH1VddaFNnGI6zuOkQZII/+JOTZFCGFERcsU5p - nShsIPPKizHWFhRFiOc0MntRbXAw5oU/yFxHa7Wbulqb2Ja101L7Q7vWKvZH0zS2aZI2OTlJ21zoheCF - 2s/3OTktJTv54+TGBx6+877f973v8/0nug8SjLElUjhc+mjY5Xn8bGRSksJnybdUqdaGcDjM+fyB+tFx - b1dcun1Papq72R9321lVUyerbOxgrgnPsGpbhd4psSESiWQraeJDlKTr1uomVlphS8hLt1sZib1E/LnC - 3q7aZjHPVDUwiFDSxAc1alQLEMtzN1uYKIpNYihUe5HEqLWJJWZCSRMfqQoAf/mzmf16o0W1To1pCbA9 - 6Gf3ewczQsRKW8A5Gtn5v+9lhIiVtgDs8rq2hxkhYqUtYNDpHpuZmdmaCSJW2gIGRt3DikszEOvDFUBn - feP09HQ1sQYMhUJn5r+Tkdp+ixiaBFCgg7hu4Su/2sjIlkvYyQgRiKFJAI3iyyGHO9LT73zRS6SgAyhh - JyP1PY0YmgRkApoE4Jmlo7SLHp0Chdyi7wKq22m1Wj+SO8eBJgHYSPf7hthf//aw2tZe5nK53qKEDbY/ - esogAm179+15IFkENmIR5gIlJTnwAZoE0CgPNHQ+Zr/Z2lhlQ4e8CVHCBpt7nrDZ2dndjQZDztXPDXPe - o0cYRIgWoVoOSNAkQJKkFZT0BxJSRCMtJHs3Stgg1X1Py7TMbuKuEVnf9m1vIUDi+dfhkyfXIIYmAamg - 1mBYS8lfQ8A/W74oIwEvICJYwpej3jnmfVhWeZe5vf57codEiBVAo9067vV1QD1Ie+IayjHPVCfVfYU2 - diNXjuR20/qXTdnZKyVBuCAL4Pmw22z+mPrki8HgLZqxXLRPCJU9UIS1hm/xRYRnlr6FGr3+E5tpwzQE - 2IzcebkPz3OTRYVvorNwohi+lKEiIHdkzDsIe8A1MUy2HaXjuWeIvr+uN+qLkZyEvLFznF4OQqDk9bIA - C/+U6XRLFHdypLMHENhu2vwMAupMG2doKa7MsyNvRxsEREVY9ipdkiMdATbj5r3RtVfneHGhLCAg8M1K - l+RIS4CJa0EiKieJt2PZ/83+VggYKfrxXfAnPvl/AmBBgHPCR5vsYAy/o3Xn0O4Ox2VXmbg5RcAhuXMM - mNWa5bcI/uhS8L8r7sSYF3CFdj6e4Vj+53C+JBGfUtKK6FRv8nfl52cp3f8HSn4KAjzHjr2i6/kzxR0f - gWDwcm1r38JdH8s+hyNSf/z4ujoj97xOrxeruU2l1G01EbfeOuJ6pYS9umxPnt4nnPBMmc2BKcF8mHyJ - TwRdq1k01Xk0yoUXb57066igu7sbCZYTVxGRCEcP64vHZxtxu1LChh/1a4loj36YrdSPZYpAwHhMAJ3u - PQ6f+XZ/CLsjAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQeSURBVFhH1VddaFNnGI5a5qYIY8Jq8ScnyaCoCEWc2Dlp + nSg42OzVLsagFhRFiOc0svWi2jBBJs5NxlylWu10s3ZNbIuttdS20j+r2B+NaW3TJG1ycpK2udALwQtd + P9/n5LSUePLHyY0PPHznfb/ve9/n+0907yUYY4ukUKjkwdCI++GTpxOSFPqZfEuUam0IhUKc1+evHR7z + 3ItJl/dRVWMnu3CzjV1s6GAV9e1sZNw9pNpWoWdSrAuHw9lKmtgQJemKtbKBlZTb4vLcjRZGYs8RT5bb + 21TbLOSJi3UMIpQ0sUGN6tUCRPP0P01MFMUGMRis/p3EqLWJJmZCSRMbyQoAT/3dyH651qRap8aUBNju + 9rE7PQNpIWKlLOA0jezs9ea0ELFSFoBdXtN6Py1ErJQFDDhdo9PT0znpIGKlLKB/2DWkuDQDsd5fAXTW + 10xNTVUSq8BgMHhi7jsRqe3XiKFJAAUqwHULX9mleka2XMJORIhADE0CaBSfDzpc4a4+5/MeIgXtRwk7 + EanvccTQJCAd0CQAzywdpS/p0clXyC34zqe6L6xW62K5cwxoEoCNdKd3kF293cWqW3qY0+l8gxI22Pbg + MYMItO3ZvfOuZBFYt0WY9RcXb4IP0CSARvlNXcdD9qetlVXUtcubECVssLHrEZuZmdlRbzBs+vUzw6zn + 0EEGEaJFqJQDEjQJkCRpGSX9gYTsp5EWkr0DJWyQ6r6nZfrAbuIuE1nvhg1vIEDi+VehY8c+RQxNApJB + tcGQSclfQcCtjetLScBziAgU82Wod4567pdW3GQuj69Z7hAP0QJotDljHm871IO0Jy6jHHVPdlDddrSx + G7kyJLebsl40ZGevkAThN1kAz4dcZvNS6pMnBgL/0oxtRfu4UNkD+7HW8C28iPDM0rdQpdd/aDOtnoIA + m5E7K/fheW6isPB1ZBaOFsGXNFQEbH066hmA3T8yPkS2HaXjmXuQvr+qNeqLkJyEvLZznF4OQqDktbIA + C/+Y6XSLFHdipLIHENhuWvcEAmpMa6ZpKc7PsT13WysERERYdildEiMVATbjul2RtVfnWFGhLMAv8I1K + l8RISYCJa0IiKieIN6LZt3dPCwR0F3z7f+BHPvF/AmBegHPcS5usIIr7aN05tPuP47LPmLhZRcB3cuco + MKs1w2cRfJGl4P9S3PExJ+A87Xw8w9HsdjhfkIjllLQ8MtVrfffy8jKU7u+Akv8EAe7Dh1/S9fyJ4o4N + fyDwR3VL7/xdH81ehyNce+TIqhoj96xGrxcrubUl1G0lEbfeKmKWUsJeWbozV+8VjronzWb/pGA+QL74 + J4Ku1Qya6lwa5fyLN0f6dZTf2dmJBB8RPyYiEY4e1hePz2biFqWEDT/qM4loj36YreSPZZJAwFiMA53u + LetG+P3WnwYYAAAAAElFTkSuQmCC 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 @@ -781,7 +781,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2 - CAAAAk1TRnQBSQFMAgEBAgEAAbQBKAG0ASgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAATQBKQE0ASkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA