add keyboard actions:

- Show waveform - Show thumbnails - Show keyframes #254 (comment)
mifi · Dec 22, 2023 · 7173564 · 7173564
1 parent f4249c7
commit 7173564
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/src/App.jsx b/src/App.jsx
@@ -214,7 +214,7 @@ const App = memo(() => {
     }
   }, [detectedFileFormat, outFormatLocked, setFileFormat, setOutFormatLocked]);
 
-  const toggleEnableThumbnails = useCallback(() => setThumbnailsEnabled((v) => !v), []);
+  const toggleShowThumbnails = useCallback(() => setThumbnailsEnabled((v) => !v), []);
 
   const toggleExportConfirmEnabled = useCallback(() => setExportConfirmEnabled((v) => {
     const newVal = !v;
@@ -226,7 +226,7 @@ const App = memo(() => {
 
   const togglePreserveMetadataOnMerge = useCallback(() => setPreserveMetadataOnMerge((v) => !v), [setPreserveMetadataOnMerge]);
 
-  const toggleKeyframesEnabled = useCallback(() => {
+  const toggleShowKeyframes = useCallback(() => {
     setKeyframesEnabled((old) => {
       const enabled = !old;
       if (enabled && !calcShouldShowKeyframes(zoomedDuration)) {
@@ -2024,8 +2024,11 @@ const App = memo(() => {
       detectSilentScenes,
       detectSceneChanges,
       createSegmentsFromKeyframes,
+      toggleWaveformMode,
+      toggleShowThumbnails,
+      toggleShowKeyframes,
     };
-  }, [addSegment, alignSegmentTimesToKeyframes, apparentCutSegments, askStartTimeOffset, batchFileJump, batchOpenSelectedFile, captureSnapshot, captureSnapshotAsCoverArt, changePlaybackRate, checkFileOpened, cleanupFilesDialog, clearSegments, closeBatch, closeFileWithConfirm, combineOverlappingSegments, combineSelectedSegments, concatBatch, convertFormatBatch, copySegmentsToClipboard, createFixedDurationSegments, createNumSegments, createRandomSegments, createSegmentsFromKeyframes, currentSegIndexSafe, cutSegmentsHistory, deselectAllSegments, detectBlackScenes, detectSceneChanges, detectSilentScenes, duplicateCurrentSegment, extractAllStreams, extractCurrentSegmentFramesAsImages, extractSelectedSegmentsFramesAsImages, fillSegmentsGaps, goToTimecode, handleShowStreamsSelectorClick, increaseRotation, invertAllSegments, invertSelectedSegments, jumpCutEnd, jumpCutStart, jumpSeg, jumpTimelineEnd, jumpTimelineStart, keyboardNormalSeekSpeed, keyboardSeekAccFactor, onExportPress, onLabelSegment, openFilesDialog, openSendReportDialogWithState, pause, play, removeCutSegment, removeSelectedSegments, reorderSegsByStartTime, seekClosestKeyframe, seekRel, seekRelPercent, selectAllSegments, selectOnlyCurrentSegment, setCutEnd, setCutStart, setPlaybackVolume, shiftAllSegmentTimes, shortStep, shuffleSegments, splitCurrentSegment, timelineToggleComfortZoom, toggleCaptureFormat, toggleCurrentSegmentSelected, toggleKeyboardShortcuts, toggleKeyframeCut, toggleLastCommands, toggleLoopSelectedSegments, togglePlay, toggleSegmentsList, toggleSettings, toggleStreamsSelector, toggleStripAudio, tryFixInvalidDuration, userHtml5ifyCurrentFile, zoomRel]);
+  }, [addSegment, alignSegmentTimesToKeyframes, apparentCutSegments, askStartTimeOffset, batchFileJump, batchOpenSelectedFile, captureSnapshot, captureSnapshotAsCoverArt, changePlaybackRate, checkFileOpened, cleanupFilesDialog, clearSegments, closeBatch, closeFileWithConfirm, combineOverlappingSegments, combineSelectedSegments, concatBatch, convertFormatBatch, copySegmentsToClipboard, createFixedDurationSegments, createNumSegments, createRandomSegments, createSegmentsFromKeyframes, currentSegIndexSafe, cutSegmentsHistory, deselectAllSegments, detectBlackScenes, detectSceneChanges, detectSilentScenes, duplicateCurrentSegment, extractAllStreams, extractCurrentSegmentFramesAsImages, extractSelectedSegmentsFramesAsImages, fillSegmentsGaps, goToTimecode, handleShowStreamsSelectorClick, increaseRotation, invertAllSegments, invertSelectedSegments, jumpCutEnd, jumpCutStart, jumpSeg, jumpTimelineEnd, jumpTimelineStart, keyboardNormalSeekSpeed, keyboardSeekAccFactor, onExportPress, onLabelSegment, openFilesDialog, openSendReportDialogWithState, pause, play, removeCutSegment, removeSelectedSegments, reorderSegsByStartTime, seekClosestKeyframe, seekRel, seekRelPercent, selectAllSegments, selectOnlyCurrentSegment, setCutEnd, setCutStart, setPlaybackVolume, shiftAllSegmentTimes, shortStep, shuffleSegments, splitCurrentSegment, timelineToggleComfortZoom, toggleCaptureFormat, toggleCurrentSegmentSelected, toggleKeyboardShortcuts, toggleKeyframeCut, toggleShowKeyframes, toggleLastCommands, toggleLoopSelectedSegments, togglePlay, toggleSegmentsList, toggleSettings, toggleShowThumbnails, toggleStreamsSelector, toggleStripAudio, toggleWaveformMode, tryFixInvalidDuration, userHtml5ifyCurrentFile, zoomRel]);
 
   const getKeyboardAction = useCallback((action) => mainActions[action], [mainActions]);
 
@@ -2190,7 +2193,7 @@ const App = memo(() => {
 
     const actionsWithArgs = {
       openFiles: (filePaths) => { userOpenFiles(filePaths.map(resolvePathIfNeeded)); },
-      // todo separate actions per type and move them into mainActions?
+      // todo separate actions per type and move them into mainActions? https://github.com/mifi/lossless-cut/issues/254#issuecomment-932649424
       importEdlFile,
       exportEdlFile: tryExportEdlFile,
     };
@@ -2494,12 +2497,12 @@ const App = memo(() => {
                 seekClosestKeyframe={seekClosestKeyframe}
                 togglePlay={togglePlay}
                 showThumbnails={showThumbnails}
-                toggleEnableThumbnails={toggleEnableThumbnails}
+                toggleShowThumbnails={toggleShowThumbnails}
                 toggleWaveformMode={toggleWaveformMode}
                 waveformMode={waveformMode}
                 hasAudio={hasAudio}
                 keyframesEnabled={keyframesEnabled}
-                toggleKeyframesEnabled={toggleKeyframesEnabled}
+                toggleShowKeyframes={toggleShowKeyframes}
                 detectedFps={detectedFps}
                 toggleLoopSelectedSegments={toggleLoopSelectedSegments}
                 isFileOpened={isFileOpened}

diff --git a/src/BottomBar.jsx b/src/BottomBar.jsx
@@ -142,9 +142,9 @@ const BottomBar = memo(({
   setCurrentSegIndex,
   jumpTimelineStart, jumpTimelineEnd, jumpCutEnd, jumpCutStart, startTimeOffset, setCutTime, currentApparentCutSeg,
   playing, shortStep, togglePlay, toggleLoopSelectedSegments, hasAudio,
-  keyframesEnabled, toggleKeyframesEnabled, seekClosestKeyframe, detectedFps, isFileOpened, selectedSegments,
+  keyframesEnabled, toggleShowKeyframes, seekClosestKeyframe, detectedFps, isFileOpened, selectedSegments,
   darkMode, setDarkMode,
-  toggleEnableThumbnails, toggleWaveformMode, waveformMode, showThumbnails,
+  toggleShowThumbnails, toggleWaveformMode, waveformMode, showThumbnails,
   outputPlaybackRate, setOutputPlaybackRate,
 }) => {
   const { t } = useTranslation();
@@ -249,15 +249,15 @@ const BottomBar = memo(({
                     style={{ padding: '0 .2em', color: showThumbnails ? primaryTextColor : undefined }}
                     role="button"
                     title={t('Show thumbnails')}
-                    onClick={toggleEnableThumbnails}
+                    onClick={toggleShowThumbnails}
                   />
 
                   <FaKey
                     size={16}
                     style={{ padding: '0 .2em', color: keyframesEnabled ? primaryTextColor : undefined }}
                     role="button"
                     title={t('Show keyframes')}
-                    onClick={toggleKeyframesEnabled}
+                    onClick={toggleShowKeyframes}
                   />
                 </>
               )}

diff --git a/src/components/KeyboardShortcuts.jsx b/src/components/KeyboardShortcuts.jsx
@@ -524,6 +524,18 @@ const KeyboardShortcuts = memo(({
           name: t('Copy selected segments times to clipboard'),
           category: otherCategory,
         },
+        toggleWaveformMode: {
+          name: t('Show waveform'),
+          category: otherCategory,
+        },
+        toggleShowThumbnails: {
+          name: t('Show thumbnails'),
+          category: otherCategory,
+        },
+        toggleShowKeyframes: {
+          name: t('Show keyframes'),
+          category: otherCategory,
+        },
         toggleSettings: {
           name: t('Settings'),
           category: otherCategory,
@@ -614,8 +626,8 @@ const KeyboardShortcuts = memo(({
     });
   }, [setKeyBindings]);
 
-  const missingAction = Object.keys(mainActions).find((key) => actionsMap[key] == null);
-  if (missingAction) throw new Error(`Action missing: ${missingAction}`);
+  const missingActions = Object.keys(mainActions).filter((key) => actionsMap[key] == null);
+  if (missingActions.length > 0) throw new Error(`Action(s) missing: ${missingActions.join(',')}`);
 
   return (
     <>