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); var result = ProgressHelper.ToProgressTime(new TimeCode(0, 0, 1, 0).TotalMilliseconds);
Assert.AreEqual("Time remaining: A few seconds", result); 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);
}
} }
} }

123
src/libse/LibSE.csproj
View File

@ -1,70 +1,77 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net48;netstandard2.1</TargetFrameworks> <TargetFrameworks>net48;netstandard2.1</TargetFrameworks>
<RootNamespace>Nikse.SubtitleEdit.Core</RootNamespace> <RootNamespace>Nikse.SubtitleEdit.Core</RootNamespace>
<AssemblyName>libse</AssemblyName> <AssemblyName>libse</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild> <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile> <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<PackageProjectUrl>https://github.com/SubtitleEdit/subtitleedit/tree/main/src/libse</PackageProjectUrl> <PackageProjectUrl>https://github.com/SubtitleEdit/subtitleedit/tree/main/src/libse</PackageProjectUrl>
<RepositoryUrl>https://github.com/SubtitleEdit/subtitleedit/tree/main/src/libse</RepositoryUrl> <RepositoryUrl>https://github.com/SubtitleEdit/subtitleedit/tree/main/src/libse</RepositoryUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageTags>subtitle subtitles subrip srt blu-ray sup</PackageTags> <PackageTags>subtitle subtitles subrip srt blu-ray sup</PackageTags>
<Authors>Nikolaj Olsson</Authors> <Authors>Nikolaj Olsson</Authors>
<PackageIcon>Icon.png</PackageIcon> <PackageIcon>Icon.png</PackageIcon>
<RepositoryType>git</RepositoryType> <RepositoryType>git</RepositoryType>
<PackageReleaseNotes>SE 3.6.12</PackageReleaseNotes> <PackageReleaseNotes>SE 3.6.12</PackageReleaseNotes>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="Forms\FixCommonErrors\HelperContinuation.cs" /> <Compile Remove="Forms\FixCommonErrors\HelperContinuation.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Update="Properties\Resources.Designer.cs"> <Compile Update="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Update="Properties\Resources.resx"> <EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator> <Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput> <LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<Target Name="InvokeBuildHelpers" BeforeTargets="BeforeCompile;CoreCompile"> <Target Name="InvokeBuildHelpers" BeforeTargets="BeforeCompile;CoreCompile">
<Exec Command="%22$(SolutionDir)build_helpers.bat%22 rev %22$(ConfigurationName)%22" /> <Exec Command="%22$(SolutionDir)build_helpers.bat%22 rev %22$(ConfigurationName)%22" />
</Target> </Target>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" /> <PackageReference Include="Microsoft.Net.Http" Version="2.2.29" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0" /> </ItemGroup>
<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>
<ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
<None Include="..\..\LICENSE.txt"> <PackageReference Include="System.Net.Http" Version="4.3.4" />
<Pack>True</Pack> </ItemGroup>
<PackagePath></PackagePath>
</None> <ItemGroup>
<None Include="Icon.png"> <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<Pack>True</Pack> <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackagePath></PackagePath> <PackageReference Include="UTF.Unknown" Version="2.5.1" />
</None> <PackageReference Include="zlib.net-mutliplatform" Version="1.0.6" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="..\..\LICENSE.txt">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
<None Include="Icon.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
</Project> </Project>

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

@ -1230,6 +1230,7 @@ namespace Nikse.SubtitleEdit.Forms.AudioToText
} }
labelTime.Text = ProgressHelper.ToProgressTime(msEstimatedLeft); labelTime.Text = ProgressHelper.ToProgressTime(msEstimatedLeft);
labelTime.Refresh();
BringToFront(); 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> <value>..\Resources\ebu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="SEIcon" type="System.Resources.ResXFileRef, System.Windows.Forms"> <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>
<data name="rec32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <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> <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')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<ApplicationIcon>SE2.ico</ApplicationIcon> <ApplicationIcon>SE.ico</ApplicationIcon>
<AssemblyName>SubtitleEdit</AssemblyName> <AssemblyName>SubtitleEdit</AssemblyName>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <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"> <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> <HintPath>..\..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
</Reference> </Reference>
<Reference Include="NAudio.Core, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL"> <Reference Include="NAudio.Core, Version=2.2.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
<HintPath>..\..\packages\NAudio.Core.2.1.0\lib\netstandard2.0\NAudio.Core.dll</HintPath> <HintPath>..\..\packages\NAudio.Core.2.2.0\lib\netstandard2.0\NAudio.Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="NAudio.WinMM, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL"> <Reference Include="NAudio.WinMM, Version=2.2.0.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
<HintPath>..\..\packages\NAudio.WinMM.2.1.0\lib\netstandard2.0\NAudio.WinMM.dll</HintPath> <HintPath>..\..\packages\NAudio.WinMM.2.2.0\lib\netstandard2.0\NAudio.WinMM.dll</HintPath>
</Reference> </Reference>
<Reference Include="NCalc, Version=1.3.8.0, Culture=neutral, PublicKeyToken=973cde3f1cafed03, processorArchitecture=MSIL"> <Reference Include="NCalc, Version=1.3.8.0, Culture=neutral, PublicKeyToken=973cde3f1cafed03, processorArchitecture=MSIL">
<HintPath>..\..\packages\ncalc.1.3.8\lib\NCalc.dll</HintPath> <HintPath>..\..\packages\ncalc.1.3.8\lib\NCalc.dll</HintPath>
@ -2329,7 +2329,7 @@
<None Include="Resources\Information.png" /> <None Include="Resources\Information.png" />
<None Include="Resources\Question.png" /> <None Include="Resources\Question.png" />
<None Include="Resources\Warning.png" /> <None Include="Resources\Warning.png" />
<Content Include="SE2.ico" /> <Content Include="SE.ico" />
<None Include="Resources\SE.ico" /> <None Include="Resources\SE.ico" />
<None Include="Hunspellx64.dll"> <None Include="Hunspellx64.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

4
src/ui/packages.config
View File

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