Merge pull request #160 from fxsound2/dev

Chinese Traditional supported added
fxsound2 · Aug 21, 2024 · cd9fbf2 · cd9fbf2
2 parents 528e1aa + 07df6a7
commit cd9fbf2
Show file tree

Hide file tree

Showing 14 changed files with 401 additions and 231 deletions.
diff --git a/Installer/Resources/Fonts/NotoSansTC-Bold.ttf b/Installer/Resources/Fonts/NotoSansTC-Bold.ttf
diff --git a/Installer/Resources/Fonts/NotoSansTC-Medium.ttf b/Installer/Resources/Fonts/NotoSansTC-Medium.ttf
diff --git a/Installer/Resources/Fonts/NotoSansTC-Regular.ttf b/Installer/Resources/Fonts/NotoSansTC-Regular.ttf
diff --git a/fxsound/FxSound.jucer b/fxsound/FxSound.jucer
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<JUCERPROJECT id="F3FTdD" name="FxSound" projectType="guiapp" version="1.1.26.0"
+<JUCERPROJECT id="F3FTdD" name="FxSound" projectType="guiapp" version="1.1.27.0"
               displaySplashScreen="1" jucerFormatVersion="1" companyName="FxSound LLC"
               companyWebsite="https://www.fxsound.com" companyCopyright="2024 FxSound&#8482;"
               defines="UNICODE" postExportShellCommandWin="type %%1%%\Project\status_icons.rc &gt;&gt; %%1%%\Project\resources.rc">
@@ -175,6 +175,8 @@
       <FILE id="mIhelm" name="FxSound.vi.txt" compile="0" resource="1" file="../Strings/Strings/FxSound.vi.txt"/>
       <FILE id="PIqwHI" name="FxSound.zh-CN.txt" compile="0" resource="1"
             file="../Strings/Strings/FxSound.zh-CN.txt"/>
+      <FILE id="gqOoeq" name="FxSound.zh-TW.txt" compile="0" resource="1"
+            file="../Strings/Strings/FxSound.zh-TW.txt"/>
     </GROUP>
   </MAINGROUP>
   <EXPORTFORMATS>

diff --git a/fxsound/JuceLibraryCode/BinaryData.cpp b/fxsound/JuceLibraryCode/BinaryData.cpp
diff --git a/fxsound/JuceLibraryCode/BinaryData.h b/fxsound/JuceLibraryCode/BinaryData.h
@@ -156,7 +156,7 @@ namespace BinaryData
     const int            FxSound_ro_txtSize = 10912;
 
     extern const char*   FxSound_ru_txt;
-    const int            FxSound_ru_txtSize = 14573;
+    const int            FxSound_ru_txtSize = 14544;
 
     extern const char*   FxSound_sv_txt;
     const int            FxSound_sv_txtSize = 10581;
@@ -176,8 +176,11 @@ namespace BinaryData
     extern const char*   FxSound_zhCN_txt;
     const int            FxSound_zhCN_txtSize = 9323;
 
+    extern const char*   FxSound_zhTW_txt;
+    const int            FxSound_zhTW_txtSize = 9324;
+
     // Number of elements in the namedResourceList and originalFileNames arrays.
-    const int namedResourceListSize = 56;
+    const int namedResourceListSize = 57;
 
     // Points to the start of a list of resource names.
     extern const char* namedResourceList[];

diff --git a/fxsound/JuceLibraryCode/JuceHeader.h b/fxsound/JuceLibraryCode/JuceHeader.h
@@ -45,7 +45,7 @@ namespace ProjectInfo
 {
     const char* const  projectName    = "FxSound";
     const char* const  companyName    = "FxSound LLC";
-    const char* const  versionString  = "1.1.26.0";
-    const int          versionNumber  = 0x1011a00;
+    const char* const  versionString  = "1.1.27.0";
+    const int          versionNumber  = 0x1011b00;
 }
 #endif
diff --git a/fxsound/Project/FxSound.sln b/fxsound/Project/FxSound.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.10.35122.118
+VisualStudioVersion = 17.11.35208.52
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FxSound_App", "FxSound_App.vcxproj", "{7A8BC8D1-8FA6-3204-17E8-DA0BF486BB4E}"
 EndProject

