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(transitions): a transition is selected on its own, with its own inspector panel
Jareer66320e67d96c
diff --git a/src/crates/concat/locales/de.json b/src/crates/concat/locales/de.jsonindex 30af5cbc..76bc902f 100644--- a/src/crates/concat/locales/de.json+++ b/src/crates/concat/locales/de.json@@ -63,7 +63,6 @@"clipInspector.object": "Objekt","clipInspector.oneStroke": "1 Strich","clipInspector.person": "Person",- "clipInspector.pickOneTransitionsTab": "Wähle einen im Tab Übergänge, um vom Schnitt davor in diesen Clip überzublenden.","clipInspector.pitch": "Tonhöhe","clipInspector.rampIn": "Einlaufen","clipInspector.rampOut": "Auslaufen",@@ -84,6 +83,7 @@"clipInspector.takesRoomsHissHum": "Nimmt Rauschen und Brummen des Raums unter der Stimme weg.","clipInspector.transform": "Transformation","clipInspector.transition": "Übergang",+ "clipInspector.transitionInto": "In {0}","clipInspector.treatments": "Aufbereitung","clipInspector.volume": "Lautstärke","common.adjust": "Anpassen",diff --git a/src/crates/concat/locales/en.json b/src/crates/concat/locales/en.jsonindex 8375e74b..4f7ac647 100644--- a/src/crates/concat/locales/en.json+++ b/src/crates/concat/locales/en.json@@ -63,7 +63,6 @@"clipInspector.object": "Object","clipInspector.oneStroke": "1 stroke","clipInspector.person": "Person",- "clipInspector.pickOneTransitionsTab": "Pick one from the Transitions tab to dissolve into this clip from the cut before it.","clipInspector.pitch": "Pitch","clipInspector.rampIn": "Ramp in","clipInspector.rampOut": "Ramp out",@@ -84,6 +83,7 @@"clipInspector.takesRoomsHissHum": "Takes the room's hiss and hum out from under the voice.","clipInspector.transform": "Transform","clipInspector.transition": "Transition",+ "clipInspector.transitionInto": "Into {0}","clipInspector.treatments": "Treatments","clipInspector.volume": "Volume","common.adjust": "Adjust",diff --git a/src/crates/concat/locales/es.json b/src/crates/concat/locales/es.jsonindex ae72769a..fc8b0d20 100644--- a/src/crates/concat/locales/es.json+++ b/src/crates/concat/locales/es.json@@ -63,7 +63,6 @@"clipInspector.object": "Objeto","clipInspector.oneStroke": "1 trazo","clipInspector.person": "Persona",- "clipInspector.pickOneTransitionsTab": "Elige una en la pestaña Transiciones para fundir hacia este clip desde el corte anterior.","clipInspector.pitch": "Tono","clipInspector.rampIn": "Rampa de entrada","clipInspector.rampOut": "Rampa de salida",@@ -84,6 +83,7 @@"clipInspector.takesRoomsHissHum": "Quita el siseo y el zumbido de la sala de debajo de la voz.","clipInspector.transform": "Transformar","clipInspector.transition": "Transición",+ "clipInspector.transitionInto": "Hacia {0}","clipInspector.treatments": "Tratamientos","clipInspector.volume": "Volumen","common.adjust": "Ajustar",diff --git a/src/crates/concat/locales/fa.json b/src/crates/concat/locales/fa.jsonindex 9e9f5c96..63db4266 100644--- a/src/crates/concat/locales/fa.json+++ b/src/crates/concat/locales/fa.json@@ -63,7 +63,6 @@"clipInspector.object": "شیء","clipInspector.oneStroke": "1 حرکت","clipInspector.person": "شخص",- "clipInspector.pickOneTransitionsTab": "یکی را از تب Transitions انتخاب کنید تا از برش قبلی به این کلیپ محو شود.","clipInspector.pitch": "گام صدا (Pitch)","clipInspector.rampIn": "Ramp ورودی","clipInspector.rampOut": "Ramp خروجی",@@ -84,6 +83,7 @@"clipInspector.takesRoomsHissHum": "هیس و Hum محیط را از زیر صدا حذف میکند.","clipInspector.transform": "تبدیل (Transform)","clipInspector.transition": "Transition",+ "clipInspector.transitionInto": "به {0}","clipInspector.treatments": "پردازشها","clipInspector.volume": "ولوم","common.adjust": "تنظیم",diff --git a/src/crates/concat/locales/fr.json b/src/crates/concat/locales/fr.jsonindex 45d0fb63..554f971c 100644--- a/src/crates/concat/locales/fr.json+++ b/src/crates/concat/locales/fr.json@@ -63,7 +63,6 @@"clipInspector.object": "Objet","clipInspector.oneStroke": "1 trait","clipInspector.person": "Personne",- "clipInspector.pickOneTransitionsTab": "Choisissez-en une dans l'onglet Transitions pour enchaîner vers ce clip depuis la coupe qui le précède.","clipInspector.pitch": "Hauteur","clipInspector.rampIn": "Montée","clipInspector.rampOut": "Descente",@@ -84,6 +83,7 @@"clipInspector.takesRoomsHissHum": "Retire le souffle et le ronflement de la pièce sous la voix.","clipInspector.transform": "Transformation","clipInspector.transition": "Transition",+ "clipInspector.transitionInto": "Vers {0}","clipInspector.treatments": "Traitements","clipInspector.volume": "Volume","common.adjust": "Réglages",diff --git a/src/crates/concat/locales/hr.json b/src/crates/concat/locales/hr.jsonindex a3f0f3bb..94235224 100644--- a/src/crates/concat/locales/hr.json+++ b/src/crates/concat/locales/hr.json@@ -63,7 +63,6 @@"clipInspector.object": "Objekt","clipInspector.oneStroke": "1 potez","clipInspector.person": "Osoba",- "clipInspector.pickOneTransitionsTab": "Odaberite jedan s kartice Prijelazi da se pretopi u ovaj klip iz reza prije njega.","clipInspector.pitch": "Visina tona","clipInspector.rampIn": "Ulazni nagib","clipInspector.rampOut": "Izlazni nagib",@@ -84,6 +83,7 @@"clipInspector.takesRoomsHissHum": "Miče šištanje i zujanje sobe ispod glasa.","clipInspector.transform": "Transformacija","clipInspector.transition": "Prijelaz",+ "clipInspector.transitionInto": "U {0}","clipInspector.treatments": "Tretmani","clipInspector.volume": "Glasnoća","common.adjust": "Prilagodi",diff --git a/src/crates/concat/locales/it.json b/src/crates/concat/locales/it.jsonindex 3cae2075..fbf82847 100644--- a/src/crates/concat/locales/it.json+++ b/src/crates/concat/locales/it.json@@ -63,7 +63,6 @@"clipInspector.object": "Oggetto","clipInspector.oneStroke": "1 tratto","clipInspector.person": "Persona",- "clipInspector.pickOneTransitionsTab": "Scegline una dalla scheda Transizioni per entrare in dissolvenza in questa clip dal taglio che la precede.","clipInspector.pitch": "Intonazione","clipInspector.rampIn": "Rampa in entrata","clipInspector.rampOut": "Rampa in uscita",@@ -84,6 +83,7 @@"clipInspector.takesRoomsHissHum": "Toglie il fruscio e il ronzio della stanza da sotto la voce.","clipInspector.transform": "Trasformazione","clipInspector.transition": "Transizione",+ "clipInspector.transitionInto": "Verso {0}","clipInspector.treatments": "Trattamenti","clipInspector.volume": "Volume","common.adjust": "Regola",diff --git a/src/crates/concat/locales/ja.json b/src/crates/concat/locales/ja.jsonindex c65bc58f..b66e2dfa 100644--- a/src/crates/concat/locales/ja.json+++ b/src/crates/concat/locales/ja.json@@ -63,7 +63,6 @@"clipInspector.object": "物体","clipInspector.oneStroke": "1 ストローク","clipInspector.person": "人物",- "clipInspector.pickOneTransitionsTab": "「トランジション」タブから選ぶと、前のカットからこのクリップへディゾルブします。","clipInspector.pitch": "ピッチ","clipInspector.rampIn": "ランプイン","clipInspector.rampOut": "ランプアウト",@@ -84,6 +83,7 @@"clipInspector.takesRoomsHissHum": "声の下にある部屋のヒスとハムを取り除きます。","clipInspector.transform": "変形","clipInspector.transition": "トランジション",+ "clipInspector.transitionInto": "{0} へ","clipInspector.treatments": "処理","clipInspector.volume": "音量","common.adjust": "調整",diff --git a/src/crates/concat/locales/ko.json b/src/crates/concat/locales/ko.jsonindex ce41b865..ba255d95 100644--- a/src/crates/concat/locales/ko.json+++ b/src/crates/concat/locales/ko.json@@ -63,7 +63,6 @@"clipInspector.object": "사물","clipInspector.oneStroke": "스트로크 1개","clipInspector.person": "인물",- "clipInspector.pickOneTransitionsTab": "전환 탭에서 하나를 골라 앞의 컷에서 이 클립으로 디졸브하세요.","clipInspector.pitch": "피치","clipInspector.rampIn": "램프 인","clipInspector.rampOut": "램프 아웃",@@ -84,6 +83,7 @@"clipInspector.takesRoomsHissHum": "음성 아래에 깔린 방의 히스와 험을 제거합니다.","clipInspector.transform": "변형","clipInspector.transition": "전환",+ "clipInspector.transitionInto": "{0}(으)로","clipInspector.treatments": "처리","clipInspector.volume": "볼륨","common.adjust": "조정",diff --git a/src/crates/concat/locales/pt-BR.json b/src/crates/concat/locales/pt-BR.jsonindex 4a3f70d6..8a5ddca2 100644--- a/src/crates/concat/locales/pt-BR.json+++ b/src/crates/concat/locales/pt-BR.json@@ -63,7 +63,6 @@"clipInspector.object": "Objeto","clipInspector.oneStroke": "1 traço","clipInspector.person": "Pessoa",- "clipInspector.pickOneTransitionsTab": "Escolha uma na aba Transições para fundir neste clipe a partir do corte anterior a ele.","clipInspector.pitch": "Tom","clipInspector.rampIn": "Rampa de entrada","clipInspector.rampOut": "Rampa de saída",@@ -84,6 +83,7 @@"clipInspector.takesRoomsHissHum": "Tira o chiado e o zumbido da sala de baixo da voz.","clipInspector.transform": "Transformar","clipInspector.transition": "Transição",+ "clipInspector.transitionInto": "Para {0}","clipInspector.treatments": "Tratamentos","clipInspector.volume": "Volume","common.adjust": "Ajustar",diff --git a/src/crates/concat/locales/ru.json b/src/crates/concat/locales/ru.jsonindex e549abbe..f25189d7 100644--- a/src/crates/concat/locales/ru.json+++ b/src/crates/concat/locales/ru.json@@ -63,7 +63,6 @@"clipInspector.object": "Предмет","clipInspector.oneStroke": "1 штрих","clipInspector.person": "Человек",- "clipInspector.pickOneTransitionsTab": "Выберите один на вкладке «Переходы», чтобы войти в этот клип из склейки перед ним.","clipInspector.pitch": "Высота","clipInspector.rampIn": "Нарастание","clipInspector.rampOut": "Спад",@@ -84,6 +83,7 @@"clipInspector.takesRoomsHissHum": "Убирает шипение и гул комнаты из-под голоса.","clipInspector.transform": "Трансформация","clipInspector.transition": "Переход",+ "clipInspector.transitionInto": "В {0}","clipInspector.treatments": "Обработка","clipInspector.volume": "Громкость","common.adjust": "Коррекция",diff --git a/src/crates/concat/locales/tr.json b/src/crates/concat/locales/tr.jsonindex 07109402..3b61f17e 100644--- a/src/crates/concat/locales/tr.json+++ b/src/crates/concat/locales/tr.json@@ -63,7 +63,6 @@"clipInspector.object": "Nesne","clipInspector.oneStroke": "1 fırça darbesi","clipInspector.person": "Kişi",- "clipInspector.pickOneTransitionsTab": "Öncesindeki kesimden bu klibe çözülerek geçmek için Geçişler sekmesinden birini seçin.","clipInspector.pitch": "Perde","clipInspector.rampIn": "Giriş rampası","clipInspector.rampOut": "Çıkış rampası",@@ -84,6 +83,7 @@"clipInspector.takesRoomsHissHum": "Odanın hışırtısını ve uğultusunu sesin altından alır.","clipInspector.transform": "Dönüştürme","clipInspector.transition": "Geçiş",+ "clipInspector.transitionInto": "{0} klibine","clipInspector.treatments": "İşlemler","clipInspector.volume": "Ses düzeyi","common.adjust": "Ayarla",diff --git a/src/crates/concat/locales/zh-Hans.json b/src/crates/concat/locales/zh-Hans.jsonindex 7f8f8023..6072eb4c 100644--- a/src/crates/concat/locales/zh-Hans.json+++ b/src/crates/concat/locales/zh-Hans.json@@ -63,7 +63,6 @@"clipInspector.object": "物体","clipInspector.oneStroke": "1 条描边","clipInspector.person": "人物",- "clipInspector.pickOneTransitionsTab": "从“转场”标签页中选择一个,即可从前一个剪辑点溶解过渡到此片段。","clipInspector.pitch": "音高","clipInspector.rampIn": "渐快进入","clipInspector.rampOut": "渐慢退出",@@ -84,6 +83,7 @@"clipInspector.takesRoomsHissHum": "去除人声底下房间里的嘶嘶声与嗡嗡声。","clipInspector.transform": "变换","clipInspector.transition": "转场",+ "clipInspector.transitionInto": "进入 {0}","clipInspector.treatments": "处理方式","clipInspector.volume": "音量","common.adjust": "调整",diff --git a/src/crates/concat/locales/zh-TW.json b/src/crates/concat/locales/zh-TW.jsonindex 71b89c42..55f8d36d 100644--- a/src/crates/concat/locales/zh-TW.json+++ b/src/crates/concat/locales/zh-TW.json@@ -63,7 +63,6 @@"clipInspector.object": "物體","clipInspector.oneStroke": "1 筆","clipInspector.person": "人物",- "clipInspector.pickOneTransitionsTab": "從「轉場」標籤頁中選擇一個,即可從前一個剪接點溶接至此片段。","clipInspector.pitch": "音高","clipInspector.rampIn": "漸快進入","clipInspector.rampOut": "漸慢退出",@@ -84,6 +83,7 @@"clipInspector.takesRoomsHissHum": "去除人聲底下房間裡的嘶嘶聲與嗡嗡聲。","clipInspector.transform": "變形","clipInspector.transition": "轉場",+ "clipInspector.transitionInto": "進入 {0}","clipInspector.treatments": "處理方式","clipInspector.volume": "音量","common.adjust": "調整",diff --git a/src/crates/concat/src/lib.rs b/src/crates/concat/src/lib.rsindex 0a4c17bb..94b6b044 100644--- a/src/crates/concat/src/lib.rs+++ b/src/crates/concat/src/lib.rs@@ -945,6 +945,7 @@ pub fn run() -> Result<(), slint::PlatformError> {}} else {state.selection = caught;+ state.transition_selected = None;}}));diff --git a/src/crates/concat/src/studio.rs b/src/crates/concat/src/studio.rsindex 183dceca..e9680030 100644--- a/src/crates/concat/src/studio.rs+++ b/src/crates/concat/src/studio.rs@@ -772,6 +772,11 @@ pub struct Studio {pub relink: crate::panes::relink::RelinkPane,/// What the confirmation sheet is asking about, while it is up.pub confirm: Option<Confirm>,+ /// The clip whose incoming transition is selected, while no clip is:+ /// a transition is picked on its own, not as part of the clip it rides+ /// into. Read through [`Studio::selected_transition`], which holds it+ /// to an empty clip selection and a clip that still has one.+ pub transition_selected: Option<String>,pub open_menu: i32,pub menu_bar_token: i32,pub menu_target: Option<String>,@@ -1942,6 +1947,7 @@ impl Studio {settings: crate::panes::settings::SettingsPane::default(),relink: crate::panes::relink::RelinkPane::default(),confirm: None,+ transition_selected: None,open_menu: -1,menu_bar_token: 0,menu_target: None,@@ -3581,11 +3587,30 @@ impl Studio {});}- /// Takes the transition off the selected clip, leaving a plain cut.+ /// The clip whose incoming transition is selected: the one picked on+ /// its own while no clip is, if it still has a transition.+ pub fn selected_transition(&self) -> Option<&Clip> {+ if !self.selection.is_empty() {+ return None;+ }+ let id = self.transition_selected.as_deref()?;+ self.clip(id).filter(|clip| clip.transition_in.is_some())+ }++ /// The clip a transition verb acts on: the selected transition's, or+ /// the one selected clip's.+ fn transition_target(&self) -> Option<String> {+ self.selected_transition()+ .map(|clip| clip.id.clone())+ .or_else(|| self.sole_selection())+ }++ /// Takes the transition off its clip, leaving a plain cut.pub fn remove_transition(&mut self) {- let Some(clip_id) = self.sole_selection() else {+ let Some(clip_id) = self.transition_target() else {return;};+ self.transition_selected = None;self.apply(Command::UpdateClip {clip_id,patch: ClipPatch {@@ -3600,7 +3625,7 @@ impl Studio {/// enforces, kept here so a drag on the timeline can never ask for more/// than the render will give it.pub fn set_transition_duration(&mut self, seconds: f64) {- let Some(clip_id) = self.sole_selection() else {+ let Some(clip_id) = self.transition_target() else {return;};self.set_clip_transition_duration(&clip_id, seconds);@@ -4009,6 +4034,21 @@ impl Studio {// now lands before the selection moves: a commit flushed after the// change would look for it on the newly selected clip and lose it.self.flush_commit();+ // A press on a transition's seam or handles selects the transition,+ // not the clip it rides into; a drag there still sets its length.+ if edge == 2+ && let Some(transition) = clip.transition_in.as_ref()+ {+ self.selection.clear();+ self.transition_selected = Some(id.to_owned());+ self.begin_echo();+ self.gesture = Gesture::TransitionResize {+ clip: id.to_owned(),+ original_duration: transition.duration as f32,+ };+ return;+ }+ self.transition_selected = None;let already = self.selection.iter().any(|held| held == id);self.selection = if additive {if already {@@ -4029,15 +4069,6 @@ impl Studio {};self.begin_echo();- if edge == 2 && self.selection.len() <= 1 {- if let Some(transition) = clip.transition_in.as_ref() {- self.gesture = Gesture::TransitionResize {- clip: id.to_owned(),- original_duration: transition.duration as f32,- };- return;- }- }if edge >= 0 && self.selection.len() <= 1 {self.gesture = Gesture::Trim {clip: id.to_owned(),@@ -4967,6 +4998,7 @@ impl Studio {let Some(id) = self.stage_hit(x, y) else {if !additive {self.selection.clear();+ self.transition_selected = None;}self.gesture = Gesture::None;return;@@ -6340,6 +6372,11 @@ impl Studio {/// Delete: the selection goes, and the hole stays unless the timeline/// is magnetic.pub fn delete_selected(&mut self) {+ // A selected transition goes on its own, leaving a plain cut.+ if self.selected_transition().is_some() {+ self.remove_transition();+ return;+ }let magnetic = self.prefs.magnetic;self.remove_selected(magnetic);}@@ -6348,6 +6385,10 @@ impl Studio {/// it, so a rough cut needs no dragging-left after every deletion./// https://github.com/jub0t/Concat/issues/106pub fn ripple_delete_selected(&mut self) {+ if self.selected_transition().is_some() {+ self.remove_transition();+ return;+ }self.remove_selected(true);}@@ -6721,6 +6762,7 @@ impl Studio {self.project_name = info.name.clone();self.export.name = projects::folder_name(&info.name);self.selection.clear();+ self.transition_selected = None;self.media.selected.clear();self.playhead = 0.0;self.handle(crate::panes::Msg::Timeline(@@ -6869,6 +6911,7 @@ impl Studio {self.echo = None;self.dirty = false;self.selection.clear();+ self.transition_selected = None;self.gesture = Gesture::None;self.handle(crate::panes::Msg::Monitor(crate::panes::monitor::MonitorMsg::Closed,@@ -7360,6 +7403,9 @@ impl Studio {start: clip.start as f32,duration: clip.duration as f32,selected: self.selection.iter().any(|id| id == &clip.id),+ transition_selected: self+ .selected_transition()+ .is_some_and(|picked| picked.id == clip.id),fx: clip.video_effects.iter().any(|effect| effect.enabled),transition_duration: clip.transition_in@@ -7442,6 +7488,7 @@ impl Studio {});editor.set_selected_clip(self.selected());+ editor.set_selected_transition(self.selected_transition_data());// Written only when it differs: a fresh model is a change to every// binding that reads it, and this one is read on every publish.let labels = self.audio_track_labels();@@ -8504,6 +8551,24 @@ impl Studio {/// The selection, flattened for the inspector: exactly one clip or/// nothing.+ /// The selected transition, as the inspector's panel for it shows it.+ fn selected_transition_data(&self) -> crate::ui::SelectedTransitionData {+ let Some(clip) = self.selected_transition() else {+ return Default::default();+ };+ let transition = clip.transition_in.as_ref().expect("held to one");+ let name = Catalogue::builtin()+ .get(&transition.id)+ .map(|package| i18n::package_text(package.id(), "name", &package.manifest.effect.name))+ .unwrap_or_else(|| label_of(&transition.id));+ crate::ui::SelectedTransitionData {+ present: true,+ name: name.into(),+ duration: transition.duration as f32,+ into: clip.name.as_str().into(),+ }+ }+fn selected(&self) -> SelectedClipData {// The one clip, or the first of a batch of titles: the panel shows// its values and writes to all of them; see `edit_targets`.@@ -9749,6 +9814,7 @@ impl Studio {"deselect" => {self.flush_commit();self.selection.clear();+ self.transition_selected = None;}// ⇧⌫, from the key table; plain ⌫ comes in as its own callback."ripple-delete" => self.ripple_delete_selected(),diff --git a/src/crates/concat/ui/app.slint b/src/crates/concat/ui/app.slintindex 0d597005..d03c7d46 100644--- a/src/crates/concat/ui/app.slint+++ b/src/crates/concat/ui/app.slint@@ -43,7 +43,7 @@ import { TooltipLayer } from "primitives/tooltip.slint";import { Workspace } from "workspace/workspace.slint";import {ClipData, ClipField, ClipKeyData, ClipKind, ClipTextField, DropData, Keyframes,- SelectedClipData, StageGuideData, StageItemData, TextAlignment, TimelineTabData,+ SelectedClipData, SelectedTransitionData, StageGuideData, StageItemData, TextAlignment, TimelineTabData,TimelineTool, TrackData, TrackSize,} from "timeline/model.slint";@@ -58,7 +58,7 @@ export {EffectData, MediaFilter, MediaItemData, MediaKind, TextPresetData,ClipData, ClipField, ClipKeyData, ClipKind, ClipTextField, DropData, Keyframes,KeyEditor, KeyMarkData, KeyRowData, ScopeMarkData, Scopes,- SelectedClipData, StageGuideData, StageItemData, TextAlignment, TimelineTabData,+ SelectedClipData, SelectedTransitionData, StageGuideData, StageItemData, TextAlignment, TimelineTabData,TimelineTool, TrackData, TrackSize, MenuItemData, MenuRow, ExportData, ExportPhase, ModelData, SettingsData,ChipOption, RecentProjectData, StartData, SystemFactData, ToastData, ProjectSheetData,CaptionsSheetData, SpeechSheetData,diff --git a/src/crates/concat/ui/editor.slint b/src/crates/concat/ui/editor.slintindex 3cdd636c..027482ea 100644--- a/src/crates/concat/ui/editor.slint+++ b/src/crates/concat/ui/editor.slint@@ -13,7 +13,7 @@ import { DockDivider, DockSide, SeatBox } from "dock.slint";import { PaneKind } from "workspace/pane-switcher.slint";import { MenuItemData } from "primitives/context-menu.slint";import {- ClipData, ClipField, ClipTextField, DropData, SelectedClipData,+ ClipData, ClipField, ClipTextField, DropData, SelectedClipData, SelectedTransitionData,StageGuideData, StageItemData, TimelineTabData, TimelineTool, TrackData,TrackSize,} from "timeline/model.slint";@@ -132,6 +132,8 @@ export global Editor {// ── the inspector ──in-out property <SelectedClipData> selected-clip;+ /// The transition selected on its own; see SelectedTransitionData.+ in-out property <SelectedTransitionData> selected-transition;/// The selected clip's media's audio tracks, one label each, in file/// order - "Track 1 · stereo", "Mic/Aux · mono". Empty unless the file/// has more than one, which is when the Audio panel offers the choice.diff --git a/src/crates/concat/ui/inspector/clip-inspector.slint b/src/crates/concat/ui/inspector/clip-inspector.slintindex 2aab36f7..c63bd262 100644--- a/src/crates/concat/ui/inspector/clip-inspector.slint+++ b/src/crates/concat/ui/inspector/clip-inspector.slint@@ -42,6 +42,7 @@ import {ClipKind,Keyframes,SelectedClipData,+ SelectedTransitionData,} from "../timeline/model.slint";// The editor's clip inspector: one panel, three tabs. Adjust is direct@@ -951,15 +952,10 @@ export component VideoPanel inherits VerticalLayout {/// What the automatic cutout keeps: 0 auto, 1 person, 2 object.callback cutout-subject(index: int);callback cutout-clear();- /// The transition riding into this clip: dropped, or set to a new- /// duration - clamped, same as applying one, so a drag here can never- /// ask for more than the cut can give it.- callback transition-remove();- callback transition-duration-set(seconds: float);/// A shape is a figure, not footage: there is no background to take- /// away, nothing to crop off its edges and no cut to ride in on, so- /// those three sections stay out of its panel.+ /// away and nothing to crop off its edges, so those sections stay out+ /// of its panel.property <bool> figure: root.selected.kind == ClipKind.shape;/// Which keyer is on the chain, and where: -1 for none. Scans the first@@ -1012,7 +1008,6 @@ export component VideoPanel inherits VerticalLayout {property <float> crop-right;property <float> crop-bottom;property <float> feather;- property <float> transition-duration;function seed() {root.feather = root.selected.cutout-feather;@@ -1027,7 +1022,6 @@ export component VideoPanel inherits VerticalLayout {root.crop-top = root.selected.crop-top;root.crop-right = root.selected.crop-right;root.crop-bottom = root.selected.crop-bottom;- root.transition-duration = root.selected.transition-duration;}property <[string]> blends: [@@ -1462,57 +1456,80 @@ export component VideoPanel inherits VerticalLayout {}}}+}- // The transition riding into this clip from the cut before it - see- // Studio::apply_transition. The section always shows, so its place in- // the panel is stable, with a note in place of controls when there is- // none: applying one from the Transitions tab is what puts it here.- if !root.figure: Section {- transition := SectionHeader {+/// A transition picked on its own on the lanes: what it is, the clip it+/// rides into, its length, and the way to take it off. Its own panel and+/// not a section of the clip's, since it belongs to the cut between two+/// clips rather than to either of them.+export component TransitionPanel inherits VerticalLayout {+ in property <SelectedTransitionData> transition;++ /// Taken off, leaving a plain cut.+ callback remove();+ /// Set to a new length - clamped as applying one is, so this can never+ /// ask for more than the cut can give it.+ callback duration-set(seconds: float);++ property <float> duration;++ init => { root.duration = root.transition.duration; }+ changed transition => { root.duration = root.transition.duration; }++ Section {+ SectionHeader {title: I18n.t("clipInspector.transition");- collapsible: true;- summary: root.selected.transition-id == "" ? I18n.t("common.none")- : root.selected.transition-name + " · "- + InspectorFmt.format(ParamFormat.seconds2, root.selected.transition-duration);+ summary: root.transition.name + " · "+ + InspectorFmt.format(ParamFormat.seconds2, root.transition.duration);}- if transition.open: SectionBody {- if root.selected.transition-id == "": Note {- text: I18n.t("clipInspector.pickOneTransitionsTab");- }-- if root.selected.transition-id != "": HorizontalLayout {+ SectionBody {+ HorizontalLayout {padding-left: Theme.pad;padding-right: Theme.pad;padding-bottom: 6px;spacing: 4px;- Text {+ VerticalLayout {horizontal-stretch: 1;- text: root.selected.transition-name;- color: Theme.fg;- font-size: Theme.fs;- font-weight: Theme.weight-title;- vertical-alignment: center;- overflow: elide;+ alignment: center;++ Text {+ text: root.transition.name;+ color: Theme.fg;+ font-size: Theme.fs;+ font-weight: Theme.weight-title;+ overflow: elide;+ }++ Text {+ text: I18n.t1("clipInspector.transitionInto", root.transition.into);+ color: Theme.fg-muted;+ font-size: Theme.fs-sm;+ overflow: elide;+ }}- IconButton {- glyph: Glyph.close;- label: I18n.t1("clipInspector.remove", "\{root.selected.transition-name}");- clicked => { root.transition-remove(); }+ VerticalLayout {+ alignment: center;+ IconButton {+ glyph: Glyph.trash;+ label: I18n.t1("clipInspector.remove", root.transition.name);+ danger: true;+ clicked => { root.remove(); }+ }}}- if root.selected.transition-id != "": Param {+ Param {label: I18n.t("common.duration");- value <=> root.transition-duration;+ value <=> root.duration;minimum: 0.05;maximum: 5;step: 0.05;default-value: 0.5;fmt: ParamFormat.seconds2;- changed(v) => { root.transition-duration-set(v); }+ changed(v) => { root.duration-set(v); }}}}diff --git a/src/crates/concat/ui/phone/editor.slint b/src/crates/concat/ui/phone/editor.slintindex 82a72579..d9f6098b 100644--- a/src/crates/concat/ui/phone/editor.slint+++ b/src/crates/concat/ui/phone/editor.slint@@ -1037,8 +1037,6 @@ export component PhoneEditor inherits Rectangle {cutout-painting(on) => { Editor.cutout-painting(on); }cutout-subject(index) => { Editor.cutout-subject(index); }cutout-clear => { Editor.cutout-clear(); }- transition-remove => { Editor.transition-remove(); }- transition-duration-set(seconds) => { Editor.transition-duration-set(seconds); }}if root.sheet == "clip-speed": SpeedPanel {diff --git a/src/crates/concat/ui/timeline/lanes.slint b/src/crates/concat/ui/timeline/lanes.slintindex 3a6edb90..899109d3 100644--- a/src/crates/concat/ui/timeline/lanes.slint+++ b/src/crates/concat/ui/timeline/lanes.slint@@ -692,7 +692,7 @@ component Clip inherits Rectangle {y: 0;width: parent.width;height: parent.height;- background: (root.trans-active || root.item.selected)+ background: (root.trans-active || root.item.transition-selected)? Theme.accent.with-alpha(0.18): Theme.transition-out.with-alpha(0.15);}@@ -703,7 +703,7 @@ component Clip inherits Rectangle {y: 0;width: parent.width;height: 1px;- background: (root.trans-active || root.item.selected)+ background: (root.trans-active || root.item.transition-selected)? Theme.accent: Theme.transition-in.with-alpha(0.4);}@@ -712,7 +712,7 @@ component Clip inherits Rectangle {y: parent.height - 1px;width: parent.width;height: 1px;- background: (root.trans-active || root.item.selected)+ background: (root.trans-active || root.item.transition-selected)? Theme.accent: Theme.transition-in.with-alpha(0.4);}@@ -725,6 +725,21 @@ component Clip inherits Rectangle {height: parent.height;background: Theme.line-strong.with-alpha(0.5);}++ // A press anywhere on the wash picks the transition, not the clip+ // under it: the wash is the transition, drawn. Under the handles+ // and the seam button, which are declared after it.+ TouchArea {+ enabled: !root.locked;+ mouse-cursor: MouseCursor.pointer;+ pointer-event(event) => {+ if (event.kind == PointerEventKind.down && event.button == PointerEventButton.left) {+ root.pressed(false, 2);+ } else if (event.kind == PointerEventKind.up || event.kind == PointerEventKind.cancel) {+ root.released();+ }+ }+ }}// ── Left draggable slider handle (at x: -root.half-w) ─────────────────@@ -926,7 +941,7 @@ component Clip inherits Rectangle {height: 22px;// Subtle accent glow when selected- if root.item.selected: Rectangle {+ if root.item.transition-selected: Rectangle {x: 0;y: 0;width: parent.width;@@ -941,11 +956,11 @@ component Clip inherits Rectangle {width: 18px;height: 18px;border-radius: 3px;- background: (root.trans-btn-hover || root.item.selected)+ background: (root.trans-btn-hover || root.item.transition-selected)? Theme.field-hover: #1e1e24;- border-width: (root.trans-btn-hover || root.item.selected) ? 2px : 1px;- border-color: (root.trans-btn-hover || root.item.selected)+ border-width: (root.trans-btn-hover || root.item.transition-selected) ? 2px : 1px;+ border-color: (root.trans-btn-hover || root.item.transition-selected)? Theme.accent: Theme.line-strong;@@ -954,7 +969,7 @@ component Clip inherits Rectangle {y: (parent.height - self.height) / 2;glyph: Glyph.transition;size: 12px;- tint: (root.trans-btn-hover || root.item.selected) ? Theme.accent : Theme.fg;+ tint: (root.trans-btn-hover || root.item.transition-selected) ? Theme.accent : Theme.fg;}trans-btn-touch := TouchArea {diff --git a/src/crates/concat/ui/timeline/model.slint b/src/crates/concat/ui/timeline/model.slintindex 95b19a7a..a673a203 100644--- a/src/crates/concat/ui/timeline/model.slint+++ b/src/crates/concat/ui/timeline/model.slint@@ -98,6 +98,9 @@ export struct ClipData {/// seconds of timeline occupiedduration: float,selected: bool,+ /// The transition on the cut into this clip is the one selected:+ /// picked on its own, with the clip itself unselected.+ transition-selected: bool,/// at least one video effect is live: draws the `fx` chip in the headerfx: bool,/// Seconds of transition on the cut into this clip; zero for none. The@@ -256,6 +259,18 @@ export enum ClipTextField {/// or there is not — `present` is what says which, since a struct cannot be/// null. Published whole on every change: it is one row, and a partial update/// is how a panel ends up showing two clips at once.+/// The transition picked on its own on the lanes, for the inspector's panel+/// for it; `present: false` when none is.+export struct SelectedTransitionData {+ present: bool,+ /// its package's name, in the interface's language+ name: string,+ /// seconds it covers+ duration: float,+ /// the name of the clip it rides into+ into: string,+}+export struct SelectedClipData {present: bool,/// how many clips the panel writes to: one, or every selected titlediff --git a/src/crates/concat/ui/timeline/tray.slint b/src/crates/concat/ui/timeline/tray.slintindex 0302cd58..95b8d3f5 100644--- a/src/crates/concat/ui/timeline/tray.slint+++ b/src/crates/concat/ui/timeline/tray.slint@@ -197,6 +197,8 @@ export component TimelineTray inherits Rectangle {/// The preview axis: the monitor follows the pointer across the lanes.in property <bool> preview-axis: false;in property <int> selected-count;+ /// A transition is selected on its own: the trash takes it off.+ in property <bool> transition-selected;/// Whether the history has a step that way. Rust's answer, read from/// the editor after every change, so the buttons never guess.in property <bool> can-undo;@@ -319,7 +321,7 @@ export component TimelineTray inherits Rectangle {label: I18n.t("tray.deleteSelected");danger: true;icon-size: 16px;- enabled: root.selected-count > 0;+ enabled: root.selected-count > 0 || root.transition-selected;clicked => { root.delete-selected(); }}diff --git a/src/crates/concat/ui/workspace/config-pane.slint b/src/crates/concat/ui/workspace/config-pane.slintindex 3fb4d327..1b2e0826 100644--- a/src/crates/concat/ui/workspace/config-pane.slint+++ b/src/crates/concat/ui/workspace/config-pane.slint@@ -10,14 +10,14 @@ import { EffectData } from "../demo/effects-panel.slint";import {AdjustPanel, AppliedEntryData, AppliedParamData, AudioPanel, ProcessorRows,CatalogueEntryData, ColourKnobData, FilterPanel, PresetStack, SpeedPanel,- VideoPanel,+ TransitionPanel, VideoPanel,} from "../inspector/clip-inspector.slint";import {CurveData, CurveGroupData, WheelData, WheelGroupData,} from "../inspector/grading.slint";import { TextPanel } from "../inspector/text-panel.slint";import {- ClipField, ClipKind, ClipTextField, SelectedClipData,+ ClipField, ClipKind, ClipTextField, SelectedClipData, SelectedTransitionData,} from "../timeline/model.slint";// The inspector column, in its two states:@@ -26,6 +26,8 @@ import {// with Modify pinned to the foot.// - Something selected: the clip inspector — Video, Audio and Effects, or// Text alone for a title, or the layer panel for a filter on the lanes.+// - A transition selected on its own: its panel, and nothing of the clips+// either side of it.// One fact: muted label left, value right. The value wraps rather than// elides — a folder path you cannot read is a path you have to go find.@@ -109,6 +111,9 @@ export component ConfigPane inherits Rectangle {/// The selected clip's media's audio tracks; see Editor.audio-tracks.in property <[string]> audio-tracks;property <bool> has-selection: root.selected.present;+ /// The transition selected on its own on the lanes, when no clip is.+ in property <SelectedTransitionData> transition;+ property <bool> on-transition: root.transition.present && !root.has-selection;in property <string> project-name: I18n.t("common.untitledProject");in property <string> project-folder: "—";/// The active timeline, whose frame, rate and duration the rows below@@ -321,7 +326,7 @@ export component ConfigPane inherits Rectangle {Pane {// ── details ──────────────────────────────────────────────────────- if !root.has-selection: Rectangle {+ if !root.has-selection && !root.on-transition: Rectangle {// The same 52px as the panes either side of it; see PaneHeader.height: 52px;@@ -369,7 +374,7 @@ export component ConfigPane inherits Rectangle {}}- if !root.has-selection: PaneBody {+ if !root.has-selection && !root.on-transition: PaneBody {padding: 0px;spacing: 0px;@@ -401,7 +406,7 @@ export component ConfigPane inherits Rectangle {}}- if !root.has-selection: Rectangle {+ if !root.has-selection && !root.on-transition: Rectangle {height: 49px;Rectangle {@@ -443,6 +448,60 @@ export component ConfigPane inherits Rectangle {}}+ // ── a transition ─────────────────────────────────────────────────+ if root.on-transition: Rectangle {+ height: 52px;++ Rectangle {+ x: 0;+ y: parent.height - 1px;+ width: parent.width;+ height: 1px;+ background: Theme.line;+ }++ HorizontalLayout {+ padding-left: Theme.pad;+ padding-right: 8px;+ spacing: 8px;++ Text {+ text: I18n.t("clipInspector.transition");+ color: Theme.fg-muted;+ font-size: Theme.fs-sm;+ font-weight: Theme.weight-title;+ letter-spacing: 1px;+ vertical-alignment: center;+ }++ Rectangle { horizontal-stretch: 1; }++ VerticalLayout {+ alignment: center;+ PaneSwitcher {+ kind: PaneKind.inspector;+ seat: root.pane-seat;+ removable: root.pane-removable;+ picked(kind) => { root.pane-picked(kind); }+ removed => { root.pane-removed(); }+ }+ }+ }+ }++ if root.on-transition: PaneBody {+ padding: 0px;+ spacing: 0px;++ PaneScroll {+ TransitionPanel {+ transition: root.transition;+ remove => { root.transition-remove(); }+ duration-set(seconds) => { root.transition-duration-set(seconds); }+ }+ }+ }+// ── the clip inspector ───────────────────────────────────────────if root.has-selection: Rectangle {// Matched to the Details bar above, or the top of the column@@ -564,8 +623,6 @@ export component ConfigPane inherits Rectangle {cutout-painting(on) => { root.cutout-painting(on); }cutout-subject(index) => { root.cutout-subject(index); }cutout-clear => { root.cutout-clear(); }- transition-remove => { root.transition-remove(); }- transition-duration-set(seconds) => { root.transition-duration-set(seconds); }}if root.showing == "Speed": SpeedPanel {diff --git a/src/crates/concat/ui/workspace/seat.slint b/src/crates/concat/ui/workspace/seat.slintindex 5b16e0de..81a5157c 100644--- a/src/crates/concat/ui/workspace/seat.slint+++ b/src/crates/concat/ui/workspace/seat.slint@@ -268,6 +268,7 @@ export component Seat inherits Rectangle {modify-project => { Editor.modify-project(); }selected: Editor.selected-clip;+ transition: Editor.selected-transition;clip-set(field, value) => { Editor.clip-set(field, value); }clip-set-text(field, value) => { Editor.clip-set-text(field, value); }clip-set-colour(field, value) => { Editor.clip-set-colour(field, value); }@@ -365,6 +366,7 @@ export component Seat inherits Rectangle {preview-axis: Editor.preview-axis;preview-axis-audio: Editor.preview-axis-audio;selected-count: Editor.selected-count;+ transition-selected: Editor.selected-transition.present;can-undo: Editor.can-undo;can-redo: Editor.can-redo;merge-blocked-because: Editor.merge-blocked-because;diff --git a/src/crates/concat/ui/workspace/timeline-pane.slint b/src/crates/concat/ui/workspace/timeline-pane.slintindex 93d5d8d3..75c317b9 100644--- a/src/crates/concat/ui/workspace/timeline-pane.slint+++ b/src/crates/concat/ui/workspace/timeline-pane.slint@@ -43,6 +43,7 @@ export component TimelinePane inherits Rectangle {in property <bool> preview-axis: false;in property <bool> preview-axis-audio;in property <int> selected-count;+ in property <bool> transition-selected;in property <bool> can-undo;in property <bool> can-redo;in property <string> merge-blocked-because;@@ -310,6 +311,7 @@ export component TimelinePane inherits Rectangle {trim-follow: root.trim-follow;preview-axis: root.preview-axis;selected-count: root.selected-count;+ transition-selected: root.transition-selected;can-undo: root.can-undo;can-redo: root.can-redo;merge-blocked-because: root.merge-blocked-because;