Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@rsjaffe
rsjaffe committed Nov 22, 2021
2 parents 1259c88 + 2b3f371 commit 7cc0134
Show file tree
Hide file tree
Showing 40 changed files with 160 additions and 54 deletions.
2 changes: 1 addition & 1 deletion MIDI2LR.jucer
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="5.1.1.0"
<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="5.2.0.0"
bundleIdentifier="com.rsjaffe.MIDI2LR" includeBinaryInAppConfig="1"
companyWebsite="http://rsjaffe.github.io/MIDI2LR/" companyEmail="[email protected]"
displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark"
Expand Down
4 changes: 2 additions & 2 deletions build/MacOS/Info-App.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>5.1.1.0</string>
<string>5.2.0.0</string>
<key>CFBundleVersion</key>
<string>5.1.1.0</string>
<string>5.2.0.0</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright (C) 2015 by Rory Jaffe.</string>
<key>NSHighResolutionCapable</key>
Expand Down
8 changes: 4 additions & 4 deletions build/MacOS/MIDI2LR.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,8 @@
"JUCE_STANDALONE_APPLICATION=1",
"JUCE_MODAL_LOOPS_PERMITTED=1",
"JUCER_XCODE_MAC_46BB2872=1",
"JUCE_APP_VERSION=5.1.1.0",
"JUCE_APP_VERSION_HEX=0x5010100",
"JUCE_APP_VERSION=5.2.0.0",
"JUCE_APP_VERSION_HEX=0x5020000",
"JucePlugin_Build_VST=0",
"JucePlugin_Build_VST3=0",
"JucePlugin_Build_AU=0",
Expand Down Expand Up @@ -645,8 +645,8 @@
"JUCE_STANDALONE_APPLICATION=1",
"JUCE_MODAL_LOOPS_PERMITTED=1",
"JUCER_XCODE_MAC_46BB2872=1",
"JUCE_APP_VERSION=5.1.1.0",
"JUCE_APP_VERSION_HEX=0x5010100",
"JUCE_APP_VERSION=5.2.0.0",
"JUCE_APP_VERSION_HEX=0x5020000",
"JucePlugin_Build_VST=0",
"JucePlugin_Build_VST3=0",
"JucePlugin_Build_AU=0",
Expand Down
4 changes: 2 additions & 2 deletions build/Windows/MIDI2LR_App.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<Optimization>Disabled</Optimization>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\external\JuceLibraryCode;..\..\external\JuceLibraryCode\modules;../../external/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60102;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_WINRT_MIDI=0;JUCE_ASIO=0;JUCE_WASAPI=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_JACK=0;JUCE_BELA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_USE_ANDROID_OPENSLES=0;JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS=0;JUCE_FORCE_DEBUG=0;JUCE_LOG_ASSERTIONS=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;JUCE_MODAL_LOOPS_PERMITTED=1;JUCER_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=5.1.1.0;JUCE_APP_VERSION_HEX=0x5010100;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;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60102;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_WINRT_MIDI=0;JUCE_ASIO=0;JUCE_WASAPI=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_JACK=0;JUCE_BELA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_USE_ANDROID_OPENSLES=0;JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS=0;JUCE_FORCE_DEBUG=0;JUCE_LOG_ASSERTIONS=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;JUCE_MODAL_LOOPS_PERMITTED=1;JUCER_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=5.2.0.0;JUCE_APP_VERSION_HEX=0x5020000;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>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
Expand Down Expand Up @@ -105,7 +105,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>..\..\external\JuceLibraryCode;..\..\external\JuceLibraryCode\modules;../../external/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60102;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_WINRT_MIDI=0;JUCE_ASIO=0;JUCE_WASAPI=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_JACK=0;JUCE_BELA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_USE_ANDROID_OPENSLES=0;JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS=0;JUCE_FORCE_DEBUG=0;JUCE_LOG_ASSERTIONS=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;JUCE_MODAL_LOOPS_PERMITTED=1;JUCER_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=5.1.1.0;JUCE_APP_VERSION_HEX=0x5010100;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;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60102;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_WINRT_MIDI=0;JUCE_ASIO=0;JUCE_WASAPI=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_JACK=0;JUCE_BELA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_USE_ANDROID_OPENSLES=0;JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS=0;JUCE_FORCE_DEBUG=0;JUCE_LOG_ASSERTIONS=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;JUCE_MODAL_LOOPS_PERMITTED=1;JUCER_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=5.2.0.0;JUCE_APP_VERSION_HEX=0x5020000;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>
Expand Down
6 changes: 3 additions & 3 deletions build/Windows/resources.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <windows.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 5,1,1,0
FILEVERSION 5,2,0,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
Expand All @@ -18,9 +18,9 @@ BEGIN
VALUE "CompanyName", "Rory Jaffe\0"
VALUE "LegalCopyright", "Copyright (C) 2015 by Rory Jaffe.\0"
VALUE "FileDescription", "MIDI2LR\0"
VALUE "FileVersion", "5.1.1.0\0"
VALUE "FileVersion", "5.2.0.0\0"
VALUE "ProductName", "MIDI2LR\0"
VALUE "ProductVersion", "5.1.1.0\0"
VALUE "ProductVersion", "5.2.0.0\0"
END
END

