Skip to content

Commit

Permalink
Merge branch 'release/1.6.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
rsjaffe committed Dec 22, 2016
2 parents 3bcd33d + 020dfee commit 11a3fba
Show file tree
Hide file tree
Showing 35 changed files with 4,009 additions and 208 deletions.
4 changes: 2 additions & 2 deletions Builds/MacOSX/Info-App.plist
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>1.6.0.0</string>
<string>1.6.1.0</string>
<key>CFBundleVersion</key>
<string>1.6.0.0</string>
<string>1.6.1.0</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>NSHighResolutionCapable</key>
Expand Down
8 changes: 4 additions & 4 deletions Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -2442,8 +2442,8 @@
"_DEBUG=1",
"DEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=1.6.0.0",
"JUCE_APP_VERSION_HEX=0x1060000", );
"JUCE_APP_VERSION=1.6.1.0",
"JUCE_APP_VERSION_HEX=0x1060100", );
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../JuceLibraryCode/modules", "$(inherited)");
INFOPLIST_FILE = Info-App.plist;
Expand All @@ -2467,8 +2467,8 @@
"_NDEBUG=1",
"NDEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=1.6.0.0",
"JUCE_APP_VERSION_HEX=0x1060000", );
"JUCE_APP_VERSION=1.6.1.0",
"JUCE_APP_VERSION_HEX=0x1060100", );
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../JuceLibraryCode/modules", "$(inherited)");
Expand Down
4 changes: 2 additions & 2 deletions Builds/VisualStudio2015/MIDI2LR.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<Optimization>Disabled</Optimization>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.6.0.0;JUCE_APP_VERSION_HEX=0x1060000;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.6.1.0;JUCE_APP_VERSION_HEX=0x1060100;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
Expand Down Expand Up @@ -97,7 +97,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.6.0.0;JUCE_APP_VERSION_HEX=0x1060000;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.6.1.0;JUCE_APP_VERSION_HEX=0x1060100;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
Expand Down
6 changes: 3 additions & 3 deletions Builds/VisualStudio2015/resources.rc
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
#include <windows.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,6,0,0
FILEVERSION 1,6,1,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "FileDescription", "MIDI2LR\0"
VALUE "FileVersion", "1.6.0.0\0"
VALUE "FileVersion", "1.6.1.0\0"
VALUE "ProductName", "MIDI2LR\0"
VALUE "ProductVersion", "1.6.0.0\0"
VALUE "ProductVersion", "1.6.1.0\0"
END
END

Expand Down
4 changes: 2 additions & 2 deletions JuceLibraryCode/JuceHeader.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
namespace ProjectInfo
{
const char* const projectName = "MIDI2LR";
const char* const versionString = "1.6.0.0";
const int versionNumber = 0x1060000;
const char* const versionString = "1.6.1.0";
const int versionNumber = 0x1060100;
}
#endif

Expand Down
2 changes: 1 addition & 1 deletion MIDI2LR.jucer
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="1.6.0.0"
<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="1.6.1.0"
bundleIdentifier="com.rsjaffe.MIDI2LR" includeBinaryInAppConfig="1"
jucerVersion="4.3.0" companyWebsite="http://rsjaffe.github.io/MIDI2LR/"
companyEmail="[email protected]">
Expand Down
15 changes: 7 additions & 8 deletions Source/CommandMenu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,18 @@ CommandMenu::CommandMenu(const MIDI_Message_ID& message):
juce::TextButton{"Unmapped"},
message_{message},

