From 69746f5fa1ef46277e32efa773d9a17363005b94 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 17 Mar 2019 12:47:47 -0700 Subject: [PATCH 1/3] Closes issue #435 Action unavailable earlier than v6.6 LR --- Source/LRPlugin/MIDI2LR.lrplugin/Client.lua | 9 +++++++-- Source/LRPlugin/MIDI2LR.lrplugin/ClientUtilities.lua | 7 ++++++- Source/LRPlugin/MIDI2LR.lrplugin/Utilities.lua | 8 ++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/Source/LRPlugin/MIDI2LR.lrplugin/Client.lua b/Source/LRPlugin/MIDI2LR.lrplugin/Client.lua index 5fe46d353..efc6d8cb5 100644 --- a/Source/LRPlugin/MIDI2LR.lrplugin/Client.lua +++ b/Source/LRPlugin/MIDI2LR.lrplugin/Client.lua @@ -451,7 +451,6 @@ LrTasks.startAsyncTask( ACTIONS.EnableToneCurve = function() LrDialogs.message('Enable Tone Curve action available in Lightroom version 7.4 and later only.') end ACTIONS.openExportDialog = function() LrDialogs.message('Open export dialog action available in Lightroom version 7.4 and later only.') end ACTIONS.openExportWithPreviousDialog = function() LrDialogs.message('Open export with previous settings action available in Lightroom version 7.4 and later only.') end - ACTIONS.ResetTransforms = function() LrDialogs.message('Reset transforms action available in Lightroom version 7.4 and later only.') end ACTIONS.RotateLeft = function() LrDialogs.message('Rotate left action available in Lightroom version 7.4 and later only.') end ACTIONS.RotateRight = function() LrDialogs.message('Rotate right action available in Lightroom version 7.4 and later only.') end ACTIONS.ShoFullHidePanels = function() LrDialogs.message('Show full screen and hide panels action available in Lightroom version 7.4 and later only.') end @@ -463,7 +462,6 @@ LrTasks.startAsyncTask( ACTIONS.EnableToneCurve = CU.fToggleTFasync('EnableToneCurve') ACTIONS.openExportDialog = CU.wrapForEachPhoto('openExportDialog') ACTIONS.openExportWithPreviousDialog = CU.wrapForEachPhoto('openExportWithPreviousDialog') - ACTIONS.ResetTransforms = CU.wrapFOM(LrDevelopController.resetTransforms) ACTIONS.RotateLeft = CU.wrapForEachPhoto('rotateLeft') ACTIONS.RotateRight = CU.wrapForEachPhoto('rotateRight') ACTIONS.ShoFullHidePanels = LrApplicationView.fullscreenHidePanels @@ -471,6 +469,13 @@ LrTasks.startAsyncTask( ACTIONS.WhiteBalanceAuto = CU.wrapFOM(LrDevelopController.setAutoWhiteBalance) end + if not Ut.LrVersion66orMore() then + ACTIONS.ResetTransforms = function() LrDialogs.message('Reset transforms action available in Lightroom version 6.6 and later only.') end + else + ACTIONS.ResetTransforms = CU.wrapFOM(LrDevelopController.resetTransforms) + end + + local SETTINGS = { AppInfo = function(value) Info.AppInfo[#Info.AppInfo+1] = value end, ChangedToDirectory = function(value) Profiles.setDirectory(value) end, diff --git a/Source/LRPlugin/MIDI2LR.lrplugin/ClientUtilities.lua b/Source/LRPlugin/MIDI2LR.lrplugin/ClientUtilities.lua index b9c80e2eb..dee857f5f 100644 --- a/Source/LRPlugin/MIDI2LR.lrplugin/ClientUtilities.lua +++ b/Source/LRPlugin/MIDI2LR.lrplugin/ClientUtilities.lua @@ -46,7 +46,6 @@ local needsModule = { [LrDevelopController.resetRedeye] = {module = 'develop', photoSelected = true }, [LrDevelopController.resetSpotRemoval] = {module = 'develop', photoSelected = true }, [LrDevelopController.resetToDefault] = {module = 'develop', photoSelected = true }, - [LrDevelopController.resetTransforms] = {module = 'develop', photoSelected = true }, [LrDevelopController.revealAdjustedControls] = {module = 'develop', photoSelected = false }, [LrDevelopController.revealPanel] = {module = 'develop', photoSelected = false }, [LrDevelopController.selectTool] = {module = 'develop', photoSelected = false }, @@ -64,6 +63,12 @@ then needsModule[LrDevelopController.setAutoWhiteBalance] = {module = 'develop', photoSelected = true } end +if Ut.LrVersion66orMore() +then + needsModule[LrDevelopController.resetTransforms] = {module = 'develop', photoSelected = true } +end + + local _needsModule = { __index = function (t,k) t[k] = {module = nil, photoSelected = false} diff --git a/Source/LRPlugin/MIDI2LR.lrplugin/Utilities.lua b/Source/LRPlugin/MIDI2LR.lrplugin/Utilities.lua index 4b0de4bac..0e89fc36e 100644 --- a/Source/LRPlugin/MIDI2LR.lrplugin/Utilities.lua +++ b/Source/LRPlugin/MIDI2LR.lrplugin/Utilities.lua @@ -38,6 +38,13 @@ local function LrVersion74orMore() return true end +local function LrVersion66orMore() + local vers = LrApplication.versionTable() + if vers.major < 6 then return false end + if vers.major == 6 and vers.minor < 6 then return false end + return true +end + local function applogpath() local ret if WIN_ENV then @@ -69,4 +76,5 @@ return { --table of exports, setting table member name and module function it po appdatapath = appdatapath, applogpath = applogpath, LrVersion74orMore = LrVersion74orMore, + LrVersion66orMore = LrVersion66orMore, } From 3df09d734a5eab93070632f888e63ddba1d5946b Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 17 Mar 2019 12:53:07 -0700 Subject: [PATCH 2/3] Update version to 3.0.2.0 --- Builds/MacOSX/Info-App.plist | 4 ++-- Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj | 8 ++++---- Builds/VisualStudio2017/MIDI2LR_App.vcxproj | 4 ++-- Builds/VisualStudio2017/resources.rc | 6 +++--- Builds/VisualStudio2019/MIDI2LR_App.vcxproj | 4 ++-- Builds/VisualStudio2019/resources.rc | 6 +++--- DoxyGen/Midi2lr.Doxyfile | 2 +- Installer/MIDI2LR.xml | 2 +- JuceLibraryCode/JuceHeader.h | 4 ++-- MIDI2LR.jucer | 2 +- Source/LRPlugin/MIDI2LR.lrplugin/Info.lua | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Builds/MacOSX/Info-App.plist b/Builds/MacOSX/Info-App.plist index e30a5ca9c..4f180a613 100644 --- a/Builds/MacOSX/Info-App.plist +++ b/Builds/MacOSX/Info-App.plist @@ -20,9 +20,9 @@ CFBundleSignature ???? CFBundleShortVersionString - 3.0.1.0 + 3.0.2.0 CFBundleVersion - 3.0.1.0 + 3.0.2.0 NSHumanReadableCopyright NSHighResolutionCapable diff --git a/Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj b/Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj index 0ae780125..0a6fdfba4 100644 --- a/Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj +++ b/Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj @@ -951,8 +951,8 @@ "DONT_SET_USING_JUCE_NAMESPACE=1", "GSL_THROW_ON_CONTRACT_VIOLATION=1", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=3.0.1.0", - "JUCE_APP_VERSION_HEX=0x3000100", + "JUCE_APP_VERSION=3.0.2.0", + "JUCE_APP_VERSION_HEX=0x3000200", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", @@ -1001,8 +1001,8 @@ "DONT_SET_USING_JUCE_NAMESPACE=1", "GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=3.0.1.0", - "JUCE_APP_VERSION_HEX=0x3000100", + "JUCE_APP_VERSION=3.0.2.0", + "JUCE_APP_VERSION_HEX=0x3000200", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", diff --git a/Builds/VisualStudio2017/MIDI2LR_App.vcxproj b/Builds/VisualStudio2017/MIDI2LR_App.vcxproj index 393ada658..3b3c41b52 100644 --- a/Builds/VisualStudio2017/MIDI2LR_App.vcxproj +++ b/Builds/VisualStudio2017/MIDI2LR_App.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../icu/source/common/;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;U_STATIC_IMPLEMENTATION=1;DONT_SET_USING_JUCE_NAMESPACE=1;GSL_THROW_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=3.0.1.0;JUCE_APP_VERSION_HEX=0x3000100;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) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;U_STATIC_IMPLEMENTATION=1;DONT_SET_USING_JUCE_NAMESPACE=1;GSL_THROW_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=3.0.2.0;JUCE_APP_VERSION_HEX=0x3000200;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) MultiThreadedDebug true @@ -105,7 +105,7 @@ Full ..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../icu/source/common/;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;U_STATIC_IMPLEMENTATION=1;DONT_SET_USING_JUCE_NAMESPACE=1;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=3.0.1.0;JUCE_APP_VERSION_HEX=0x3000100;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) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;U_STATIC_IMPLEMENTATION=1;DONT_SET_USING_JUCE_NAMESPACE=1;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=3.0.2.0;JUCE_APP_VERSION_HEX=0x3000200;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) MultiThreadedDLL true diff --git a/Builds/VisualStudio2017/resources.rc b/Builds/VisualStudio2017/resources.rc index 3cee320f0..6df867be2 100644 --- a/Builds/VisualStudio2017/resources.rc +++ b/Builds/VisualStudio2017/resources.rc @@ -7,16 +7,16 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 3,0,1,0 +FILEVERSION 3,0,2,0 BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904E4" BEGIN VALUE "FileDescription", "MIDI2LR\0" - VALUE "FileVersion", "3.0.1.0\0" + VALUE "FileVersion", "3.0.2.0\0" VALUE "ProductName", "MIDI2LR\0" - VALUE "ProductVersion", "3.0.1.0\0" + VALUE "ProductVersion", "3.0.2.0\0" END END diff --git a/Builds/VisualStudio2019/MIDI2LR_App.vcxproj b/Builds/VisualStudio2019/MIDI2LR_App.vcxproj index a98342381..68ab16a8b 100644 --- a/Builds/VisualStudio2019/MIDI2LR_App.vcxproj +++ b/Builds/VisualStudio2019/MIDI2LR_App.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../icu/source/common/;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;U_STATIC_IMPLEMENTATION=1;DONT_SET_USING_JUCE_NAMESPACE=1;GSL_THROW_ON_CONTRACT_VIOLATION=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=3.0.1.0;JUCE_APP_VERSION_HEX=0x3000100;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) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;U_STATIC_IMPLEMENTATION=1;DONT_SET_USING_JUCE_NAMESPACE=1;GSL_THROW_ON_CONTRACT_VIOLATION=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=3.0.2.0;JUCE_APP_VERSION_HEX=0x3000200;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) MultiThreadedDebug true @@ -105,7 +105,7 @@ Full ..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../icu/source/common/;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;U_STATIC_IMPLEMENTATION=1;DONT_SET_USING_JUCE_NAMESPACE=1;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=3.0.1.0;JUCE_APP_VERSION_HEX=0x3000100;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) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;U_STATIC_IMPLEMENTATION=1;DONT_SET_USING_JUCE_NAMESPACE=1;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=3.0.2.0;JUCE_APP_VERSION_HEX=0x3000200;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) MultiThreadedDLL true diff --git a/Builds/VisualStudio2019/resources.rc b/Builds/VisualStudio2019/resources.rc index 3cee320f0..6df867be2 100644 --- a/Builds/VisualStudio2019/resources.rc +++ b/Builds/VisualStudio2019/resources.rc @@ -7,16 +7,16 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 3,0,1,0 +FILEVERSION 3,0,2,0 BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904E4" BEGIN VALUE "FileDescription", "MIDI2LR\0" - VALUE "FileVersion", "3.0.1.0\0" + VALUE "FileVersion", "3.0.2.0\0" VALUE "ProductName", "MIDI2LR\0" - VALUE "ProductVersion", "3.0.1.0\0" + VALUE "ProductVersion", "3.0.2.0\0" END END diff --git a/DoxyGen/Midi2lr.Doxyfile b/DoxyGen/Midi2lr.Doxyfile index a2ef20245..cfd9f467b 100644 --- a/DoxyGen/Midi2lr.Doxyfile +++ b/DoxyGen/Midi2lr.Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = MIDI2LR # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 3.0.1.0 +PROJECT_NUMBER = 3.0.2.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/Installer/MIDI2LR.xml b/Installer/MIDI2LR.xml index 0a20b00cd..b03966bb3 100644 --- a/Installer/MIDI2LR.xml +++ b/Installer/MIDI2LR.xml @@ -1,7 +1,7 @@ MIDI2LR MIDI2LR - 3.0.1.0 + 3.0.2.0 ${product_shortname}-${product_version}-${debuglabel}${platform_name}-installer.${platform_exec_suffix} ../Source/LRPlugin/ReadMe.txt ../LICENSE.txt diff --git a/JuceLibraryCode/JuceHeader.h b/JuceLibraryCode/JuceHeader.h index 3ed2cab36..a1b1d475a 100644 --- a/JuceLibraryCode/JuceHeader.h +++ b/JuceLibraryCode/JuceHeader.h @@ -35,7 +35,7 @@ namespace ProjectInfo { const char* const projectName = "MIDI2LR"; const char* const companyName = ""; - const char* const versionString = "3.0.1.0"; - const int versionNumber = 0x3000100; + const char* const versionString = "3.0.2.0"; + const int versionNumber = 0x3000200; } #endif diff --git a/MIDI2LR.jucer b/MIDI2LR.jucer index 60607c1bf..579f57ebf 100644 --- a/MIDI2LR.jucer +++ b/MIDI2LR.jucer @@ -1,6 +1,6 @@ - Date: Sun, 17 Mar 2019 22:07:25 -0700 Subject: [PATCH 3/3] Document reset transforms valid ver 6.6+ --- Source/LRPlugin/MIDI2LR.lrplugin/Database.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/LRPlugin/MIDI2LR.lrplugin/Database.lua b/Source/LRPlugin/MIDI2LR.lrplugin/Database.lua index e1e3d3aa2..a5a143f3a 100644 --- a/Source/LRPlugin/MIDI2LR.lrplugin/Database.lua +++ b/Source/LRPlugin/MIDI2LR.lrplugin/Database.lua @@ -479,7 +479,7 @@ local DataBase = { {Command='PerspectiveAspect',Type='parameter',Translation=LOC('$$$/AgCameraRawNamedSettings/CameraRawSettingMapping/PerspectiveAspect=Perspective Aspect'),Group=transform,Explanation='Adjusts the amount the image is stretched horizontally or vertically.',Panel='transformPanel'}, {Command='PerspectiveX',Type='parameter',Experimental=true,Translation=LOC('$$$/AgCameraRawNamedSettings/CameraRawSettingMapping/PerspectiveX=Perspective X'),Group=transform,Explanation='Moves the center of the image laterally.',Panel='transformPanel'}, {Command='PerspectiveY',Type='parameter',Experimental=true,Translation=LOC('$$$/AgCameraRawNamedSettings/CameraRawSettingMapping/PerspectiveY=Perspective Y'),Group=transform,Explanation='Moves the center of the image vertically.',Panel='transformPanel'}, - {Command='ResetTransforms',Type='button',Translation=LOC("$$$/AgLibrary/Ops/ResetTransforms=Reset all transforms"),Group=transform,Explanation='Clears all transforms from the current photo. Must be called while the Develop module is active. Supported in LR versions 7.4 and later.',Panel='transformPanel'}, + {Command='ResetTransforms',Type='button',Translation=LOC("$$$/AgLibrary/Ops/ResetTransforms=Reset all transforms"),Group=transform,Explanation='Clears all transforms from the current photo. Must be called while the Develop module is active. Supported in LR versions 6.6 and later.',Panel='transformPanel'}, {Command='ResetPerspectiveVertical',Type='button',Translation=reset..' '..LOC('$$$/AgCameraRawNamedSettings/CameraRawSettingMapping/PerspectiveVertical=Perspective Vertical'),Group=transform,Explanation='Reset to default.',Panel='transformPanel'}, {Command='ResetPerspectiveHorizontal',Type='button',Translation=reset..' '..LOC('$$$/AgCameraRawNamedSettings/CameraRawSettingMapping/PerspectiveHorizontal=Perspective Horizontal'),Group=transform,Explanation='Reset to default.',Panel='transformPanel'}, {Command='ResetPerspectiveRotate',Type='button',Translation=reset..' '..LOC('$$$/AgCameraRawNamedSettings/CameraRawSettingMapping/PerspectiveRotate=Perspective Rotate'),Group=transform,Explanation='Reset to default.',Panel='transformPanel'},