From 804a71b131d16e8b39ae73b87ceb0bd28bbdf620 Mon Sep 17 00:00:00 2001 From: sukuwc Date: Mon, 18 Jul 2022 12:50:18 +0200 Subject: [PATCH 1/3] SUKU move action crashing bug fixed --- src/app/main/_actions/move.action.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/app/main/_actions/move.action.js b/src/app/main/_actions/move.action.js index 8021fa88d..7cfbe3f99 100644 --- a/src/app/main/_actions/move.action.js +++ b/src/app/main/_actions/move.action.js @@ -183,7 +183,7 @@ export function changeOrder(node, {configs}) { detail: {id: _configIds} })); - } + } // drag over section if(drag >= 2 && !moveDisabled){ @@ -194,13 +194,16 @@ export function changeOrder(node, {configs}) { if(id){ let drop_target = ''; // if its a modifier, the below helper shouldn't be used! - if(id.startsWith('cfg-') && (!e.target.getAttribute('config-component').endsWith('_If')) && e.target.getAttribute('config-component') !== 'Then'){ - if((clientHeight / 2) < e.offsetY){ - drop_target = Number(id.substr(4,)); - } else { - drop_target = Number(id.substr(4,)) - 1; + + if (e.target.getAttribute('config-component') !== null ){ + if(id.startsWith('cfg-') && (!e.target.getAttribute('config-component').endsWith('_If')) && e.target.getAttribute('config-component') !== 'Then'){ + if((clientHeight / 2) < e.offsetY){ + drop_target = Number(id.substr(4,)); + } else { + drop_target = Number(id.substr(4,)) - 1; + } } - } else if(id.substr(0,3) == 'dz-'){ + }else if(id.substr(0,3) == 'dz-'){ drop_target = Number(id.substr(3,)); } else if(id == 'config-bin'){ drop_target = 'bin'; From 9dae910921ae957fdf3aef73d2cc37222662112d Mon Sep 17 00:00:00 2001 From: sukuwc Date: Mon, 18 Jul 2022 12:50:48 +0200 Subject: [PATCH 2/3] SUKU ED-80 UXP plugin download implemented --- configuration.json | 17 +++++-- package-lock.json | 4 +- .../panels/preferences/Preferences.svelte | 49 +++++++++++++++++++ src/electron.js | 1 + 4 files changed, 65 insertions(+), 6 deletions(-) diff --git a/configuration.json b/configuration.json index 2c6f0cdf0..a1f780ed8 100644 --- a/configuration.json +++ b/configuration.json @@ -11,19 +11,28 @@ "YOUTUBE_RELEASENOTES_PLAYLIST_ID": "PLtMbdpAm17zdDZ9jkStSFvdWJdVi3skVu", "YOUTUBE_RELEASENOTES_FALLBACK_URL": "https://www.youtube.com/playlist?list=PLtMbdpAm17zdDZ9jkStSFvdWJdVi3skVu", - "FIRMWARE_REQUIRED_MAJOR":1, - "FIRMWARE_REQUIRED_MINOR":2, - "FIRMWARE_REQUIRED_PATCH":18, - "USB_VID_0": "0x03eb", "USB_PID_0": "0xecac", "USB_VID_1": "0x03eb", "USB_PID_1": "0xecad", + "FIRMWARE_REQUIRED_MAJOR":1, + "FIRMWARE_REQUIRED_MINOR":2, + "FIRMWARE_REQUIRED_PATCH":18, + "FIRMWARE_URL_BEGINING":"https://github.com/intechstudio/grid-fw/releases/download/", "FIRMWARE_URL_END":"/grid_release.zip", + "UXP_PHOTOSHOP_REQUIRED_MAJOR":0, + "UXP_PHOTOSHOP_REQUIRED_MINOR":0, + "UXP_PHOTOSHOP_REQUIRED_PATCH":1, + + "UXP_PHOTOSHOP_URL_BEGINING":"https://github.com/intechstudio/grid-photoshop-plugin/releases/download/", + "UXP_PHOTOSHOP_URL_END":"/uxp_photoshop_release.zip", + + + "LIBRARY_GITHUB_URL": "https://github.com/intechstudio/grid-profiles/archive/refs/heads/main.zip", "EDITOR_DOWNLOAD_URL": "https://intech.studio/grid-editor/downloads", diff --git a/package-lock.json b/package-lock.json index aedb246ff..b6014abec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "grid_editor", - "version": "1.2.25", + "version": "1.2.26", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "grid_editor", - "version": "1.2.25", + "version": "1.2.26", "hasInstallScript": true, "dependencies": { "@codemirror/basic-setup": "^0.18.0", diff --git a/src/app/main/panels/preferences/Preferences.svelte b/src/app/main/panels/preferences/Preferences.svelte index 7de19e9ff..7bb63c9c3 100644 --- a/src/app/main/panels/preferences/Preferences.svelte +++ b/src/app/main/panels/preferences/Preferences.svelte @@ -199,6 +199,48 @@ } + function delay(time) { + return new Promise((resolve) => { + setTimeout(() => resolve(), time); + }); + } + + async function uxpPhotoshopDownload(){ + + + const version = "v"+process.env.UXP_PHOTOSHOP_REQUIRED_MAJOR+"."+process.env.UXP_PHOTOSHOP_REQUIRED_MINOR+"."+process.env.UXP_PHOTOSHOP_REQUIRED_PATCH + + let link = process.env.UXP_PHOTOSHOP_URL_BEGINING + version + process.env.UXP_PHOTOSHOP_URL_END + console.log(link) + + + let result = ipcRenderer.sendSync('download', {url: link, folder: "temp"}); + download_status = "Download completed!" + let zip = new AdmZip(result); + + let zipEntries = zip.getEntries(); // an array of ZipEntry records + + let pluginFilePaths = []; + + zipEntries.forEach(function (zipEntry) { + + console.log(zipEntry.entryName) + + if (zipEntry.entryName.endsWith(".ccx")) { + + pluginFilePaths.push(zipEntry.entryName); + } + }); + + let folder = get(appSettings).persistant.profileFolder; + + zip.extractAllTo(folder + "/temp", /*overwrite*/ true); + + + shell.showItemInFolder(folder + "/temp/" +pluginFilePaths[0]) + + } + function resetAppSettings(){ ipcRenderer.sendSync('resetAppSettings', 'foo'); @@ -328,6 +370,13 @@ Download Library +
Photoshop Plugin
+ + diff --git a/src/electron.js b/src/electron.js index f9f32bd76..29badd701 100644 --- a/src/electron.js +++ b/src/electron.js @@ -281,6 +281,7 @@ ipcMain.on('download', async (event, arg) => { }catch(e){ + console.log("Download Error", e) event.returnValue = undefined; } From d311c46ab5f24cb8c682b646d4fd5118a5f8e0fa Mon Sep 17 00:00:00 2001 From: sukuwc Date: Mon, 18 Jul 2022 13:00:17 +0200 Subject: [PATCH 3/3] SUKU default encoder velocity reduced to 50% --- src/app/config-blocks/SettingsEncoder.svelte | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/config-blocks/SettingsEncoder.svelte b/src/app/config-blocks/SettingsEncoder.svelte index 4cfb87b16..e1d62380f 100644 --- a/src/app/config-blocks/SettingsEncoder.svelte +++ b/src/app/config-blocks/SettingsEncoder.svelte @@ -7,7 +7,7 @@ category: 'element settings', color: '#5F416D', desc: 'Encoder Mode', - defaultLua: 'self:emo(0) self:ev0(100)', + defaultLua: 'self:emo(0) self:ev0(50)', icon: `EC`, } @@ -91,7 +91,8 @@ [ {value: '0', info: 'No velocity (0%)'}, - {value: '100', info: 'Default (100%)'}, + {value: '50', info: 'Default (50%)'}, + {value: '100', info: 'Maximum (100%)'}, ] ]