menus_({"Keyboard Shortcuts for User", "General", "Library", "Develop",
"Basic", "Tone Curve", "HSL / Color / B&W", "Reset HSL / Color / B&W",
menus_({"Keyboard Shortcuts for User", "Library filter", "General", "Library",
"Develop", "Basic", "Tone Curve", "HSL / Color / B&W", "Reset HSL / Color / B&W",
"Split Toning", "Detail", "Lens Corrections", "Transform", "Effects",
"Camera Calibration", "Develop Presets", "Local Adjustments", "Crop",
"Go to Tool, Module, or Panel", "Secondary Display", "Profiles",
"Next/Prev Profile"}),

menu_entries_({LRCommandList::KeyShortcuts, LRCommandList::General,
LRCommandList::Library, LRCommandList::Develop,
LRCommandList::BasicAdjustments, LRCommandList::ToneCurve,
LRCommandList::Mixer, LRCommandList::ResetMixer, LRCommandList::SplitToning,
LRCommandList::Detail, LRCommandList::LensCorrections,
LRCommandList::Transform, LRCommandList::Effects,
menu_entries_({LRCommandList::KeyShortcuts, LRCommandList::Filters,
LRCommandList::General, LRCommandList::Library, LRCommandList::Develop,
LRCommandList::BasicAdjustments, LRCommandList::ToneCurve, LRCommandList::Mixer,
LRCommandList::ResetMixer, LRCommandList::SplitToning, LRCommandList::Detail,
LRCommandList::LensCorrections, LRCommandList::Transform, LRCommandList::Effects,
LRCommandList::Calibration, LRCommandList::DevelopPresets,
LRCommandList::LocalAdjustments, LRCommandList::Crop,
LRCommandList::ToolModulePanel, LRCommandList::SecondaryDisplay,
Expand Down
24 changes: 24 additions & 0 deletions Source/LRCommands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,19 @@ const std::vector<std::string> LRCommandList::KeyShortcuts = {
"Key 40",
};

const std::vector<std::string> LRCommandList::Filters = {
"Library filter 1",
"Library filter 2",
"Library filter 3",
"Library filter 4",
"Library filter 5",
"Library filter 6",
"Library filter 7",
"Library filter 8",
"Library filter 9",
"Library filter 10",
};

const std::vector<std::string> LRCommandList::General = {
"Primary Display Grid",
"Primary Display Loupe",
Expand Down Expand Up @@ -601,6 +614,17 @@ const std::vector<std::string> LRCommandList::LRStringList = {
"Key38",
"Key39",
"Key40",
/* Library filter */
"Filter_1",
"Filter_2",
"Filter_3",
"Filter_4",
"Filter_5",
"Filter_6",
"Filter_7",
"Filter_8",
"Filter_9",
"Filter_10",
/* General */
"ShoVwgrid",
"ShoVwloupe",
Expand Down
1 change: 1 addition & 0 deletions Source/LRCommands.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class LRCommandList {

// Sectioned and readable develop param strings
static const std::vector<std::string> KeyShortcuts;
static const std::vector<std::string> Filters;
static const std::vector<std::string> General;
static const std::vector<std::string> Library;
static const std::vector<std::string> Develop;
Expand Down
10 changes: 10 additions & 0 deletions Source/LRPlugin/MIDI2LR.lrplugin/Client.lua
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,16 @@ LrTasks.startAsyncTask(
EnableRetouch = CU.fToggleTF('EnableRetouch'),
EnableSplitToning = CU.fToggleTF('EnableSplitToning'),
EnableToneCurve = CU.fToggleTF('EnableToneCurve'),
Filter_1 = CU.fApplyFilter(1),
Filter_2 = CU.fApplyFilter(2),
Filter_3 = CU.fApplyFilter(3),
Filter_4 = CU.fApplyFilter(4),
Filter_5 = CU.fApplyFilter(5),
Filter_6 = CU.fApplyFilter(6),
Filter_7 = CU.fApplyFilter(7),
Filter_8 = CU.fApplyFilter(8),
Filter_9 = CU.fApplyFilter(9),
Filter_10 = CU.fApplyFilter(10),
FullRefresh = CU.FullRefresh,
GraduatedFilter = CU.fToggleTool('gradient'),
IncreaseRating = LrSelection.increaseRating,
Expand Down
9 changes: 9 additions & 0 deletions Source/LRPlugin/MIDI2LR.lrplugin/ClientUtilities.lua
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ local LrFunctionContext = import 'LrFunctionContext'
local LrTasks = import 'LrTasks'
local LrView = import 'LrView'

local function fApplyFilter(filternumber)
return function()
local filterUuid = ProgramPreferences.Filters[filternumber]
if filterUuid == nil then return end
LrApplication.activeCatalog():setViewFilter(filterUuid)
end
end

local function fApplyPreset(presetnumber)
return function()
local presetUuid = ProgramPreferences.Presets[presetnumber]
Expand Down Expand Up @@ -216,6 +224,7 @@ end

return {
CopySettings = CopySettings,
fApplyFilter = fApplyFilter,
fApplyPreset = fApplyPreset,
fChangeModule = fChangeModule,
fChangePanel = fChangePanel,
Expand Down
13 changes: 13 additions & 0 deletions Source/LRPlugin/MIDI2LR.lrplugin/Database.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ local whiteBalance = LOC("$$$/AgCameraRawNamedSettings/CameraRawSettingMapping/W
local coarse = LOC("$$$/AgPrint/CalibrationDialog/Coarse=Coarse")
local fine = LOC("$$$/AgPrint/CalibrationDialog/Fine=Fine")
local key = LOC("$$$/MIDI2LR/Shortcuts/Key=Key")
local filter= LOC("$$$/Library/Filter/FilterLabel=Library filter")

--[[----------------------------------------------------------------------------
Expand Down Expand Up @@ -137,6 +138,17 @@ local DataBase = {
{'Key38',false,false,true,false,true,false,key..' 38',keyshortcuts,'Key 38. *button*'},
{'Key39',false,false,true,false,true,false,key..' 39',keyshortcuts,'Key 39. *button*'},
{'Key40',false,false,true,false,true,false,key..' 40',keyshortcuts,'Key 40. *button*'},
--library filters
{'Filter_1',false,false,true,false,true,false,filter..' 1',filter,'Library filter 1. *button*'},
{'Filter_2',false,false,true,false,true,false,filter..' 2',filter,'Library filter 2. *button*'},
{'Filter_3',false,false,true,false,true,false,filter..' 3',filter,'Library filter 3. *button*'},
{'Filter_4',false,false,true,false,true,false,filter..' 4',filter,'Library filter 4. *button*'},
{'Filter_5',false,false,true,false,true,false,filter..' 5',filter,'Library filter 5. *button*'},
{'Filter_6',false,false,true,false,true,false,filter..' 6',filter,'Library filter 6. *button*'},
{'Filter_7',false,false,true,false,true,false,filter..' 7',filter,'Library filter 7. *button*'},
{'Filter_8',false,false,true,false,true,false,filter..' 8',filter,'Library filter 8. *button*'},
{'Filter_9',false,false,true,false,true,false,filter..' 9',filter,'Library filter 9. *button*'},
{'Filter_10',false,false,true,false,true,false,filter..' 10',filter,'Library filter 10. *button*'},
--General Workspace
--workspace: grid view options
{"ShoVwgrid",false,false,true,false,true,false,primaryDisplay..' '..LOC("$$$/AgPhotoBin/ViewMode/Library/Grid=Grid"),general,"Displays photos as thumbnails in cells, which can be viewed in compact and expanded sizes. *button*"},
Expand Down Expand Up @@ -845,6 +857,7 @@ local cppvectors ={
[developPresets]={'DevelopPresets','Develop Presets'},
[develop]={'Develop',develop},
[effects]={'Effects','Effects'},
[filter]={'Filters',filter},
[general]={'General',general},
[gotoToolModulePanel]={'ToolModulePanel','Go to Tool, Module, or Panel'},
[keyshortcuts]={'KeyShortcuts',keyshortcuts},
Expand Down
92 changes: 92 additions & 0 deletions Source/LRPlugin/MIDI2LR.lrplugin/Filters.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
--[[----------------------------------------------------------------------------
Filters.lua
Manages catalog filters for plugin
This file is part of MIDI2LR. Copyright 2015-2016 by Rory Jaffe.
MIDI2LR is free software: you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the Free Software
Foundation, either version 3 of the License, or (at your option) any later version.
MIDI2LR is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
MIDI2LR. If not, see <http://www.gnu.org/licenses/>.
------------------------------------------------------------------------------]]


local LrApplication = import 'LrApplication'
local LrView = import 'LrView'

local function StartDialog(obstable,f)
for i = 1,10 do
obstable['filter'..i] = {}
obstable['filter'..i][1] = ProgramPreferences.Filters[i]
end
local allfilters = LrApplication.viewFilterPresets()
local filtersbyuuid = {}
local filterlist = {}
for t,u in pairs(allfilters) do
table.insert(filterlist,{title = t, value = u})
filtersbyuuid[u] = t
end
local groupboxfilters = {}
for i=1,10 do
table.insert(
groupboxfilters,
f:static_text {fill_horizontal = 1,
width_in_chars = 40,
truncation = 'head',
title = LrView.bind { key = 'filter'..i,
transform = function(value) return i .. ' ' .. filtersbyuuid[value[1]] end
}, -- title
} -- static_text
)
end
local tabviewitems = {}
local filterrows, filtercolumns = 5,2
for column=1, filtercolumns do
tabviewitems[column] = f:tab_view_item {title = LOC("$$$/Library/Filter/FilterLabel=Library filter")..' '..((column-1)*filterrows+1)..'-'..(column*filterrows), identifier = 'filters-'..((column-1)*filterrows+1)..'-'..(column*filterrows),}
for row=1, filterrows do
table.insert(tabviewitems[column],f:simple_list {items = filterlist, allows_multiple_selection = false, value = LrView.bind ('filter'..((column-1)*filterrows+row)) })
end
tabviewitems[column] = f:tab_view_item (tabviewitems[column]) -- prepare for use in f:tabview below
end
return
f:row {
f:column {
spacing = f:control_spacing(),
f:tab_view (tabviewitems), -- tab_view
}, -- column
f:column{ -- for the display of chosen filters
spacing = f:control_spacing(),
f:spacer {
height = f:control_spacing() * 2,
}, -- spacer
unpack (groupboxfilters),
}, -- column
} -- row
end


local function EndDialog(obstable, status)
if status == 'ok' then
ProgramPreferences.Filters = {} -- empty out prior settings
for i = 1,10 do
if type(obstable['filter'..i])=='table' then -- simple_list should return a table
ProgramPreferences.Filters[i] = obstable['filter'..i][1]
end
end
end
end



return {
StartDialog = StartDialog,
EndDialog = EndDialog,
}
2 changes: 1 addition & 1 deletion Source/LRPlugin/MIDI2LR.lrplugin/Info.lua
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@ return {
file = "Build.lua"
},
},
VERSION = { major=1, minor=6, revision=0, build=0}
VERSION = { major=1, minor=6, revision=1, build=0}
}
16 changes: 13 additions & 3 deletions Source/LRPlugin/MIDI2LR.lrplugin/Init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,20 @@ You should have received a copy of the GNU General Public License along with
MIDI2LR. If not, see <http://www.gnu.org/licenses/>.
------------------------------------------------------------------------------]]

local LrApplication = import 'LrApplication'
local LrApplicationView = import 'LrApplicationView'
local LrDevelopController = import 'LrDevelopController'
local ParamList = require 'ParamList'
local ProfileTypes = require 'ProfileTypes'


--Filters.lua
local function UseDefaultsFilters()
ProgramPreferences.Filters = {}
end
local function LoadedFilters()
if type(ProgramPreferences.Filters) ~= 'table' then
UseDefaultsFilters()
end
end

--Limits.lua

local function UseDefaultsLimits()
Expand Down Expand Up @@ -103,11 +111,13 @@ end


return {
LoadedFilters = LoadedFilters,
LoadedKeys = LoadedKeys,
LoadedLimits = LoadedLimits,
LoadedPaste = LoadedPaste,
LoadedPresets = LoadedPresets,
LoadedProfiles = LoadedProfiles,
UseDefaultsFilters = UseDefaultsFilters,
UseDefaultsKeys = UseDefaultsKeys,
UseDefaultsLimits = UseDefaultsLimits,
UseDefaultsPaste = UseDefaultsPaste,
Expand Down
Loading

0 comments on commit 11a3fba

Please sign in to comment.