Skip to content

Commit 2313b09

Browse files
rabanti-githubrabanti-github
committed
Update v1.9
1 parent d32a26b commit 2313b09

23 files changed

Lines changed: 602 additions & 37 deletions

‎Changelog.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Change Log
22

3+
## v1.9.0
4+
5+
Release Date: **15.11.2023**
6+
7+
- Added Spanish translation
8+
- Code maintenance
9+
- Updated readme
10+
11+
Note: Due to an error in the installer of the previous version 1.8, the upgrade process from 1.8 to 1.9 may fail. Please uninstall version 1.8 first in case of a message, stating that the installation directory already exists.
12+
13+
---
14+
315
## v1.8.0
416

517
Release Date: **04.10.2022**
@@ -11,6 +23,7 @@ Release Date: **04.10.2022**
1123
- Code maintenance
1224
- Updated readme, added development utilities and updated project structure
1325

26+
---
1427

1528
## v1.7.2
1629

‎InstallerBootstrap/InstallerBootstrap.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
<ProductName>.NET Framework 3.5 SP1</ProductName>
8181
<Install>false</Install>
8282
</BootstrapperPackage>
83+
<Content Include="README.md" />
8384
</ItemGroup>
8485
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8586
</Project>

‎InstallerBootstrap/README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This project is the link between the actual Media-Extractor application project
44

55
## Usage
66

7-
The utility resolves the application version of Media-Extractor and several ebedded properties, like the project website, the author or path to the appliucation files.
7+
The utility resolves the application version of Media-Extractor and several embedded properties, like the project website, the author or path to the application files.
88

99
The application is usually automatically executed when building Media-Extractor. Then, the above mentioned properties are extracted and written as installer file for **Inno Setup**
1010

@@ -13,14 +13,14 @@ The (console) application takes four arguments:
1313
| Order | Argument | Description |
1414
| --- | --- | --- |
1515
| 1 | Template path | The absolute Path to the Inno Setup template file |
16-
| 2 | Installer file path | The absolut path to the Inno Setup installer file (*.iss), used to buld the intsaller |
17-
| 3 | Assemply path | The absolute path to the Media-Extractor assebly and all necessary files |
16+
| 2 | Installer file path | The absolute path to the Inno Setup installer file (*.iss), used to build the installer |
17+
| 3 | Assembly path | The absolute path to the Media-Extractor assembly and all necessary files |
1818
| 4 | Assembly file | The file name of the executable (e.g. MediaExtractor.exe) within the assembly path |
1919

2020
## Template Variables
2121

22-
All template variables (e.g. *TPL_MY_APP_VERSION*) are hardcoded in the class **TemplateProcessor** and must match in the bootstrap utilit and the setup template file.
23-
Therefore, any change mut be performed in the bootstrap utility and the template file (*.TPL) in the Inno Setup installer project.
22+
All template variables (e.g. *TPL_MY_APP_VERSION*) are hardcoded in the class **TemplateProcessor** and must match in the bootstrap utility and the setup template file.
23+
Therefore, any change must be performed in the bootstrap utility and the template file (*.TPL) in the Inno Setup installer project.
2424

2525
## License
2626

‎MediaExtracor.sln‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
44
VisualStudioVersion = 16.0.30517.126
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaExtractor", "MediaExtractor\MediaExtractor.csproj", "{863DFC29-45E2-4769-B980-51E3C635AFAB}"
7-
ProjectSection(ProjectDependencies) = postProject
8-
{AA74FD79-120E-457F-A596-9A3DE3845F36} = {AA74FD79-120E-457F-A596-9A3DE3845F36}
9-
EndProjectSection
107
EndProject
118
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TranslationHelper", "TranslationHelper\TranslationHelper.csproj", "{595C1814-AA36-4499-A98D-E21D9EC2A57E}"
129
ProjectSection(ProjectDependencies) = postProject
1310
{863DFC29-45E2-4769-B980-51E3C635AFAB} = {863DFC29-45E2-4769-B980-51E3C635AFAB}
1411
EndProjectSection
1512
EndProject
1613
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InstallerBootstrap", "InstallerBootstrap\InstallerBootstrap.csproj", "{AA74FD79-120E-457F-A596-9A3DE3845F36}"
17-
EndProject
18-
Project("{29E15B7A-B420-4782-B51D-1BE2F663A160}") = "MediaExtractorInstaller", "MediaExtractorInstaller\MediaExtractorInstaller.innoproj", "{3589BA86-F4BA-4B13-B153-BB2F15C78B77}"
1914
ProjectSection(ProjectDependencies) = postProject
2015
{863DFC29-45E2-4769-B980-51E3C635AFAB} = {863DFC29-45E2-4769-B980-51E3C635AFAB}
2116
EndProjectSection
2217
EndProject
18+
Project("{29E15B7A-B420-4782-B51D-1BE2F663A160}") = "MediaExtractorInstaller", "MediaExtractorInstaller\MediaExtractorInstaller.innoproj", "{3589BA86-F4BA-4B13-B153-BB2F15C78B77}"
19+
EndProject
2320
Global
2421
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2522
All|Any CPU = All|Any CPU