Expand Down
Binary file added data/application/fonts/NotoSans-Bold-Plus-Thai.ttf
View file
Binary file not shown.
Binary file removed data/application/fonts/NotoSans-Bold-plus-Thai.ttf
View file
Binary file not shown.
Binary file modified data/application/fonts/NotoSans-Regular-Plus-Thai.ttf
View file
Binary file not shown.
Binary file modified data/application/fonts/NotoSansJP-Regular.otf
View file
Binary file not shown.
Binary file modified data/application/fonts/NotoSansKR-Regular.otf
View file
Binary file not shown.
Binary file modified data/application/fonts/NotoSansSC-Regular.otf
View file
Binary file not shown.
Binary file modified data/application/fonts/NotoSansTC-Regular.otf
View file
Binary file not shown.
1 change: 1 addition & 0 deletions data/plugin/TranslatedStrings_de.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"$$$/MIDI2LR/Help/OnlineHelp=&Onlinehilfe"
"$$$/MIDI2LR/Help/Support=&Support"
"$$$/MIDI2LR/Info/BuildFiles=Build Dateien (nur für Software-Entwickler)"
"$$$/MIDI2LR/Info/DeleteSettings=Einstellungen löschen"
"$$$/MIDI2LR/Keys/Shortcut=Tastenkombination"
"$$$/MIDI2LR/Keyword/Toggle=Stichwort aktivieren/deaktivieren"
"$$$/MIDI2LR/Keyword/Toggle1=Stichwort ein/aus ^1"
Expand Down
1 change: 1 addition & 0 deletions data/plugin/TranslatedStrings_en.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"$$$/MIDI2LR/Help/OnlineHelp=&Online help"
"$$$/MIDI2LR/Help/Support=&Support"
"$$$/MIDI2LR/Info/BuildFiles=Build files (development use only)"
"$$$/MIDI2LR/Info/DeleteSettings=Delete settings"
"$$$/MIDI2LR/Keys/Shortcut=Keyboard shortcut"
"$$$/MIDI2LR/Keyword/Toggle=Toggle Keyword"
"$$$/MIDI2LR/Keyword/Toggle1=Toggle Keyword ^1"
Expand Down
1 change: 1 addition & 0 deletions data/plugin/TranslatedStrings_es.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"$$$/MIDI2LR/Help/OnlineHelp=&Ayuda en pantalla"
"$$$/MIDI2LR/Help/Support=&Soporte"
"$$$/MIDI2LR/Info/BuildFiles=Crear archivos (uso de desarrollo solamente)"
"$$$/MIDI2LR/Info/DeleteSettings=Eliminar configuración"
"$$$/MIDI2LR/Keys/Shortcut=Método abreviado"
"$$$/MIDI2LR/Keyword/Toggle=Alternar palabra clave"
"$$$/MIDI2LR/Keyword/Toggle1=Conmutar palabra clave ^1"
Expand Down
1 change: 1 addition & 0 deletions data/plugin/TranslatedStrings_fr.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"$$$/MIDI2LR/Help/OnlineHelp=&Aide en ligne"
"$$$/MIDI2LR/Help/Support=&Support"
"$$$/MIDI2LR/Info/BuildFiles=Générer les fichiers (pour développeur seulement)"
"$$$/MIDI2LR/Info/DeleteSettings=Supprimer les paramètres"
"$$$/MIDI2LR/Keys/Shortcut=Raccourci"
"$$$/MIDI2LR/Keyword/Toggle=Activer/Désactiver mot-clé"
"$$$/MIDI2LR/Keyword/Toggle1=Afficher/Masquer le mot-clé ^1"
Expand Down
1 change: 1 addition & 0 deletions data/plugin/TranslatedStrings_it.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"$$$/MIDI2LR/Help/OnlineHelp=&Guida"
"$$$/MIDI2LR/Help/Support=&Supporto"
"$$$/MIDI2LR/Info/BuildFiles=Build files (solo per gli sviluppatori)"
"$$$/MIDI2LR/Info/DeleteSettings=Elimina impostazioni"
"$$$/MIDI2LR/Keys/Shortcut=Scelta rapida"
"$$$/MIDI2LR/Keyword/Toggle=Attiva/disattiva parola chiave"
"$$$/MIDI2LR/Keyword/Toggle1=Attiva/disattiva parola chiave ^1"
Expand Down
1 change: 1 addition & 0 deletions data/plugin/TranslatedStrings_ja.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"$$$/MIDI2LR/Help/OnlineHelp=オンライン ヘルプ(&O)"
"$$$/MIDI2LR/Help/Support=サポート(&S)"
"$$$/MIDI2LR/Info/BuildFiles=ビルドファイル（開発専用）"
"$$$/MIDI2LR/Info/DeleteSettings=設定を削除"
"$$$/MIDI2LR/Keys/Shortcut=ショートカット"
"$$$/MIDI2LR/Keyword/Toggle=キーワードの切り替え"
"$$$/MIDI2LR/Keyword/Toggle1=キーワード ^1 を切り替え"
Expand Down
1 change: 1 addition & 0 deletions data/plugin/TranslatedStrings_ko.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"$$$/MIDI2LR/Help/OnlineHelp=온라인 도움말(&O)"
"$$$/MIDI2LR/Help/Support=지원(&S)"
"$$$/MIDI2LR/Info/BuildFiles=파일 만들기 (개발용)"
"$$$/MIDI2LR/Info/DeleteSettings=설정 삭제"
"$$$/MIDI2LR/Keys/Shortcut=바로 가기"
"$$$/MIDI2LR/Keyword/Toggle=키워드 켜기/끄기"
"$$$/MIDI2LR/Keyword/Toggle1=키워드 ^1 켜기/끄기"
Expand Down
1 change: 1 addition & 0 deletions data/plugin/TranslatedStrings_nl.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"$$$/MIDI2LR/Help/OnlineHelp=online-&Help"
"$$$/MIDI2LR/Help/Support=&Ondersteuning"
"$$$/MIDI2LR/Info/BuildFiles=Build bestanden (alleen voor developers)"
"$$$/MIDI2LR/Info/DeleteSettings=Instellingen verwijderen"
"$$$/MIDI2LR/Keys/Shortcut=Snelkoppeling"
"$$$/MIDI2LR/Keyword/Toggle=Trefwoord in-/uitschakelen"
"$$$/MIDI2LR/Keyword/Toggle1=Trefwoord in-/uitschakelen ^1"
Expand Down
1 change: 1 addition & 0 deletions data/plugin/TranslatedStrings_pt.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"$$$/MIDI2LR/Help/OnlineHelp=&Ajuda online"
"$$$/MIDI2LR/Help/Support=&Suporte"
"$$$/MIDI2LR/Info/BuildFiles=Compilar arquivos (apenas para desenvolvedores)"
"$$$/MIDI2LR/Info/DeleteSettings=Excluir configurações"
"$$$/MIDI2LR/Keys/Shortcut=Atalho"
"$$$/MIDI2LR/Keyword/Toggle=Alternar palavra-chavre"
"$$$/MIDI2LR/Keyword/Toggle1=Alternar palavra-chave ^1"
Expand Down
1 change: 1 addition & 0 deletions data/plugin/TranslatedStrings_ru.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"$$$/MIDI2LR/Help/OnlineHelp=Справка в Интернете"
"$$$/MIDI2LR/Help/Support=Поддержка"
"$$$/MIDI2LR/Info/BuildFiles=Файлы сборки (только для разработки)"
"$$$/MIDI2LR/Info/DeleteSettings=Удалить параметры"
"$$$/MIDI2LR/Keys/Shortcut=сочетание клавиш"
"$$$/MIDI2LR/Keyword/Toggle=Переключить ключевое слово"
"$$$/MIDI2LR/Keyword/Toggle1=Переключение ключевого слова ^1"
Expand Down
1 change: 1 addition & 0 deletions data/plugin/TranslatedStrings_sv.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"$$$/MIDI2LR/Help/OnlineHelp=Direkt&hjälp"
"$$$/MIDI2LR/Help/Support=&Support"
"$$$/MIDI2LR/Info/BuildFiles=Byggfiler (endast för utvecklare)"
"$$$/MIDI2LR/Info/DeleteSettings=Ta bort inställningar"
"$$$/MIDI2LR/Keys/Shortcut=Genväg"
"$$$/MIDI2LR/Keyword/Toggle=Växla nyckelord (av/på)"
"$$$/MIDI2LR/Keyword/Toggle1=Växla nyckelord ^1"
Expand Down
1 change: 1 addition & 0 deletions data/plugin/TranslatedStrings_th.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"$$$/MIDI2LR/Help/OnlineHelp=วิธีใช้ทางออนไลน์"
"$$$/MIDI2LR/Help/Support=สนับสนุน"
"$$$/MIDI2LR/Info/BuildFiles=สร้างไฟล์ (ใช้สำหรับการพัฒนาเท่านั้น)"
"$$$/MIDI2LR/Info/DeleteSettings=ลบการตั้งค่า"
"$$$/MIDI2LR/Keys/Shortcut=แป้นพิมพ์ลัด"
"$$$/MIDI2LR/Keyword/Toggle=สลับทางคำหลัก"
"$$$/MIDI2LR/Keyword/Toggle1=สลับคำหลัก ^1"
Expand Down
1 change: 1 addition & 0 deletions data/plugin/TranslatedStrings_zh_cn.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"$$$/MIDI2LR/Help/OnlineHelp=联机帮助(&O)"
"$$$/MIDI2LR/Help/Support=支持(&S)"
"$$$/MIDI2LR/Info/BuildFiles=生成文件（仅供开发模式使用）"
"$$$/MIDI2LR/Info/DeleteSettings=删除设置"
"$$$/MIDI2LR/Keys/Shortcut=快捷方式"
"$$$/MIDI2LR/Keyword/Toggle=切换关键字"
"$$$/MIDI2LR/Keyword/Toggle1=切换关键字 ^1"
Expand Down
1 change: 1 addition & 0 deletions data/plugin/TranslatedStrings_zh_tw.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"$$$/MIDI2LR/Help/OnlineHelp=線上說明(&O)"
"$$$/MIDI2LR/Help/Support=支援(&S)"
"$$$/MIDI2LR/Info/BuildFiles=生成文件（僅供開發模式使用）"
"$$$/MIDI2LR/Info/DeleteSettings=刪除設定"
"$$$/MIDI2LR/Keys/Shortcut=捷徑"
"$$$/MIDI2LR/Keyword/Toggle=切換關鍵字"
"$$$/MIDI2LR/Keyword/Toggle1=切換關鍵字 ^1"
Expand Down
4 changes: 2 additions & 2 deletions external/JuceLibraryCode/JuceHeader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace ProjectInfo
{
const char* const projectName = "MIDI2LR";
const char* const companyName = "Rory Jaffe";
const char* const versionString = "5.1.1.0";
const int versionNumber = 0x5010100;
const char* const versionString = "5.2.0.0";
const int versionNumber = 0x5020000;
}
#endif
2 changes: 1 addition & 1 deletion src/application/Main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ class MIDI2LRApplication final : public juce::JUCEApplication {
}
else {
font1_name = "NotoSans-Regular-Plus-Thai.ttf";
font2_name = "NotoSans-Bold-plus-Thai.ttf";
font2_name = "NotoSans-Bold-Plus-Thai.ttf";
}
juce::MemoryBlock font_data {};
auto font_file = juce::File::getSpecialLocation(juce::File::currentApplicationFile)
Expand Down
8 changes: 8 additions & 0 deletions src/plugin/Client.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,14 @@ LrTasks.startAsyncTask(
QuickDevShadowsLargeDec = CU.quickDevAdjust('Shadows',-20,'QuickDevShadowsLargeDec'),
QuickDevShadowsSmall = CU.quickDevAdjust('Shadows',5,'QuickDevShadowsSmall'),
QuickDevShadowsSmallDec = CU.quickDevAdjust('Shadows',-5,'QuickDevShadowsSmallDec'),
QuickDevTempLarge = CU.quickDevAdjustWB('Temperature',20,'QuickDevTempLarge'),
QuickDevTempLargeDec = CU.quickDevAdjustWB('Temperature',-20,'QuickDevTempLargeDec'),
QuickDevTempSmall = CU.quickDevAdjustWB('Temperature',5,'QuickDevTempSmall'),
QuickDevTempSmalDec = CU.quickDevAdjustWB('Temperature',-5,'QuickDevTempSmalDec'),
QuickDevTintLarge = CU.quickDevAdjustWB('Tint',20,'QuickDevTintLarge'),
QuickDevTintLargeDec = CU.quickDevAdjustWB('Tint',-20,'QuickDevTintLargeDec'),
QuickDevTintSmall = CU.quickDevAdjustWB('Tint',5,'QuickDevTintSmall'),
QuickDevTintSmallDec = CU.quickDevAdjustWB('Tint',-5,'QuickDevTintSmallDec'),
QuickDevVibranceLarge = CU.quickDevAdjust('Vibrance',20,'QuickDevVibranceLarge'),
QuickDevVibranceLargeDec = CU.quickDevAdjust('Vibrance',-20,'QuickDevVibranceLargeDec'),
QuickDevVibranceSmall = CU.quickDevAdjust('Vibrance',5,'QuickDevVibranceSmall'),
Expand Down
16 changes: 16 additions & 0 deletions src/plugin/ClientUtilities.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,21 @@ local function quickDevAdjust(par,val,cmd) --note lightroom applies this to all
end
end

local function quickDevAdjustWB(par,val,cmd) --note lightroom applies this to all selected photos. no need to get all selected
return function()
LrTasks.startAsyncTask(
function()
local TargetPhoto = LrApplication.activeCatalog():getTargetPhoto()
if TargetPhoto then
TargetPhoto:quickDevelopAdjustWhiteBalance(par,val)
if ProgramPreferences.ClientShowBezelOnChange then
LrDialogs.showBezel(Database.CmdTrans[cmd][1])
end
end
end
)
end
end
return {
ApplySettings = ApplySettings,
FullRefresh = FullRefresh,
Expand Down Expand Up @@ -880,6 +895,7 @@ return {
fToggleTool = fToggleTool,
fToggleTool1 = fToggleTool1,
quickDevAdjust = quickDevAdjust,
quickDevAdjustWB = quickDevAdjustWB,
showBezel = showBezel,
wrapFOM = wrapFOM,
wrapForEachPhoto = wrapForEachPhoto,
Expand Down
Loading

0 comments on commit 7cc0134

Please sign in to comment.