diff --git a/public/MainEvents/Helpers/TelmiOS.js b/public/MainEvents/Helpers/TelmiOS.js index 956d54e..ae792a3 100644 --- a/public/MainEvents/Helpers/TelmiOS.js +++ b/public/MainEvents/Helpers/TelmiOS.js @@ -3,7 +3,7 @@ import * as fs from 'fs' const getPathTelmiOsParameters = (drive) => { - return path.join(drive, 'Saves/parameters.json') + return path.join(drive, 'Saves/.parameters') }, readTelmiOSParameters = (usb) => { diff --git a/public/MainEvents/Processes/Import/ConvertFolderFS.js b/public/MainEvents/Processes/Import/ConvertFolderFS.js index 0f82df3..85c246a 100644 --- a/public/MainEvents/Processes/Import/ConvertFolderFS.js +++ b/public/MainEvents/Processes/Import/ConvertFolderFS.js @@ -13,7 +13,7 @@ const } return { action: actionNodeKey, - defaultIndex: transitionSelectedOptionIndex + index: transitionSelectedOptionIndex } }, decipherMedias = (srcMedias, dstMedias, index, length, onEnd) => { @@ -60,7 +60,8 @@ function convertFolderFS (srcPath, storyName) { renameImage = (name) => findNewName(name, '.png', imagesNewNames), renameAudio = (name) => findNewName(name, '.mp3', audiosNewNames), - uuid = stringSlugify(path.basename(srcPath)), + tmpUuid = stringSlugify(path.basename(srcPath)), + uuid = tmpUuid.length > 48 ? tmpUuid.substring(0, 48) : tmpUuid, title = storyName || uuid, dstPath = getStoriesPath(uuid), srcImagesPath = path.join(srcPath, 'rf'), @@ -116,19 +117,19 @@ function convertFolderFS (srcPath, storyName) { stages[stageNodeKey] = { image: renameImage(ri[imageAssetIndexInRI]), audio: renameAudio(si[soundAssetIndexInSI]), - okButton: varsToTransitionNode( + ok: varsToTransitionNode( okTransitionActionNodeIndexInLI, okTransitionNumberOfOptions, okTransitionSelectedOptionIndex, okActionNodeKey ), - homeButton: varsToTransitionNode( + home: varsToTransitionNode( homeTransitionActionNodeIndexInLI, homeTransitionNumberOfOptions, homeTransitionSelectedOptionIndex, homeActionNodeKey ), - controlSettings: { + control: { wheel, ok, home, @@ -142,7 +143,7 @@ function convertFolderFS (srcPath, storyName) { const firstStageNode = stages['s0'], - nodes = {startAction: firstStageNode.okButton, stages, actions}, + nodes = {startAction: firstStageNode.ok, stages, actions}, metadata = {title, uuid, image: 'title.png'} delete stages['s0'] diff --git a/public/MainEvents/Processes/Import/ConvertFolderSTUdio.js b/public/MainEvents/Processes/Import/ConvertFolderSTUdio.js index c880352..5f87ee0 100644 --- a/public/MainEvents/Processes/Import/ConvertFolderSTUdio.js +++ b/public/MainEvents/Processes/Import/ConvertFolderSTUdio.js @@ -37,7 +37,7 @@ function convertFolderSTUdio (srcPath, storyName) { } return { action: renameAction(transition.actionNode), - defaultIndex: transition.optionIndex + index: transition.optionIndex } }, @@ -62,9 +62,9 @@ function convertFolderSTUdio (srcPath, storyName) { [renameStage(node.uuid)]: { image: renameImage(node.image), audio: renameAudio(node.audio), - okButton: reformatTransition(node.okTransition), - homeButton: reformatTransition(node.homeTransition), - controlSettings: node.controlSettings, + ok: reformatTransition(node.okTransition), + home: reformatTransition(node.homeTransition), + control: node.controlSettings, } }), {} diff --git a/src/App/Components/Form/Input/InputRange.js b/src/App/Components/Form/Input/InputRange.js index bdace34..d37209a 100644 --- a/src/App/Components/Form/Input/InputRange.js +++ b/src/App/Components/Form/Input/InputRange.js @@ -15,7 +15,7 @@ function InputRange ({label, type, id, unit, defaultValue, className, ...props}, return null } r.getValue = () => { - return parseInt(r.value, 10) + return parseFloat(r.value) } ref.current = r } diff --git a/src/App/Components/Form/Input/InputText.js b/src/App/Components/Form/Input/InputText.js index 259076a..716d4f4 100644 --- a/src/App/Components/Form/Input/InputText.js +++ b/src/App/Components/Form/Input/InputText.js @@ -27,7 +27,7 @@ function InputText ({label, type, id, required, className, ...props}, ref) { return null } r.getValue = () => { - return (r.type === 'number') ? parseInt(r.value, 10) : r.value + return (r.type === 'number') ? parseFloat(r.value) : r.value } ref.current = r } diff --git a/src/App/Components/Modal/Templates/ModalTasksVisualizer/ModalTasksVisualizer.module.scss b/src/App/Components/Modal/Templates/ModalTasksVisualizer/ModalTasksVisualizer.module.scss index d188333..f0588d3 100644 --- a/src/App/Components/Modal/Templates/ModalTasksVisualizer/ModalTasksVisualizer.module.scss +++ b/src/App/Components/Modal/Templates/ModalTasksVisualizer/ModalTasksVisualizer.module.scss @@ -16,9 +16,14 @@ background: $black20; } -.taskTextes { +.taskTextes, .taskTextesCancellable { padding: 0 15px; - flex: 0 1 100%; + flex: 0 0 395px; + width: 395px; +} +.taskTextesCancellable { + flex: 0 0 364px; + width: 364px; } .taskProgressDescription { diff --git a/src/App/Components/Modal/Templates/ModalTasksVisualizer/TaskProcessing.js b/src/App/Components/Modal/Templates/ModalTasksVisualizer/TaskProcessing.js index ca6b4ca..c728114 100644 --- a/src/App/Components/Modal/Templates/ModalTasksVisualizer/TaskProcessing.js +++ b/src/App/Components/Modal/Templates/ModalTasksVisualizer/TaskProcessing.js @@ -11,7 +11,7 @@ function TaskProcessing ({task, message, current, total, onCancelTask}) { return
diff --git a/src/App/Modules/Synchronize/Music/ModalMusicFormUpdate.js b/src/App/Modules/Synchronize/Music/ModalMusicFormUpdate.js
index 2415b5c..7666d69 100644
--- a/src/App/Modules/Synchronize/Music/ModalMusicFormUpdate.js
+++ b/src/App/Modules/Synchronize/Music/ModalMusicFormUpdate.js
@@ -54,7 +54,7 @@ function ModalMusicFormUpdate ({music, onValidate, onClose}) {
(values) => {
onValidate({
...music,
- track: parseInt(values[0], 10),
+ track: Math.round(values[0]),
title: values[1],
album: values[2],
artist: values[3],
diff --git a/src/App/Modules/Synchronize/TelmiOS/ModalTelmiOSParamsForm.js b/src/App/Modules/Synchronize/TelmiOS/ModalTelmiOSParamsForm.js
index bc49be3..d57c848 100644
--- a/src/App/Modules/Synchronize/TelmiOS/ModalTelmiOSParamsForm.js
+++ b/src/App/Modules/Synchronize/TelmiOS/ModalTelmiOSParamsForm.js
@@ -25,29 +25,29 @@ function ModalTelmiOSParamsForm ({parameters, onValidate, onClose}) {
(validation) => {
return <>