Merge remote-tracking branch 'vsicurella.TerpstraSysEx.2014/master' i…

…nto merge2023

.github/workflows/build-lte.yml

@@ -0,0 +1,99 @@
+name: Build Lumatone Editor
+
+on: [push, pull_request]
+
+env: {}
+
+jobs:
+  build-lte-linux:
+    name: Build Lumatone Editor (Linux)
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install JUCE to $HOME
+        run: |
+          wget https://github.com/juce-framework/JUCE/releases/download/6.1.6/juce-6.1.6-linux.zip
+          unzip -d ~ juce-6.1.6-linux.zip
+      - name: Install APT dependencies
+        run: |
+          sudo apt update
+          sudo apt install libssh2-1-dev libasound2-dev libjack-jackd2-dev ladspa-sdk libcurl4-openssl-dev  libfreetype6-dev libx11-dev libxcomposite-dev libxcursor-dev libxcursor-dev libxext-dev libxinerama-dev libxrandr-dev libxrender-dev libwebkit2gtk-4.0-dev libglu1-mesa-dev mesa-common-dev
+      - name: Build Lumatone Editor
+        run: |
+          ~/JUCE/Projucer --resave TerpstraSysEx.jucer
+          cd Builds/Linux
+          make CONFIG=Release
+      - name: List build directory
+        run: |
+          cd Builds/Linux
+          find
+      - name: Upload Lumatone Editor
+        uses: actions/upload-artifact@v2
+        with:
+          name: LumatoneEditor-Linux
+          path: Builds/Linux/build/Lumatone\ Editor
+          if-no-files-found: error
+
+  build-lte-macos:
+    name: Build Lumatone Editor (macOS)
+
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install JUCE to $HOME
+        run: |
+          wget https://github.com/juce-framework/JUCE/releases/download/6.1.6/juce-6.1.6-osx.zip
+          unzip -d ~ juce-6.1.6-osx.zip
+      - name: Build Lumatone Editor
+        run: |
+          ~/JUCE/Projucer.app/Contents/MacOS/Projucer --resave TerpstraSysEx.jucer
+          cd Builds/MacOSX
+          xcodebuild -configuration Release
+      - name: List build directory
+        run: |
+          cd Builds/MacOSX
+          find .
+      - name: Upload Lumatone Editor
+        uses: actions/upload-artifact@v2
+        with:
+          name: LumatoneEditor-macOS
+          path: Builds/MacOSX/build/Release
+          if-no-files-found: error
+
+  build-lte-windows:
+    name: Build Lumatone Editor (Windows)
+
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: microsoft/[email protected]
+      - name: Install JUCE to C:\
+        run: |
+          Invoke-WebRequest https://github.com/juce-framework/JUCE/releases/download/6.1.6/juce-6.1.6-windows.zip -O juce-6.1.6-windows.zip
+          7z x juce-6.1.6-windows.zip -oC:\
+      - name: Build Lumatone Editor
+        run: |
+          bash -c '/c/JUCE/Projucer --resave TerpstraSysEx.jucer'
+          cd Builds/VisualStudio2019
+          msbuild "Lumatone Editor.sln" /p:configuration=Release
+      - name: List build directory
+        run: |
+          cd Builds/VisualStudio2019
+          Get-ChildItem -Recurse
+      - name: Upload Lumatone Editor
+        uses: actions/upload-artifact@v2
+        with:
+          name: LumatoneEditor-Windows
+          path: "Builds/VisualStudio2019/x64/Release/App/Lumatone Editor.exe"
+          if-no-files-found: error
+      - name: Upload dynamic libraries
+        uses: actions/upload-artifact@v2
+        with:
+          name: LumatoneEditor-Windows
+          path: Libraries/win64/bin/*.dll
+          if-no-files-found: error
+

.gitignore

@@ -6,3 +6,5 @@
 /Installers/InnoSetup/Install*
 /Installers/InnoSetup/archive*
 /Installers/Packages/build*
+.vscode
+/Releases

BinaryData/Localisation/en-gb.txt

@@ -73,4 +73,7 @@ countries: ca gb au
 "FreeDrawing" = "Free Drawing"
 "Linear" = "Linear"
 "Quadratic" = "Quadratic"
-"Ticks" = "ticks"
+"Ticks" = "ticks"
+"EditButtonTip" = "Edit palette colours"
+"CloneButtonTip" = "Clone palette"
+"TrashButtonTip" = "Delete palette (currently irreversible)"

Installers/InnoSetup/LumatoneEditorWinInstallerScript.iss

@@ -2,10 +2,11 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Lumatone Editor"
-#define MyAppVersion "1.0.0"
+#define MyAppVersion "1.0.2"
 #define MyAppPublisher "Lumatone"
 #define MyAppURL "https://www.lumatone.io/"
 #define MyAppExeName "Lumatone Editor.exe"
+#define MyAppExeNameDest "Lumatone Editor.exe"
 #define MappingAssocName MyAppName + " Mapping"
 #define MappingAssocExt ".ltn"
 #define MappingAssocKey StringChange(MappingAssocName, " ", "") + MappingAssocExt
@@ -23,6 +24,7 @@ AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
+AllowNoIcons=yes
 DefaultDirName={autopf64}\{#MyAppName}
 ChangesAssociations=yes
 DisableProgramGroupPage=yes
@@ -33,7 +35,7 @@ OutputDir=.\
 OutputBaseFilename=Install {#MyAppName} {#MyAppVersion}
 Compression=lzma
 SolidCompression=yes
-UsePreviousAppDir=no
+UsePreviousAppDir=yes
 WizardStyle=modern
 
 [Languages]
@@ -42,8 +44,8 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
-[Files]
-Source: "..\..\Builds\VisualStudio2019\x64\Release\App\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+[Files]                                                         
+Source: "..\..\Builds\VisualStudio2019\x64\Release\App\{#MyAppExeName}"; DestDir: "{app}"; DestName: "{#MyAppExeNameDest}"; Flags: ignoreversion
 Source: "..\..\Presets\Mappings\*"; DestDir: "{userdocs}\{#MyAppName}\Mappings"; Flags: ignoreversion recursesubdirs createallsubdirs uninsneveruninstall
 Source: "..\..\Presets\Palettes\*"; DestDir: "{userdocs}\{#MyAppName}\Palettes"; Flags: ignoreversion recursesubdirs createallsubdirs uninsneveruninstall
 Source: "..\..\Libraries\win64\bin\libssh2-x64.dll"; DestDir: "{app}"; Flags: ignoreversion
@@ -57,14 +59,14 @@ Source: "vc_redist.x64.exe"; DestDir: "{tmp}"; Flags: ignoreversion deleteafteri
 Root: HKA; Subkey: "Software\Classes\{#MappingAssocExt}\OpenWithProgIds"; ValueType: string; ValueName: "{#MappingAssocKey}"; ValueData: "%"; Flags: uninsdeletevalue
 Root: HKA; Subkey: "Software\Classes\{#MappingAssocExt}"; ValueType: string; ValueName: ""; ValueData: "{#MappingAssocName}"; Flags: uninsdeletekey
 Root: HKA; Subkey: "Software\Classes\{#MappingAssocExt}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\ltn.ico"
-Root: HKA; Subkey: "Software\Classes\{#MappingAssocExt}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
-Root: HKA; Subkey: "Software\Classes\Applications\{#MyAppExeName}\SupportedTypes"; ValueType: string; ValueName: {#MappingAssocExt}; ValueData: ""
+Root: HKA; Subkey: "Software\Classes\{#MappingAssocExt}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeNameDest}"" ""%1"""
+Root: HKA; Subkey: "Software\Classes\Applications\{#MyAppExeNameDest}\SupportedTypes"; ValueType: string; ValueName: {#MappingAssocExt}; ValueData: ""
 Root: HKA; Subkey: "Software\Classes\{#PaletteAssocExt}"; ValueType: string; ValueName: ""; ValueData: "{#PaletteAssocName}"; Flags: uninsdeletekey
 Root: HKA; Subkey: "Software\Classes\{#PaletteAssocExt}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData:"{app}\ltp.ico"
 
 [Icons]
-Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeNameDest}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeNameDest}"; Tasks: desktopicon
 
 [Code]
 // Pulled from https://stackoverflow.com/questions/24574035/how-to-install-microsoft-vc-redistributables-silently-in-inno-setup
@@ -94,5 +96,5 @@ end;
 [Run]
 Filename: "{tmp}\vc_redist.x64.exe"; Description: "Install VC Redistributable package if necessary"; Parameters: "/q /norestart /c:""msiexec /q /i vcredist.msi"""; \
    Check: VCRedistNeedsInstall; StatusMsg: "Installing Microsoft Visual C++ 2015, may take a few minutes..."
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+Filename: "{app}\{#MyAppExeNameDest}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
 

Installers/Packages/Lumatone Editor/LICENSE.txt

@@ -0,0 +1,11 @@
+Copyright 2022 Lumatone Inc.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.