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

Fix one more in #8204 - thx rRobis :)

Browse Source
This commit is contained in:
Nikolaj Olsson 2024-04-18 19:54:41 +02:00
parent a7953b21c4
commit 3431a2450f
4 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -17,6 +17,7 @@
* Fix for Antrophic translate - thx venomousraid * Fix for Antrophic translate - thx venomousraid
* Fix possible crash in teletext reading - thx yellobyte * Fix possible crash in teletext reading - thx yellobyte
* Fix unwanted text boxes background color change - thx Leon * Fix unwanted text boxes background color change - thx Leon
* Fix Whisper on selection in waveform in "translation mode" - thx rRobis
4.0.5 (13th April 2024) 4.0.5 (13th April 2024)

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

@ -41,9 +41,9 @@ namespace Nikse.SubtitleEdit.Forms
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main));
Nikse.SubtitleEdit.Core.Common.TimeCode timeCode4 = new Nikse.SubtitleEdit.Core.Common.TimeCode(); Nikse.SubtitleEdit.Core.Common.TimeCode timeCode1 = new Nikse.SubtitleEdit.Core.Common.TimeCode();
Nikse.SubtitleEdit.Core.Common.TimeCode timeCode5 = new Nikse.SubtitleEdit.Core.Common.TimeCode(); Nikse.SubtitleEdit.Core.Common.TimeCode timeCode2 = new Nikse.SubtitleEdit.Core.Common.TimeCode();
Nikse.SubtitleEdit.Core.Common.TimeCode timeCode6 = 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.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.labelStatus = new System.Windows.Forms.ToolStripStatusLabel(); this.labelStatus = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripSelected = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripSelected = new System.Windows.Forms.ToolStripStatusLabel();
@ -3886,14 +3886,14 @@ namespace Nikse.SubtitleEdit.Forms
this.timeUpDownVideoPosition.Size = new System.Drawing.Size(113, 23); this.timeUpDownVideoPosition.Size = new System.Drawing.Size(113, 23);
this.timeUpDownVideoPosition.TabIndex = 12; this.timeUpDownVideoPosition.TabIndex = 12;
this.timeUpDownVideoPosition.TabStop = false; this.timeUpDownVideoPosition.TabStop = false;
timeCode4.Hours = 0; timeCode1.Hours = 0;
timeCode4.Milliseconds = 0; timeCode1.Milliseconds = 0;
timeCode4.Minutes = 0; timeCode1.Minutes = 0;
timeCode4.Seconds = 0; timeCode1.Seconds = 0;
timeCode4.TimeSpan = System.TimeSpan.Parse("00:00:00"); timeCode1.TimeSpan = System.TimeSpan.Parse("00:00:00");
timeCode4.TotalMilliseconds = 0D; timeCode1.TotalMilliseconds = 0D;
timeCode4.TotalSeconds = 0D; timeCode1.TotalSeconds = 0D;
this.timeUpDownVideoPosition.TimeCode = timeCode4; this.timeUpDownVideoPosition.TimeCode = timeCode1;
this.timeUpDownVideoPosition.UseVideoOffset = false; this.timeUpDownVideoPosition.UseVideoOffset = false;
// //
// buttonGotoSub // buttonGotoSub
@ -4166,14 +4166,14 @@ namespace Nikse.SubtitleEdit.Forms
this.timeUpDownVideoPositionAdjust.Size = new System.Drawing.Size(113, 23); this.timeUpDownVideoPositionAdjust.Size = new System.Drawing.Size(113, 23);
this.timeUpDownVideoPositionAdjust.TabIndex = 13; this.timeUpDownVideoPositionAdjust.TabIndex = 13;
this.timeUpDownVideoPositionAdjust.TabStop = false; this.timeUpDownVideoPositionAdjust.TabStop = false;
timeCode5.Hours = 0; timeCode2.Hours = 0;
timeCode5.Milliseconds = 0; timeCode2.Milliseconds = 0;
timeCode5.Minutes = 0; timeCode2.Minutes = 0;
timeCode5.Seconds = 0; timeCode2.Seconds = 0;
timeCode5.TimeSpan = System.TimeSpan.Parse("00:00:00"); timeCode2.TimeSpan = System.TimeSpan.Parse("00:00:00");
timeCode5.TotalMilliseconds = 0D; timeCode2.TotalMilliseconds = 0D;
timeCode5.TotalSeconds = 0D; timeCode2.TotalSeconds = 0D;
this.timeUpDownVideoPositionAdjust.TimeCode = timeCode5; this.timeUpDownVideoPositionAdjust.TimeCode = timeCode2;
this.timeUpDownVideoPositionAdjust.UseVideoOffset = false; this.timeUpDownVideoPositionAdjust.UseVideoOffset = false;
// //
// buttonAdjustSetEndTime // buttonAdjustSetEndTime
@ -4455,7 +4455,6 @@ namespace Nikse.SubtitleEdit.Forms
this.splitToolStripMenuItem1, this.splitToolStripMenuItem1,
this.mergeWithPreviousToolStripMenuItem, this.mergeWithPreviousToolStripMenuItem,
this.mergeWithNextToolStripMenuItem, this.mergeWithNextToolStripMenuItem,
this.runWhiperOnParagraphToolStripMenuItem,
this.toolStripSeparator11, this.toolStripSeparator11,
this.extendToPreviousToolStripMenuItem, this.extendToPreviousToolStripMenuItem,
this.extendToNextToolStripMenuItem, this.extendToNextToolStripMenuItem,
@ -4468,11 +4467,12 @@ namespace Nikse.SubtitleEdit.Forms
this.toolStripSeparatorGuessTimeCodes, this.toolStripSeparatorGuessTimeCodes,
this.removeShotChangeToolStripMenuItem, this.removeShotChangeToolStripMenuItem,
this.addShotChangeToolStripMenuItem, this.addShotChangeToolStripMenuItem,
this.runWhiperOnParagraphToolStripMenuItem,
this.guessTimeCodesToolStripMenuItem, this.guessTimeCodesToolStripMenuItem,
this.seekSilenceToolStripMenuItem, this.seekSilenceToolStripMenuItem,
this.insertSubtitleHereToolStripMenuItem}); this.insertSubtitleHereToolStripMenuItem});
this.contextMenuStripWaveform.Name = "contextMenuStripWaveform"; this.contextMenuStripWaveform.Name = "contextMenuStripWaveform";
this.contextMenuStripWaveform.Size = new System.Drawing.Size(275, 512); this.contextMenuStripWaveform.Size = new System.Drawing.Size(275, 534);
this.contextMenuStripWaveform.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.ContextMenuStripWaveformClosing); this.contextMenuStripWaveform.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.ContextMenuStripWaveformClosing);
this.contextMenuStripWaveform.Opening += new System.ComponentModel.CancelEventHandler(this.ContextMenuStripWaveformOpening); this.contextMenuStripWaveform.Opening += new System.ComponentModel.CancelEventHandler(this.ContextMenuStripWaveformOpening);
// //
@ -5522,14 +5522,14 @@ namespace Nikse.SubtitleEdit.Forms
this.timeUpDownStartTime.Size = new System.Drawing.Size(113, 23); this.timeUpDownStartTime.Size = new System.Drawing.Size(113, 23);
this.timeUpDownStartTime.TabIndex = 0; this.timeUpDownStartTime.TabIndex = 0;
this.timeUpDownStartTime.TabStop = false; this.timeUpDownStartTime.TabStop = false;
timeCode6.Hours = 0; timeCode3.Hours = 0;
timeCode6.Milliseconds = 0; timeCode3.Milliseconds = 0;
timeCode6.Minutes = 0; timeCode3.Minutes = 0;
timeCode6.Seconds = 0; timeCode3.Seconds = 0;
timeCode6.TimeSpan = System.TimeSpan.Parse("00:00:00"); timeCode3.TimeSpan = System.TimeSpan.Parse("00:00:00");
timeCode6.TotalMilliseconds = 0D; timeCode3.TotalMilliseconds = 0D;
timeCode6.TotalSeconds = 0D; timeCode3.TotalSeconds = 0D;
this.timeUpDownStartTime.TimeCode = timeCode6; this.timeUpDownStartTime.TimeCode = timeCode3;
this.timeUpDownStartTime.UseVideoOffset = false; this.timeUpDownStartTime.UseVideoOffset = false;
// //
// numericUpDownDuration // numericUpDownDuration

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