diff --git a/fxsound/Project/FxSound_App.vcxproj b/fxsound/Project/FxSound_App.vcxproj
@@ -87,7 +87,7 @@
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <AdditionalIncludeDirectories>..\JuceLibraryCode;C:\JUCE\modules;$(SolutionDir)..\..\audiopassthru\include;$(SolutionDir)..\..\dsp\include;$(SolutionDir)..\Source\GUI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;UNICODE;JUCE_MODAL_LOOPS_PERMITTED;JUCER_VS2022_50C8E2F9=1;JUCE_APP_VERSION=1.1.26.0;JUCE_APP_VERSION_HEX=0x1011a00;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;UNICODE;JUCE_MODAL_LOOPS_PERMITTED;JUCER_VS2022_50C8E2F9=1;JUCE_APP_VERSION=1.1.27.0;JUCE_APP_VERSION_HEX=0x1011b00;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -133,7 +133,7 @@
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <AdditionalIncludeDirectories>..\JuceLibraryCode;C:\JUCE\modules;$(SolutionDir)..\..\audiopassthru\include;$(SolutionDir)..\..\dsp\include;$(SolutionDir)..\Source\GUI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;UNICODE;JUCE_MODAL_LOOPS_PERMITTED;JUCER_VS2022_50C8E2F9=1;JUCE_APP_VERSION=1.1.26.0;JUCE_APP_VERSION_HEX=0x1011a00;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;UNICODE;JUCE_MODAL_LOOPS_PERMITTED;JUCER_VS2022_50C8E2F9=1;JUCE_APP_VERSION=1.1.27.0;JUCE_APP_VERSION_HEX=0x1011b00;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -179,7 +179,7 @@
       <Optimization>Full</Optimization>
       <DebugInformationFormat>None</DebugInformationFormat>
       <AdditionalIncludeDirectories>..\JuceLibraryCode;C:\JUCE\modules;$(SolutionDir)..\..\audiopassthru\include;$(SolutionDir)..\..\dsp\include;$(SolutionDir)..\Source\GUI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;UNICODE;JUCE_MODAL_LOOPS_PERMITTED;JUCER_VS2022_50C8E2F9=1;JUCE_APP_VERSION=1.1.26.0;JUCE_APP_VERSION_HEX=0x1011a00;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;UNICODE;JUCE_MODAL_LOOPS_PERMITTED;JUCER_VS2022_50C8E2F9=1;JUCE_APP_VERSION=1.1.27.0;JUCE_APP_VERSION_HEX=0x1011b00;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -232,7 +232,7 @@ copy $(TargetDir)$(TargetName).pdb ..\..\bin\$(PlatformTarget)\ /y</Command>
       <Optimization>Full</Optimization>
       <DebugInformationFormat>None</DebugInformationFormat>
       <AdditionalIncludeDirectories>..\JuceLibraryCode;C:\JUCE\modules;$(SolutionDir)..\..\audiopassthru\include;$(SolutionDir)..\..\dsp\include;$(SolutionDir)..\Source\GUI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;UNICODE;JUCE_MODAL_LOOPS_PERMITTED;JUCER_VS2022_50C8E2F9=1;JUCE_APP_VERSION=1.1.26.0;JUCE_APP_VERSION_HEX=0x1011a00;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;UNICODE;JUCE_MODAL_LOOPS_PERMITTED;JUCER_VS2022_50C8E2F9=1;JUCE_APP_VERSION=1.1.27.0;JUCE_APP_VERSION_HEX=0x1011b00;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -2144,6 +2144,7 @@ copy $(TargetDir)$(TargetName).pdb ..\..\bin\$(PlatformTarget)\ /y</Command>
     <None Include="..\..\Strings\Strings\FxSound.txt" />
     <None Include="..\..\Strings\Strings\FxSound.vi.txt" />
     <None Include="..\..\Strings\Strings\FxSound.zh-CN.txt" />
+    <None Include="..\..\Strings\Strings\FxSound.zh-TW.txt" />
     <None Include="..\..\..\..\..\..\..\JUCE\modules\juce_core\native\java\README.txt" />
     <None Include="..\..\..\..\..\..\..\JUCE\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt" />
     <None Include="..\..\..\..\..\..\..\JUCE\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt" />

diff --git a/fxsound/Project/FxSound_App.vcxproj.filters b/fxsound/Project/FxSound_App.vcxproj.filters
@@ -3349,6 +3349,9 @@
     <None Include="..\..\Strings\Strings\FxSound.zh-CN.txt">
       <Filter>FxSound\Strings</Filter>
     </None>
+    <None Include="..\..\Strings\Strings\FxSound.zh-TW.txt">
+      <Filter>FxSound\Strings</Filter>
+    </None>
     <None Include="..\..\..\..\..\..\..\JUCE\modules\juce_core\native\java\README.txt">
       <Filter>JUCE Modules\juce_core\native\java</Filter>
     </None>

diff --git a/fxsound/Project/resources.rc b/fxsound/Project/resources.rc
@@ -9,7 +9,7 @@
 #include <windows.h>
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION  1,1,26,0
+FILEVERSION  1,1,27,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
@@ -18,9 +18,9 @@ BEGIN
       VALUE "CompanyName",  "FxSound LLC\0"
       VALUE "LegalCopyright",  "2024 FxSound™\0"
       VALUE "FileDescription",  "FxSound\0"