‎MediaExtractor/I18N.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ public enum Key
8787
MenuAppearanceLanguageEnglish,
8888
MenuAppearanceLanguageGerman,
8989
MenuAppearanceLanguageFrench,
90+
MenuAppearanceLanguageSpanish,
9091
MenuDocument,
9192
MenuDocumentGenerictextPreview,
9293
MenuDocumentSizeWarning,
@@ -148,6 +149,10 @@ public enum Key
148149
/// Locale identifier for French (fr-FR)
149150
/// </summary>
150151
public const string FRENCH = "fr-FR";
152+
/// <summary>
153+
/// Locale identifier for Spanish (es-ES)
154+
/// </summary>
155+
public const string SPANISH = "es-ES";
151156

152157
/// <summary>
153158
/// Method to set the current locale in the view model
@@ -168,18 +173,28 @@ public static void MatchLocale(ViewModel viewModel, string currentLocale)
168173
viewModel.UseEnglishLocale = true;
169174
viewModel.UseGermanLocale = false;
170175
viewModel.UseFrenchLocale = false;
176+
viewModel.UseSpanishLocale = false;
171177
viewModel.UseSystemLocale = false;
172178
break;
173179
case GERMAN:
174180
viewModel.UseEnglishLocale = false;
175181
viewModel.UseGermanLocale = true;
176182
viewModel.UseFrenchLocale = false;
183+
viewModel.UseSpanishLocale = false;
177184
viewModel.UseSystemLocale = false;
178185
break;
179186
case FRENCH:
180187
viewModel.UseEnglishLocale = false;
181188
viewModel.UseGermanLocale = false;
182189
viewModel.UseFrenchLocale = true;
190+
viewModel.UseSpanishLocale = false;
191+
viewModel.UseSystemLocale = false;
192+
break;
193+
case SPANISH:
194+
viewModel.UseEnglishLocale = false;
195+
viewModel.UseGermanLocale = false;
196+
viewModel.UseFrenchLocale = false;
197+
viewModel.UseSpanishLocale = true;
183198
viewModel.UseSystemLocale = false;
184199
break;
185200
default:
@@ -242,6 +257,7 @@ private static void SetSystemLocale(ViewModel viewModel)
242257
viewModel.UseEnglishLocale = false;
243258
viewModel.UseGermanLocale = false;
244259
viewModel.UseFrenchLocale = false;
260+
viewModel.UseSpanishLocale = false;
245261
viewModel.UseSystemLocale = true;
246262
}
247263

‎MediaExtractor/MainWindow.xaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@
8686
<MenuItem x:Name="EnglishMenuItem" Header="{x:Static p:Resources.MenuAppearanceLanguageEnglish}" IsCheckable="True" IsChecked="{Binding Path=UseEnglishLocale}" Click="EnglishMenuItem_Click" />
8787
<MenuItem x:Name="GermanhMenuItem" Header="{x:Static p:Resources.MenuAppearanceLanguageGerman}" IsCheckable="True" IsChecked="{Binding Path=UseGermanLocale}" Click="GermanMenuItem_Click" />
8888
<MenuItem x:Name="FrenchMenuItem" Header="{x:Static p:Resources.MenuAppearanceLanguageFrench}" IsCheckable="True" IsChecked="{Binding Path=UseFrenchLocale}" Click="FrenchMenuItem_Click" />
89+
<MenuItem x:Name="SpanishMenuItem" Header="{x:Static p:Resources.MenuAppearanceLanguageSpanish}" IsCheckable="True" IsChecked="{Binding Path=UseSpanishLocale}" Click="SpanishMenuItem_Click" />
90+
8991

9092
</MenuItem>
9193
</MenuItem>

‎MediaExtractor/MainWindow.xaml.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -866,6 +866,16 @@ private void FrenchMenuItem_Click(object sender, RoutedEventArgs e)
866866
ChangeLocale(I18n.FRENCH);
867867
}
868868

869+
/// <summary>
870+
/// Enables Spanish as application language
871+
/// </summary>
872+
/// <param name="sender">The source of the event.</param>
873+
/// <param name="e">The <see cref="RoutedEventArgs"/> instance containing the event data.</param>
874+
private void SpanishMenuItem_Click(object sender, RoutedEventArgs e)
875+
{
876+
ChangeLocale(I18n.SPANISH);
877+
}
878+
869879
/// <summary>
870880
/// Enables the system locale as application language
871881
/// </summary>

