Skip to content

The truly free, open-source, local-first, cross-platform CapCut replacement. Scriptable through a JSON-RPC API & MCP.

feat(timeline): one way to split, at the playhead; the razor tool is gone

Jareer5b48fce0741e
diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
index ce04b426..bd08f55e 100644
--- a/ARCHITECTURE.md
+++ b/ARCHITECTURE.md
@@ -210,8 +210,8 @@ sequenceDiagram
duration of `update`, so it can be handed the rest of the window without
borrowing itself twice; a result that arrives after its project closed is
dropped in one place.
-- **What stays on the controller:** the gestures (a clip dragged, trimmed or
- razored; a picture moved on the stage; a brush stroke), because one gesture
+- **What stays on the controller:** the gestures (a clip dragged or
+ trimmed; a picture moved on the stage; a brush stroke), because one gesture
spans the lanes and the stage over an *echo* of the document, a clone the
pointer mutates and commits as one command on release. Moving those is the
next cut of `studio.rs`.
diff --git a/TODO.MD b/TODO.MD
index 3c32e9ae..66507982 100644
--- a/TODO.MD
+++ b/TODO.MD
@@ -12,7 +12,7 @@ DO NOT DELETE ANY OF THE TODOs, JUST MARK THEM DONE.
- [x] We need to add texts presets. In Library>Text, create a new tab/dropdown under Text in the sidebar called Presets where pre-designed Texts profiles/configs are shown and can be used immediately. Text profiles use typography settings like font, size, etc. For font we create a consistent/idempotent copy where if a Text preset is distributed openly among the users/community the "Installer" checks if the new text preset-profile font is already cached/installed/imported for used in Concat, else it installs the font bundled with the Text preset/profile. Each profile has a unique name/identifier. _(Library › Text › Presets: nine built-in looks, each card drawn in its own style; click places at the playhead, drag places on a lane. Community presets are TOML files under the app's `text-presets/` folder (macOS: ~/Library/Application Support/app.concat.editor/text-presets), a folder per preset with its font beside it; the font is copied into the app's `fonts/` once and registered on the project the first time the preset is used. Format documented at the top of src/crates/concat/src/presets.rs.)_
- [x] In Library>Transitions>Basic: use the same light/thinner font-weight as Transitions>Motion.
- [x] Remove the "Concat" watermark from the bottom-left of the Preview. _(That corner showed the name of the clip under the playhead; it no longer does.)_
-- [x] Add basic CapCut-like keybinds to the app. Like for delete, CTRL+B to toggle split tool, etc. _(⌘B split all at playhead · S split selected · A/V select · B razor toggle · N snap · M mute · Delete/Backspace · ⌘A select all · ⌘C/⌘V/⌘D · ⌘E export · ⌘I import · ⌘, settings · ⌘+/⌘- zoom · Home/End · ←/→ a frame, ⇧ ten.)_
+- [x] Add basic CapCut-like keybinds to the app. Like for delete, CTRL+B to toggle split tool, etc. _(⌘B split all at playhead · B split selected · N snap · M mute · Delete/Backspace · ⌘A select all · ⌘C/⌘V/⌘D · ⌘E export · ⌘I import · ⌘, settings · ⌘+/⌘- zoom · Home/End · ←/→ a frame, ⇧ ten.)_
- [x] Recheck and fix Export system/modal. Things like 9:16 export output is broken and does not work. _(Export follows the project's own aspect (a 9:16 project exports 1080 × 1920); the picker sets the short side. Please try a 9:16 export.)_
- [x] in Settings>Appearance: remove the "Dark is the edit's own room" text-paragraph.
- [x] Change the Timeline>Timestamps-line tray background color from dark to the same as Tracks section background.
diff --git a/src/crates/concat/locales/de.json b/src/crates/concat/locales/de.json
index 53aaecbf..df108e98 100644
--- a/src/crates/concat/locales/de.json
+++ b/src/crates/concat/locales/de.json
@@ -382,7 +382,6 @@
"Ramps": "Rampen",
"Rate": "Rate",
"Rate re-times the clip in place, so the timeline length changes with it. Trim afterwards, not before. A curve varies the rate over the clip; the same footage plays, faster here and slower there.": "Rate ändert das Tempo des Clips an Ort und Stelle, die Länge auf der Zeitleiste ändert sich mit. Erst danach kürzen. Eine Kurve verändert die Rate über den Clip; dasselbe Material läuft, hier schneller und dort langsamer.",
- "Razor (B)": "Rasierklinge (B)",
"Recent": "Zuletzt",
"Recommended": "Empfohlen",
"Redo": "Wiederholen",
@@ -416,7 +415,6 @@
"Screen": "Negativ multiplizieren",
"Script": "Skript",
"Search {0}s": "{0} suchen",
- "Select (A or V)": "Auswahl (A oder V)",
"Select a clip on the timeline first": "Wähle zuerst einen Clip auf der Zeitleiste",
"Select a video or image clip on the timeline first": "Wähle zuerst einen Video- oder Bildclip auf der Zeitleiste",
"Select the clip the transition leads into": "Wähle den Clip, in den der Übergang führt",
@@ -457,7 +455,6 @@
"Speed": "Tempo",
"Spin": "Drehen",
"Split at playhead": "Am Abspielkopf teilen",
- "Split at playhead (S, or ⌘B for every clip)": "Am Abspielkopf teilen (S, oder ⌘B für jeden Clip)",
"Stone and height: reflections that take a while to arrive.": "Stein und Höhe: Reflexionen, die eine Weile brauchen.",
"Strength": "Stärke",
"Stylize": "Stilisieren",
diff --git a/src/crates/concat/locales/en.json b/src/crates/concat/locales/en.json
index 99b38a52..b0316732 100644
--- a/src/crates/concat/locales/en.json
+++ b/src/crates/concat/locales/en.json
@@ -497,7 +497,6 @@
"Ramps": "Ramps",
"Rate": "Rate",
"Rate re-times the clip in place, so the timeline length changes with it. Trim afterwards, not before. A curve varies the rate over the clip; the same footage plays, faster here and slower there.": "Rate re-times the clip in place, so the timeline length changes with it. Trim afterwards, not before. A curve varies the rate over the clip; the same footage plays, faster here and slower there.",
- "Razor (B)": "Razor (B)",
"Reattach audio": "Reattach audio",
"Recent": "Recent",
"Recommended": "Recommended",
@@ -543,7 +542,6 @@
"Screen": "Screen",
"Script": "Script",
"Search {0}s": "Search {0}s",
- "Select (A or V)": "Select (A or V)",
"Select a clip on the timeline first": "Select a clip on the timeline first",
"Select a video or image clip on the timeline first": "Select a video or image clip on the timeline first",
"Select folder containing media files": "Select folder containing media files",
@@ -605,7 +603,7 @@
"Speed": "Speed",
"Spin": "Spin",
"Split at playhead": "Split at playhead",
- "Split at playhead (S, or ⌘B for every clip)": "Split at playhead (S, or ⌘B for every clip)",
+ "Split at playhead (B, or ⌘B for every clip)": "Split at playhead (B, or ⌘B for every clip)",
"Spooky": "Spooky",
"stereo": "stereo",
"Stone and height: reflections that take a while to arrive.": "Stone and height: reflections that take a while to arrive.",
diff --git a/src/crates/concat/locales/es.json b/src/crates/concat/locales/es.json
index f87ace7b..cef886c4 100644
--- a/src/crates/concat/locales/es.json
+++ b/src/crates/concat/locales/es.json
@@ -382,7 +382,6 @@
"Ramps": "Rampas",
"Rate": "Velocidad",
"Rate re-times the clip in place, so the timeline length changes with it. Trim afterwards, not before. A curve varies the rate over the clip; the same footage plays, faster here and slower there.": "La velocidad cambia el ritmo del clip en su sitio, así que su duración en la línea de tiempo cambia con ella. Recorta después, no antes. Una curva varía la velocidad a lo largo del clip: el mismo metraje se reproduce más rápido aquí y más lento allá.",
- "Razor (B)": "Cuchilla (B)",
"Recent": "Recientes",
"Recommended": "Recomendada",
"Redo": "Rehacer",
@@ -416,7 +415,6 @@
"Screen": "Trama",
"Script": "Guion",
"Search {0}s": "Buscar {0}",
- "Select (A or V)": "Seleccionar (A o V)",
"Select a clip on the timeline first": "Selecciona primero un clip en la línea de tiempo",
"Select a video or image clip on the timeline first": "Selecciona primero un clip de vídeo o imagen en la línea de tiempo",
"Select the clip the transition leads into": "Selecciona el clip al que lleva la transición",
@@ -457,7 +455,6 @@
"Speed": "Velocidad",
"Spin": "Giro",
"Split at playhead": "Dividir en el cabezal",
- "Split at playhead (S, or ⌘B for every clip)": "Dividir en el cabezal (S, o ⌘B para todos los clips)",
"Stone and height: reflections that take a while to arrive.": "Piedra y altura: reflexiones que tardan en llegar.",
"Strength": "Intensidad",
"Stylize": "Estilizar",
diff --git a/src/crates/concat/locales/fa.json b/src/crates/concat/locales/fa.json
index d3006f15..05a8f695 100644
--- a/src/crates/concat/locales/fa.json
+++ b/src/crates/concat/locales/fa.json
@@ -490,7 +490,6 @@
"Ramps": "Rampها",
"Rate": "نرخ (Rate)",
"Rate re-times the clip in place, so the timeline length changes with it. Trim afterwards, not before. A curve varies the rate over the clip; the same footage plays, faster here and slower there.": "Rate زمان‌بندی کلیپ را در همان محل تغییر می‌دهد، بنابراین طول تایم‌لاین هم تغییر می‌کند. ابتدا Rate را تنظیم کنید و بعد برش کنید. منحنی می‌تواند Rate را در طول کلیپ تغییر دهد؛ همان ویدئوی خام در بخشی سریع‌تر و در بخشی کندتر پخش می‌شود.",
- "Razor (B)": "تیغ (B)",
"Reattach audio": "اتصال دوباره صدا",
"Recent": "اخیر",
"Recommended": "پیشنهادی",
@@ -534,7 +533,6 @@
"Screen": "صفحه",
"Script": "اسکریپت",
"Search {0}s": "جستجوی {0}",
- "Select (A or V)": "انتخاب (A یا V)",
"Select a clip on the timeline first": "ابتدا یک کلیپ را روی تایم‌لاین انتخاب کنید",
"Select a video or image clip on the timeline first": "ابتدا یک ویدئو یا تصویر کلیپ را روی تایم‌لاین انتخاب کنید",
"Select folder containing media files": "پوشه حاوی فایل رسانه‌ایها را انتخاب کنید",
@@ -596,7 +594,6 @@
"Speed": "سرعت",
"Spin": "چرخش",
"Split at playhead": "تقسیم در نشانگر پخش",
- "Split at playhead (S, or ⌘B for every clip)": "تقسیم در نشانگر پخش (S، یا ⌘B برای همه کلیپ‌ها)",
"Spooky": "ترسناک",
"stereo": "Stereo",
"Stone and height: reflections that take a while to arrive.": "حس سنگ و ارتفاع با Reflectionهایی که با تأخیر می‌رسند.",
diff --git a/src/crates/concat/locales/fr.json b/src/crates/concat/locales/fr.json
index 723c7c95..4cfb8fe0 100644
--- a/src/crates/concat/locales/fr.json
+++ b/src/crates/concat/locales/fr.json
@@ -382,7 +382,6 @@
"Ramps": "Rampes",
"Rate": "Vitesse",
"Rate re-times the clip in place, so the timeline length changes with it. Trim afterwards, not before. A curve varies the rate over the clip; the same footage plays, faster here and slower there.": "La vitesse rythme le clip sur place, sa durée sur la timeline change donc avec elle. Rognez après, pas avant. Une courbe fait varier la vitesse le long du clip : les mêmes images passent, plus vite ici et plus lentement là.",
- "Razor (B)": "Lame (B)",
"Recent": "Récents",
"Recommended": "Recommandée",
"Redo": "Rétablir",
@@ -416,7 +415,6 @@
"Screen": "Superposition",
"Script": "Texte",
"Search {0}s": "Rechercher un {0}",
- "Select (A or V)": "Sélection (A ou V)",
"Select a clip on the timeline first": "Sélectionnez d'abord un clip sur la timeline",
"Select a video or image clip on the timeline first": "Sélectionnez d'abord un clip vidéo ou image sur la timeline",
"Select the clip the transition leads into": "Sélectionnez le clip vers lequel mène la transition",
@@ -457,7 +455,6 @@
"Speed": "Vitesse",
"Spin": "Rotation",
"Split at playhead": "Couper à la tête de lecture",
- "Split at playhead (S, or ⌘B for every clip)": "Couper à la tête de lecture (S, ou ⌘B pour tous les clips)",
"Stone and height: reflections that take a while to arrive.": "Pierre et hauteur : des réflexions qui mettent du temps à arriver.",
"Strength": "Intensité",
"Stylize": "Styliser",
diff --git a/src/crates/concat/locales/hr.json b/src/crates/concat/locales/hr.json
index ad5385ab..98ea356e 100644
--- a/src/crates/concat/locales/hr.json
+++ b/src/crates/concat/locales/hr.json
@@ -479,7 +479,6 @@
"Ramps": "Nagibi",
"Rate": "Brzina",
"Rate re-times the clip in place, so the timeline length changes with it. Trim afterwards, not before. A curve varies the rate over the clip; the same footage plays, faster here and slower there.": "Brzina ponovno tempira klip na mjestu, pa se dužina na vremenskoj liniji mijenja s njom. Režite poslije, ne prije. Krivulja mijenja brzinu preko klipa; ista snimka igra, brže ovdje, sporije tamo.",
- "Razor (B)": "Žilet (B)",
"Recent": "Nedavno",
"Recommended": "Preporučeno",
"Red and blue pulled apart, the colour fringing of a cheap lens.": "Crvena i plava razdvojene, kolorni rub jeftinog objektiva.",
@@ -518,7 +517,6 @@
"Screen": "Zaslon",
"Script": "Skripta",
"Search {0}s": "Pretraži {0}e",
- "Select (A or V)": "Odabir (A ili V)",
"Select a clip on the timeline first": "Prvo odaberite klip na vremenskoj liniji",
"Select a video or image clip on the timeline first": "Prvo odaberite video ili slikovni klip na vremenskoj liniji",
"Select the clip the transition leads into": "Odaberite klip u koji prijelaz ulazi",
@@ -572,7 +570,6 @@
"Speed": "Brzina",
"Spin": "Vrtnja",
"Split at playhead": "Podijeli na playheadu",
- "Split at playhead (S, or ⌘B for every clip)": "Podijeli na playheadu (S, ili ⌘B za svaki klip)",
"Spooky": "Jezivo",
"stereo": "stereo",
"Stone and height: reflections that take a while to arrive.": "Kamen i visina: refleksije kojima treba vremena da stignu.",
diff --git a/src/crates/concat/locales/it.json b/src/crates/concat/locales/it.json
index a3d4a92f..92b0cdd7 100644
--- a/src/crates/concat/locales/it.json
+++ b/src/crates/concat/locales/it.json
@@ -382,7 +382,6 @@
"Ramps": "Rampe",
"Rate": "Velocità",
"Rate re-times the clip in place, so the timeline length changes with it. Trim afterwards, not before. A curve varies the rate over the clip; the same footage plays, faster here and slower there.": "La velocità ricalcola i tempi della clip sul posto, quindi la durata sulla timeline cambia con essa. Accorcia dopo, non prima. Una curva varia la velocità lungo la clip: la stessa ripresa scorre, più veloce qui e più lenta là.",
- "Razor (B)": "Lametta (B)",
"Recent": "Recenti",
"Recommended": "Consigliata",
"Redo": "Ripeti",
@@ -416,7 +415,6 @@
"Screen": "Scolora",
"Script": "Testo",
"Search {0}s": "Cerca {0}",
- "Select (A or V)": "Seleziona (A o V)",
"Select a clip on the timeline first": "Seleziona prima una clip sulla timeline",
"Select a video or image clip on the timeline first": "Seleziona prima una clip video o immagine sulla timeline",
"Select the clip the transition leads into": "Seleziona la clip in cui porta la transizione",
@@ -457,7 +455,6 @@
"Speed": "Velocità",
"Spin": "Rotazione",
"Split at playhead": "Dividi alla testina",
- "Split at playhead (S, or ⌘B for every clip)": "Dividi alla testina (S, o ⌘B per tutte le clip)",
"Stone and height: reflections that take a while to arrive.": "Pietra e altezza: riflessioni che tardano ad arrivare.",
"Strength": "Intensità",
"Stylize": "Stilizza",
diff --git a/src/crates/concat/locales/ja.json b/src/crates/concat/locales/ja.json
index fef7a11f..a1d9de94 100644
--- a/src/crates/concat/locales/ja.json
+++ b/src/crates/concat/locales/ja.json
@@ -382,7 +382,6 @@
"Ramps": "ランプ",
"Rate": "速度",
"Rate re-times the clip in place, so the timeline length changes with it. Trim afterwards, not before. A curve varies the rate over the clip; the same footage plays, faster here and slower there.": "速度はクリップをその場でリタイムするため、タイムライン上の長さも変わります。トリミングは前ではなく後で。カーブはクリップ内で速度を変化させ、同じ映像がここでは速く、そこでは遅く再生されます。",
- "Razor (B)": "レーザー (B)",
"Recent": "最近",
"Recommended": "推奨",
"Redo": "やり直す",
@@ -416,7 +415,6 @@
"Screen": "スクリーン",
"Script": "原稿",
"Search {0}s": "{0}を検索",
- "Select (A or V)": "選択 (A または V)",
"Select a clip on the timeline first": "まずタイムラインでクリップを選択してください",
"Select a video or image clip on the timeline first": "まずタイムラインで映像または画像のクリップを選択してください",
"Select the clip the transition leads into": "トランジションの先になるクリップを選択してください",
@@ -457,7 +455,6 @@
"Speed": "速度",
"Spin": "スピン",
"Split at playhead": "再生ヘッドで分割",
- "Split at playhead (S, or ⌘B for every clip)": "再生ヘッドで分割(S、すべてのクリップは ⌘B)",
"Stone and height: reflections that take a while to arrive.": "石と高さ:届くまでに時間のかかる反射。",
"Strength": "強さ",
"Stylize": "スタイライズ",
diff --git a/src/crates/concat/locales/ko.json b/src/crates/concat/locales/ko.json
index f9a7851a..fd01e3df 100644
--- a/src/crates/concat/locales/ko.json
+++ b/src/crates/concat/locales/ko.json
@@ -382,7 +382,6 @@
"Ramps": "램프",
"Rate": "속도",
"Rate re-times the clip in place, so the timeline length changes with it. Trim afterwards, not before. A curve varies the rate over the clip; the same footage plays, faster here and slower there.": "속도는 클립을 제자리에서 다시 타이밍하므로 타임라인 길이도 함께 바뀝니다. 다듬기는 나중에 하세요. 곡선은 클립 안에서 속도를 바꿉니다. 같은 영상이 여기서는 빠르게, 저기서는 느리게 재생됩니다.",
- "Razor (B)": "면도칼 (B)",
"Recent": "최근",
"Recommended": "권장",
"Redo": "다시 실행",
@@ -416,7 +415,6 @@
"Screen": "스크린",
"Script": "대본",
"Search {0}s": "{0} 검색",
- "Select (A or V)": "선택 (A 또는 V)",
"Select a clip on the timeline first": "먼저 타임라인에서 클립을 선택하세요",
"Select a video or image clip on the timeline first": "먼저 타임라인에서 영상 또는 이미지 클립을 선택하세요",
"Select the clip the transition leads into": "전환이 이어지는 클립을 선택하세요",
@@ -457,7 +455,6 @@
"Speed": "속도",
"Spin": "회전",
"Split at playhead": "재생 헤드에서 나누기",
- "Split at playhead (S, or ⌘B for every clip)": "재생 헤드에서 나누기 (S, 모든 클립은 ⌘B)",
"Stone and height: reflections that take a while to arrive.": "돌과 높이: 도착하기까지 시간이 걸리는 반사.",
"Strength": "강도",
"Stylize": "스타일화",
diff --git a/src/crates/concat/locales/pt-BR.json b/src/crates/concat/locales/pt-BR.json
index 1c5e2abc..c6fb93af 100644
--- a/src/crates/concat/locales/pt-BR.json
+++ b/src/crates/concat/locales/pt-BR.json
@@ -382,7 +382,6 @@
"Ramps": "Rampas",
"Rate": "Velocidade",
"Rate re-times the clip in place, so the timeline length changes with it. Trim afterwards, not before. A curve varies the rate over the clip; the same footage plays, faster here and slower there.": "A velocidade altera o tempo do clipe no lugar, então a duração na linha do tempo muda junto. Apare depois, não antes. Uma curva varia a velocidade ao longo do clipe: a mesma imagem passa, mais rápido aqui e mais devagar ali.",
- "Razor (B)": "Lâmina (B)",
"Recent": "Recentes",
"Recommended": "Recomendada",
"Redo": "Refazer",
@@ -416,7 +415,6 @@
"Screen": "Tela",
"Script": "Roteiro",
"Search {0}s": "Buscar {0}",
- "Select (A or V)": "Selecionar (A ou V)",
"Select a clip on the timeline first": "Selecione primeiro um clipe na linha do tempo",
"Select a video or image clip on the timeline first": "Selecione primeiro um clipe de vídeo ou imagem na linha do tempo",
"Select the clip the transition leads into": "Selecione o clipe para o qual a transição leva",
@@ -457,7 +455,6 @@
"Speed": "Velocidade",
"Spin": "Giro",
"Split at playhead": "Dividir no cursor",
- "Split at playhead (S, or ⌘B for every clip)": "Dividir no cursor (S, ou ⌘B para todos os clipes)",
"Stone and height: reflections that take a while to arrive.": "Pedra e altura: reflexões que demoram a chegar.",
"Strength": "Intensidade",
"Stylize": "Estilizar",
diff --git a/src/crates/concat/locales/ru.json b/src/crates/concat/locales/ru.json
index 1b6884ac..0fe18104 100644
--- a/src/crates/concat/locales/ru.json
+++ b/src/crates/concat/locales/ru.json
@@ -382,7 +382,6 @@
"Ramps": "Плавность",
"Rate": "Скорость",
"Rate re-times the clip in place, so the timeline length changes with it. Trim afterwards, not before. A curve varies the rate over the clip; the same footage plays, faster here and slower there.": "Скорость меняет темп клипа на месте, так что его длина на таймлайне меняется вместе с ней. Подрезайте после, а не до. Кривая меняет скорость по ходу клипа: тот же материал идёт быстрее здесь и медленнее там.",
- "Razor (B)": "Лезвие (B)",
"Recent": "Недавние",
"Recommended": "Рекомендуется",
"Redo": "Повторить",
@@ -416,7 +415,6 @@
"Screen": "Экран",
"Script": "Текст",
"Search {0}s": "Поиск: {0}",
- "Select (A or V)": "Выделение (A или V)",
"Select a clip on the timeline first": "Сначала выберите клип на таймлайне",
"Select a video or image clip on the timeline first": "Сначала выберите видео или изображение на таймлайне",
"Select the clip the transition leads into": "Выберите клип, в который ведёт переход",
@@ -457,7 +455,6 @@
"Speed": "Скорость",
"Spin": "Вращение",
"Split at playhead": "Разрезать по курсору",
- "Split at playhead (S, or ⌘B for every clip)": "Разрезать по курсору (S, или ⌘B для всех клипов)",
"Stone and height: reflections that take a while to arrive.": "Камень и высота: отражения, которые долго идут.",
"Strength": "Сила",
"Stylize": "Стилизация",
diff --git a/src/crates/concat/locales/tr.json b/src/crates/concat/locales/tr.json
index f5d97dde..cce2fdff 100644
--- a/src/crates/concat/locales/tr.json
+++ b/src/crates/concat/locales/tr.json
@@ -382,7 +382,6 @@
"Ramps": "Rampalar",
"Rate": "Hız",
"Rate re-times the clip in place, so the timeline length changes with it. Trim afterwards, not before. A curve varies the rate over the clip; the same footage plays, faster here and slower there.": "Hız klibi yerinde yeniden zamanlar, bu yüzden zaman çizelgesindeki uzunluk da değişir. Önce değil, sonra kırpın. Bir eğri hızı klip boyunca değiştirir; aynı görüntü burada hızlı, orada yavaş oynar.",
- "Razor (B)": "Jilet (B)",
"Recent": "Son kullanılanlar",
"Recommended": "Önerilen",
"Redo": "Yinele",
@@ -416,7 +415,6 @@
"Screen": "Ekran",
"Script": "Metin",
"Search {0}s": "{0} ara",
- "Select (A or V)": "Seç (A veya V)",
"Select a clip on the timeline first": "Önce zaman çizelgesinde bir klip seçin",
"Select a video or image clip on the timeline first": "Önce zaman çizelgesinde bir video veya görüntü klibi seçin",
"Select the clip the transition leads into": "Geçişin götürdüğü klibi seçin",
@@ -457,7 +455,6 @@
"Speed": "Hız",
"Spin": "Dönme",
"Split at playhead": "Oynatma imlecinde böl",
- "Split at playhead (S, or ⌘B for every clip)": "Oynatma imlecinde böl (S, veya her klip için ⌘B)",
"Stone and height: reflections that take a while to arrive.": "Taş ve yükseklik: gelmesi zaman alan yansımalar.",
"Strength": "Güç",
"Stylize": "Stilize",
diff --git a/src/crates/concat/locales/zh-Hans.json b/src/crates/concat/locales/zh-Hans.json
index b94f9f70..c9b4360a 100644
--- a/src/crates/concat/locales/zh-Hans.json
+++ b/src/crates/concat/locales/zh-Hans.json
@@ -382,7 +382,6 @@
"Ramps": "渐变",
"Rate": "速率",
"Rate re-times the clip in place, so the timeline length changes with it. Trim afterwards, not before. A curve varies the rate over the clip; the same footage plays, faster here and slower there.": "速率就地改变片段的时间,时间线上的长度随之变化。修剪请在之后而非之前。曲线让速率在片段内变化:同一段素材,这里快一些,那里慢一些。",
- "Razor (B)": "剃刀 (B)",
"Recent": "最近",
"Recommended": "推荐",
"Redo": "重做",
@@ -416,7 +415,6 @@
"Screen": "滤色",
"Script": "文稿",
"Search {0}s": "搜索{0}",
- "Select (A or V)": "选择 (A 或 V)",
"Select a clip on the timeline first": "请先在时间线上选择一个片段",
"Select a video or image clip on the timeline first": "请先在时间线上选择一个视频或图片片段",
"Select the clip the transition leads into": "请选择转场所进入的片段",
@@ -457,7 +455,6 @@
"Speed": "速度",
"Spin": "旋转",
"Split at playhead": "在播放头处分割",
- "Split at playhead (S, or ⌘B for every clip)": "在播放头处分割(S,全部片段用 ⌘B)",
"Stone and height: reflections that take a while to arrive.": "石壁与高度:需要一段时间才到达的反射。",
"Strength": "强度",
"Stylize": "风格化",
diff --git a/src/crates/concat/locales/zh-TW.json b/src/crates/concat/locales/zh-TW.json
index bb796acf..f42283d4 100644
--- a/src/crates/concat/locales/zh-TW.json
+++ b/src/crates/concat/locales/zh-TW.json
@@ -479,7 +479,6 @@
"Ramps": "漸變",
"Rate": "速率",
"Rate re-times the clip in place, so the timeline length changes with it. Trim afterwards, not before. A curve varies the rate over the clip; the same footage plays, faster here and slower there.": "速率會直接改變片段的播放時間,時間軸上的長度也會隨之調整。請先調整速率,再修剪片段。曲線可讓片段各處使用不同速率,同一段素材便能時快時慢地播放。",
- "Razor (B)": "剃刀(B)",
"Recent": "最近使用",
"Recommended": "建議",
"Red and blue pulled apart, the colour fringing of a cheap lens.": "將紅色與藍色錯開,模擬廉價鏡頭造成的彩色邊緣。",
@@ -518,7 +517,6 @@
"Screen": "濾色",
"Script": "文稿",
"Search {0}s": "搜尋{0}",
- "Select (A or V)": "選取(A 或 V)",
"Select a clip on the timeline first": "請先在時間軸上選取片段",
"Select a video or image clip on the timeline first": "請先選取時間軸上的影片或圖片片段",
"Select the clip the transition leads into": "請選取轉場結束後接續的片段",
@@ -572,7 +570,6 @@
"Speed": "速度",
"Spin": "旋轉",
"Split at playhead": "在播放頭位置分割",
- "Split at playhead (S, or ⌘B for every clip)": "在播放頭位置分割(S,或按 ⌘B 分割所有片段)",
"Spooky": "詭譎",
"stereo": "立體聲",
"Stone and height: reflections that take a while to arrive.": "模擬石造高挑空間,反射聲延遲抵達。",
diff --git a/src/crates/concat/src/lib.rs b/src/crates/concat/src/lib.rs
index e3b7d28c..8b718b04 100644
--- a/src/crates/concat/src/lib.rs
+++ b/src/crates/concat/src/lib.rs
@@ -711,16 +711,6 @@ pub fn run() -> Result<(), slint::PlatformError> {
state.place(&plan);
}
}));
- editor.on_razored(on_window!(|state, id: SharedString, seconds: f32| {
- let Some(clip) = state.clip(id.as_str()).cloned() else {
- return;
- };
- if state.locked(&clip.track_id) {
- return;
- }
- state.selection = vec![id.to_string()];
- state.split_at(seconds, true);
- }));
editor.on_band_selected(on_lanes!(
|state, from: f32, to: f32, from_y: f32, to_y: f32, additive: bool| {
let (from_row, to_row) = (state.row_at(from_y), state.row_at(to_y));
diff --git a/src/crates/concat/src/studio.rs b/src/crates/concat/src/studio.rs
index ea24052f..7656a48e 100644
--- a/src/crates/concat/src/studio.rs
+++ b/src/crates/concat/src/studio.rs
@@ -6314,15 +6314,6 @@ impl Studio {
}
}
}
- "tool-select" => self.lanes.tool = TimelineTool::Select,
- // B toggles: pressing it with the razor up puts the pointer back.
- "tool-razor" => {
- self.lanes.tool = if self.lanes.tool == TimelineTool::Razor {
- TimelineTool::Select
- } else {
- TimelineTool::Razor
- };
- }
_ => {}
}
}
diff --git a/src/crates/concat/ui/app.slint b/src/crates/concat/ui/app.slint
index 25e81351..4d404ff6 100644
--- a/src/crates/concat/ui/app.slint
+++ b/src/crates/concat/ui/app.slint
@@ -381,12 +381,11 @@ export component App inherits Window {
if (event.modifiers.shift) {
return reject;
}
- if (event.text == "a" || event.text == "v") {
- Editor.shortcut("tool-select");
- return accept;
- }
- if (event.text == "b") { Editor.shortcut("tool-razor"); return accept; }
- if (event.text == "s") { Editor.shortcut("split-selected"); return accept; }
+ // B splits the selected clips at the playhead, or every clip
+ // when nothing is selected; ⌘B above splits every clip either
+ // way. There was a razor tool on B and this split on S, and
+ // the two did the same thing by different pointers.
+ if (event.text == "b") { Editor.shortcut("split-selected"); return accept; }
if (event.text == "n") { Editor.shortcut("snap"); return accept; }
if (event.text == "m") { Editor.shortcut("mute"); return accept; }
if (event.text == "h") { Editor.shortcut("flip-h"); return accept; }
diff --git a/src/crates/concat/ui/editor.slint b/src/crates/concat/ui/editor.slint
index 35ec0838..10648cce 100644
--- a/src/crates/concat/ui/editor.slint
+++ b/src/crates/concat/ui/editor.slint
@@ -274,7 +274,6 @@ export global Editor {
callback clip-pressed(id: string, additive: bool, edge: int);
callback clip-dragged(seconds: float, pixels: length);
callback clip-released();
- callback razored(id: string, seconds: float);
in-out property <[MenuItemData]> menu-items;
in-out property <length> menu-height;
in-out property <int> menu-token;
diff --git a/src/crates/concat/ui/timeline/lanes.slint b/src/crates/concat/ui/timeline/lanes.slint
index f5bb5620..fef6af3a 100644
--- a/src/crates/concat/ui/timeline/lanes.slint
+++ b/src/crates/concat/ui/timeline/lanes.slint
@@ -133,7 +133,6 @@ component Clip inherits Rectangle {
/// reached is a question only the side holding the heights can answer.
callback dragged(seconds: float, pixels: length);
callback released();
- callback razored(seconds: float);
callback context-requested();
property <color> mark: Paint.mark(root.item.kind);
@@ -516,9 +515,7 @@ component Clip inherits Rectangle {
// the same fix, as the workspace splitters.
touch := TouchArea {
enabled: !root.locked;
- mouse-cursor: root.tool == TimelineTool.razor ? MouseCursor.crosshair
- : root.edge-at >= 0 ? MouseCursor.ew-resize
- : MouseCursor.grab;
+ mouse-cursor: root.edge-at >= 0 ? MouseCursor.ew-resize : MouseCursor.grab;
pointer-event(event) => {
// The right button opens the menu and does nothing else — it must
@@ -535,11 +532,6 @@ component Clip inherits Rectangle {
}
if (event.kind == PointerEventKind.down
&& event.button == PointerEventButton.left) {
- if (root.tool == TimelineTool.razor) {
- // The razor cuts where you click, not at the playhead.
- root.razored(self.mouse-x / root.px-per-second);
- return;
- }
self.origin-x = self.absolute-position.x + self.mouse-x;
self.origin-y = self.absolute-position.y + self.mouse-y;
root.pressed(event.modifiers.shift || event.modifiers.control
@@ -589,7 +581,6 @@ export component Lanes inherits Rectangle {
callback clip-pressed(id: string, additive: bool, edge: int);
callback clip-dragged(seconds: float, pixels: length);
callback clip-released();
- callback razored(id: string, seconds: float);
/// Right-click on a clip. The caller fills the menu and bumps `menu-token`;
/// where it opens is decided here, because only this side knows where the
/// pointer was.
@@ -805,7 +796,6 @@ export component Lanes inherits Rectangle {
pressed(additive, edge) => { root.clip-pressed(entry.id, additive, edge); }
dragged(seconds, pixels) => { root.clip-dragged(seconds, pixels); }
released => { root.clip-released(); }
- razored(seconds) => { root.razored(entry.id, entry.start + seconds); }
context-requested => {
// Captured before the round trip: by the time the items come
// back the pointer may have moved, and a menu that opens away
@@ -913,20 +903,6 @@ export component Lanes inherits Rectangle {
}
}
- // ── the razor guide ──────────────────────────────────────────────
- //
- // Follows the pointer so the cut is visible before it is made. The
- // outer TouchArea is hovered even while the pointer is over a clip,
- // which is what keeps the guide alive across one.
- if root.tool == TimelineTool.razor && wheel.has-hover: Rectangle {
- x: wheel.mouse-x;
- y: root.ruler-height;
- width: 1px;
- height: root.lanes-h;
- background: Theme.fg;
- opacity: 0.5;
- }
-
// ── the ruler ────────────────────────────────────────────────────
//
// Last, so it paints over any lane scrolled up behind it, and so its
diff --git a/src/crates/concat/ui/timeline/model.slint b/src/crates/concat/ui/timeline/model.slint
index a8b31f0e..f6436e6e 100644
--- a/src/crates/concat/ui/timeline/model.slint
+++ b/src/crates/concat/ui/timeline/model.slint
@@ -15,12 +15,12 @@
/// the way CapCut's filter bars do.
export enum ClipKind { video, audio, image, text, filter }
-/// What a press on a clip means.
+/// What a press on a clip means. One tool since the razor went - a cut
+/// is made at the playhead, by B or the tray - and the type stays for the
+/// plumbing that carries it, and for the next tool.
export enum TimelineTool {
/// grab, move, trim, band-select
select,
- /// cut where you click, not where the playhead is
- razor,
}
/// One tab. A project holds several timelines the way it holds sequences in
diff --git a/src/crates/concat/ui/timeline/tray.slint b/src/crates/concat/ui/timeline/tray.slint
index fefac3d2..43140dc7 100644
--- a/src/crates/concat/ui/timeline/tray.slint
+++ b/src/crates/concat/ui/timeline/tray.slint
@@ -9,8 +9,8 @@ import { TimelineTool } from "model.slint";
// The timeline's tool tray.
//
-// The tool set: add-track first, then pointer and razor, then the three
-// edit actions, then snapping, then the tools a clip's sound and words need
+// The tool set: add-track first, then the three edit actions, then
+// snapping, then the tools a clip's sound and words need
// - captions, a spoken title, detaching the sound - and the view controls
// pushed to the far end behind the timecode readout. The metrics: 40px
// tall, 4px between buttons, an 18px hairline with 4px of air on each side
@@ -98,26 +98,12 @@ export component TimelineTray inherits Rectangle {
Divider { }
- IconButton {
- glyph: Glyph.pointer;
- label: I18n.t("Select (A or V)");
- icon-size: 16px;
- checked: root.tool == TimelineTool.select;
- clicked => { root.tool-changed(TimelineTool.select); }
- }
- IconButton {
- glyph: Glyph.razor;
- label: I18n.t("Razor (B)");
- icon-size: 16px;
- checked: root.tool == TimelineTool.razor;
- clicked => { root.tool-changed(TimelineTool.razor); }
- }
-
- Divider { }
-
+ // One way to cut: at the playhead. The razor that cut where you
+ // clicked is gone - two tools for one edit, and the playhead is
+ // already where you were looking.
IconButton {
glyph: Glyph.split;
- label: I18n.t("Split at playhead (S, or ⌘B for every clip)");
+ label: I18n.t("Split at playhead (B, or ⌘B for every clip)");
icon-size: 16px;
clicked => { root.split(); }
}
diff --git a/src/crates/concat/ui/workspace/seat.slint b/src/crates/concat/ui/workspace/seat.slint
index 606b7427..be365503 100644
--- a/src/crates/concat/ui/workspace/seat.slint
+++ b/src/crates/concat/ui/workspace/seat.slint
@@ -339,7 +339,6 @@ export component Seat inherits Rectangle {
}
clip-dragged(seconds, pixels) => { Editor.clip-dragged(seconds, pixels); }
clip-released => { Editor.clip-released(); }
- razored(id, seconds) => { Editor.razored(id, seconds); }
menu-items: Editor.menu-items;
menu-height: Editor.menu-height;
menu-token: Editor.menu-token;
diff --git a/src/crates/concat/ui/workspace/timeline-pane.slint b/src/crates/concat/ui/workspace/timeline-pane.slint
index 8dcabced..113d6a4f 100644
--- a/src/crates/concat/ui/workspace/timeline-pane.slint
+++ b/src/crates/concat/ui/workspace/timeline-pane.slint
@@ -71,7 +71,6 @@ export component TimelinePane inherits Rectangle {
callback clip-pressed(id: string, additive: bool, edge: int);
callback clip-dragged(seconds: float, pixels: length);
callback clip-released();
- callback razored(id: string, seconds: float);
in property <[MenuItemData]> menu-items;
in property <length> menu-height;
in property <int> menu-token;
@@ -268,7 +267,6 @@ export component TimelinePane inherits Rectangle {
clip-pressed(id, additive, edge) => { root.clip-pressed(id, additive, edge); }
clip-dragged(seconds, pixels) => { root.clip-dragged(seconds, pixels); }
clip-released => { root.clip-released(); }
- razored(id, seconds) => { root.razored(id, seconds); }
menu-items: root.menu-items;
menu-height: root.menu-height;
menu-token: root.menu-token;