-      VALUE "FileVersion",  "1.1.26.0\0"
+      VALUE "FileVersion",  "1.1.27.0\0"
       VALUE "ProductName",  "FxSound\0"
-      VALUE "ProductVersion",  "1.1.26.0\0"
+      VALUE "ProductVersion",  "1.1.27.0\0"
     END
   END
 

diff --git a/fxsound/Source/GUI/FxController.cpp b/fxsound/Source/GUI/FxController.cpp
@@ -1540,10 +1540,14 @@ void FxController::setLanguage(String language_code)
     {
         LocalisedStrings::setCurrentMappings(new LocalisedStrings(String::createStringFromData(BinaryData::FxSound_es_txt, BinaryData::FxSound_es_txtSize), false));
     }
-    else if (language_.startsWithIgnoreCase("zh"))
+    else if (language_.startsWithIgnoreCase("zh-CN"))
     {
         LocalisedStrings::setCurrentMappings(new LocalisedStrings(String::createStringFromData(BinaryData::FxSound_zhCN_txt, BinaryData::FxSound_zhCN_txtSize), false));
-    } 
+    }
+	else if (language_.startsWithIgnoreCase("zh-TW"))
+	{
+		LocalisedStrings::setCurrentMappings(new LocalisedStrings(String::createStringFromData(BinaryData::FxSound_zhTW_txt, BinaryData::FxSound_zhTW_txtSize), false));
+	}
     else if (language_.startsWithIgnoreCase("fr"))
     {
         LocalisedStrings::setCurrentMappings(new LocalisedStrings(String::createStringFromData(BinaryData::FxSound_fr_txt, BinaryData::FxSound_fr_txtSize), false));
@@ -1644,10 +1648,14 @@ String FxController::getLanguageName(String language_code) const
     {
         return L"Espa\u00f1ol";
     }    
-    else if (language_code.startsWithIgnoreCase("zh"))
+    else if (language_code.startsWithIgnoreCase("zh-CN"))
     {
-        return L"\u4e2d\u6587";
+        return L"\u7b80\u4f53\u4e2d\u6587";
     }
+	else if (language_code.startsWithIgnoreCase("zh-TW"))
+	{
+		return L"\u7e41\u9ad4\u4e2d\u6587";
+	}
     else if (language_code.startsWithIgnoreCase("sv"))
     {
         return L"svenska";

diff --git a/fxsound/Source/GUI/FxLanguage.cpp b/fxsound/Source/GUI/FxLanguage.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 FxLanguage::FxLanguage() : next_button_("next", DrawableButton::ButtonStyle::ImageFitted), prev_button_("prev", DrawableButton::ButtonStyle::ImageFitted)
 {
-    languages_ = { "en", "ar", "ba", "hr", "de", "es", "fr", "hu", "id", "it", "ja", "ko", "nl", "pl", "pt", "pt-br", "ro", "ru", "sv", "th", "tr", "vi", "zh"};
+    languages_ = { "en", "ar", "ba", "hr", "de", "es", "fr", "hu", "id", "it", "ja", "ko", "nl", "pl", "pt", "pt-br", "ro", "ru", "sv", "th", "tr", "vi", "zh-CN", "zh-TW"};
 
     language_.setColour(Label::ColourIds::textColourId, getLookAndFeel().findColour(TextButton::textColourOnId));
     language_.setJustificationType(Justification::centred);

diff --git a/fxsound/Source/GUI/FxTheme.cpp b/fxsound/Source/GUI/FxTheme.cpp
@@ -318,11 +318,17 @@ void FxTheme::loadFont(String language)
         font_600_ = loadTypeface("NotoSansKR-Medium.otf");
         font_700_ = loadTypeface("NotoSansKR-Medium.otf");
     }
-    else if (language.startsWithIgnoreCase("zh"))
+	else if (language.startsWithIgnoreCase("zh-CN"))
+	{
+		font_400_ = loadTypeface("NotoSansSC-Regular.otf");
+		font_600_ = loadTypeface("NotoSansSC-Medium.otf");
+		font_700_ = loadTypeface("NotoSansSC-Medium.otf");
+	}
+    else if (language.startsWithIgnoreCase("zh-TW"))
     {
-        font_400_ = loadTypeface("NotoSansSC-Regular.otf");
-        font_600_ = loadTypeface("NotoSansSC-Medium.otf");
-        font_700_ = loadTypeface("NotoSansSC-Medium.otf");
+        font_400_ = loadTypeface("NotoSansTC-Regular.ttf");
+        font_600_ = loadTypeface("NotoSansTC-Medium.ttf");
+        font_700_ = loadTypeface("NotoSansTC-Medium.ttf");
     }
 	else if (language.startsWithIgnoreCase("th"))
 	{