‎MediaExtractor/MediaExtractor.csproj‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@
110110
<Compile Include="ExtractorItem.cs" />
111111
<Compile Include="I18N.cs" />
112112
<Compile Include="Preview.cs" />
113+
<Compile Include="Properties\Resources.Designer.cs">
114+
<DependentUpon>Resources.resx</DependentUpon>
115+
<AutoGen>True</AutoGen>
116+
<DesignTime>True</DesignTime>
117+
</Compile>
113118
<Compile Include="Properties\Resources.fr-FR.Designer.cs">
114119
<DependentUpon>Resources.fr-FR.resx</DependentUpon>
115120
<AutoGen>True</AutoGen>
@@ -120,10 +125,10 @@
120125
<AutoGen>True</AutoGen>
121126
<DesignTime>True</DesignTime>
122127
</Compile>
123-
<Compile Include="Properties\Resources.Designer.cs">
128+
<Compile Include="Properties\Resources.es-ES.Designer.cs">
124129
<AutoGen>True</AutoGen>
125130
<DesignTime>True</DesignTime>
126-
<DependentUpon>Resources.resx</DependentUpon>
131+
<DependentUpon>Resources.es-ES.resx</DependentUpon>
127132
</Compile>
128133
<Compile Include="Properties\Resources.en.Designer.cs">
129134
<DependentUpon>Resources.en.resx</DependentUpon>
@@ -168,6 +173,10 @@
168173
<DependentUpon>Settings.settings</DependentUpon>
169174
<DesignTimeSharedInput>True</DesignTimeSharedInput>
170175
</Compile>
176+
<EmbeddedResource Include="Properties\Resources.resx">
177+
<Generator>PublicResXFileCodeGenerator</Generator>
178+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
179+
</EmbeddedResource>
171180
<EmbeddedResource Include="Properties\Resources.fr-FR.resx">
172181
<Generator>PublicResXFileCodeGenerator</Generator>
173182
<LastGenOutput>Resources.fr-FR.Designer.cs</LastGenOutput>
@@ -180,9 +189,9 @@
180189
<Generator>PublicResXFileCodeGenerator</Generator>
181190
<LastGenOutput>Resources.en.Designer.cs</LastGenOutput>
182191
</EmbeddedResource>
183-
<EmbeddedResource Include="Properties\Resources.resx">
192+
<EmbeddedResource Include="Properties\Resources.es-ES.resx">
184193
<Generator>PublicResXFileCodeGenerator</Generator>
185-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
194+
<LastGenOutput>Resources.es-ES.Designer.cs</LastGenOutput>
186195
</EmbeddedResource>
187196
<None Include="App.config" />
188197
<None Include="packages.config" />
@@ -212,15 +221,14 @@
212221
<PropertyGroup>
213222
<PostBuildEvent>cd $(TargetDir)
214223
del *.pdb
215-
if $(ConfigurationName) == Release (
216-
del *.xml
217-
)
224+
if $(ConfigurationName) == Release del *.xml
218225
xcopy "$(SolutionDir)LICENSE" "$(TargetDir)" /Y
219226
ren "$(TargetDir)LICENSE" license.txt
220227
xcopy "$(SolutionDir)Changelog.md" "$(TargetDir)" /Y
221228
ren "$(TargetDir)Changelog.md" changelog.txt
222229

223-
"$(SolutionDir)InstallerBootstrap\bin\$(ConfigurationName)\InstallerBootstrap.exe" "$(SolutionDir)MediaExtractorInstaller\Templates\InstallScript.iss.TPL" "$(SolutionDir)MediaExtractorInstaller\InstallScript.iss" $(TargetDir) $(TargetFileName)</PostBuildEvent>
230+
"$(SolutionDir)InstallerBootstrap\bin\$(ConfigurationName)\InstallerBootstrap.exe" "$(SolutionDir)MediaExtractorInstaller\Templates\InstallScript.iss.TPL" "$(SolutionDir)MediaExtractorInstaller\InstallScript.iss" $(TargetDir) $(TargetFileName)
231+
</PostBuildEvent>
224232
</PropertyGroup>
225233
<PropertyGroup>
226234
<PreBuildEvent>rd /s /q "$(TargetDir)"</PreBuildEvent>

‎MediaExtractor/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222

2323

2424
// [assembly: AssemblyVersion("1.0.*")]
25-
[assembly: AssemblyVersion("1.8.0.0")]
26-
[assembly: AssemblyFileVersion("1.8.0.0")]
25+
[assembly: AssemblyVersion("1.9.0.0")]
26+
[assembly: AssemblyFileVersion("1.9.0.0")]
2727
[assembly: Guid("691EE0C3-5FD3-42CF-992D-BF7706176E13")]

‎MediaExtractor/Properties/Resources.Designer.cs‎

Lines changed: 11 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)