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

Work on project settings

Browse Source
This commit is contained in:
niksedk 2023-08-26 08:02:22 +02:00
parent de0c366c88
commit 7bece10d77
9 changed files with 81 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Test/Logic/ProgressHelperTest.cs
View File

@ -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);
}
}
}

9
src/libse/LibSE.csproj
View File

@ -48,10 +48,17 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<PackageReference Include="Microsoft.Net.Http" Version="2.2.29" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
<PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="UTF.Unknown" Version="2.5.1" />
<PackageReference Include="zlib.net-mutliplatform" Version="1.0.6" />
</ItemGroup>

1
src/ui/Forms/AudioToText/WhisperAudioToText.cs
View File

@ -1230,6 +1230,7 @@ namespace Nikse.SubtitleEdit.Forms.AudioToText
}
labelTime.Text = ProgressHelper.ToProgressTime(msEstimatedLeft);
labelTime.Refresh();
BringToFront();
}

2
src/ui/Properties/Resources.resx
View File

@ -128,7 +128,7 @@
<value>..\Resources\ebu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SEIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\SE2.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<value>..\Resources\SE.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="rec32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\rec32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

BIN
src/ui/Resources/SE.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 52 KiB

0
src/ui/Resources/SE2.ico → src/ui/SE.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 52 KiB

BIN
src/ui/SE2.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 52 KiB

12
src/ui/SubtitleEdit.csproj
View File

@ -3,7 +3,7 @@
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<AppDesignerFolder>Properties</AppDesignerFolder>
<ApplicationIcon>SE2.ico</ApplicationIcon>
<ApplicationIcon>SE.ico</ApplicationIcon>
<AssemblyName>SubtitleEdit</AssemblyName>
<BootstrapperEnabled>true</BootstrapperEnabled>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -65,11 +65,11 @@
<Reference Include="Microsoft.Win32.Registry, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
</Reference>
<Reference Include="NAudio.Core, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
<HintPath>..\..\packages\NAudio.Core.2.1.0\lib\netstandard2.0\NAudio.Core.dll</HintPath>
<Reference Include="NAudio.Core, Version=2.2.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
<HintPath>..\..\packages\NAudio.Core.2.2.0\lib\netstandard2.0\NAudio.Core.dll</HintPath>
</Reference>
<Reference Include="NAudio.WinMM, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
<HintPath>..\..\packages\NAudio.WinMM.2.1.0\lib\netstandard2.0\NAudio.WinMM.dll</HintPath>
<Reference Include="NAudio.WinMM, Version=2.2.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
<HintPath>..\..\packages\NAudio.WinMM.2.2.0\lib\netstandard2.0\NAudio.WinMM.dll</HintPath>
</Reference>
<Reference Include="NCalc, Version=1.3.8.0, Culture=neutral, PublicKeyToken=973cde3f1cafed03, processorArchitecture=MSIL">
<HintPath>..\..\packages\ncalc.1.3.8\lib\NCalc.dll</HintPath>
@ -2329,7 +2329,7 @@
<None Include="Resources\Information.png" />
<None Include="Resources\Question.png" />
<None Include="Resources\Warning.png" />
<Content Include="SE2.ico" />
<Content Include="SE.ico" />
<None Include="Resources\SE.ico" />
<None Include="Hunspellx64.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

4
src/ui/packages.config
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Win32.Registry" version="5.0.0" targetFramework="net48" />
<package id="NAudio.Core" version="2.1.0" targetFramework="net48" />
<package id="NAudio.WinMM" version="2.1.0" targetFramework="net48" />
<package id="NAudio.Core" version="2.2.0" targetFramework="net48" />
<package id="NAudio.WinMM" version="2.2.0" targetFramework="net48" />
<package id="ncalc" version="1.3.8" targetFramework="net472" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
<package id="NHunspell" version="1.2.5554.16953" targetFramework="net462" />