{t('Last ffmpeg commands')}
{ffmpegCommandLog.length > 0 ? ( diff --git a/src/Timeline.jsx b/src/Timeline.jsx index efaeac66..a943bd4f 100644 --- a/src/Timeline.jsx +++ b/src/Timeline.jsx @@ -42,7 +42,7 @@ const Waveforms = memo(({ calculateTimelinePercent, durationSafe, waveforms, zoo const CommandedTime = memo(({ commandedTimePercent }) => { const color = 'var(--gray12)'; - const commonStyle = { left: commandedTimePercent, position: 'absolute', zIndex: 4, pointerEvents: 'none' }; + const commonStyle = { left: commandedTimePercent, position: 'absolute', pointerEvents: 'none' }; return ( <>
+
-
- "avoid_negative_ts"
- {!['make_zero', 'auto'].includes(avoidNegativeTs) &&
-
-
-
-
- {!['make_zero', 'auto'].includes(avoidNegativeTs) ? (
-
-
- )}
+ {!needSmartCut && (() => {
+ const avoidNegativeTsWarn = (() => {
+ if (willMerge) {
+ if (avoidNegativeTs !== 'make_non_negative') {
+ return t('When merging, it\'s generally recommended to set this to "make_non_negative"');
+ }
+ return undefined;
+ }
+ if (!['make_zero', 'auto'].includes(avoidNegativeTs)) {
+ return t('It\'s generally recommended to set this to one of: {{values}}', { values: '"auto", "make_zero"' });
+ }
+ return undefined;
+ })();
+
+ return (
+
+
+ {`"${'avoid_negative_ts'}"`}
+ {avoidNegativeTsWarn != null &&
+
+
+
+
+ {avoidNegativeTsWarn != null ? (
+
+
+ );
+ })()}
@@ -397,7 +412,7 @@ const ExportConfirm = memo(({
-
{formatTimeAndFrames(displayTime)}{isZoomed ? ` ${displayTimePercent}` : ''}
diff --git a/src/components/ExportConfirm.jsx b/src/components/ExportConfirm.jsx
index 1fc77f2f..7e694289 100644
--- a/src/components/ExportConfirm.jsx
+++ b/src/components/ExportConfirm.jsx
@@ -356,29 +356,44 @@ const ExportConfirm = memo(({
)}
- {!needSmartCut && (
- {t('It\'s generally recommended to set this to one of: {{values}}', { values: '"auto", "make_zero"' })}
}
- {avoidNegativeTsWarn}
}
+
+
keys.map((key, i) => (
@@ -105,13 +107,15 @@ const CreateBinding = memo(({
);
});
-const rowStyle = { display: 'flex', alignItems: 'center', margin: '6px 0' };
+const rowStyle = { display: 'flex', alignItems: 'center', margin: '.2em 0', borderBottom: '1px solid rgba(0,0,0,0.1)', paddingBottom: '.5em' };
const KeyboardShortcuts = memo(({
keyBindings, setKeyBindings, resetKeyBindings, currentCutSeg, mainActions,
}) => {
const { t } = useTranslation();
+ const { mouseWheelZoomModifierKey } = useUserSettings();
+
const { actionsMap, extraLinesPerCategory } = useMemo(() => {
const playbackCategory = t('Playback');
const selectivePlaybackCategory = t('Playback/preview segments only');
@@ -136,8 +140,9 @@ const KeyboardShortcuts = memo(({
{t('Pan timeline')}
+ {getModifier(mouseWheelZoomModifierKey).map((v) => {v})}
{t('Mouse scroll/wheel left/right')}
+ {t('Mouse scroll/wheel up/down')}
,
],
},
@@ -649,7 +654,7 @@ const KeyboardShortcuts = memo(({
return (
<>
-
- {error != null &&
+
setSearchQuery(e.target.value)} placeholder="Search" width="100%" />
@@ -691,7 +696,7 @@ const KeyboardShortcuts = memo(({
);
})}
- {extraLinesPerCategory[category]}
+ {extraLinesPerCategory[category] &&
))}
diff --git a/src/components/OutSegTemplateEditor.jsx b/src/components/OutSegTemplateEditor.jsx
index 224e1add..e55f0c2e 100644
--- a/src/components/OutSegTemplateEditor.jsx
+++ b/src/components/OutSegTemplateEditor.jsx
@@ -23,13 +23,13 @@ const formatVariable = (variable) => `\${${variable}}`;
const extVar = formatVariable('EXT');
-const OutSegTemplateEditor = memo(({ outSegTemplate, setOutSegTemplate, generateOutSegFileNames, currentSegIndexSafe, getOutSegError }) => {
+const OutSegTemplateEditor = memo(({ outSegTemplate, setOutSegTemplate, generateOutSegFileNames, currentSegIndexSafe }) => {
const { safeOutputFileName, toggleSafeOutputFileName, outputFileNameMinZeroPadding, setOutputFileNameMinZeroPadding } = useUserSettings();
const [text, setText] = useState(outSegTemplate);
const [debouncedText] = useDebounce(text, 500);
const [validText, setValidText] = useState();
- const [error, setError] = useState();
+ const [outSegProblems, setOutSegProblems] = useState({ error: undefined, sameAsInputFileNameWarning: false });
const [outSegFileNames, setOutSegFileNames] = useState();
const [shown, setShown] = useState();
const inputRef = useRef();
@@ -42,22 +42,16 @@ const OutSegTemplateEditor = memo(({ outSegTemplate, setOutSegTemplate, generate
if (debouncedText == null) return;
try {
- const { outSegFileNames: newOutSegFileNames, outSegError } = generateOutSegFileNames({ template: debouncedText });
- setOutSegFileNames(newOutSegFileNames);
- if (outSegError) {
- setError(outSegError);
- setValidText();
- return;
- }
-
- setValidText(debouncedText);
- setError();
+ const outSegs = generateOutSegFileNames({ template: debouncedText });
+ setOutSegFileNames(outSegs.outSegFileNames);
+ setOutSegProblems(outSegs.outSegProblems);
+ setValidText(outSegs.outSegProblems.error == null ? debouncedText : undefined);
} catch (err) {
console.error(err);
setValidText();
- setError(err.message);
+ setOutSegProblems({ error: err.message });
}
- }, [debouncedText, generateOutSegFileNames, getOutSegError, t]);
+ }, [debouncedText, generateOutSegFileNames, t]);
// eslint-disable-next-line no-template-curly-in-string
const isMissingExtension = validText != null && !validText.endsWith(extVar);
@@ -80,8 +74,8 @@ const OutSegTemplateEditor = memo(({ outSegTemplate, setOutSegTemplate, generate
}, [setOutSegTemplate]);
const onHideClick = useCallback(() => {
- if (error == null) setShown(false);
- }, [error]);
+ if (outSegProblems.error == null) setShown(false);
+ }, [outSegProblems.error]);
const onShowClick = useCallback(() => {
if (!shown) setShown(true);
@@ -89,7 +83,7 @@ const OutSegTemplateEditor = memo(({ outSegTemplate, setOutSegTemplate, generate
const onTextChange = useCallback((e) => setText(e.target.value), []);
- const needToShow = shown || error != null;
+ const needToShow = shown || outSegProblems.error != null || outSegProblems.sameAsInputFileNameWarning;
const onVariableClick = useCallback((variable) => {
const input = inputRef.current;
@@ -132,7 +126,18 @@ const OutSegTemplateEditor = memo(({ outSegTemplate, setOutSegTemplate, generate
))}
{extraLinesPerCategory[category]}
}
+
+ )}
+
+ {outSegProblems.error == null && outSegProblems.sameAsInputFileNameWarning && (
+
+
+ )}
{isMissingExtension && (
diff --git a/src/components/Settings.jsx b/src/components/Settings.jsx
index 336ae72a..062664b9 100644
--- a/src/components/Settings.jsx
+++ b/src/components/Settings.jsx
@@ -78,11 +78,11 @@ const Settings = memo(({
return (
<>
-
+
-
+
{t('Hover mouse over buttons in the main interface to see which function they have')}
| {t('Settings')} | @@ -321,8 +321,8 @@ const Settings = memo(({diff --git a/src/components/Sheet.jsx b/src/components/Sheet.jsx index 057c57a8..01f8a3a1 100644 --- a/src/components/Sheet.jsx +++ b/src/components/Sheet.jsx @@ -1,27 +1,33 @@ import React, { memo } from 'react'; import { IoIosCloseCircleOutline } from 'react-icons/io'; import { motion, AnimatePresence } from 'framer-motion'; +import { useTranslation } from 'react-i18next'; import styles from './Sheet.module.css'; -const Sheet = memo(({ visible, onClosePress, style, children }) => ( - |
|---|