The truly free, open-source, local-first, cross-platform CapCut replacement. Scriptable through a JSON-RPC API & MCP.
Rust ffmpegfree-video-editormodel-context-protocolnon-linear-editoroffline-firstopen-source-video-editorself-hostedvideo-editingvideo-editing-automationvideo-editing-softwarevideo-editing-toolsvideo-editorvoice-cloningyoutube-automationyoutube-shorts
feat(keyframes): a Keyframes pane of its own - a dopesheet and a curve editor beside the other four panes
Jareer360378d75d7a
diff --git a/src/crates/concat/locales/de.json b/src/crates/concat/locales/de.jsonindex 98438f6f..052cead0 100644--- a/src/crates/concat/locales/de.json+++ b/src/crates/concat/locales/de.json@@ -58,6 +58,7 @@"Add a panel": "Panel hinzufügen","Add at playhead": "Am Abspielkopf hinzufügen","Add captions": "Add captions",+ "Add or remove a key at the playhead": "Key am Abspielkopf setzen oder entfernen","Add selected to timeline": "Auswahl zur Zeitleiste hinzufügen","Add track": "Spur hinzufügen","Added {0} captions": "{0} Untertitel hinzugefügt",@@ -211,6 +212,7 @@"Cube": "Würfel","Curvature": "Krümmung","Curve": "Kurve",+ "Curves": "Kurven","Custom": "Benutzerdefiniert","Custom removal": "Manuell entfernen","Custom URL": "Eigene URL",@@ -253,6 +255,7 @@"Distort": "Verzerren","Distorted": "Verzerrt","Distortion & Glitch": "Verzerrung & Glitch",+ "Dopesheet": "Dopesheet","Dot size": "Punktgröße","Download": "Herunterladen","Download a transcriber model in Settings › Transcriber first": "Lade zuerst ein Transkriptionsmodell unter Einstellungen › Transkription herunter",@@ -273,7 +276,6 @@"Dust": "Dust","Ease in": "Sanft hinein","Ease in and out": "Sanft hinein und hinaus",- "Ease into the key": "Verlauf in den Key","Ease out": "Sanft hinaus","Echo": "Echo","Edge glow": "Kantenglühen",@@ -298,7 +300,6 @@"Even": "Even","Every colour becomes its opposite.": "Jede Farbe wird zu ihrem Gegenteil.","Every colour turned around the wheel by the same angle.": "Every colour turned around the wheel by the same angle.",- "Every knob that can ride is a row: its keys along the clip, the playhead's place among them, and its value there. Change the value to set the key under the playhead. Click a diamond to go to its key, drag one to move it. The curve is the way into the key the playhead is on, or is heading for.": "Jeder Regler, der animiert werden kann, ist eine Zeile: seine Keys entlang des Clips, die Position des Abspielkopfs dazwischen und sein Wert dort. Ändere den Wert, um den Key unter dem Abspielkopf zu setzen. Klicke auf eine Raute, um zu ihrem Key zu springen, ziehe sie, um den Key zu verschieben. Die Kurve ist der Verlauf in den Key, auf dem der Abspielkopf steht oder auf den er zuläuft.","Everyday": "Everyday","Everything brighter than the threshold turns negative, as an over-exposed print does.": "Everything brighter than the threshold turns negative, as an over-exposed print does.","Everything you have opened on this machine.": "Alles, was du auf diesem Rechner geöffnet hast.",@@ -736,6 +737,7 @@"See all": "Alle anzeigen","Segments": "Segmente","Select a clip on the timeline first": "Wähle zuerst einen Clip auf der Zeitleiste",+ "Select a clip to edit its keyframes": "Wähle einen Clip, um seine Keyframes zu bearbeiten","Select a video or image clip on the timeline first": "Wähle zuerst einen Video- oder Bildclip auf der Zeitleiste","Select a video, image or text clip on the timeline first": "Wähle zuerst einen Video-, Bild- oder Textclip auf der Zeitleiste","Select folder containing media files": "Select folder containing media files",diff --git a/src/crates/concat/locales/en.json b/src/crates/concat/locales/en.jsonindex 30d30050..f4403eca 100644--- a/src/crates/concat/locales/en.json+++ b/src/crates/concat/locales/en.json@@ -58,6 +58,7 @@"Add a panel": "Add a panel","Add at playhead": "Add at playhead","Add captions": "Add captions",+ "Add or remove a key at the playhead": "Add or remove a key at the playhead","Add selected to timeline": "Add selected to timeline","Add track": "Add track","Added {0} captions": "Added {0} captions",@@ -211,6 +212,7 @@"Cube": "Cube","Curvature": "Curvature","Curve": "Curve",+ "Curves": "Curves","Custom": "Custom","Custom removal": "Custom removal","Custom URL": "Custom URL",@@ -253,6 +255,7 @@"Distort": "Distort","Distorted": "Distorted","Distortion & Glitch": "Distortion & Glitch",+ "Dopesheet": "Dopesheet","Dot size": "Dot size","Download": "Download","Download a transcriber model in Settings › Transcriber first": "Download a transcriber model in Settings › Transcriber first",@@ -273,7 +276,6 @@"Dust": "Dust","Ease in": "Ease in","Ease in and out": "Ease in and out",- "Ease into the key": "Ease into the key","Ease out": "Ease out","Echo": "Echo","Edge glow": "Edge glow",@@ -298,7 +300,6 @@"Even": "Even","Every colour becomes its opposite.": "Every colour becomes its opposite.","Every colour turned around the wheel by the same angle.": "Every colour turned around the wheel by the same angle.",- "Every knob that can ride is a row: its keys along the clip, the playhead's place among them, and its value there. Change the value to set the key under the playhead. Click a diamond to go to its key, drag one to move it. The curve is the way into the key the playhead is on, or is heading for.": "Every knob that can ride is a row: its keys along the clip, the playhead's place among them, and its value there. Change the value to set the key under the playhead. Click a diamond to go to its key, drag one to move it. The curve is the way into the key the playhead is on, or is heading for.","Everyday": "Everyday","Everything brighter than the threshold turns negative, as an over-exposed print does.": "Everything brighter than the threshold turns negative, as an over-exposed print does.","Everything you have opened on this machine.": "Everything you have opened on this machine.",@@ -736,6 +737,7 @@"See all": "See all","Segments": "Segments","Select a clip on the timeline first": "Select a clip on the timeline first",+ "Select a clip to edit its keyframes": "Select a clip to edit its keyframes","Select a video or image clip on the timeline first": "Select a video or image clip on the timeline first","Select a video, image or text clip on the timeline first": "Select a video, image or text clip on the timeline first","Select folder containing media files": "Select folder containing media files",diff --git a/src/crates/concat/locales/es.json b/src/crates/concat/locales/es.jsonindex eadaa6d0..bc1981b2 100644--- a/src/crates/concat/locales/es.json+++ b/src/crates/concat/locales/es.json@@ -58,6 +58,7 @@"Add a panel": "Añadir un panel","Add at playhead": "Añadir en el cabezal","Add captions": "Add captions",+ "Add or remove a key at the playhead": "Añadir o quitar un fotograma clave en el cabezal","Add selected to timeline": "Añadir la selección a la línea de tiempo","Add track": "Añadir pista","Added {0} captions": "{0} subtítulos añadidos",@@ -211,6 +212,7 @@"Cube": "Cubo","Curvature": "Curvatura","Curve": "Curva",+ "Curves": "Curvas","Custom": "Personalizado","Custom removal": "Eliminación manual","Custom URL": "URL personalizada",@@ -253,6 +255,7 @@"Distort": "Distorsión","Distorted": "Distorsionado","Distortion & Glitch": "Distorsión y glitch",+ "Dopesheet": "Hoja de claves","Dot size": "Tamaño de punto","Download": "Descargar","Download a transcriber model in Settings › Transcriber first": "Descarga primero un modelo de transcripción en Ajustes › Transcriptor",@@ -273,7 +276,6 @@"Dust": "Dust","Ease in": "Suavizar entrada","Ease in and out": "Suavizar entrada y salida",- "Ease into the key": "Curva hacia el fotograma clave","Ease out": "Suavizar salida","Echo": "Eco","Edge glow": "Brillo de bordes",@@ -298,7 +300,6 @@"Even": "Even","Every colour becomes its opposite.": "Cada color se convierte en su opuesto.","Every colour turned around the wheel by the same angle.": "Every colour turned around the wheel by the same angle.",- "Every knob that can ride is a row: its keys along the clip, the playhead's place among them, and its value there. Change the value to set the key under the playhead. Click a diamond to go to its key, drag one to move it. The curve is the way into the key the playhead is on, or is heading for.": "Cada control que puede animarse es una fila: sus fotogramas clave a lo largo del clip, la posición del cabezal entre ellos y su valor ahí. Cambia el valor para fijar el fotograma clave bajo el cabezal. Haz clic en un rombo para ir a su fotograma clave, arrástralo para moverlo. La curva es la forma de llegar al fotograma clave en el que está el cabezal, o al que se dirige.","Everyday": "Everyday","Everything brighter than the threshold turns negative, as an over-exposed print does.": "Everything brighter than the threshold turns negative, as an over-exposed print does.","Everything you have opened on this machine.": "Todo lo que has abierto en este equipo.",@@ -736,6 +737,7 @@"See all": "Ver todo","Segments": "Segmentos","Select a clip on the timeline first": "Selecciona primero un clip en la línea de tiempo",+ "Select a clip to edit its keyframes": "Selecciona un clip para editar sus fotogramas clave","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 a video, image or text clip on the timeline first": "Selecciona primero un clip de vídeo, imagen o texto en la línea de tiempo","Select folder containing media files": "Select folder containing media files",diff --git a/src/crates/concat/locales/fa.json b/src/crates/concat/locales/fa.jsonindex 67869286..191f6904 100644--- a/src/crates/concat/locales/fa.json+++ b/src/crates/concat/locales/fa.json@@ -58,6 +58,7 @@"Add a panel": "افزودن پنل","Add at playhead": "افزودن در نشانگر پخش","Add captions": "افزودن زیرنویس",+ "Add or remove a key at the playhead": "افزودن یا حذف کیفریم در جای نشانگر پخش","Add selected to timeline": "افزودن موارد انتخابشده به تایملاین","Add track": "افزودن ترک","Added {0} captions": "{0} زیرنویس اضافه شد",@@ -211,6 +212,7 @@"Cube": "مکعب","Curvature": "انحنا","Curve": "منحنی",+ "Curves": "منحنیها","Custom": "سفارشی","Custom removal": "حذف سفارشی","Custom URL": "URL سفارشی",@@ -253,6 +255,7 @@"Distort": "اعوجاج","Distorted": "اعوجاجیافته","Distortion & Glitch": "اعوجاج و Glitch",+ "Dopesheet": "برگهٔ کیفریمها","Dot size": "اندازه نقطه","Download": "دانلود","Download a transcriber model in Settings › Transcriber first": "ابتدا یک مدل Transcriber را از «تنظیمات › Transcriber» دانلود کنید",@@ -273,7 +276,6 @@"Dust": "گردوغبار","Ease in": "نرم در ورود","Ease in and out": "نرم در ورود و خروج",- "Ease into the key": "منحنی رسیدن به کیفریم","Ease out": "نرم در خروج","Echo": "اکو","Edge glow": "لبه درخشش",@@ -298,7 +300,6 @@"Even": "یکنواخت","Every colour becomes its opposite.": "هر رنگ به رنگ مکمل خودش تبدیل میشود.","Every colour turned around the wheel by the same angle.": "تمام رنگها با یک Angle یکسان روی رنگ Wheel جابهجا میشوند.",- "Every knob that can ride is a row: its keys along the clip, the playhead's place among them, and its value there. Change the value to set the key under the playhead. Click a diamond to go to its key, drag one to move it. The curve is the way into the key the playhead is on, or is heading for.": "هر کنترلی که بتواند تغییر کند یک ردیف است: کیفریمهایش در طول کلیپ، جای نشانگر پخش میان آنها و مقدارش در آنجا. مقدار را تغییر دهید تا کیفریم زیر نشانگر پخش تنظیم شود. روی یک لوزی کلیک کنید تا به کیفریمش بروید، آن را بکشید تا جابهجا شود. منحنی، نحوهٔ رسیدن به کیفریمی است که نشانگر پخش روی آن یا در راه آن است.","Everyday": "روزمره","Everything brighter than the threshold turns negative, as an over-exposed print does.": "هر چیزی که از آستانه روشنتر باشد نگاتیو میشود، شبیه یک چاپ بیشازحد Exposure دادهشده.","Everything you have opened on this machine.": "همه چیزهایی که روی این دستگاه باز کردهاید.",@@ -736,6 +737,7 @@"See all": "مشاهده همه","Segments": "قطعهها","Select a clip on the timeline first": "ابتدا یک کلیپ را روی تایملاین انتخاب کنید",+ "Select a clip to edit its keyframes": "برای ویرایش کیفریمها یک کلیپ انتخاب کنید","Select a video or image clip on the timeline first": "ابتدا یک ویدئو یا تصویر کلیپ را روی تایملاین انتخاب کنید","Select a video, image or text clip on the timeline first": "ابتدا یک کلیپ ویدئو، تصویر یا متن را روی تایملاین انتخاب کنید","Select folder containing media files": "پوشه حاوی فایل رسانهایها را انتخاب کنید",diff --git a/src/crates/concat/locales/fr.json b/src/crates/concat/locales/fr.jsonindex e83d53e8..7ca1956b 100644--- a/src/crates/concat/locales/fr.json+++ b/src/crates/concat/locales/fr.json@@ -58,6 +58,7 @@"Add a panel": "Ajouter un panneau","Add at playhead": "Ajouter à la tête de lecture","Add captions": "Add captions",+ "Add or remove a key at the playhead": "Ajouter ou retirer une image clé à la tête de lecture","Add selected to timeline": "Ajouter la sélection à la timeline","Add track": "Ajouter une piste","Added {0} captions": "{0} sous-titres ajoutés",@@ -211,6 +212,7 @@"Cube": "Cube","Curvature": "Courbure","Curve": "Courbe",+ "Curves": "Courbes","Custom": "Personnalisé","Custom removal": "Suppression manuelle","Custom URL": "URL personnalisée",@@ -253,6 +255,7 @@"Distort": "Distorsion","Distorted": "Distordu","Distortion & Glitch": "Distorsion et glitch",+ "Dopesheet": "Feuille de clés","Dot size": "Taille des points","Download": "Télécharger","Download a transcriber model in Settings › Transcriber first": "Téléchargez d'abord un modèle de transcription dans Réglages › Transcription",@@ -273,7 +276,6 @@"Dust": "Dust","Ease in": "Accélération","Ease in and out": "Accélération et décélération",- "Ease into the key": "Courbe vers l’image clé","Ease out": "Décélération","Echo": "Écho","Edge glow": "Lueur des bords",@@ -298,7 +300,6 @@"Even": "Even","Every colour becomes its opposite.": "Chaque couleur devient son opposée.","Every colour turned around the wheel by the same angle.": "Every colour turned around the wheel by the same angle.",- "Every knob that can ride is a row: its keys along the clip, the playhead's place among them, and its value there. Change the value to set the key under the playhead. Click a diamond to go to its key, drag one to move it. The curve is the way into the key the playhead is on, or is heading for.": "Chaque réglage qui peut s’animer est une ligne : ses images clés le long du clip, la position de la tête de lecture parmi elles et sa valeur à cet endroit. Modifiez la valeur pour poser l’image clé sous la tête de lecture. Cliquez sur un losange pour aller à son image clé, faites-le glisser pour la déplacer. La courbe est la façon d’arriver à l’image clé sur laquelle se trouve la tête de lecture, ou vers laquelle elle se dirige.","Everyday": "Everyday","Everything brighter than the threshold turns negative, as an over-exposed print does.": "Everything brighter than the threshold turns negative, as an over-exposed print does.","Everything you have opened on this machine.": "Tout ce que vous avez ouvert sur cette machine.",@@ -736,6 +737,7 @@"See all": "Tout voir","Segments": "Segments","Select a clip on the timeline first": "Sélectionnez d'abord un clip sur la timeline",+ "Select a clip to edit its keyframes": "Sélectionnez un clip pour modifier ses images clés","Select a video or image clip on the timeline first": "Sélectionnez d'abord un clip vidéo ou image sur la timeline","Select a video, image or text clip on the timeline first": "Sélectionnez d'abord un clip vidéo, image ou texte sur la timeline","Select folder containing media files": "Select folder containing media files",diff --git a/src/crates/concat/locales/hr.json b/src/crates/concat/locales/hr.jsonindex c8747eb9..83f8ba9a 100644--- a/src/crates/concat/locales/hr.json+++ b/src/crates/concat/locales/hr.json@@ -58,6 +58,7 @@"Add a panel": "Dodaj ploču","Add at playhead": "Dodaj na playheadu","Add captions": "Dodaj titlove",+ "Add or remove a key at the playhead": "Dodaj ili ukloni ključni kadar na playheadu","Add selected to timeline": "Dodaj odabrano na vremensku liniju","Add track": "Dodaj traku","Added {0} captions": "Dodano {0} titlova",@@ -211,6 +212,7 @@"Cube": "Kocka","Curvature": "Zakrivljenost","Curve": "Krivulja",+ "Curves": "Krivulje","Custom": "Prilagođeno","Custom removal": "Prilagođeno uklanjanje","Custom URL": "Vlastiti URL",@@ -253,6 +255,7 @@"Distort": "Izobliči","Distorted": "Izobličeno","Distortion & Glitch": "Iskrivljenje i glitch",+ "Dopesheet": "Tablica ključeva","Dot size": "Veličina točke","Download": "Preuzmi","Download a transcriber model in Settings › Transcriber first": "Prvo preuzmite model za transkripciju u Postavke › Transkriber",@@ -273,7 +276,6 @@"Dust": "Prašina","Ease in": "Ublaženi ulaz","Ease in and out": "Ublaženi ulaz i izlaz",- "Ease into the key": "Krivulja do ključnog kadra","Ease out": "Ublaženi izlaz","Echo": "Jeka","Edge glow": "Sjaj rubova",@@ -298,7 +300,6 @@"Even": "Ujednačeno","Every colour becomes its opposite.": "Svaka boja postaje svoja suprotnost.","Every colour turned around the wheel by the same angle.": "Svaka boja zakrenuta oko kruga za isti kut.",- "Every knob that can ride is a row: its keys along the clip, the playhead's place among them, and its value there. Change the value to set the key under the playhead. Click a diamond to go to its key, drag one to move it. The curve is the way into the key the playhead is on, or is heading for.": "Svaka kontrola koja se može animirati je redak: njezini ključni kadrovi duž klipa, položaj playheada među njima i njezina vrijednost ondje. Promijenite vrijednost da postavite ključni kadar pod playheadom. Kliknite romb da odete na njegov ključni kadar, povucite ga da ga premjestite. Krivulja je način dolaska do ključnog kadra na kojem je playhead ili prema kojem ide.","Everyday": "Svakodnevno","Everything brighter than the threshold turns negative, as an over-exposed print does.": "Sve svjetlije od praga postaje negativ, kao kod prekoračeno eksponiranog printa.","Everything you have opened on this machine.": "Sve što ste otvorili na ovom računalu.",@@ -736,6 +737,7 @@"See all": "Prikaži sve","Segments": "Segmenti","Select a clip on the timeline first": "Prvo odaberite klip na vremenskoj liniji",+ "Select a clip to edit its keyframes": "Odaberite klip za uređivanje njegovih ključnih kadrova","Select a video or image clip on the timeline first": "Prvo odaberite video ili slikovni klip na vremenskoj liniji","Select a video, image or text clip on the timeline first": "Prvo odaberite video, slikovni ili tekstualni klip na vremenskoj liniji","Select folder containing media files": "Select folder containing media files",diff --git a/src/crates/concat/locales/it.json b/src/crates/concat/locales/it.jsonindex 7a22465e..ac702fb7 100644--- a/src/crates/concat/locales/it.json+++ b/src/crates/concat/locales/it.json@@ -58,6 +58,7 @@"Add a panel": "Aggiungi un pannello","Add at playhead": "Aggiungi alla testina","Add captions": "Add captions",+ "Add or remove a key at the playhead": "Aggiungi o rimuovi un fotogramma chiave alla testina","Add selected to timeline": "Aggiungi la selezione alla timeline","Add track": "Aggiungi traccia","Added {0} captions": "{0} sottotitoli aggiunti",@@ -211,6 +212,7 @@"Cube": "Cubo","Curvature": "Curvatura","Curve": "Curva",+ "Curves": "Curve","Custom": "Personalizzato","Custom removal": "Rimozione manuale","Custom URL": "URL personalizzato",@@ -253,6 +255,7 @@"Distort": "Distorsione","Distorted": "Distorto","Distortion & Glitch": "Distorsione e glitch",+ "Dopesheet": "Foglio chiavi","Dot size": "Dimensione dei punti","Download": "Scarica","Download a transcriber model in Settings › Transcriber first": "Scarica prima un modello di trascrizione in Impostazioni › Trascrizione",@@ -273,7 +276,6 @@"Dust": "Dust","Ease in": "Ingresso graduale","Ease in and out": "Ingresso e uscita graduali",- "Ease into the key": "Curva verso il fotogramma chiave","Ease out": "Uscita graduale","Echo": "Eco","Edge glow": "Bagliore dei bordi",@@ -298,7 +300,6 @@"Even": "Even","Every colour becomes its opposite.": "Ogni colore diventa il suo opposto.","Every colour turned around the wheel by the same angle.": "Every colour turned around the wheel by the same angle.",- "Every knob that can ride is a row: its keys along the clip, the playhead's place among them, and its value there. Change the value to set the key under the playhead. Click a diamond to go to its key, drag one to move it. The curve is the way into the key the playhead is on, or is heading for.": "Ogni controllo che può animarsi è una riga: i suoi fotogrammi chiave lungo la clip, la posizione della testina tra di essi e il suo valore lì. Cambia il valore per impostare il fotogramma chiave sotto la testina. Fai clic su un rombo per andare al suo fotogramma chiave, trascinalo per spostarlo. La curva è il modo di arrivare al fotogramma chiave su cui si trova la testina, o verso cui si dirige.","Everyday": "Everyday","Everything brighter than the threshold turns negative, as an over-exposed print does.": "Everything brighter than the threshold turns negative, as an over-exposed print does.","Everything you have opened on this machine.": "Tutto ciò che hai aperto su questo computer.",@@ -736,6 +737,7 @@"See all": "Vedi tutto","Segments": "Segmenti","Select a clip on the timeline first": "Seleziona prima una clip sulla timeline",+ "Select a clip to edit its keyframes": "Seleziona una clip per modificarne i fotogrammi chiave","Select a video or image clip on the timeline first": "Seleziona prima una clip video o immagine sulla timeline","Select a video, image or text clip on the timeline first": "Seleziona prima una clip video, immagine o testo sulla timeline","Select folder containing media files": "Select folder containing media files",diff --git a/src/crates/concat/locales/ja.json b/src/crates/concat/locales/ja.jsonindex f29d0715..4ea831e3 100644--- a/src/crates/concat/locales/ja.json+++ b/src/crates/concat/locales/ja.json@@ -58,6 +58,7 @@"Add a panel": "パネルを追加","Add at playhead": "再生ヘッドに追加","Add captions": "Add captions",+ "Add or remove a key at the playhead": "再生ヘッドにキーを追加または削除","Add selected to timeline": "選択項目をタイムラインに追加","Add track": "トラックを追加","Added {0} captions": "{0} 件の字幕を追加しました",@@ -211,6 +212,7 @@"Cube": "キューブ","Curvature": "湾曲","Curve": "カーブ",+ "Curves": "カーブ","Custom": "カスタム","Custom removal": "カスタム削除","Custom URL": "カスタム URL",@@ -253,6 +255,7 @@"Distort": "ディストーション","Distorted": "ディストーション","Distortion & Glitch": "ディストーションとグリッチ",+ "Dopesheet": "ドープシート","Dot size": "ドットサイズ","Download": "ダウンロード","Download a transcriber model in Settings › Transcriber first": "まず「設定 › 文字起こし」でモデルをダウンロードしてください",@@ -273,7 +276,6 @@"Dust": "Dust","Ease in": "イーズイン","Ease in and out": "イーズインアウト",- "Ease into the key": "キーへのイージング","Ease out": "イーズアウト","Echo": "エコー","Edge glow": "エッジグロー",@@ -298,7 +300,6 @@"Even": "Even","Every colour becomes its opposite.": "すべての色を反転します。","Every colour turned around the wheel by the same angle.": "Every colour turned around the wheel by the same angle.",- "Every knob that can ride is a row: its keys along the clip, the playhead's place among them, and its value there. Change the value to set the key under the playhead. Click a diamond to go to its key, drag one to move it. The curve is the way into the key the playhead is on, or is heading for.": "アニメーションできるつまみはそれぞれ一行になります。クリップ上のキー、その間の再生ヘッドの位置、そこでの値です。値を変えると再生ヘッドの下のキーが設定されます。ひし形をクリックするとそのキーへ移動し、ドラッグすると移動できます。カーブは、再生ヘッドが乗っている、または向かっているキーへの入り方です。","Everyday": "Everyday","Everything brighter than the threshold turns negative, as an over-exposed print does.": "Everything brighter than the threshold turns negative, as an over-exposed print does.","Everything you have opened on this machine.": "このマシンで開いたすべてのもの。",@@ -736,6 +737,7 @@"See all": "すべて表示","Segments": "分割数","Select a clip on the timeline first": "まずタイムラインでクリップを選択してください",+ "Select a clip to edit its keyframes": "クリップを選択するとキーフレームを編集できます","Select a video or image clip on the timeline first": "まずタイムラインで映像または画像のクリップを選択してください","Select a video, image or text clip on the timeline first": "まずタイムラインでビデオ、画像、またはテキストのクリップを選択してください","Select folder containing media files": "Select folder containing media files",diff --git a/src/crates/concat/locales/ko.json b/src/crates/concat/locales/ko.jsonindex 07c70a22..f789a422 100644--- a/src/crates/concat/locales/ko.json+++ b/src/crates/concat/locales/ko.json@@ -58,6 +58,7 @@"Add a panel": "패널 추가","Add at playhead": "재생 헤드에 추가","Add captions": "Add captions",+ "Add or remove a key at the playhead": "재생 헤드에 키 추가 또는 제거","Add selected to timeline": "선택 항목을 타임라인에 추가","Add track": "트랙 추가","Added {0} captions": "자막 {0}개를 추가했습니다",@@ -211,6 +212,7 @@"Cube": "큐브","Curvature": "곡률","Curve": "곡선",+ "Curves": "커브","Custom": "사용자 지정","Custom removal": "사용자 지정 제거","Custom URL": "사용자 지정 URL",@@ -253,6 +255,7 @@"Distort": "왜곡","Distorted": "왜곡","Distortion & Glitch": "왜곡 & 글리치",+ "Dopesheet": "도프시트","Dot size": "점 크기","Download": "다운로드","Download a transcriber model in Settings › Transcriber first": "먼저 설정 › 받아쓰기에서 모델을 다운로드하세요",@@ -273,7 +276,6 @@"Dust": "Dust","Ease in": "이즈 인","Ease in and out": "이즈 인 아웃",- "Ease into the key": "키로 들어가는 곡선","Ease out": "이즈 아웃","Echo": "에코","Edge glow": "가장자리 발광",@@ -298,7 +300,6 @@"Even": "Even","Every colour becomes its opposite.": "모든 색이 반대색으로 바뀝니다.","Every colour turned around the wheel by the same angle.": "Every colour turned around the wheel by the same angle.",- "Every knob that can ride is a row: its keys along the clip, the playhead's place among them, and its value there. Change the value to set the key under the playhead. Click a diamond to go to its key, drag one to move it. The curve is the way into the key the playhead is on, or is heading for.": "애니메이션할 수 있는 조절 항목은 각각 한 행입니다. 클립을 따라 놓인 키, 그 사이의 재생 헤드 위치, 그 지점의 값이 표시됩니다. 값을 바꾸면 재생 헤드 아래의 키가 설정됩니다. 마름모를 클릭하면 해당 키로 이동하고, 드래그하면 키를 옮깁니다. 곡선은 재생 헤드가 놓인 키 또는 향하고 있는 키로 들어가는 방식입니다.","Everyday": "Everyday","Everything brighter than the threshold turns negative, as an over-exposed print does.": "Everything brighter than the threshold turns negative, as an over-exposed print does.","Everything you have opened on this machine.": "이 컴퓨터에서 연 모든 프로젝트.",@@ -736,6 +737,7 @@"See all": "모두 보기","Segments": "조각 수","Select a clip on the timeline first": "먼저 타임라인에서 클립을 선택하세요",+ "Select a clip to edit its keyframes": "키프레임을 편집할 클립을 선택하세요","Select a video or image clip on the timeline first": "먼저 타임라인에서 영상 또는 이미지 클립을 선택하세요","Select a video, image or text clip on the timeline first": "먼저 타임라인에서 영상, 이미지 또는 텍스트 클립을 선택하세요","Select folder containing media files": "Select folder containing media files",diff --git a/src/crates/concat/locales/pt-BR.json b/src/crates/concat/locales/pt-BR.jsonindex 97447e85..7a01a8fe 100644--- a/src/crates/concat/locales/pt-BR.json+++ b/src/crates/concat/locales/pt-BR.json@@ -58,6 +58,7 @@"Add a panel": "Adicionar um painel","Add at playhead": "Adicionar no cursor","Add captions": "Add captions",+ "Add or remove a key at the playhead": "Adicionar ou remover um quadro-chave no cursor","Add selected to timeline": "Adicionar seleção à linha do tempo","Add track": "Adicionar faixa","Added {0} captions": "{0} legendas adicionadas",@@ -211,6 +212,7 @@"Cube": "Cubo","Curvature": "Curvatura","Curve": "Curva",+ "Curves": "Curvas","Custom": "Personalizado","Custom removal": "Remoção manual","Custom URL": "URL personalizada",@@ -253,6 +255,7 @@"Distort": "Distorção","Distorted": "Distorcido","Distortion & Glitch": "Distorção e glitch",+ "Dopesheet": "Planilha de chaves","Dot size": "Tamanho do ponto","Download": "Baixar","Download a transcriber model in Settings › Transcriber first": "Baixe primeiro um modelo de transcrição em Configurações › Transcrição",@@ -273,7 +276,6 @@"Dust": "Dust","Ease in": "Suavizar entrada","Ease in and out": "Suavizar entrada e saída",- "Ease into the key": "Curva até o quadro-chave","Ease out": "Suavizar saída","Echo": "Eco","Edge glow": "Brilho das bordas",@@ -298,7 +300,6 @@"Even": "Even","Every colour becomes its opposite.": "Cada cor vira seu oposto.","Every colour turned around the wheel by the same angle.": "Every colour turned around the wheel by the same angle.",- "Every knob that can ride is a row: its keys along the clip, the playhead's place among them, and its value there. Change the value to set the key under the playhead. Click a diamond to go to its key, drag one to move it. The curve is the way into the key the playhead is on, or is heading for.": "Cada controle que pode ser animado é uma linha: seus quadros-chave ao longo do clipe, a posição do cursor entre eles e o valor ali. Altere o valor para definir o quadro-chave sob o cursor. Clique em um losango para ir até o quadro-chave, arraste-o para movê-lo. A curva é o caminho até o quadro-chave em que o cursor está, ou para o qual ele segue.","Everyday": "Everyday","Everything brighter than the threshold turns negative, as an over-exposed print does.": "Everything brighter than the threshold turns negative, as an over-exposed print does.","Everything you have opened on this machine.": "Tudo que você abriu nesta máquina.",@@ -736,6 +737,7 @@"See all": "Ver tudo","Segments": "Segmentos","Select a clip on the timeline first": "Selecione primeiro um clipe na linha do tempo",+ "Select a clip to edit its keyframes": "Selecione um clipe para editar seus quadros-chave","Select a video or image clip on the timeline first": "Selecione primeiro um clipe de vídeo ou imagem na linha do tempo","Select a video, image or text clip on the timeline first": "Selecione primeiro um clipe de vídeo, imagem ou texto na linha do tempo","Select folder containing media files": "Select folder containing media files",diff --git a/src/crates/concat/locales/ru.json b/src/crates/concat/locales/ru.jsonindex 6fb74df9..a45b11f4 100644--- a/src/crates/concat/locales/ru.json+++ b/src/crates/concat/locales/ru.json@@ -58,6 +58,7 @@"Add a panel": "Добавить панель","Add at playhead": "Добавить по курсору","Add captions": "Добавить субтитры",+ "Add or remove a key at the playhead": "Добавить или убрать ключевой кадр под курсором","Add selected to timeline": "Добавить выбранное на таймлайн","Add track": "Добавить дорожку","Added {0} captions": "Добавлено субтитров: {0}",@@ -211,6 +212,7 @@"Cube": "Куб","Curvature": "Кривизна","Curve": "Кривая",+ "Curves": "Кривые","Custom": "Вручную","Custom removal": "Ручное удаление","Custom URL": "Свой URL",@@ -253,6 +255,7 @@"Distort": "Искажение","Distorted": "Искажённый","Distortion & Glitch": "Искажения и глитч",+ "Dopesheet": "Таблица ключей","Dot size": "Размер точки","Download": "Скачать","Download a transcriber model in Settings › Transcriber first": "Сначала скачайте модель распознавания в Настройки › Распознавание",@@ -273,7 +276,6 @@"Dust": "Пыль","Ease in": "Плавный вход","Ease in and out": "Плавный вход и выход",- "Ease into the key": "Кривая к ключевому кадру","Ease out": "Плавный выход","Echo": "Эхо","Edge glow": "Свечение краёв",@@ -298,7 +300,6 @@"Even": "Выровнять","Every colour becomes its opposite.": "Каждый цвет становится противоположным.","Every colour turned around the wheel by the same angle.": "Каждый цвет повёрнут по кругу на один и тот же угол.",- "Every knob that can ride is a row: its keys along the clip, the playhead's place among them, and its value there. Change the value to set the key under the playhead. Click a diamond to go to its key, drag one to move it. The curve is the way into the key the playhead is on, or is heading for.": "Каждый регулятор, который можно анимировать, — это строка: его ключевые кадры вдоль клипа, положение курсора среди них и значение в этой точке. Измените значение, чтобы задать ключевой кадр под курсором. Щёлкните ромб, чтобы перейти к его ключевому кадру, перетащите его, чтобы переместить. Кривая — это путь к ключевому кадру, на котором стоит курсор или к которому он движется.","Everyday": "На каждый день","Everything brighter than the threshold turns negative, as an over-exposed print does.": "Всё ярче порога уходит в негатив, как на переэкспонированном отпечатке.","Everything you have opened on this machine.": "Всё, что вы открывали на этом компьютере.",@@ -736,6 +737,7 @@"See all": "Показать все","Segments": "Сегменты","Select a clip on the timeline first": "Сначала выберите клип на таймлайне",+ "Select a clip to edit its keyframes": "Выберите клип, чтобы редактировать его ключевые кадры","Select a video or image clip on the timeline first": "Сначала выберите видео или изображение на таймлайне","Select a video, image or text clip on the timeline first": "Сначала выберите видео, изображение или текстовый клип на таймлайне","Select folder containing media files": "Выберите папку с медиафайлами",diff --git a/src/crates/concat/locales/tr.json b/src/crates/concat/locales/tr.jsonindex 97bb6f75..ff054b12 100644--- a/src/crates/concat/locales/tr.json+++ b/src/crates/concat/locales/tr.json@@ -58,6 +58,7 @@"Add a panel": "Panel ekle","Add at playhead": "Playhead konumuna ekle","Add captions": "Add captions",+ "Add or remove a key at the playhead": "Oynatma kafasında anahtar kare ekle veya kaldır","Add selected to timeline": "Seçilenleri zaman çizelgesine ekle","Add track": "Parça ekle","Added {0} captions": "{0} altyazı eklendi",@@ -211,6 +212,7 @@"Cube": "Küp","Curvature": "Eğrilik","Curve": "Eğri",+ "Curves": "Eğriler","Custom": "Özel","Custom removal": "Özel kaldırma","Custom URL": "Özel URL",@@ -253,6 +255,7 @@"Distort": "Bozma","Distorted": "Bozulmuş","Distortion & Glitch": "Bozulma ve glitch",+ "Dopesheet": "Anahtar tablosu","Dot size": "Nokta boyutu","Download": "İndir","Download a transcriber model in Settings › Transcriber first": "Önce Ayarlar › Yazıya dökme bölümünden bir model indirin",@@ -273,7 +276,6 @@"Dust": "Dust","Ease in": "Yumuşak giriş","Ease in and out": "Yumuşak giriş ve çıkış",- "Ease into the key": "Anahtar kareye giden eğri","Ease out": "Yumuşak çıkış","Echo": "Yankı","Edge glow": "Kenar parıltısı",@@ -298,7 +300,6 @@"Even": "Even","Every colour becomes its opposite.": "Her renk karşıtına dönüşür.","Every colour turned around the wheel by the same angle.": "Every colour turned around the wheel by the same angle.",- "Every knob that can ride is a row: its keys along the clip, the playhead's place among them, and its value there. Change the value to set the key under the playhead. Click a diamond to go to its key, drag one to move it. The curve is the way into the key the playhead is on, or is heading for.": "Canlandırılabilen her ayar bir satırdır: klip boyunca anahtar kareleri, aralarında oynatma kafasının yeri ve oradaki değeri. Oynatma kafasının altındaki anahtar kareyi ayarlamak için değeri değiştirin. Bir baklava işaretine tıklayarak o anahtar kareye gidin, sürükleyerek taşıyın. Eğri, oynatma kafasının üzerinde olduğu ya da yöneldiği anahtar kareye giriş biçimidir.","Everyday": "Everyday","Everything brighter than the threshold turns negative, as an over-exposed print does.": "Everything brighter than the threshold turns negative, as an over-exposed print does.","Everything you have opened on this machine.": "Bu makinede açtığınız her şey.",@@ -736,6 +737,7 @@"See all": "Tümünü gör","Segments": "Bölümler","Select a clip on the timeline first": "Önce zaman çizelgesinde bir klip seçin",+ "Select a clip to edit its keyframes": "Anahtar karelerini düzenlemek için 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 a video, image or text clip on the timeline first": "Önce zaman çizelgesinde bir video, görüntü veya metin klibi seçin","Select folder containing media files": "Select folder containing media files",diff --git a/src/crates/concat/locales/zh-Hans.json b/src/crates/concat/locales/zh-Hans.jsonindex 4e0fbaea..460eb7eb 100644--- a/src/crates/concat/locales/zh-Hans.json+++ b/src/crates/concat/locales/zh-Hans.json@@ -58,6 +58,7 @@"Add a panel": "添加面板","Add at playhead": "在播放头处添加","Add captions": "Add captions",+ "Add or remove a key at the playhead": "在播放头处添加或移除关键帧","Add selected to timeline": "将所选添加到时间线","Add track": "添加轨道","Added {0} captions": "已添加 {0} 条字幕",@@ -211,6 +212,7 @@"Cube": "立方体","Curvature": "曲率","Curve": "曲线",+ "Curves": "曲线","Custom": "自定义","Custom removal": "自定义移除","Custom URL": "自定义 URL",@@ -253,6 +255,7 @@"Distort": "扭曲","Distorted": "失真","Distortion & Glitch": "扭曲与故障",+ "Dopesheet": "摄影表","Dot size": "点大小","Download": "下载","Download a transcriber model in Settings › Transcriber first": "请先在“设置 › 转写”中下载转写模型",@@ -273,7 +276,6 @@"Dust": "Dust","Ease in": "缓入","Ease in and out": "缓入缓出",- "Ease into the key": "进入关键帧的曲线","Ease out": "缓出","Echo": "回声","Edge glow": "边缘发光",@@ -298,7 +300,6 @@"Even": "Even","Every colour becomes its opposite.": "每种颜色变为其反色。","Every colour turned around the wheel by the same angle.": "Every colour turned around the wheel by the same angle.",- "Every knob that can ride is a row: its keys along the clip, the playhead's place among them, and its value there. Change the value to set the key under the playhead. Click a diamond to go to its key, drag one to move it. The curve is the way into the key the playhead is on, or is heading for.": "每个可以随时间变化的旋钮都是一行:它在片段上的关键帧、播放头在其中的位置,以及该处的值。修改值即可设置播放头下的关键帧。点击菱形跳到该关键帧,拖动则移动它。曲线是进入播放头所在或即将到达的关键帧的方式。","Everyday": "Everyday","Everything brighter than the threshold turns negative, as an over-exposed print does.": "Everything brighter than the threshold turns negative, as an over-exposed print does.","Everything you have opened on this machine.": "你在这台电脑上打开过的所有项目。",@@ -736,6 +737,7 @@"See all": "查看全部","Segments": "分段数","Select a clip on the timeline first": "请先在时间线上选择一个片段",+ "Select a clip to edit its keyframes": "选择一个片段以编辑其关键帧","Select a video or image clip on the timeline first": "请先在时间线上选择一个视频或图片片段","Select a video, image or text clip on the timeline first": "请先在时间线上选择一个视频、图片或文本片段","Select folder containing media files": "Select folder containing media files",diff --git a/src/crates/concat/locales/zh-TW.json b/src/crates/concat/locales/zh-TW.jsonindex ce2ab451..c14962a2 100644--- a/src/crates/concat/locales/zh-TW.json+++ b/src/crates/concat/locales/zh-TW.json@@ -58,6 +58,7 @@"Add a panel": "新增面板","Add at playhead": "在播放頭位置加入","Add captions": "新增字幕",+ "Add or remove a key at the playhead": "在播放頭處新增或移除關鍵影格","Add selected to timeline": "將所選內容新增至時間軸","Add track": "新增軌道","Added {0} captions": "已新增 {0} 段字幕",@@ -211,6 +212,7 @@"Cube": "立方體","Curvature": "曲率","Curve": "曲線",+ "Curves": "曲線","Custom": "自訂","Custom removal": "自訂去背","Custom URL": "自訂 URL",@@ -253,6 +255,7 @@"Distort": "扭曲","Distorted": "失真","Distortion & Glitch": "扭曲故障",+ "Dopesheet": "攝影表","Dot size": "圓點大小","Download": "下載","Download a transcriber model in Settings › Transcriber first": "請先到 [設定] › [語音轉錄] 下載模型",@@ -273,7 +276,6 @@"Dust": "灰塵","Ease in": "緩入","Ease in and out": "緩入緩出",- "Ease into the key": "進入關鍵影格的曲線","Ease out": "緩出","Echo": "回音","Edge glow": "邊緣發光",@@ -298,7 +300,6 @@"Even": "均勻膚色","Every colour becomes its opposite.": "將所有顏色反相。","Every colour turned around the wheel by the same angle.": "將所有顏色沿色相環旋轉相同角度。",- "Every knob that can ride is a row: its keys along the clip, the playhead's place among them, and its value there. Change the value to set the key under the playhead. Click a diamond to go to its key, drag one to move it. The curve is the way into the key the playhead is on, or is heading for.": "每個可以隨時間變化的旋鈕都是一列:它在片段上的關鍵影格、播放頭在其中的位置,以及該處的值。變更值即可設定播放頭下的關鍵影格。點一下菱形跳到該關鍵影格,拖曳則移動它。曲線是進入播放頭所在或即將抵達的關鍵影格的方式。","Everyday": "日常","Everything brighter than the threshold turns negative, as an over-exposed print does.": "將亮度超過臨界值的部分反相,呈現照片過度曝光般的效果。","Everything you have opened on this machine.": "在這台機器上開啟過的所有專案。",@@ -736,6 +737,7 @@"See all": "查看全部","Segments": "分段數","Select a clip on the timeline first": "請先在時間軸上選取片段",+ "Select a clip to edit its keyframes": "選取一個片段以編輯其關鍵影格","Select a video or image clip on the timeline first": "請先選取時間軸上的影片或圖片片段","Select a video, image or text clip on the timeline first": "請先在時間軸上選取影片、圖片或文字片段","Select folder containing media files": "選擇包含媒體檔案的資料夾",diff --git a/src/crates/concat/src/chips.rs b/src/crates/concat/src/chips.rsindex 9f272665..693bf1f3 100644--- a/src/crates/concat/src/chips.rs+++ b/src/crates/concat/src/chips.rs@@ -40,6 +40,8 @@ pub fn pane_glyph(slug: &str) -> &'static str {"M5 3h14a2 2 0 0 1 2 2v14a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2Z \M7 9a2 2 0 1 0 4 0a2 2 0 1 0 -4 0 M21 15l-3.086-3.086a2 2 0 0 0-2.828 0L6 21"}+ // lucide/diamond+ "keyframes" => "M12 2.5l9.5 9.5-9.5 9.5-9.5-9.5z",// lucide/sliders-horizontal"inspector" => {"M10 5H3 M12 19H3 M14 3v4 M16 17v4 M21 12h-9 M21 19h-5 M21 5h-7 \diff --git a/src/crates/concat/src/lib.rs b/src/crates/concat/src/lib.rsindex 3ba05a52..491ec53a 100644--- a/src/crates/concat/src/lib.rs+++ b/src/crates/concat/src/lib.rs@@ -882,6 +882,11 @@ pub fn run() -> Result<(), slint::PlatformError> {y2: f32| {state.set_key_ease(field, param.as_str(), at, [x1, y1, x2, y2]);}));+ editor.on_drag_key(on_lanes!(+ |state, field: ClipField, param: SharedString, from: f32, to: f32, value: f32| {+ state.drag_key(field, param.as_str(), from, to, value);+ }+ ));editor.on_step_all(on_lanes!(|state, delta: i32| {state.step_any_key(delta);}));diff --git a/src/crates/concat/src/studio.rs b/src/crates/concat/src/studio.rsindex 43804a88..a18637a6 100644--- a/src/crates/concat/src/studio.rs+++ b/src/crates/concat/src/studio.rs@@ -1162,6 +1162,47 @@ fn shown(clip: &Clip, property: model::KeyProperty, at: f64) -> f64 {}}+/// A keyable property's value in the knob's units: the model's, except+/// the level, which the knob shows in decibels and the clip holds as gain.+fn knob_value(property: model::KeyProperty, value: f64) -> f64 {+ match property {+ model::KeyProperty::Volume => {+ if value <= 0.001 {+ -60.0+ } else {+ (20.0 * value.log10()).clamp(-60.0, 24.0)+ }+ }+ _ => value,+ }+}++/// The reverse of [`knob_value`]: a knob's number as the model holds it.+fn model_value(property: model::KeyProperty, knob: f64) -> f64 {+ match property {+ model::KeyProperty::Volume => {+ if knob <= -60.0 {+ 0.0+ } else {+ 10f64.powf(knob / 20.0)+ }+ }+ _ => knob,+ }+}++/// The range a keyable knob runs over, in the knob's units: what the+/// curve view's height spans. The same numbers as the inspector's rows.+fn knob_range(property: model::KeyProperty) -> (f64, f64) {+ match property {+ model::KeyProperty::Scale => (0.05, 8.0),+ model::KeyProperty::OffsetX | model::KeyProperty::OffsetY => (-1.0, 1.0),+ model::KeyProperty::Rotation => (-180.0, 180.0),+ model::KeyProperty::Opacity => (0.0, 1.0),+ model::KeyProperty::Volume => (-60.0, 24.0),+ }+}+/// Writes a keyable property the way the person means it: the constant/// while the property has no keys, and once it rides, the key at `at` -/// put on if there was none, with the ease of the key behind it. The engine@@ -6201,58 +6242,77 @@ impl Studio {.collect()}- /// The Keyframes panel's rows: the six properties of the selected- /// clip, and every Adjust knob of it that carries keys, each with its- /// keys along the clip, what it is worth at the playhead, and the ease- /// into the key the playhead is on or heading for.+ /// The Keyframes pane's rows: the six properties of the selected clip,+ /// and every Adjust knob of it that carries keys, each with its keys+ /// along the clip - where, what value as a fraction of the knob's+ /// range, and the ease into it - what the knob is worth at the+ /// playhead, and the ride over the clip as a path for the curve view.pub fn key_editor_rows(&self) -> Vec<KeyRowData> {let Some(clip) = self.sole_selection().and_then(|id| self.clip(&id)) else {return Vec::new();};let at = place_in(clip, self.playhead);let near = |a: f64, b: f64| (a - b).abs() <= model::KEY_EPSILON;- // The ease shown for a run of keys: the one into the key at the- // playhead, else into the next key - the segment being played -- // when there is a key behind it to ease from.- let ease_of = |keys: &[(f64, model::KeyEase)]| -> (bool, [f32; 4], f32) {- let target = keys+ // A run of keys as marks: each with its value as a fraction of the+ // range and the ease into it, and the ride as a path - a hold to+ // the first key, a cubic per segment (the ease's control points are+ // exactly the curve's, in time and value), a hold after the last.+ let marks_and_curve = |keys: &[(f64, f64, model::KeyEase)],+ to_fraction: &dyn Fn(f64) -> f64|+ -> (ModelRc<KeyMarkData>, String, i32) {+ let marks: Vec<KeyMarkData> = keys.iter()- .find(|(key_at, _)| near(*key_at, at))- .or_else(|| keys.iter().find(|(key_at, _)| *key_at > at));- match target {- Some((key_at, ease))- if keys- .iter()- .any(|(other, _)| *other < key_at - model::KEY_EPSILON) =>- {+ .enumerate()+ .map(|(index, (key_at, value, ease))| {let [x1, y1, x2, y2] = ease.0;- (- true,- [x1 as f32, y1 as f32, x2 as f32, y2 as f32],- *key_at as f32,- )+ KeyMarkData {+ at: *key_at as f32,+ here: near(*key_at, at),+ value: to_fraction(*value).clamp(0.0, 1.0) as f32,+ ease_x1: x1 as f32,+ ease_y1: y1 as f32,+ ease_x2: x2 as f32,+ ease_y2: y2 as f32,+ eased: index > 0,+ }+ })+ .collect();+ let mut curve = String::new();+ if let (Some(first), Some(last)) = (marks.first(), marks.last()) {+ let y = |value: f32| 1.0 - value;+ curve.push_str(&format!(+ "M 0 {:.4} L {:.4} {:.4}",+ y(first.value),+ first.at,+ y(first.value)+ ));+ for pair in marks.windows(2) {+ let (a, b) = (&pair[0], &pair[1]);+ let (dx, dy) = (b.at - a.at, b.value - a.value);+ curve.push_str(&format!(+ " C {:.4} {:.4} {:.4} {:.4} {:.4} {:.4}",+ a.at + b.ease_x1 * dx,+ y(a.value + b.ease_y1 * dy),+ a.at + b.ease_x2 * dx,+ y(a.value + b.ease_y2 * dy),+ b.at,+ y(b.value)+ ));}- _ => (false, [0.0, 0.0, 1.0, 1.0], 0.0),+ curve.push_str(&format!(" L 1 {:.4}", y(last.value)));}- };- let marks = |ats: &[f64]| -> ModelRc<KeyMarkData> {- ModelRc::new(VecModel::from(- ats.iter()- .map(|&key_at| KeyMarkData {- at: key_at as f32,- here: near(key_at, at),- })- .collect::<Vec<_>>(),- ))+ // The key the ease menu edits: the one at the playhead, else+ // the next, when it has a key behind it to ease from.+ let ease_index = marks+ .iter()+ .position(|mark| mark.eased && f64::from(mark.at) >= at - model::KEY_EPSILON)+ .map_or(-1, |index| index as i32);+ (ModelRc::new(VecModel::from(marks)), curve, ease_index)};let mut rows = Vec::new();for property in model::KeyProperty::ALL {- let keys: Vec<(f64, model::KeyEase)> = clip- .keys_on(property)- .map(|key| (key.at, key.ease))- .collect();- let ats: Vec<f64> = keys.iter().map(|(key_at, _)| *key_at).collect();- // The same ranges and units as the inspector's knobs.+ // The same ranges and units as the inspector's knobs. The level+ // knob speaks decibels, floored where silence is.let (label, minimum, maximum, step, default_value, fmt, unit, unit_scale) =match property {model::KeyProperty::Scale => (@@ -6316,24 +6376,19 @@ impl Studio {1.0,),};- let shown_value = shown(clip, property, at);- let value = if property == model::KeyProperty::Volume {- // The level knob speaks decibels, floored where silence is.- if shown_value <= 0.001 {- -60.0- } else {- (20.0 * shown_value.log10()).clamp(-60.0, 24.0)- }- } else {- shown_value- };+ let to_knob = |value: f64| knob_value(property, value);+ let keys: Vec<(f64, f64, model::KeyEase)> = clip+ .keys_on(property)+ .map(|key| (key.at, to_knob(key.value), key.ease))+ .collect();+ let (marks, curve, ease_index) =+ marks_and_curve(&keys, &|value| (value - minimum) / (maximum - minimum));let (prev, next) = clip.keys_around(property, at);- let (has_ease, ease, ease_at) = ease_of(&keys);rows.push(KeyRowData {field: key_field_of(property),param: SharedString::default(),label: label.into(),- keys: marks(&ats),+ keys: marks,state: ClipKeyData {field: key_field_of(property),keyed: !keys.is_empty(),@@ -6341,20 +6396,16 @@ impl Studio {prev: prev.is_some(),next: next.is_some(),},- value: value as f32,- minimum,- maximum,+ value: to_knob(shown(clip, property, at)) as f32,+ minimum: minimum as f32,+ maximum: maximum as f32,step,default_value,fmt,unit: unit.into(),unit_scale,- ease_x1: ease[0],- ease_y1: ease[1],- ease_x2: ease[2],- ease_y2: ease[3],- has_ease,- ease_at,+ curve: curve.into(),+ ease_index,});}if let Some(link) = clip@@ -6367,18 +6418,24 @@ impl Studio {if !row.keyed {continue;}- let keys: Vec<(f64, model::KeyEase)> = link+ let keys: Vec<(f64, f64, model::KeyEase)> = link.keys_on(&row.key).iter()- .map(|key| (key.at, key.ease))+ .map(|key| (key.at, key.value, key.ease)).collect();- let ats: Vec<f64> = keys.iter().map(|(key_at, _)| *key_at).collect();- let (has_ease, ease, ease_at) = ease_of(&keys);+ let (minimum, maximum) = (f64::from(row.min), f64::from(row.max));+ let (marks, curve, ease_index) = marks_and_curve(&keys, &|value| {+ if maximum > minimum {+ (value - minimum) / (maximum - minimum)+ } else {+ 0.5+ }+ });rows.push(KeyRowData {field: ClipField::Scale,param: row.key.clone(),label: row.label.clone(),- keys: marks(&ats),+ keys: marks,state: ClipKeyData {field: ClipField::Scale,keyed: true,@@ -6394,18 +6451,88 @@ impl Studio {fmt: row.fmt,unit: row.unit.clone(),unit_scale: 1.0,- ease_x1: ease[0],- ease_y1: ease[1],- ease_x2: ease[2],- ease_y2: ease[3],- has_ease,- ease_at,+ curve: curve.into(),+ ease_index,});}}rows}+ /// Moves the key at `from` to `to` and gives it `fraction` of its+ /// row's range, keeping its ease: a drag of a handle in the curve view.+ pub fn drag_key(&mut self, field: ClipField, param: &str, from: f32, to: f32, fraction: f32) {+ let Some(clip) = self.sole_selection().and_then(|id| self.clip(&id)) else {+ return;+ };+ let clip_id = clip.id.clone();+ let (from, to) = (f64::from(from), f64::from(to).clamp(0.0, 1.0));+ let fraction = f64::from(fraction).clamp(0.0, 1.0);+ let commands = if param.is_empty() {+ let Some(property) = Self::key_property_of(field) else {+ return;+ };+ let Some(index) = clip.key_at(property, from) else {+ return;+ };+ let (minimum, maximum) = knob_range(property);+ let value = model_value(property, minimum + fraction * (maximum - minimum));+ let ease = clip.keys[index].ease;+ vec![+ Command::ClearClipKey {+ clip_id: clip_id.clone(),+ property,+ at: from,+ },+ Command::SetClipKey {+ clip_id,+ property,+ at: to,+ value,+ ease,+ },+ ]+ } else {+ let Some(entry) = clip+ .video_effects+ .iter()+ .position(|entry| entry.id == ADJUST_ID)+ else {+ return;+ };+ let link = &clip.video_effects[entry];+ let Some(index) = link.key_at(param, from) else {+ return;+ };+ let Some(row) = adjust_rows(&clip.video_effects, Some(from))+ .into_iter()+ .find(|row| row.key == param)+ else {+ return;+ };+ let (minimum, maximum) = (f64::from(row.min), f64::from(row.max));+ let value = minimum + fraction * (maximum - minimum);+ let ease = link.keys_on(param)[index].ease;+ vec![+ Command::ClearEffectKey {+ clip_id: clip_id.clone(),+ entry,+ key: param.to_owned(),+ at: from,+ },+ Command::SetEffectKey {+ clip_id,+ entry,+ key: param.to_owned(),+ at: to,+ value,+ ease,+ },+ ]+ };+ self.apply(Command::Batch { commands });+ }+/// The selected clip's keys as instants on the timeline, every property/// and Adjust knob together, one diamond per instant: what the ruler/// draws while exactly one clip is selected (#188).diff --git a/src/crates/concat/ui/app.slint b/src/crates/concat/ui/app.slintindex b4f9ca3a..59005b0c 100644--- a/src/crates/concat/ui/app.slint+++ b/src/crates/concat/ui/app.slint@@ -46,7 +46,7 @@ import {} from "timeline/model.slint";// Re-exported so main.rs can reach the globals and the struct.-import { KeyEditor, KeyMarkData, KeyRowData } from "inspector/keyframes-panel.slint";+import { KeyEditor, KeyMarkData, KeyRowData } from "workspace/keyframes-pane.slint";export {Curves, Fmt, Focus, Payload, Theme, Bezier, Editor, I18n,diff --git a/src/crates/concat/ui/inspector/keyframes-panel.slint b/src/crates/concat/ui/inspector/keyframes-panel.slintdeleted file mode 100644index 88040a20..00000000--- a/src/crates/concat/ui/inspector/keyframes-panel.slint+++ /dev/null@@ -1,301 +0,0 @@-// SPDX-License-Identifier: AGPL-3.0-or-later-// SPDX-FileCopyrightText: 2026 Jareer and Concat contributors--// The Keyframes panel: every knob of the selected clip that can ride, as a-// row - the knob itself, and under it a strip of the clip with a diamond-// at every key and a hairline where the playhead is. Changing the knob sets-// the key under the playhead; clicking a diamond goes to it; dragging one-// moves it. Below the rows, the ease into the key the playhead is on, or is-// heading for, as a curve.--import { I18n } from "../i18n.slint";-import { Theme } from "../theme/theme.slint";-import { Glyph, Icon } from "../icons.slint";-import { IconButton, Row, Section, SectionHeader } from "../primitives/panel.slint";-import { Button } from "../primitives/modal.slint";-import { Select } from "../primitives/select.slint";-import { BezierEditor } from "../primitives/bezier-editor.slint";-import { HelpButton, InspectorFmt, Param, ParamFormat, Subhead } from "controls.slint";-import { ClipField, ClipKeyData, Keyframes, SelectedClipData } from "../timeline/model.slint";--/// One key on a row's strip: where in the clip, `0..1`, and whether the-/// playhead is on it.-export struct KeyMarkData {- at: float,- here: bool,-}--/// One row of the panel: a keyable knob, its keys, and its ease.-export struct KeyRowData {- /// The clip property, for a row that is one.- field: ClipField,- /// The Adjust knob's key, for a row that is one; empty for a property.- param: string,- label: string,- keys: [KeyMarkData],- state: ClipKeyData,- /// What the knob is worth at the playhead, in the knob's own units.- value: float,- minimum: float,- maximum: float,- step: float,- default-value: float,- fmt: ParamFormat,- unit: string,- unit-scale: float,- /// The ease into the key the playhead is on, or else the next key: the- /// segment being played.- ease-x1: float,- ease-y1: float,- ease-x2: float,- ease-y2: float,- /// That key exists and has a key behind it to ease from.- has-ease: bool,- /// Where that key sits, to write the ease back to.- ease-at: float,-}--/// The panel's rows and verbs, a global so Rust publishes one list.-export global KeyEditor {- in property <[KeyRowData]> rows;- /// The playhead's place in the selected clip, `0..1`, held to its ends.- in property <float> at;-- /// Move the playhead to `at` of the selected clip.- callback jump(at: float);- /// Move the key at `from` to `to` on a property, or on the Adjust knob- /// `param` names.- callback move-key(field: ClipField, param: string, from: float, to: float);- /// Set the ease into the key at `at`.- callback set-ease(field: ClipField, param: string, at: float, x1: float, y1: float, x2: float, y2: float);- /// Move the playhead to the nearest key behind (-1) or ahead (+1) on- /// any knob of the clip.- callback step-all(delta: int);- /// Take every key off the clip.- callback clear-all();-}--/// The strip under a row: the clip's length, its keys as diamonds, the-/// playhead as a hairline. A diamond is clicked to go to its key and-/// dragged to move it.-component KeyStrip inherits Rectangle {- in property <[KeyMarkData]> keys;- in property <float> at;- callback jump(at: float);- callback moved(from: float, to: float);-- height: 18px;-- Rectangle {- x: 0;- y: root.height / 2 - 1px;- width: root.width;- height: 2px;- border-radius: 1px;- background: Theme.line-strong;- }-- Rectangle {- x: root.at * root.width;- y: 0;- width: 1px;- height: root.height;- background: Theme.accent;- opacity: 0.7;- }-- for key in root.keys: TouchArea {- property <float> drag-at: key.at;- property <bool> dragging;- property <float> shown-at: self.dragging ? self.drag-at : key.at;-- x: self.shown-at * root.width - 7px;- y: 0;- width: 14px;- height: root.height;- mouse-cursor: pointer;-- Path {- x: 2px;- y: root.height / 2 - 5px;- width: 10px;- height: 10px;- viewbox-width: 10;- viewbox-height: 10;- commands: "M 5 0.75 L 9.25 5 L 5 9.25 L 0.75 5 Z";- fill: key.here ? Theme.accent : Theme.panel;- stroke: Theme.accent;- stroke-width: 1.5px;- }-- moved => {- if (self.pressed) {- self.dragging = true;- self.drag-at = Math.max(0, Math.min(1,- key.at + (self.mouse-x - self.pressed-x) / root.width));- }- }- pointer-event(event) => {- if (event.kind == PointerEventKind.up || event.kind == PointerEventKind.cancel) {- if (self.dragging && Math.abs(self.drag-at - key.at) > 0.002) {- root.moved(key.at, self.drag-at);- } else if (event.kind == PointerEventKind.up) {- root.jump(key.at);- }- self.dragging = false;- }- }- }-}--/// The ease presets the curve editor offers, matched within a hair.-component EasePreset inherits Select {- in property <float> x1;- in property <float> y1;- in property <float> x2;- in property <float> y2;- callback picked(x1: float, y1: float, x2: float, y2: float);-- pure function near(a: float, b: float) -> bool { return Math.abs(a - b) < 0.005; }- pure function matches(px1: float, py1: float, px2: float, py2: float) -> bool {- return near(root.x1, px1) && near(root.y1, py1) && near(root.x2, px2) && near(root.y2, py2);- }-- options: [I18n.t("Linear"), I18n.t("Ease in"), I18n.t("Ease out"), I18n.t("Ease in and out"), I18n.t("Custom")];- current: matches(0, 0, 1, 1) ? 0- : matches(0.42, 0, 1, 1) ? 1- : matches(0, 0, 0.58, 1) ? 2- : matches(0.42, 0, 0.58, 1) ? 3- : 4;- changed(index) => {- if (index == 0) { root.picked(0, 0, 1, 1); }- else if (index == 1) { root.picked(0.42, 0, 1, 1); }- else if (index == 2) { root.picked(0, 0, 0.58, 1); }- else if (index == 3) { root.picked(0.42, 0, 0.58, 1); }- }-}--export component KeyframesPanel inherits VerticalLayout {- in property <SelectedClipData> selected;-- callback set(field: ClipField, value: float);- callback set-param(key: string, value: float);- callback commit();-- /// The row whose ease is shown: the last one touched.- property <int> active: 0;- property <int> shown-row: Math.max(0, Math.min(root.active, KeyEditor.rows.length - 1));- property <bool> any-keys: KeyEditor.rows.length > 0;- /// The row whose ease the curve shows.- property <KeyRowData> ease-row: root.any-keys ? KeyEditor.rows[root.shown-row] : KeyEditor.rows[0];-- Section {- first: true;- SectionHeader {- title: I18n.t("Keyframes");- HelpButton {- text: I18n.t("Every knob that can ride is a row: its keys along the clip, the playhead's place among them, and its value there. Change the value to set the key under the playhead. Click a diamond to go to its key, drag one to move it. The curve is the way into the key the playhead is on, or is heading for.");- }- }-- Row {- HorizontalLayout {- spacing: 6px;- IconButton {- glyph: Glyph.chevron-left;- label: I18n.t("Previous key");- enabled: Keyframes.available;- clicked => { KeyEditor.step-all(-1); }- }- IconButton {- glyph: Glyph.chevron-right;- label: I18n.t("Next key");- enabled: Keyframes.available;- clicked => { KeyEditor.step-all(1); }- }- Rectangle { horizontal-stretch: 1; }- Button {- label: I18n.t("Clear all keys");- enabled: root.any-keys;- clicked => { KeyEditor.clear-all(); }- }- }- }-- for row[index] in KeyEditor.rows: Rectangle {- property <KeyRowData> data: row;- changed data => { knob.value = self.data.value; }-- VerticalLayout {- spacing: 2px;- knob := Param {- label: row.label;- value: row.value;- minimum: row.minimum;- maximum: row.maximum;- step: row.step;- default-value: row.default-value;- fmt: row.fmt;- unit: row.unit;- unit-scale: row.unit-scale;- keyable: true;- field: row.field;- key-name: row.param;- key-state: row.state;- changed(v) => {- root.active = index;- if (row.param != "") { root.set-param(row.param, v); }- // The level knob speaks decibels; the clip holds a gain.- else if (row.field == ClipField.volume) { root.set(row.field, InspectorFmt.from-decibels(v)); }- else { root.set(row.field, v); }- root.commit();- }- }- KeyStrip {- keys: row.keys;- at: KeyEditor.at;- jump(at) => { root.active = index; KeyEditor.jump(at); }- moved(from, to) => { root.active = index; KeyEditor.move-key(row.field, row.param, from, to); }- }- }- }-- if root.any-keys && root.ease-row.has-ease: VerticalLayout {- spacing: 6px;-- Subhead { title: I18n.t("Ease into the key"); }- Row {- EasePreset {- x1: root.ease-row.ease-x1;- y1: root.ease-row.ease-y1;- x2: root.ease-row.ease-x2;- y2: root.ease-row.ease-y2;- picked(x1, y1, x2, y2) => {- KeyEditor.set-ease(root.ease-row.field, root.ease-row.param, root.ease-row.ease-at, x1, y1, x2, y2);- }- }- }- Rectangle {- // The editor's handles are in-out and stop following a- // binding once dragged; a row change puts them back.- property <KeyRowData> shown: root.ease-row;- changed shown => {- curve.x1 = self.shown.ease-x1;- curve.y1 = self.shown.ease-y1;- curve.x2 = self.shown.ease-x2;- curve.y2 = self.shown.ease-y2;- }- height: 200px;- curve := BezierEditor {- x1: root.ease-row.ease-x1;- y1: root.ease-row.ease-y1;- x2: root.ease-row.ease-x2;- y2: root.ease-row.ease-y2;- changed => {- KeyEditor.set-ease(root.ease-row.field, root.ease-row.param, root.ease-row.ease-at, self.x1, self.y1, self.x2, self.y2);- }- }- }- }- }-}diff --git a/src/crates/concat/ui/workspace/config-pane.slint b/src/crates/concat/ui/workspace/config-pane.slintindex dd5706a8..1cfec352 100644--- a/src/crates/concat/ui/workspace/config-pane.slint+++ b/src/crates/concat/ui/workspace/config-pane.slint@@ -11,7 +11,6 @@ import {AdjustPanel, AppliedEntryData, AppliedParamData, AudioPanel, ProcessorRows,CatalogueEntryData, FilterPanel, PresetStack, SpeedPanel, VideoPanel,} from "../inspector/clip-inspector.slint";-import { KeyframesPanel } from "../inspector/keyframes-panel.slint";import { TextPanel } from "../inspector/text-panel.slint";import {ClipField, ClipKind, ClipTextField, SelectedClipData,@@ -201,18 +200,18 @@ export component ConfigPane inherits Rectangle {/// it has no transform, no gain and no rate, and every other tab could/// only say "nothing here".property <bool> is-layer: root.selected.kind == ClipKind.filter;- property <[string]> tabs: root.is-text ? ["Text", "Effects", "Keyframes"]- : root.is-layer ? ["Filter", "Keyframes"]- : root.is-image ? ["Video", "Effects", "Keyframes"]- : root.is-audio ? ["Audio", "Keyframes"]- : ["Video", "Audio", "Effects", "Keyframes"];+ property <[string]> tabs: root.is-text ? ["Text", "Effects"]+ : root.is-layer ? ["Filter"]+ : root.is-image ? ["Video", "Effects"]+ : root.is-audio ? ["Audio"]+ : ["Video", "Audio", "Effects"];/// The same tabs in the interface's language. `tabs` stays English,/// because the panels are picked by comparing against it.- property <[string]> tabs-shown: root.is-text ? [I18n.t("Text"), I18n.t("Effects"), I18n.t("Keyframes")]- : root.is-layer ? [I18n.t("Filter"), I18n.t("Keyframes")]- : root.is-image ? [I18n.t("Video"), I18n.t("Effects"), I18n.t("Keyframes")]- : root.is-audio ? [I18n.t("Audio"), I18n.t("Keyframes")]- : [I18n.t("Video"), I18n.t("Audio"), I18n.t("Effects"), I18n.t("Keyframes")];+ property <[string]> tabs-shown: root.is-text ? [I18n.t("Text"), I18n.t("Effects")]+ : root.is-layer ? [I18n.t("Filter")]+ : root.is-image ? [I18n.t("Video"), I18n.t("Effects")]+ : root.is-audio ? [I18n.t("Audio")]+ : [I18n.t("Video"), I18n.t("Audio"), I18n.t("Effects")];/// A one-segment segmented control is a label wearing a costume, so a lone/// tab renders as the panel's plain heading instead.property <bool> single: root.tabs.length < 2;@@ -246,7 +245,6 @@ export component ConfigPane inherits Rectangle {? (root.is-audio ? ["Sound", "Speed"] : ["Sound"]): root.heading == "Effects" ? ["Effects"]: root.heading == "Text" ? ["Text"]- : root.heading == "Keyframes" ? ["Keyframes"]: ["Layer"];/// The sections as the dropdown shows them; see `tabs-shown`.property <[string]> sections-shown: root.heading == "Video"@@ -256,7 +254,6 @@ export component ConfigPane inherits Rectangle {? (root.is-audio ? [I18n.t("Sound"), I18n.t("Speed")] : [I18n.t("Sound")]): root.heading == "Effects" ? [I18n.t("Effects")]: root.heading == "Text" ? [I18n.t("Text")]- : root.heading == "Keyframes" ? [I18n.t("Keyframes")]: [I18n.t("Layer")];// Each tab remembers its own section, so flipping to Audio and back@@ -290,7 +287,7 @@ export component ConfigPane inherits Rectangle {if (root.jump-token == 0) { return; }if (root.jump-tab == "Video") { root.tab = 0; }else if (root.jump-tab == "Audio") { root.tab = root.is-audio ? 0 : 1; }- else if (root.jump-tab == "Effects") { root.tab = root.is-text || root.is-image ? 1 : 2; }+ else if (root.jump-tab == "Effects") { root.tab = root.tabs.length - 1; }root.pick-section(0);}changed jump-token => { root.jump(); }@@ -541,13 +538,6 @@ export component ConfigPane inherits Rectangle {transition-duration-set(seconds) => { root.transition-duration-set(seconds); }}- if root.showing == "Keyframes": KeyframesPanel {- selected: root.selected;- set(field, value) => { root.clip-set(field, value); }- set-param(key, value) => { root.adjust-set(key, value); }- commit => { root.clip-commit(); }- }-if root.showing == "Speed": SpeedPanel {selected: root.selected;set(field, value) => { root.clip-set(field, value); }diff --git a/src/crates/concat/ui/workspace/keyframes-pane.slint b/src/crates/concat/ui/workspace/keyframes-pane.slintnew file mode 100644index 00000000..550e075f--- /dev/null+++ b/src/crates/concat/ui/workspace/keyframes-pane.slint@@ -0,0 +1,642 @@+// SPDX-License-Identifier: AGPL-3.0-or-later+// SPDX-FileCopyrightText: 2026 Jareer and Concat contributors++// The Keyframes pane: the selected clip's keys, with room to work on them.+// A column of every knob that can ride on the left - the knob itself, with+// its diamond and step arrows - and, on the right, the clip's length as a+// dopesheet (a lane per knob, a diamond per key) or as curves (each knob's+// value over the clip, with the keys as handles and the ease into each key+// as the two bezier handles of that segment). Everything drags: a diamond+// along the clip, a curve handle in value and in time, an ease handle to+// reshape the way in.++import { I18n } from "../i18n.slint";+import { Theme } from "../theme/theme.slint";+import { Glyph, Icon } from "../icons.slint";+import { Fmt } from "../util.slint";+import { IconButton } from "../primitives/panel.slint";+import { Button } from "../primitives/modal.slint";+import { Select } from "../primitives/select.slint";+import { SegmentedControl } from "../primitives/segmented-control.slint";+import { InspectorFmt, Param, ParamFormat } from "../inspector/controls.slint";+import { ClipField, ClipKeyData, Keyframes, SelectedClipData } from "../timeline/model.slint";+import { Pane } from "pane.slint";+import { PaneKind, PaneSwitcher } from "pane-switcher.slint";++/// One key on a row: where in the clip, its value as a fraction of the+/// knob's range, and the ease into it from the key behind.+export struct KeyMarkData {+ at: float,+ here: bool,+ /// The value, `0..1` of the row's range, 1 at the top.+ value: float,+ ease-x1: float,+ ease-y1: float,+ ease-x2: float,+ ease-y2: float,+ /// There is a key behind this one, so its ease is a segment.+ eased: bool,+}++/// One row of the pane: a keyable knob, its keys, and its ride.+export struct KeyRowData {+ /// The clip property, for a row that is one.+ field: ClipField,+ /// The Adjust knob's key, for a row that is one; empty for a property.+ param: string,+ label: string,+ keys: [KeyMarkData],+ state: ClipKeyData,+ /// What the knob is worth at the playhead, in the knob's own units.+ value: float,+ minimum: float,+ maximum: float,+ step: float,+ default-value: float,+ fmt: ParamFormat,+ unit: string,+ unit-scale: float,+ /// The ride over the clip as a path in the unit square: time across,+ /// value up, the way the curve view draws it.+ curve: string,+ /// The key whose ease the menu edits - the one at the playhead, else+ /// the next one - as an index into `keys`, or -1 for none.+ ease-index: int,+}++/// The pane's rows and verbs, a global so Rust publishes one list.+export global KeyEditor {+ in property <[KeyRowData]> rows;+ /// The playhead's place in the selected clip, `0..1`, held to its ends.+ in property <float> at;++ /// Move the playhead to `at` of the selected clip.+ callback jump(at: float);+ /// Move the key at `from` to `to`, keeping its value and ease.+ callback move-key(field: ClipField, param: string, from: float, to: float);+ /// Move the key at `from` to `to` and give it `value`, a fraction of+ /// the row's range, keeping its ease: a drag in the curve view.+ callback drag-key(field: ClipField, param: string, from: float, to: float, value: float);+ /// Set the ease into the key at `at`.+ callback set-ease(field: ClipField, param: string, at: float, x1: float, y1: float, x2: float, y2: float);+ /// Move the playhead to the nearest key behind (-1) or ahead (+1) on+ /// any knob of the clip.+ callback step-all(delta: int);+ /// Take every key off the clip.+ callback clear-all();+}++/// The ease presets, matched within a hair; the fifth is whatever else.+component EasePreset inherits Select {+ in property <float> x1;+ in property <float> y1;+ in property <float> x2;+ in property <float> y2;+ callback picked(x1: float, y1: float, x2: float, y2: float);++ pure function near(a: float, b: float) -> bool { return Math.abs(a - b) < 0.005; }+ pure function matches(px1: float, py1: float, px2: float, py2: float) -> bool {+ return near(root.x1, px1) && near(root.y1, py1) && near(root.x2, px2) && near(root.y2, py2);+ }++ options: [I18n.t("Linear"), I18n.t("Ease in"), I18n.t("Ease out"), I18n.t("Ease in and out"), I18n.t("Custom")];+ current: matches(0, 0, 1, 1) ? 0+ : matches(0.42, 0, 1, 1) ? 1+ : matches(0, 0, 0.58, 1) ? 2+ : matches(0.42, 0, 0.58, 1) ? 3+ : 4;+ changed(index) => {+ if (index == 0) { root.picked(0, 0, 1, 1); }+ else if (index == 1) { root.picked(0.42, 0, 1, 1); }+ else if (index == 2) { root.picked(0, 0, 0.58, 1); }+ else if (index == 3) { root.picked(0.42, 0, 0.58, 1); }+ }+}++/// A diamond that goes to its key when clicked and moves it when dragged+/// along the lane. `at` is the key's place; `scale` how many pixels a+/// whole clip is.+component KeyDiamond inherits TouchArea {+ in property <float> at;+ in property <bool> here;+ in property <length> scale;+ callback jump();+ callback key-moved(to: float);++ property <float> drag-to: root.at;+ property <bool> dragging;+ /// Where the diamond is drawn: the key, or the drag in progress.+ out property <float> shown-at: self.dragging ? self.drag-to : root.at;++ x: self.shown-at * root.scale - 8px;+ width: 16px;+ mouse-cursor: pointer;++ Path {+ x: 3px;+ y: root.height / 2 - 5px;+ width: 10px;+ height: 10px;+ viewbox-width: 10;+ viewbox-height: 10;+ commands: "M 5 0.75 L 9.25 5 L 5 9.25 L 0.75 5 Z";+ fill: root.here ? Theme.accent : Theme.panel;+ stroke: Theme.accent;+ stroke-width: 1.5px;+ }++ moved => {+ if (self.pressed) {+ self.dragging = true;+ self.drag-to = Math.max(0, Math.min(1, root.at + (self.mouse-x - self.pressed-x) / root.scale));+ }+ }+ pointer-event(event) => {+ if (event.kind == PointerEventKind.up || event.kind == PointerEventKind.cancel) {+ if (self.dragging && Math.abs(self.drag-to - root.at) > 0.002) {+ root.key-moved(self.drag-to);+ } else if (event.kind == PointerEventKind.up) {+ root.jump();+ }+ self.dragging = false;+ }+ }+}++/// A curve handle: the key as a dot, dragged in time and in value.+component KeyHandle inherits TouchArea {+ in property <float> at;+ in property <float> value;+ in property <bool> here;+ in property <length> plot-w;+ in property <length> plot-h;+ callback jump();+ callback key-moved(to: float, value: float);++ property <float> drag-at: root.at;+ property <float> drag-value: root.value;+ property <bool> dragging;++ x: (self.dragging ? self.drag-at : root.at) * root.plot-w - 7px;+ y: (1 - (self.dragging ? self.drag-value : root.value)) * root.plot-h - 7px;+ width: 14px;+ height: 14px;+ mouse-cursor: move;++ Rectangle {+ x: 3px;+ y: 3px;+ width: 8px;+ height: 8px;+ border-radius: 4px;+ background: root.here ? Theme.accent : Theme.panel;+ border-width: 1.5px;+ border-color: Theme.accent;+ }++ moved => {+ if (self.pressed) {+ self.dragging = true;+ self.drag-at = Math.max(0, Math.min(1, root.at + (self.mouse-x - self.pressed-x) / root.plot-w));+ self.drag-value = Math.max(0, Math.min(1, root.value - (self.mouse-y - self.pressed-y) / root.plot-h));+ }+ }+ pointer-event(event) => {+ if (event.kind == PointerEventKind.up || event.kind == PointerEventKind.cancel) {+ if (self.dragging && (Math.abs(self.drag-at - root.at) > 0.002+ || Math.abs(self.drag-value - root.value) > 0.002)) {+ root.key-moved(self.drag-at, self.drag-value);+ } else if (event.kind == PointerEventKind.up) {+ root.jump();+ }+ self.dragging = false;+ }+ }+}++/// One ease handle of a segment: a small square on a stalk from its key,+/// dragged to reshape the way into the segment's end key.+component EaseHandle inherits TouchArea {+ /// The handle's place in the plot, `0..1` each way.+ in property <float> px;+ in property <float> py;+ /// The key it hangs off, in the plot.+ in property <float> anchor-x;+ in property <float> anchor-y;+ in property <length> plot-w;+ in property <length> plot-h;+ callback handle-moved(px: float, py: float);++ property <float> drag-x: root.px;+ property <float> drag-y: root.py;+ property <bool> dragging;+ property <float> shown-x: self.dragging ? self.drag-x : root.px;+ property <float> shown-y: self.dragging ? self.drag-y : root.py;++ x: self.shown-x * root.plot-w - 6px;+ y: (1 - self.shown-y) * root.plot-h - 6px;+ width: 12px;+ height: 12px;+ mouse-cursor: pointer;++ Rectangle {+ x: 3px;+ y: 3px;+ width: 6px;+ height: 6px;+ background: Theme.fg-dim;+ border-radius: 1px;+ }++ moved => {+ if (self.pressed) {+ self.dragging = true;+ self.drag-x = root.px + (self.mouse-x - self.pressed-x) / root.plot-w;+ self.drag-y = root.py - (self.mouse-y - self.pressed-y) / root.plot-h;+ }+ }+ pointer-event(event) => {+ if (event.kind == PointerEventKind.up || event.kind == PointerEventKind.cancel) {+ if (self.dragging) { root.handle-moved(self.drag-x, self.drag-y); }+ self.dragging = false;+ }+ }+}++export component KeyframesPane inherits Pane {+ in property <SelectedClipData> selected;+ in property <int> pane-seat;+ in property <bool> pane-removable;+ callback pane-picked(kind: PaneKind);+ callback pane-removed();+ callback clip-set(field: ClipField, value: float);+ callback adjust-set(key: string, value: float);+ callback clip-commit();++ property <[KeyRowData]> rows: KeyEditor.rows;+ property <bool> any: root.rows.length > 0;+ /// 0 the dopesheet, 1 the curves.+ property <int> view: 0;+ /// The row the curve view draws in full and the ease menu edits.+ property <int> active: 0;+ property <int> shown: Math.max(0, Math.min(root.active, root.rows.length - 1));+ property <KeyRowData> focus-row: root.any ? root.rows[root.shown] : root.rows[0];+ property <length> row-h: 34px;+ property <length> ruler-h: 22px;+ property <length> column-w: 300px;++ /// The ease shown in the menu: into the key at the playhead, else the+ /// next key; Rust picks it, since a Slint function cannot loop.+ property <int> ease-key: root.any ? root.focus-row.ease-index : -1;++ VerticalLayout {+ // ── header ──────────────────────────────────────────────────────+ Rectangle {+ height: 40px;+ background: Theme.panel;+ Rectangle { x: 0; y: parent.height - 1px; width: parent.width; height: 1px; background: Theme.line; }++ HorizontalLayout {+ padding-left: 12px;+ padding-right: 8px;+ spacing: 8px;+ alignment: stretch;++ Text {+ text: I18n.t("Keyframes");+ color: Theme.fg;+ font-size: Theme.fs;+ font-weight: 600;+ vertical-alignment: center;+ }+ VerticalLayout {+ alignment: center;+ SegmentedControl {+ options: [I18n.t("Dopesheet"), I18n.t("Curves")];+ current: root.view;+ changed(index) => { root.view = index; }+ }+ }+ VerticalLayout {+ alignment: center;+ HorizontalLayout {+ spacing: 2px;+ IconButton {+ glyph: Glyph.chevron-left;+ label: I18n.t("Previous key");+ enabled: Keyframes.available;+ clicked => { KeyEditor.step-all(-1); }+ }+ IconButton {+ glyph: Glyph.keyframe;+ label: I18n.t("Add or remove a key at the playhead");+ enabled: Keyframes.available && root.any;+ clicked => {+ if (root.focus-row.param == "") { Keyframes.toggle(root.focus-row.field); }+ else { Keyframes.toggle-param(root.focus-row.param); }+ }+ }+ IconButton {+ glyph: Glyph.chevron-right;+ label: I18n.t("Next key");+ enabled: Keyframes.available;+ clicked => { KeyEditor.step-all(1); }+ }+ }+ }+ if root.any && root.ease-key >= 0: VerticalLayout {+ alignment: center;+ EasePreset {+ x1: root.focus-row.keys[root.ease-key].ease-x1;+ y1: root.focus-row.keys[root.ease-key].ease-y1;+ x2: root.focus-row.keys[root.ease-key].ease-x2;+ y2: root.focus-row.keys[root.ease-key].ease-y2;+ picked(x1, y1, x2, y2) => {+ KeyEditor.set-ease(root.focus-row.field, root.focus-row.param, root.focus-row.keys[root.ease-key].at, x1, y1, x2, y2);+ }+ }+ }+ Rectangle { horizontal-stretch: 1; }+ VerticalLayout {+ alignment: center;+ Button {+ label: I18n.t("Clear all keys");+ ghost: true;+ enabled: root.any;+ clicked => { KeyEditor.clear-all(); }+ }+ }+ VerticalLayout {+ alignment: center;+ PaneSwitcher {+ kind: PaneKind.keyframes;+ seat: root.pane-seat;+ removable: root.pane-removable;+ picked(kind) => { root.pane-picked(kind); }+ removed => { root.pane-removed(); }+ }+ }+ }+ }++ // ── empty ───────────────────────────────────────────────────────+ if !root.any: Rectangle {+ vertical-stretch: 1;+ Text {+ text: I18n.t("Select a clip to edit its keyframes");+ color: Theme.fg-dim;+ font-size: Theme.fs;+ horizontal-alignment: center;+ vertical-alignment: center;+ }+ }++ // ── body ────────────────────────────────────────────────────────+ if root.any: HorizontalLayout {+ vertical-stretch: 1;++ // The knobs, one a row, the active one marked.+ Rectangle {+ width: root.column-w;+ background: Theme.panel;+ Rectangle { x: parent.width - 1px; y: 0; width: 1px; height: parent.height; background: Theme.line; }++ VerticalLayout {+ padding-top: root.ruler-h;+ padding-left: 8px;+ padding-right: 12px;+ alignment: start;++ for row[index] in root.rows: Rectangle {+ height: root.row-h;+ background: index == root.shown ? Theme.accent.with-alpha(0.08) : Colors.transparent;+ property <KeyRowData> data: row;+ changed data => { knob.value = self.data.value; }++ TouchArea {+ clicked => { root.active = index; }+ }+ VerticalLayout {+ alignment: center;+ knob := Param {+ label: row.label;+ value: row.value;+ minimum: row.minimum;+ maximum: row.maximum;+ step: row.step;+ default-value: row.default-value;+ fmt: row.fmt;+ unit: row.unit;+ unit-scale: row.unit-scale;+ keyable: true;+ field: row.field;+ key-name: row.param;+ key-state: row.state;+ changed(v) => {+ root.active = index;+ if (row.param != "") { root.adjust-set(row.param, v); }+ else if (row.field == ClipField.volume) { root.clip-set(row.field, InspectorFmt.from-decibels(v)); }+ else { root.clip-set(row.field, v); }+ root.clip-commit();+ }+ }+ }+ }+ }+ }++ // The clip: a ruler, then the dopesheet or the curves.+ plot := Rectangle {+ horizontal-stretch: 1;+ background: Theme.well;+ clip: true;++ property <length> inset: 16px;+ property <length> lane-w: Math.max(1px, self.width - 2 * self.inset);+ property <length> lane-x: self.inset;+ property <length> plot-h: Math.max(1px, self.height - root.ruler-h - 2 * self.inset);++ // The ruler: the clip's own seconds, five marks across.+ Rectangle {+ x: 0; y: 0;+ width: parent.width;+ height: root.ruler-h;+ background: Theme.ruler;+ Rectangle { x: 0; y: parent.height - 1px; width: parent.width; height: 1px; background: Theme.line; }+ for step in 5: Text {+ x: plot.lane-x + step * plot.lane-w / 4 - (step == 4 ? self.width : step == 0 ? 0 : self.width / 2);+ y: 0;+ height: root.ruler-h;+ text: Fmt.short-duration(step * root.selected.duration / 4);+ color: Theme.fg-dim;+ font-size: Theme.fs-xs;+ vertical-alignment: center;+ }+ TouchArea {+ mouse-cursor: pointer;+ pointer-event(event) => {+ if (event.kind == PointerEventKind.down) {+ KeyEditor.jump(Math.max(0, Math.min(1, (self.mouse-x - plot.lane-x) / plot.lane-w)));+ }+ }+ moved => {+ if (self.pressed) {+ KeyEditor.jump(Math.max(0, Math.min(1, (self.mouse-x - plot.lane-x) / plot.lane-w)));+ }+ }+ }+ }++ // ── the dopesheet ───────────────────────────────────────+ if root.view == 0: Rectangle {+ x: 0; y: root.ruler-h;+ width: parent.width;+ height: parent.height - root.ruler-h;++ for row[index] in root.rows: Rectangle {+ x: 0;+ y: index * root.row-h;+ width: parent.width;+ height: root.row-h;+ background: index == root.shown ? Theme.accent.with-alpha(0.06) : Colors.transparent;+ Rectangle { x: 0; y: parent.height - 1px; width: parent.width; height: 1px; background: Theme.line; opacity: 0.5; }+ Rectangle {+ x: plot.lane-x; y: parent.height / 2 - 1px;+ width: plot.lane-w; height: 2px;+ border-radius: 1px;+ background: row.state.keyed ? Theme.line-strong : Theme.line;+ }+ TouchArea {+ clicked => { root.active = index; }+ }+ for key in row.keys: KeyDiamond {+ at: key.at;+ here: key.here;+ scale: plot.lane-w;+ x: plot.lane-x + self.shown-at * self.scale - 8px;+ y: 0;+ height: root.row-h;+ jump => { root.active = index; KeyEditor.jump(key.at); }+ key-moved(to) => { root.active = index; KeyEditor.move-key(row.field, row.param, key.at, to); }+ }+ }+ }++ // ── the curves ──────────────────────────────────────────+ if root.view == 1: Rectangle {+ x: plot.lane-x;+ y: root.ruler-h + plot.inset;+ width: plot.lane-w;+ height: plot.plot-h;++ // The grid: quarters each way.+ for step in 5: Rectangle {+ x: 0; y: step * parent.height / 4 - (step == 4 ? 1px : 0);+ width: parent.width; height: 1px;+ background: Theme.line;+ opacity: step == 0 || step == 4 ? 1 : 0.5;+ }+ for step in 5: Rectangle {+ x: step * parent.width / 4 - (step == 4 ? 1px : 0); y: 0;+ width: 1px; height: parent.height;+ background: Theme.line;+ opacity: step == 0 || step == 4 ? 1 : 0.5;+ }+ Text {+ x: 4px; y: 2px;+ text: InspectorFmt.format(root.focus-row.fmt, root.focus-row.maximum);+ color: Theme.fg-dim; font-size: Theme.fs-xs;+ }+ Text {+ x: 4px; y: parent.height - self.height - 2px;+ text: InspectorFmt.format(root.focus-row.fmt, root.focus-row.minimum);+ color: Theme.fg-dim; font-size: Theme.fs-xs;+ }++ // Every other row's ride, faint, for the shape of the+ // whole; the active row's in full.+ for row[index] in root.rows: Path {+ x: 0; y: 0;+ width: parent.width; height: parent.height;+ viewbox-width: 1;+ viewbox-height: 1;+ fit: fill;+ commands: row.curve;+ fill: Colors.transparent;+ stroke: Theme.accent;+ stroke-width: index == root.shown ? 2px : 1px;+ opacity: index == root.shown ? 1 : 0.25;+ visible: row.state.keyed;+ }++ // The active row's ease handles: a stalk and a square+ // from each end of every segment.+ for key[k] in root.focus-row.keys: Rectangle {+ visible: key.eased && k > 0;+ property <float> ax: root.focus-row.keys[Math.max(0, k - 1)].at;+ property <float> ay: root.focus-row.keys[Math.max(0, k - 1)].value;+ property <float> span-x: key.at - self.ax;+ property <float> span-y: key.value - self.ay;+ x: 0; y: 0;+ width: parent.width; height: parent.height;++ Path {+ x: 0; y: 0; width: parent.width; height: parent.height;+ viewbox-width: 1; viewbox-height: 1; fit: fill;+ commands: "M \{parent.ax} \{1 - parent.ay} L \{parent.ax + key.ease-x1 * parent.span-x} \{1 - (parent.ay + key.ease-y1 * parent.span-y)} M \{key.at} \{1 - key.value} L \{parent.ax + key.ease-x2 * parent.span-x} \{1 - (parent.ay + key.ease-y2 * parent.span-y)}";+ fill: Colors.transparent;+ stroke: Theme.fg-dim;+ stroke-width: 1px;+ }+ EaseHandle {+ px: parent.ax + key.ease-x1 * parent.span-x;+ py: parent.ay + key.ease-y1 * parent.span-y;+ anchor-x: parent.ax; anchor-y: parent.ay;+ plot-w: parent.width; plot-h: parent.height;+ handle-moved(px, py) => {+ KeyEditor.set-ease(root.focus-row.field, root.focus-row.param, key.at,+ parent.span-x == 0 ? key.ease-x1 : (px - parent.ax) / parent.span-x,+ parent.span-y == 0 ? key.ease-y1 : (py - parent.ay) / parent.span-y,+ key.ease-x2, key.ease-y2);+ }+ }+ EaseHandle {+ px: parent.ax + key.ease-x2 * parent.span-x;+ py: parent.ay + key.ease-y2 * parent.span-y;+ anchor-x: key.at; anchor-y: key.value;+ plot-w: parent.width; plot-h: parent.height;+ handle-moved(px, py) => {+ KeyEditor.set-ease(root.focus-row.field, root.focus-row.param, key.at,+ key.ease-x1, key.ease-y1,+ parent.span-x == 0 ? key.ease-x2 : (px - parent.ax) / parent.span-x,+ parent.span-y == 0 ? key.ease-y2 : (py - parent.ay) / parent.span-y);+ }+ }+ }++ // The active row's keys as handles, dragged in both+ // axes.+ for key in root.focus-row.keys: KeyHandle {+ at: key.at;+ value: key.value;+ here: key.here;+ plot-w: parent.width;+ plot-h: parent.height;+ jump => { KeyEditor.jump(key.at); }+ key-moved(to, value) => { KeyEditor.drag-key(root.focus-row.field, root.focus-row.param, key.at, to, value); }+ }+ }++ // The playhead, over both views.+ Rectangle {+ x: plot.lane-x + KeyEditor.at * plot.lane-w;+ y: root.ruler-h;+ width: 1px;+ height: parent.height - root.ruler-h;+ background: Theme.accent;+ opacity: 0.8;+ }+ }+ }+ }+}diff --git a/src/crates/concat/ui/workspace/pane-switcher.slint b/src/crates/concat/ui/workspace/pane-switcher.slintindex e83e7eca..435c0c29 100644--- a/src/crates/concat/ui/workspace/pane-switcher.slint+++ b/src/crates/concat/ui/workspace/pane-switcher.slint@@ -36,6 +36,8 @@ export enum PaneKind {inspector,/// tabs, tray, lanestimeline,+ /// the selected clip's keys: a dopesheet and a curve editor+ keyframes,}export global Panes {@@ -43,6 +45,7 @@ export global Panes {return kind == PaneKind.media ? I18n.t("Library"): kind == PaneKind.preview ? I18n.t("Preview"): kind == PaneKind.inspector ? I18n.t("Inspector")+ : kind == PaneKind.keyframes ? I18n.t("Keyframes"): I18n.t("Timeline");}@@ -53,6 +56,7 @@ export global Panes {return kind == PaneKind.media ? "media": kind == PaneKind.preview ? "preview": kind == PaneKind.inspector ? "inspector"+ : kind == PaneKind.keyframes ? "keyframes": "timeline";}@@ -64,6 +68,7 @@ export global Panes {return kind == PaneKind.media ? Glyph.film: kind == PaneKind.preview ? Glyph.image: kind == PaneKind.inspector ? Glyph.settings+ : kind == PaneKind.keyframes ? Glyph.keyframe: Glyph.rows;}}@@ -357,6 +362,11 @@ export component PaneSwitcher inherits Rectangle {current: root.kind == PaneKind.inspector;chosen => { menu.close(); root.picked(PaneKind.inspector); }}+ SwitchRow {+ kind: PaneKind.keyframes;+ current: root.kind == PaneKind.keyframes;+ chosen => { menu.close(); root.picked(PaneKind.keyframes); }+ }SwitchRow {kind: PaneKind.timeline;current: root.kind == PaneKind.timeline;diff --git a/src/crates/concat/ui/workspace/seat.slint b/src/crates/concat/ui/workspace/seat.slintindex 651feef4..29649432 100644--- a/src/crates/concat/ui/workspace/seat.slint+++ b/src/crates/concat/ui/workspace/seat.slint@@ -10,6 +10,7 @@ import { ConfigPane } from "config-pane.slint";import { MediaPane } from "media-pane.slint";import { PreviewPane } from "preview-pane.slint";import { TimelinePane } from "timeline-pane.slint";+import { KeyframesPane } from "keyframes-pane.slint";// One box of the workspace, showing whichever view its `kind` names.//@@ -295,6 +296,23 @@ export component Seat inherits Rectangle {}}+ if root.kind == PaneKind.keyframes: KeyframesPane {+ x: 0;+ y: 0;+ width: root.width;+ height: root.height;++ pane-picked(kind) => { root.picked(kind); }+ pane-seat: root.index;+ pane-removable: Editor.seats.length > 1;+ pane-removed => { root.removed(); }++ selected: Editor.selected-clip;+ clip-set(field, value) => { Editor.clip-set(field, value); }+ adjust-set(key, value) => { Editor.adjust-set(key, value); }+ clip-commit => { Editor.clip-commit(); }+ }+if root.kind == PaneKind.timeline: TimelinePane {x: 0;y: 0;