@ -36608,6 +36608,9 @@ namespace Nikse.SubtitleEdit.Forms
_subtitleOriginal = new Subtitle(_subtitle, false); _subtitleOriginal = new Subtitle(_subtitle, false);
_subtitleOriginalFileName = _fileName; _subtitleOriginalFileName = _fileName;
_fileName = null; _fileName = null;
var oldHash = _changeOriginalSubtitleHash;
SetupOriginalEdit();
_changeOriginalSubtitleHash = oldHash;
foreach (var p in _subtitle.Paragraphs) foreach (var p in _subtitle.Paragraphs)
{ {

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

@ -687,9 +687,6 @@
<metadata name="toolStripWaveControls.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="toolStripWaveControls.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>652, 56</value> <value>652, 56</value>
</metadata> </metadata>
<metadata name="toolStripWaveControls.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>652, 56</value>
</metadata>
<data name="toolStripButtonWaveformZoomOut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="toolStripButtonWaveformZoomOut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@ -772,12 +769,12 @@
<metadata name="imageListBookmarks.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="imageListBookmarks.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>981, 56</value> <value>981, 56</value>
</metadata> </metadata>
<metadata name="contextMenuStripTextBoxSourceView.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>193, 17</value>
</metadata>
<metadata name="contextMenuStripTextBoxListView.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="contextMenuStripTextBoxListView.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>668, 17</value> <value>668, 17</value>
</metadata> </metadata>
<metadata name="contextMenuStripTextBoxSourceView.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>193, 17</value>
</metadata>
<metadata name="contextMenuStripEmpty.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="contextMenuStripEmpty.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 95</value> <value>17, 95</value>
</metadata> </metadata>