diff --git a/src/Test/Logic/ProgressHelperTest.cs b/src/Test/Logic/ProgressHelperTest.cs index ab8952d4b..ad18efc94 100644 --- a/src/Test/Logic/ProgressHelperTest.cs +++ b/src/Test/Logic/ProgressHelperTest.cs @@ -34,5 +34,11 @@ namespace Test.Logic var result = ProgressHelper.ToProgressTime(new TimeCode(0, 0, 1, 0).TotalMilliseconds); Assert.AreEqual("Time remaining: A few seconds", result); } + + [TestMethod] public void TestOneMinuteAnd19Seconds() + { + var result = ProgressHelper.ToProgressTime(new TimeCode(0, 1, 19, 0).TotalMilliseconds); + Assert.AreEqual("Time remaining: One minute and 19 seconds", result); + } } } diff --git a/src/libse/LibSE.csproj b/src/libse/LibSE.csproj index 4323c358a..54c7a9ac5 100644 --- a/src/libse/LibSE.csproj +++ b/src/libse/LibSE.csproj @@ -1,70 +1,77 @@  - - net48;netstandard2.1 - Nikse.SubtitleEdit.Core - libse - false - false - LICENSE.txt - https://github.com/SubtitleEdit/subtitleedit/tree/main/src/libse - https://github.com/SubtitleEdit/subtitleedit/tree/main/src/libse - false - subtitle subtitles subrip srt blu-ray sup - Nikolaj Olsson - Icon.png - git - SE 3.6.12 - + + net48;netstandard2.1 + Nikse.SubtitleEdit.Core + libse + false + false + LICENSE.txt + https://github.com/SubtitleEdit/subtitleedit/tree/main/src/libse + https://github.com/SubtitleEdit/subtitleedit/tree/main/src/libse + false + subtitle subtitles subrip srt blu-ray sup + Nikolaj Olsson + Icon.png + git + SE 3.6.12 + - - - + + + - - - True - True - Resources.resx - - + + + True + True + Resources.resx + + - - - ResXFileCodeGenerator - Resources.Designer.cs - - + + + ResXFileCodeGenerator + Resources.Designer.cs + + - - - + + + - - true - + + true + - - true - + + true + - - - - - - - + + + - - - True - - - - True - - - + + + + + + + + + + + + + + True + + + + True + + + \ No newline at end of file diff --git a/src/ui/Forms/AudioToText/WhisperAudioToText.cs b/src/ui/Forms/AudioToText/WhisperAudioToText.cs index 5dbf1323f..e04c00f2b 100644 --- a/src/ui/Forms/AudioToText/WhisperAudioToText.cs +++ b/src/ui/Forms/AudioToText/WhisperAudioToText.cs @@ -1230,6 +1230,7 @@ namespace Nikse.SubtitleEdit.Forms.AudioToText } labelTime.Text = ProgressHelper.ToProgressTime(msEstimatedLeft); + labelTime.Refresh(); BringToFront(); } diff --git a/src/ui/Properties/Resources.resx b/src/ui/Properties/Resources.resx index e218f4aa1..0b924527a 100644 --- a/src/ui/Properties/Resources.resx +++ b/src/ui/Properties/Resources.resx @@ -128,7 +128,7 @@ ..\Resources\ebu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\SE2.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\SE.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\rec32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/src/ui/Resources/SE.ico b/src/ui/Resources/SE.ico index 0f1f5f39b..f4df3652b 100644 Binary files a/src/ui/Resources/SE.ico and b/src/ui/Resources/SE.ico differ diff --git a/src/ui/Resources/SE2.ico b/src/ui/SE.ico similarity index 100% rename from src/ui/Resources/SE2.ico rename to src/ui/SE.ico diff --git a/src/ui/SE2.ico b/src/ui/SE2.ico deleted file mode 100644 index f4df3652b..000000000 Binary files a/src/ui/SE2.ico and /dev/null differ diff --git a/src/ui/SubtitleEdit.csproj b/src/ui/SubtitleEdit.csproj index 3c587b488..1b197eda7 100644 --- a/src/ui/SubtitleEdit.csproj +++ b/src/ui/SubtitleEdit.csproj @@ -3,7 +3,7 @@ Properties - SE2.ico + SE.ico SubtitleEdit true Debug @@ -65,11 +65,11 @@ ..\..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll - - ..\..\packages\NAudio.Core.2.1.0\lib\netstandard2.0\NAudio.Core.dll + + ..\..\packages\NAudio.Core.2.2.0\lib\netstandard2.0\NAudio.Core.dll - - ..\..\packages\NAudio.WinMM.2.1.0\lib\netstandard2.0\NAudio.WinMM.dll + + ..\..\packages\NAudio.WinMM.2.2.0\lib\netstandard2.0\NAudio.WinMM.dll ..\..\packages\ncalc.1.3.8\lib\NCalc.dll @@ -2329,7 +2329,7 @@ - + PreserveNewest diff --git a/src/ui/packages.config b/src/ui/packages.config index 81295e166..e5d527fad 100644 --- a/src/ui/packages.config +++ b/src/ui/packages.config @@ -1,8 +1,8 @@  - - + +