Skip to content

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

updates

Jareer38290e3d2c22
diff --git a/README.md b/README.md
index b502d460..ab7f52b3 100644
--- a/README.md
+++ b/README.md
@@ -74,11 +74,8 @@ Concat runs everything on your machine, so the hardware sets the ceiling. The mi
|---|---|---|
| **CPU** | Any 64-bit processor from 2013 or later | 6 cores or more |
| **GPU** | None. Without a usable GPU the window and monitor fall back to the CPU | Any GPU with Metal (macOS), DirectX 12 (Windows) or Vulkan (Linux) |
-| **RAM** | 4 GB | 16 GB for 4K timelines and the larger caption models |
-| **Storage** | 500 MB for the app and the smallest caption model | 2 GB for every optional model, plus room for projects and exports |
-| **Display** | 1280 × 720 | 1920 × 1080 or larger |
-| **Audio** | Optional. Playback wants an output device, everything else works without one | |
-| **Internet** | Not required. Only used when you download an optional model, once | |
+| **RAM** | **4 GB** | **16 GB** for 4K timelines and the larger caption models |
+| **Storage** | **500 MB** for the app and the smallest caption model | **2 GB** for every optional model, plus room for projects and exports |
Optional models download from the settings panel on first use and then never need the network again: auto-captions 78 MB to 488 MB depending on the whisper size you pick, text-to-speech 132 MB or 349 MB, person cutout 15 MB, object cutout 179 MB, and the cutout brush 40 MB.
diff --git a/engine/Cargo.lock b/engine/Cargo.lock
index 1ca78778..5d4fdce5 100644
--- a/engine/Cargo.lock
+++ b/engine/Cargo.lock
@@ -1153,6 +1153,7 @@ dependencies = [
"concat-project",
"concat-speech",
"concat-vision",
+ "image",
"opener",
"png 0.17.16",
"pollster",
diff --git a/engine/crates/concat-project/src/commands.rs b/engine/crates/concat-project/src/commands.rs
index 44cf0ff3..6fe73bf6 100644
--- a/engine/crates/concat-project/src/commands.rs
+++ b/engine/crates/concat-project/src/commands.rs
@@ -535,14 +535,6 @@ pub enum Command {
/// The lane to delete.
track_id: String,
},
- /// Renames a lane. Whitespace-only names are ignored so a track can
- /// never end up blank; unknown ids are tolerated.
- RenameTrack {
- /// The lane to rename.
- track_id: String,
- /// The new label; trimmed before it lands.
- name: String,
- },
/// Flips one of a track's two toggles. An unknown id is a no-op.
SetTrackFlag {
/// The lane to change.
@@ -570,8 +562,8 @@ pub enum Command {
/// The frame and the rate, together.
video: VideoSettings,
},
- /// Renames a timeline tab, with the same trim-and-ignore-blank rule as
- /// [`Command::RenameTrack`].
+ /// Renames a timeline tab. Whitespace-only names are ignored so a tab
+ /// can never end up blank; unknown ids are tolerated.
RenameTimeline {
/// The timeline to rename.
timeline_id: String,
@@ -1853,13 +1845,8 @@ pub fn apply(
Some(track) => track.id.clone(),
None => {
let id = mint.next("t");
- let name = next_numbered(
- "Track",
- timeline.tracks.iter().map(|track| track.name.clone()),
- );
timeline.tracks.push(Track {
id: id.clone(),
- name,
visible: true,
muted: false,
});
@@ -1929,13 +1916,8 @@ pub fn apply(
Command::AddTrack => {
let timeline = project.active_mut();
let id = mint.next("t");
- let name = next_numbered(
- "Track",
- timeline.tracks.iter().map(|track| track.name.clone()),
- );
timeline.tracks.push(Track {
id: id.clone(),
- name,
visible: true,
muted: false,
});
@@ -1962,23 +1944,6 @@ pub fn apply(
})
}
- Command::RenameTrack { track_id, name } => {
- let trimmed = name.trim();
- if trimmed.is_empty() {
- return Ok(Outcome::default());
- }
- let timeline = project.active_mut();
- let applied = timeline
- .tracks
- .iter_mut()
- .find(|track| track.id == track_id)
- .is_some_and(|track| assign(&mut track.name, trimmed.to_owned()));
- Ok(Outcome {
- created_id: None,
- applied,
- })
- }
-
Command::SetTrackFlag {
track_id,
flag,
@@ -2009,9 +1974,8 @@ pub fn apply(
.map(|timeline| timeline.name.clone()),
);
let tracks = (1..=4)
- .map(|number| Track {
+ .map(|_| Track {
id: mint.next("t"),
- name: format!("Track {number}"),
visible: true,
muted: false,
})
diff --git a/engine/crates/concat-project/src/doc.rs b/engine/crates/concat-project/src/doc.rs
index 96c14db2..324873cb 100644
--- a/engine/crates/concat-project/src/doc.rs
+++ b/engine/crates/concat-project/src/doc.rs
@@ -106,10 +106,9 @@ fn read_tracks(raw: Option<&Value>) -> Vec<Track> {
.filter_map(|entry| {
let id = entry.get("id")?.as_str()?.to_owned();
Some(Track {
- name: text(entry.get("name"), &id),
+ id,
visible: flag(entry.get("visible"), true),
muted: flag(entry.get("muted"), false),
- id,
})
})
.collect()
diff --git a/engine/crates/concat-project/src/lib.rs b/engine/crates/concat-project/src/lib.rs
index ee4f7bec..451e8ad8 100644
--- a/engine/crates/concat-project/src/lib.rs
+++ b/engine/crates/concat-project/src/lib.rs
@@ -1333,25 +1333,6 @@ mod tests {
#[test]
fn renames_trim_whitespace_and_refuse_to_blank_a_name() {
let (mut editor, _, _) = fixture();
- let track_id = editor.project().active().tracks[0].id.clone();
- editor
- .apply(Command::RenameTrack {
- track_id: track_id.clone(),
- name: " Cutaways ".to_owned(),
- })
- .expect("renames");
- assert_eq!(editor.project().active().tracks[0].name, "Cutaways");
-
- // Whitespace-only would leave the lane unlabelled, so it is ignored.
- let outcome = editor
- .apply(Command::RenameTrack {
- track_id,
- name: " ".to_owned(),
- })
- .expect("tolerated");
- assert!(!outcome.applied);
- assert_eq!(editor.project().active().tracks[0].name, "Cutaways");
-
editor
.apply(Command::RenameTimeline {
timeline_id: "TL1".to_owned(),
@@ -1646,10 +1627,6 @@ mod tests {
Command::RemoveTrack {
track_id: "T1".to_owned(),
},
- Command::RenameTrack {
- track_id: "T1".to_owned(),
- name: "Cutaways".to_owned(),
- },
Command::SetTrackFlag {
track_id: "T1".to_owned(),
flag: TrackFlag::Muted,
diff --git a/engine/crates/concat-project/src/model.rs b/engine/crates/concat-project/src/model.rs
index ed04f64e..18b4a3b3 100644
--- a/engine/crates/concat-project/src/model.rs
+++ b/engine/crates/concat-project/src/model.rs
@@ -150,9 +150,6 @@ pub struct Track {
/// Minted per timeline ("t5", or "T1".."T4" for the first timeline's
/// starter lanes); never shared between timelines.
pub id: String,
- /// User-editable label. Renames to whitespace are ignored, so it is
- /// never blank.
- pub name: String,
/// Video clips on this track are left out of the composite when false.
pub visible: bool,
/// Audio on this track is silent when true.
@@ -1219,7 +1216,6 @@ impl Project {
tracks: (1..=4)
.map(|number| Track {
id: format!("T{number}"),
- name: format!("Track {number}"),
visible: true,
muted: false,
})
diff --git a/engine/crates/concat/locales/de.json b/engine/crates/concat/locales/de.json
index 65b96613..31ad4a62 100644
--- a/engine/crates/concat/locales/de.json
+++ b/engine/crates/concat/locales/de.json
@@ -215,7 +215,7 @@
"Headline": "Schlagzeile",
"Height": "Höhe",
"Hero": "Held",
- "Hide {0}": "{0} ausblenden",
+ "Hide lane": "Spur ausblenden",
"High": "Hoch",
"Higher and squeakier.": "Höher und quietschiger.",
"Highlights": "Lichter",
@@ -260,8 +260,8 @@
"Lo-fi": "Lo-fi",
"Loading the model": "Modell wird geladen",
"Location": "Speicherort",
+ "Lock lane": "Spur sperren",
"Lock track": "Spur sperren",
- "Lock {0}": "{0} sperren",
"Lower and fuller.": "Tiefer und voller.",
"Lower third": "Bauchbinde",
"male": "männlich",
@@ -289,7 +289,7 @@
"Move {0} up": "{0} nach oben",
"Multiply": "Multiplizieren",
"Mute": "Stumm",
- "Mute {0}": "{0} stummschalten",
+ "Mute lane": "Spur stummschalten",
"My templates": "Meine Vorlagen",
"Name": "Name",
"Natural": "Natürlich",
@@ -375,6 +375,7 @@
"Remove": "Entfernen",
"Remove background": "Hintergrund entfernen",
"Remove background: {0}": "Hintergrund entfernen: {0}",
+ "Remove lane": "Spur entfernen",
"Remove panel": "Panel entfernen",
"Remove {0}": "{0} entfernen",
"Renderer": "Renderer",
@@ -386,7 +387,7 @@
"Robot": "Roboter",
"Room": "Raum",
"Rotation": "Drehung",
- "Row height for {0}": "Zeilenhöhe für {0}",
+ "Row height": "Zeilenhöhe",
"Runs locally": "Läuft lokal",
"Saturation": "Sättigung",
"Save": "Speichern",
@@ -418,7 +419,7 @@
"Shifts the picture towards candlelight.": "Verschiebt das Bild in Richtung Kerzenlicht.",
"Shifts the picture towards daylight shade.": "Verschiebt das Bild in Richtung Tageslichtschatten.",
"Show in folder": "Im Ordner zeigen",
- "Show {0}": "{0} einblenden",
+ "Show lane": "Spur einblenden",
"Silent": "Stumm",
"Similarity": "Ähnlichkeit",
"Size": "Größe",
@@ -492,8 +493,8 @@
"Treble": "Höhen",
"Type the narration to read aloud…": "Tippe den Text, der vorgelesen werden soll…",
"Undo": "Rückgängig",
- "Unlock {0}": "{0} entsperren",
- "Unmute {0}": "{0} laut schalten",
+ "Unlock lane": "Spur entsperren",
+ "Unmute lane": "Spur laut schalten",
"Unpacking…": "Wird entpackt…",
"Untitled project": "Unbenanntes Projekt",
"Up or down by semitones, the length untouched.": "Nach oben oder unten in Halbtönen, die Länge unverändert.",
diff --git a/engine/crates/concat/locales/en.json b/engine/crates/concat/locales/en.json
index 74f06d4f..8edca896 100644
--- a/engine/crates/concat/locales/en.json
+++ b/engine/crates/concat/locales/en.json
@@ -48,7 +48,6 @@
"Audio Effects": "Audio Effects",
"Audio effects": "Audio effects",
"Audio track": "Audio track",
- "Audio tracks": "Audio tracks",
"Auto": "Auto",
"auto": "auto",
"Auto captions from this clip's sound": "Auto captions from this clip's sound",
@@ -202,7 +201,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 track": "Every track",
"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 on this machine. Transcription and speech run against models you download here, and nothing about a project leaves the device.": "Everything on this machine. Transcription and speech run against models you download here, and nothing about a project leaves the device.",
@@ -237,7 +235,6 @@
"Filters": "Filters",
"Finalising file": "Finalising file",
"Finding the subject… {0}%": "Finding the subject… {0}%",
- "First track": "First track",
"Fisheye": "Fisheye",
"Flash": "Flash",
"Flash In": "Flash In",
@@ -274,7 +271,7 @@
"Headline": "Headline",
"Height": "Height",
"Hero": "Hero",
- "Hide {0}": "Hide {0}",
+ "Hide lane": "Hide lane",
"High": "High",
"Higher and squeakier.": "Higher and squeakier.",
"Highlights": "Highlights",
@@ -282,6 +279,7 @@
"Horizontal": "Horizontal",
"Hue Shift": "Hue Shift",
"Images": "Images",
+ "Import": "Import",
"Import a LUT (.cube)": "Import a LUT (.cube)",
"Import LUT": "Import LUT",
"Import media": "Import media",
@@ -311,7 +309,6 @@
"Lagoon": "Lagoon",
"Language": "Language",
"Large": "Large",
- "Last track": "Last track",
"Late light: a warm balance that keeps its brightness, orange in the highlights, a whisper of magenta in the shadows, blacks lifted a touch.": "Late light: a warm balance that keeps its brightness, orange in the highlights, a whisper of magenta in the shadows, blacks lifted a touch.",
"Layer": "Layer",
"Layout": "Layout",
@@ -332,8 +329,8 @@
"Lo-fi": "Lo-fi",
"Loading the model": "Loading the model",
"Location": "Location",
+ "Lock lane": "Lock lane",
"Lock track": "Lock track",
- "Lock {0}": "Lock {0}",
"Low contrast, pink and lavender in the light, and a soft bloom over it all. The dreamy one.": "Low contrast, pink and lavender in the light, and a soft bloom over it all. The dreamy one.",
"Low light opened up: shadows lifted with the noise softened before it rises, whites held, the blue of the night kept.": "Low light opened up: shadows lifted with the noise softened before it rises, whites held, the blue of the night kept.",
"Lower and fuller.": "Lower and fuller.",
@@ -374,7 +371,7 @@
"Move {0} up": "Move {0} up",
"Multiply": "Multiply",
"Mute": "Mute",
- "Mute {0}": "Mute {0}",
+ "Mute lane": "Mute lane",
"Muted and green-teal through the midtones, a gentle film curve, warmth only where a face is. The quiet grade of an indie film.": "Muted and green-teal through the midtones, a gentle film curve, warmth only where a face is. The quiet grade of an indie film.",
"My templates": "My templates",
"Name": "Name",
@@ -413,6 +410,8 @@
"One title per sentence, held for as long as it takes to read, one after another on the first lane with room.": "One title per sentence, held for as long as it takes to read, one after another on the first lane with room.",
"Only panel": "Only panel",
"Opacity": "Opacity",
+ "Open project": "Open project",
+ "Open project…": "Open project…",
"Operating system": "Operating system",
"Other": "Other",
"Out": "Out",
@@ -478,6 +477,7 @@
"Remove": "Remove",
"Remove background": "Remove background",
"Remove background: {0}": "Remove background: {0}",
+ "Remove lane": "Remove lane",
"Remove panel": "Remove panel",
"Remove {0}": "Remove {0}",
"Renderer": "Renderer",
@@ -491,7 +491,7 @@
"Robot": "Robot",
"Room": "Room",
"Rotation": "Rotation",
- "Row height for {0}": "Row height for {0}",
+ "Row height": "Row height",
"Runs locally": "Runs locally",
"Sage": "Sage",
"Saturation": "Saturation",
@@ -527,7 +527,7 @@
"Shifts the picture towards candlelight.": "Shifts the picture towards candlelight.",
"Shifts the picture towards daylight shade.": "Shifts the picture towards daylight shade.",
"Show in folder": "Show in folder",
- "Show {0}": "Show {0}",
+ "Show lane": "Show lane",
"Showing the look over the picture. Double-click the card, or its plus, to lay it on the timeline": "Showing the look over the picture. Double-click the card, or its plus, to lay it on the timeline",
"Silent": "Silent",
"Similarity": "Similarity",
@@ -553,6 +553,9 @@
"Softness": "Softness",
"Solarize": "Solarize",
"Soon": "Soon",
+ "Sort: Added": "Sort: Added",
+ "Sort: Name": "Sort: Name",
+ "Sort: Type": "Sort: Type",
"Sound": "Sound",
"Source": "Source",
"Space": "Space",
@@ -628,8 +631,8 @@
"Type the words to put on screen…": "Type the words to put on screen…",
"Umber": "Umber",
"Undo": "Undo",
- "Unlock {0}": "Unlock {0}",
- "Unmute {0}": "Unmute {0}",
+ "Unlock lane": "Unlock lane",
+ "Unmute lane": "Unmute lane",
"Unpacking…": "Unpacking…",
"Untitled project": "Untitled project",
"Up or down by semitones, the length untouched.": "Up or down by semitones, the length untouched.",
@@ -650,7 +653,6 @@
"Warmth": "Warmth",
"Water": "Water",
"Water and sky turned aquamarine and brightened, sand and skin left warm and clean. The beach-day look creators reach for first.": "Water and sky turned aquamarine and brightened, sand and skin left warm and clean. The beach-day look creators reach for first.",
- "What a clip plays when its file has more than one audio track, as a screen recording with the desktop and the microphone apart does. Every track puts each one on a sound lane of its own, the way Detach audio does. The Audio panel can change any clip afterwards.": "What a clip plays when its file has more than one audio track, as a screen recording with the desktop and the microphone apart does. Every track puts each one on a sound lane of its own, the way Detach audio does. The Audio panel can change any clip afterwards.",
"Where should the project folder go?": "Where should the project folder go?",
"Whites": "Whites",
"Width": "Width",
diff --git a/engine/crates/concat/locales/es.json b/engine/crates/concat/locales/es.json
index 69fd391c..6b9bbc73 100644
--- a/engine/crates/concat/locales/es.json
+++ b/engine/crates/concat/locales/es.json
@@ -215,7 +215,7 @@
"Headline": "Titular",
"Height": "Alto",
"Hero": "Héroe",
- "Hide {0}": "Ocultar {0}",
+ "Hide lane": "Ocultar pista",
"High": "Alta",
"Higher and squeakier.": "Más agudo y chillón.",
"Highlights": "Luces",
@@ -260,8 +260,8 @@
"Lo-fi": "Lo-fi",
"Loading the model": "Cargando el modelo",
"Location": "Ubicación",
+ "Lock lane": "Bloquear pista",
"Lock track": "Bloquear pista",
- "Lock {0}": "Bloquear {0}",
"Lower and fuller.": "Más grave y llena.",
"Lower third": "Rótulo inferior",
"male": "masculina",
@@ -289,7 +289,7 @@
"Move {0} up": "Subir {0}",
"Multiply": "Multiplicar",
"Mute": "Silenciar",
- "Mute {0}": "Silenciar {0}",
+ "Mute lane": "Silenciar pista",
"My templates": "Mis plantillas",
"Name": "Nombre",
"Natural": "Natural",
@@ -375,6 +375,7 @@
"Remove": "Quitar",
"Remove background": "Quitar fondo",
"Remove background: {0}": "Quitar fondo: {0}",
+ "Remove lane": "Quitar pista",
"Remove panel": "Quitar panel",
"Remove {0}": "Quitar {0}",
"Renderer": "Renderizador",
@@ -386,7 +387,7 @@
"Robot": "Robot",
"Room": "Habitación",
"Rotation": "Rotación",
- "Row height for {0}": "Alto de fila de {0}",
+ "Row height": "Alto de fila",
"Runs locally": "Se ejecuta localmente",
"Saturation": "Saturación",
"Save": "Guardar",
@@ -418,7 +419,7 @@
"Shifts the picture towards candlelight.": "Lleva la imagen hacia la luz de las velas.",
"Shifts the picture towards daylight shade.": "Lleva la imagen hacia la sombra de la luz del día.",
"Show in folder": "Mostrar en la carpeta",
- "Show {0}": "Mostrar {0}",
+ "Show lane": "Mostrar pista",
"Silent": "Silencio",
"Similarity": "Similitud",
"Size": "Tamaño",
@@ -492,8 +493,8 @@
"Treble": "Agudos",
"Type the narration to read aloud…": "Escribe la narración que se leerá en voz alta…",
"Undo": "Deshacer",
- "Unlock {0}": "Desbloquear {0}",
- "Unmute {0}": "Activar el sonido de {0}",
+ "Unlock lane": "Desbloquear pista",
+ "Unmute lane": "Activar el sonido de la pista",
"Unpacking…": "Desempaquetando…",
"Untitled project": "Proyecto sin título",
"Up or down by semitones, the length untouched.": "Arriba o abajo por semitonos, sin tocar la duración.",
diff --git a/engine/crates/concat/locales/fr.json b/engine/crates/concat/locales/fr.json
index df124593..3edc8898 100644
--- a/engine/crates/concat/locales/fr.json
+++ b/engine/crates/concat/locales/fr.json
@@ -215,7 +215,7 @@
"Headline": "Gros titre",
"Height": "Hauteur",
"Hero": "Héros",
- "Hide {0}": "Masquer {0}",
+ "Hide lane": "Masquer la piste",
"High": "Haute",
"Higher and squeakier.": "Plus aigu et plus criard.",
"Highlights": "Hautes lumières",
@@ -260,8 +260,8 @@
"Lo-fi": "Lo-fi",
"Loading the model": "Chargement du modèle",
"Location": "Emplacement",
+ "Lock lane": "Verrouiller la piste",
"Lock track": "Verrouiller la piste",
- "Lock {0}": "Verrouiller {0}",
"Lower and fuller.": "Plus grave et plus plein.",
"Lower third": "Synthé",
"male": "masculine",
@@ -289,7 +289,7 @@
"Move {0} up": "Monter {0}",
"Multiply": "Produit",
"Mute": "Muet",
- "Mute {0}": "Couper le son de {0}",
+ "Mute lane": "Couper le son de la piste",
"My templates": "Mes modèles",
"Name": "Nom",
"Natural": "Naturel",
@@ -375,6 +375,7 @@
"Remove": "Retirer",
"Remove background": "Retirer l'arrière-plan",
"Remove background: {0}": "Retirer l'arrière-plan : {0}",
+ "Remove lane": "Retirer la piste",
"Remove panel": "Retirer le panneau",
"Remove {0}": "Retirer {0}",
"Renderer": "Moteur de rendu",
@@ -386,7 +387,7 @@
"Robot": "Robot",
"Room": "Pièce",
"Rotation": "Rotation",
- "Row height for {0}": "Hauteur de rangée de {0}",
+ "Row height": "Hauteur de rangée",
"Runs locally": "S'exécute localement",
"Saturation": "Saturation",
"Save": "Enregistrer",
@@ -418,7 +419,7 @@
"Shifts the picture towards candlelight.": "Tire l'image vers la lumière des bougies.",
"Shifts the picture towards daylight shade.": "Tire l'image vers l'ombre du jour.",
"Show in folder": "Afficher dans le dossier",
- "Show {0}": "Afficher {0}",
+ "Show lane": "Afficher la piste",
"Silent": "Silence",
"Similarity": "Similarité",
"Size": "Taille",
@@ -492,8 +493,8 @@
"Treble": "Aigus",
"Type the narration to read aloud…": "Saisissez le texte à lire à voix haute…",
"Undo": "Annuler",
- "Unlock {0}": "Déverrouiller {0}",
- "Unmute {0}": "Rétablir le son de {0}",
+ "Unlock lane": "Déverrouiller la piste",
+ "Unmute lane": "Rétablir le son de la piste",
"Unpacking…": "Décompression…",
"Untitled project": "Projet sans titre",
"Up or down by semitones, the length untouched.": "Vers le haut ou le bas par demi-tons, sans toucher à la durée.",
diff --git a/engine/crates/concat/locales/hr.json b/engine/crates/concat/locales/hr.json
index 68c17523..703c5c29 100644
--- a/engine/crates/concat/locales/hr.json
+++ b/engine/crates/concat/locales/hr.json
@@ -48,7 +48,6 @@
"Audio Effects": "Zvučni efekti",
"Audio effects": "Zvučni efekti",
"Audio track": "Zvučna traka",
- "Audio tracks": "Zvučne trake",
"Auto": "Auto",
"auto": "auto",
"Auto captions from this clip's sound": "Automatski titlovi iz zvuka ovog klipa",
@@ -202,7 +201,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 track": "Svaka traka",
"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 on this machine. Transcription and speech run against models you download here, and nothing about a project leaves the device.": "Sve na ovom stroju. Transkripcija i govor rade na modelima koje preuzimate ovdje i ništa iz projekta ne napušta uređaj.",
@@ -237,7 +235,6 @@
"Filters": "Filtri",
"Finalising file": "Dovršavanje datoteke",
"Finding the subject… {0}%": "Traženje subjekta… {0}%",
- "First track": "Prva traka",
"Fisheye": "Riblje oko",
"Flash": "Bljeskalica",
"Flash In": "Bljesak unutra",
@@ -274,7 +271,7 @@
"Headline": "Naslov",
"Height": "Visina",
"Hero": "Junak",
- "Hide {0}": "Sakrij {0}",
+ "Hide lane": "Sakrij traku",
"High": "Visoko",
"Higher and squeakier.": "Više i piskutavije.",
"Highlights": "Svjetla",
@@ -282,6 +279,7 @@
"Horizontal": "Vodoravno",
"Hue Shift": "Pomak tona",
"Images": "Slike",
+ "Import": "Uvezi",
"Import a LUT (.cube)": "Uvezi LUT (.cube)",
"Import LUT": "Uvezi LUT",
"Import media": "Uvezi medije",
@@ -311,7 +309,6 @@
"Lagoon": "Laguna",
"Language": "Jezik",
"Large": "Veliko",
- "Last track": "Zadnja traka",
"Late light: a warm balance that keeps its brightness, orange in the highlights, a whisper of magenta in the shadows, blacks lifted a touch.": "Kasno svjetlo: topli balans koji čuva svjetlinu, narančasto u svjetlima, šapat magente u sjenama, crne malo podignute.",
"Layer": "Sloj",
"Layout": "Raspored",
@@ -332,8 +329,8 @@
"Lo-fi": "Lo-fi",
"Loading the model": "Učitavanje modela",
"Location": "Lokacija",
+ "Lock lane": "Zaključaj traku",
"Lock track": "Zaključaj traku",
- "Lock {0}": "Zaključaj {0}",
"Low contrast, pink and lavender in the light, and a soft bloom over it all. The dreamy one.": "Nizak kontrast, ružičasto i lavanda u svjetlu i meki oreol preko svega. Onaj sanjivi.",
"Low light opened up: shadows lifted with the noise softened before it rises, whites held, the blue of the night kept.": "Slabo svjetlo otvoreno: sjene podignute, šum omekšan prije nego što naraste, bijele zadržane, plavet noći sačuvana.",
"Lower and fuller.": "Niže i punije.",
@@ -374,7 +371,7 @@
"Move {0} up": "Pomakni {0} gore",
"Multiply": "Množenje",
"Mute": "Utišaj",
- "Mute {0}": "Utišaj {0}",
+ "Mute lane": "Utišaj traku",
"Muted and green-teal through the midtones, a gentle film curve, warmth only where a face is. The quiet grade of an indie film.": "Prigušeno i zeleno-tirkizno kroz srednje tonove, nježna filmska krivulja, toplina samo gdje je lice. Tihi grade indie filma.",
"My templates": "Moji predlošci",
"Name": "Naziv",
@@ -478,6 +475,7 @@
"Remove": "Ukloni",
"Remove background": "Ukloni pozadinu",
"Remove background: {0}": "Ukloni pozadinu: {0}",
+ "Remove lane": "Ukloni traku",
"Remove panel": "Ukloni ploču",
"Remove {0}": "Ukloni {0}",
"Renderer": "Renderer",
@@ -491,7 +489,7 @@
"Robot": "Robot",
"Room": "Soba",
"Rotation": "Rotacija",
- "Row height for {0}": "Visina retka za {0}",
+ "Row height": "Visina retka",
"Runs locally": "Radi lokalno",
"Sage": "Kadulja",
"Saturation": "Zasićenje",
@@ -527,7 +525,7 @@
"Shifts the picture towards candlelight.": "Miče sliku prema svjetlu svijeće.",
"Shifts the picture towards daylight shade.": "Miče sliku prema sjeni dnevnog svjetla.",
"Show in folder": "Prikaži u mapi",
- "Show {0}": "Prikaži {0}",
+ "Show lane": "Prikaži traku",
"Showing the look over the picture. Double-click the card, or its plus, to lay it on the timeline": "Prikaz izgleda preko slike. Dvoklik na karticu ili njezin plus postavlja je na vremensku liniju",
"Silent": "Tiho",
"Similarity": "Sličnost",
@@ -628,8 +626,8 @@
"Type the words to put on screen…": "Upišite riječi za prikaz na zaslonu…",
"Umber": "Umbra",
"Undo": "Poništi",
- "Unlock {0}": "Otključaj {0}",
- "Unmute {0}": "Uključi zvuk {0}",
+ "Unlock lane": "Otključaj traku",
+ "Unmute lane": "Uključi zvuk trake",
"Unpacking…": "Raspakiranje…",
"Untitled project": "Neimenovani projekt",
"Up or down by semitones, the length untouched.": "Gore ili dolje za polustupnjeve, dužina netaknuta.",
@@ -650,7 +648,6 @@
"Warmth": "Toplina",
"Water": "Voda",
"Water and sky turned aquamarine and brightened, sand and skin left warm and clean. The beach-day look creators reach for first.": "Voda i nebo pretvoreni u akvamarin i posvijetljeni, pijesak i koža topli i čisti. Izgled plažnog dana po koji kreatori prvo posežu.",
- "What a clip plays when its file has more than one audio track, as a screen recording with the desktop and the microphone apart does. Every track puts each one on a sound lane of its own, the way Detach audio does. The Audio panel can change any clip afterwards.": "Što klip reproducira kada njegova datoteka ima više zvučnih traka, kao snimka zaslona s odvojenim stolom i mikrofonom. Svaka traka stavlja svaku na vlastitu zvučnu traku, kao što to radi Odvoji zvuk. Zvučna ploča poslije može promijeniti bilo koji klip.",
"Where should the project folder go?": "Kamo bi mapa projekta trebala ići?",
"Whites": "Bijele",
"Width": "Širina",
diff --git a/engine/crates/concat/locales/it.json b/engine/crates/concat/locales/it.json
index 08ebbd22..750484f7 100644
--- a/engine/crates/concat/locales/it.json
+++ b/engine/crates/concat/locales/it.json
@@ -215,7 +215,7 @@
"Headline": "Titolo grande",
"Height": "Altezza",
"Hero": "Eroe",
- "Hide {0}": "Nascondi {0}",
+ "Hide lane": "Nascondi traccia",
"High": "Alta",
"Higher and squeakier.": "Più acuta e stridula.",
"Highlights": "Luci",
@@ -260,8 +260,8 @@
"Lo-fi": "Lo-fi",
"Loading the model": "Caricamento del modello",
"Location": "Posizione",
+ "Lock lane": "Blocca traccia",
"Lock track": "Blocca traccia",
- "Lock {0}": "Blocca {0}",
"Lower and fuller.": "Più bassa e piena.",
"Lower third": "Sottopancia",
"male": "maschile",
@@ -289,7 +289,7 @@
"Move {0} up": "Sposta {0} in alto",
"Multiply": "Moltiplica",
"Mute": "Muto",
- "Mute {0}": "Silenzia {0}",
+ "Mute lane": "Silenzia traccia",
"My templates": "I miei modelli",
"Name": "Nome",
"Natural": "Naturale",
@@ -375,6 +375,7 @@
"Remove": "Rimuovi",
"Remove background": "Rimuovi sfondo",
"Remove background: {0}": "Rimuovi sfondo: {0}",
+ "Remove lane": "Rimuovi traccia",
"Remove panel": "Rimuovi pannello",
"Remove {0}": "Rimuovi {0}",
"Renderer": "Renderer",
@@ -386,7 +387,7 @@
"Robot": "Robot",
"Room": "Stanza",
"Rotation": "Rotazione",
- "Row height for {0}": "Altezza riga di {0}",
+ "Row height": "Altezza riga",
"Runs locally": "Funziona in locale",
"Saturation": "Saturazione",
"Save": "Salva",
@@ -418,7 +419,7 @@
"Shifts the picture towards candlelight.": "Sposta l'immagine verso la luce di candela.",
"Shifts the picture towards daylight shade.": "Sposta l'immagine verso l'ombra della luce diurna.",
"Show in folder": "Mostra nella cartella",
- "Show {0}": "Mostra {0}",
+ "Show lane": "Mostra traccia",
"Silent": "Silenzio",
"Similarity": "Somiglianza",
"Size": "Dimensione",
@@ -492,8 +493,8 @@
"Treble": "Alti",
"Type the narration to read aloud…": "Scrivi la narrazione da leggere ad alta voce…",
"Undo": "Annulla",
- "Unlock {0}": "Sblocca {0}",
- "Unmute {0}": "Riattiva il suono di {0}",
+ "Unlock lane": "Sblocca traccia",
+ "Unmute lane": "Riattiva il suono della traccia",
"Unpacking…": "Estrazione…",
"Untitled project": "Progetto senza titolo",
"Up or down by semitones, the length untouched.": "Su o giù per semitoni, senza toccare la durata.",
diff --git a/engine/crates/concat/locales/ja.json b/engine/crates/concat/locales/ja.json
index 91bbf17f..77db194d 100644
--- a/engine/crates/concat/locales/ja.json
+++ b/engine/crates/concat/locales/ja.json
@@ -215,7 +215,7 @@
"Headline": "見出し",
"Height": "高さ",
"Hero": "ヒーロー",
- "Hide {0}": "{0} を隠す",
+ "Hide lane": "トラックを隠す",
"High": "高",
"Higher and squeakier.": "より高く、キーキーと。",
"Highlights": "ハイライト",
@@ -260,8 +260,8 @@
"Lo-fi": "ローファイ",
"Loading the model": "モデルを読み込み中",
"Location": "場所",
+ "Lock lane": "トラックをロック",
"Lock track": "トラックをロック",
- "Lock {0}": "{0} をロック",
"Lower and fuller.": "より低く、豊かに。",
"Lower third": "ローワーサード",
"male": "男性",
@@ -289,7 +289,7 @@
"Move {0} up": "{0} を上へ",
"Multiply": "乗算",
"Mute": "ミュート",
- "Mute {0}": "{0} をミュート",
+ "Mute lane": "トラックをミュート",
"My templates": "マイテンプレート",
"Name": "名前",
"Natural": "自然",
@@ -375,6 +375,7 @@
"Remove": "削除",
"Remove background": "背景を削除",
"Remove background: {0}": "背景を削除:{0}",
+ "Remove lane": "トラックを削除",
"Remove panel": "パネルを削除",
"Remove {0}": "{0} を削除",
"Renderer": "レンダラー",
@@ -386,7 +387,7 @@
"Robot": "ロボット",
"Room": "ルーム",
"Rotation": "回転",
- "Row height for {0}": "{0} の行の高さ",
+ "Row height": "行の高さ",
"Runs locally": "ローカルで動作",
"Saturation": "彩度",
"Save": "保存",
@@ -418,7 +419,7 @@
"Shifts the picture towards candlelight.": "画像をろうそくの光の色へ寄せます。",
"Shifts the picture towards daylight shade.": "画像を日陰の色へ寄せます。",
"Show in folder": "フォルダで表示",
- "Show {0}": "{0} を表示",
+ "Show lane": "トラックを表示",
"Silent": "無音",
"Similarity": "類似度",
"Size": "サイズ",
@@ -492,8 +493,8 @@
"Treble": "高音",
"Type the narration to read aloud…": "読み上げるナレーションを入力…",
"Undo": "取り消す",
- "Unlock {0}": "{0} のロックを解除",
- "Unmute {0}": "{0} のミュートを解除",
+ "Unlock lane": "トラックのロックを解除",
+ "Unmute lane": "トラックのミュートを解除",
"Unpacking…": "展開中…",
"Untitled project": "無題のプロジェクト",
"Up or down by semitones, the length untouched.": "半音単位で上下させ、長さは変えません。",
diff --git a/engine/crates/concat/locales/ko.json b/engine/crates/concat/locales/ko.json
index f23ba96b..db0d6d3c 100644
--- a/engine/crates/concat/locales/ko.json
+++ b/engine/crates/concat/locales/ko.json
@@ -215,7 +215,7 @@
"Headline": "헤드라인",
"Height": "높이",
"Hero": "히어로",
- "Hide {0}": "{0} 숨기기",
+ "Hide lane": "트랙 숨기기",
"High": "높음",
"Higher and squeakier.": "더 높고 새된 소리.",
"Highlights": "하이라이트",
@@ -260,8 +260,8 @@
"Lo-fi": "로파이",
"Loading the model": "모델 불러오는 중",
"Location": "위치",
+ "Lock lane": "트랙 잠금",
"Lock track": "트랙 잠금",
- "Lock {0}": "{0} 잠금",
"Lower and fuller.": "더 낮고 풍성하게.",
"Lower third": "하단 자막",
"male": "남성",
@@ -289,7 +289,7 @@
"Move {0} up": "{0} 위로",
"Multiply": "곱하기",
"Mute": "음소거",
- "Mute {0}": "{0} 음소거",
+ "Mute lane": "트랙 음소거",
"My templates": "내 템플릿",
"Name": "이름",
"Natural": "자연스럽게",
@@ -375,6 +375,7 @@
"Remove": "제거",
"Remove background": "배경 제거",
"Remove background: {0}": "배경 제거: {0}",
+ "Remove lane": "트랙 제거",
"Remove panel": "패널 제거",
"Remove {0}": "{0} 제거",
"Renderer": "렌더러",
@@ -386,7 +387,7 @@
"Robot": "로봇",
"Room": "룸",
"Rotation": "회전",
- "Row height for {0}": "{0} 행 높이",
+ "Row height": "행 높이",
"Runs locally": "로컬에서 실행",
"Saturation": "채도",
"Save": "저장",
@@ -418,7 +419,7 @@
"Shifts the picture towards candlelight.": "화면을 촛불 빛 쪽으로 옮깁니다.",
"Shifts the picture towards daylight shade.": "화면을 한낮의 그늘 쪽으로 옮깁니다.",
"Show in folder": "폴더에서 보기",
- "Show {0}": "{0} 표시",
+ "Show lane": "트랙 표시",
"Silent": "무음",
"Similarity": "유사도",
"Size": "크기",
@@ -492,8 +493,8 @@
"Treble": "고음",
"Type the narration to read aloud…": "읽어 줄 내레이션을 입력하세요…",
"Undo": "실행 취소",
- "Unlock {0}": "{0} 잠금 해제",
- "Unmute {0}": "{0} 음소거 해제",
+ "Unlock lane": "트랙 잠금 해제",
+ "Unmute lane": "트랙 음소거 해제",
"Unpacking…": "압축 해제 중…",
"Untitled project": "제목 없는 프로젝트",
"Up or down by semitones, the length untouched.": "반음 단위로 올리거나 내리며 길이는 그대로입니다.",
diff --git a/engine/crates/concat/locales/pt-BR.json b/engine/crates/concat/locales/pt-BR.json
index 6519172d..6663dd6a 100644
--- a/engine/crates/concat/locales/pt-BR.json
+++ b/engine/crates/concat/locales/pt-BR.json
@@ -215,7 +215,7 @@
"Headline": "Manchete",
"Height": "Altura",
"Hero": "Herói",
- "Hide {0}": "Ocultar {0}",
+ "Hide lane": "Ocultar faixa",
"High": "Alta",
"Higher and squeakier.": "Mais aguda e esganiçada.",
"Highlights": "Realces",
@@ -260,8 +260,8 @@
"Lo-fi": "Lo-fi",
"Loading the model": "Carregando o modelo",
"Location": "Local",
+ "Lock lane": "Bloquear faixa",
"Lock track": "Bloquear faixa",
- "Lock {0}": "Bloquear {0}",
"Lower and fuller.": "Mais grave e cheia.",
"Lower third": "Terço inferior",
"male": "masculina",
@@ -289,7 +289,7 @@
"Move {0} up": "Mover {0} para cima",
"Multiply": "Multiplicar",
"Mute": "Mudo",
- "Mute {0}": "Silenciar {0}",
+ "Mute lane": "Silenciar faixa",
"My templates": "Meus modelos",
"Name": "Nome",
"Natural": "Natural",
@@ -375,6 +375,7 @@
"Remove": "Remover",
"Remove background": "Remover fundo",
"Remove background: {0}": "Remover fundo: {0}",
+ "Remove lane": "Remover faixa",
"Remove panel": "Remover painel",
"Remove {0}": "Remover {0}",
"Renderer": "Renderizador",
@@ -386,7 +387,7 @@
"Robot": "Robô",
"Room": "Sala",
"Rotation": "Rotação",
- "Row height for {0}": "Altura da linha de {0}",
+ "Row height": "Altura da linha",
"Runs locally": "Executa localmente",
"Saturation": "Saturação",
"Save": "Salvar",
@@ -418,7 +419,7 @@
"Shifts the picture towards candlelight.": "Puxa a imagem para a luz de velas.",
"Shifts the picture towards daylight shade.": "Puxa a imagem para a sombra da luz do dia.",
"Show in folder": "Mostrar na pasta",
- "Show {0}": "Mostrar {0}",
+ "Show lane": "Mostrar faixa",
"Silent": "Silêncio",
"Similarity": "Similaridade",
"Size": "Tamanho",
@@ -492,8 +493,8 @@
"Treble": "Agudos",
"Type the narration to read aloud…": "Digite a narração a ser lida em voz alta…",
"Undo": "Desfazer",
- "Unlock {0}": "Desbloquear {0}",
- "Unmute {0}": "Ativar o som de {0}",
+ "Unlock lane": "Desbloquear faixa",
+ "Unmute lane": "Ativar o som da faixa",
"Unpacking…": "Descompactando…",
"Untitled project": "Projeto sem título",
"Up or down by semitones, the length untouched.": "Para cima ou para baixo em semitons, sem mexer na duração.",
diff --git a/engine/crates/concat/locales/ru.json b/engine/crates/concat/locales/ru.json
index 98636f73..6f408b96 100644
--- a/engine/crates/concat/locales/ru.json
+++ b/engine/crates/concat/locales/ru.json
@@ -215,7 +215,7 @@
"Headline": "Заголовок",
"Height": "Высота",
"Hero": "Герой",
- "Hide {0}": "Скрыть {0}",
+ "Hide lane": "Скрыть дорожку",
"High": "Высокое",
"Higher and squeakier.": "Выше и писклявее.",
"Highlights": "Света",
@@ -260,8 +260,8 @@
"Lo-fi": "Лоу-фай",
"Loading the model": "Загрузка модели",
"Location": "Расположение",
+ "Lock lane": "Заблокировать дорожку",
"Lock track": "Заблокировать дорожку",
- "Lock {0}": "Заблокировать {0}",
"Lower and fuller.": "Ниже и полнее.",
"Lower third": "Нижняя треть",
"male": "мужской",
@@ -289,7 +289,7 @@
"Move {0} up": "Переместить {0} вверх",
"Multiply": "Умножение",
"Mute": "Без звука",
- "Mute {0}": "Выключить звук {0}",
+ "Mute lane": "Выключить звук дорожки",
"My templates": "Мои шаблоны",
"Name": "Имя",
"Natural": "Естественно",
@@ -375,6 +375,7 @@
"Remove": "Удалить",
"Remove background": "Удалить фон",
"Remove background: {0}": "Удалить фон: {0}",
+ "Remove lane": "Удалить дорожку",
"Remove panel": "Убрать панель",
"Remove {0}": "Удалить {0}",
"Renderer": "Рендерер",
@@ -386,7 +387,7 @@
"Robot": "Робот",
"Room": "Комната",
"Rotation": "Поворот",
- "Row height for {0}": "Высота строки {0}",
+ "Row height": "Высота строки",
"Runs locally": "Работает локально",
"Saturation": "Насыщенность",
"Save": "Сохранить",
@@ -418,7 +419,7 @@
"Shifts the picture towards candlelight.": "Сдвигает картинку к свету свечей.",
"Shifts the picture towards daylight shade.": "Сдвигает картинку к дневной тени.",
"Show in folder": "Показать в папке",
- "Show {0}": "Показать {0}",
+ "Show lane": "Показать дорожку",
"Silent": "Тишина",
"Similarity": "Сходство",
"Size": "Размер",
@@ -492,8 +493,8 @@
"Treble": "Высокие",
"Type the narration to read aloud…": "Введите текст, который нужно прочитать вслух…",
"Undo": "Отменить",
- "Unlock {0}": "Разблокировать {0}",
- "Unmute {0}": "Включить звук {0}",
+ "Unlock lane": "Разблокировать дорожку",
+ "Unmute lane": "Включить звук дорожки",
"Unpacking…": "Распаковка…",
"Untitled project": "Проект без названия",
"Up or down by semitones, the length untouched.": "Вверх или вниз по полутонам, длина не меняется.",
diff --git a/engine/crates/concat/locales/tr.json b/engine/crates/concat/locales/tr.json
index 235bd24b..bb125a9d 100644
--- a/engine/crates/concat/locales/tr.json
+++ b/engine/crates/concat/locales/tr.json
@@ -215,7 +215,7 @@
"Headline": "Manşet",
"Height": "Yükseklik",
"Hero": "Kahraman",
- "Hide {0}": "{0} gizle",
+ "Hide lane": "Parçayı gizle",
"High": "Yüksek",
"Higher and squeakier.": "Daha tiz ve cıyaklayan.",
"Highlights": "Işıklar",
@@ -260,8 +260,8 @@
"Lo-fi": "Lo-fi",
"Loading the model": "Model yükleniyor",
"Location": "Konum",
+ "Lock lane": "Parçayı kilitle",
"Lock track": "Parçayı kilitle",
- "Lock {0}": "{0} kilitle",
"Lower and fuller.": "Daha pes ve dolgun.",
"Lower third": "Alt bant",
"male": "erkek",
@@ -289,7 +289,7 @@
"Move {0} up": "{0} yukarı taşı",
"Multiply": "Çarp",
"Mute": "Sessiz",
- "Mute {0}": "{0} sessize al",
+ "Mute lane": "Parçayı sessize al",
"My templates": "Şablonlarım",
"Name": "Ad",
"Natural": "Doğal",
@@ -375,6 +375,7 @@
"Remove": "Kaldır",
"Remove background": "Arka planı kaldır",
"Remove background: {0}": "Arka planı kaldır: {0}",
+ "Remove lane": "Parçayı kaldır",
"Remove panel": "Paneli kaldır",
"Remove {0}": "{0} kaldır",
"Renderer": "İşleyici",
@@ -386,7 +387,7 @@
"Robot": "Robot",
"Room": "Oda",
"Rotation": "Döndürme",
- "Row height for {0}": "{0} için satır yüksekliği",
+ "Row height": "Satır yüksekliği",
"Runs locally": "Yerel çalışır",
"Saturation": "Doygunluk",
"Save": "Kaydet",
@@ -418,7 +419,7 @@
"Shifts the picture towards candlelight.": "Görüntüyü mum ışığına doğru kaydırır.",
"Shifts the picture towards daylight shade.": "Görüntüyü gün ışığı gölgesine doğru kaydırır.",
"Show in folder": "Klasörde göster",
- "Show {0}": "{0} göster",
+ "Show lane": "Parçayı göster",
"Silent": "Sessiz",
"Similarity": "Benzerlik",
"Size": "Boyut",
@@ -492,8 +493,8 @@
"Treble": "Tiz",
"Type the narration to read aloud…": "Sesli okunacak anlatımı yazın…",
"Undo": "Geri al",
- "Unlock {0}": "{0} kilidini aç",
- "Unmute {0}": "{0} sesini aç",
+ "Unlock lane": "Parçanın kilidini aç",
+ "Unmute lane": "Parçanın sesini aç",
"Unpacking…": "Açılıyor…",
"Untitled project": "Adsız proje",
"Up or down by semitones, the length untouched.": "Yarım tonlarla yukarı veya aşağı, uzunluk aynı.",
diff --git a/engine/crates/concat/locales/zh-Hans.json b/engine/crates/concat/locales/zh-Hans.json
index eda72f00..2af677e8 100644
--- a/engine/crates/concat/locales/zh-Hans.json
+++ b/engine/crates/concat/locales/zh-Hans.json
@@ -215,7 +215,7 @@
"Headline": "标题",
"Height": "高度",
"Hero": "主角",
- "Hide {0}": "隐藏 {0}",
+ "Hide lane": "隐藏轨道",
"High": "高",
"Higher and squeakier.": "更高更尖。",
"Highlights": "高光",
@@ -260,8 +260,8 @@
"Lo-fi": "低保真",
"Loading the model": "正在加载模型",
"Location": "位置",
+ "Lock lane": "锁定轨道",
"Lock track": "锁定轨道",
- "Lock {0}": "锁定 {0}",
"Lower and fuller.": "更低沉、更饱满。",
"Lower third": "下方字幕条",
"male": "男声",
@@ -289,7 +289,7 @@
"Move {0} up": "上移 {0}",
"Multiply": "正片叠底",
"Mute": "静音",
- "Mute {0}": "将 {0} 静音",
+ "Mute lane": "将轨道静音",
"My templates": "我的模板",
"Name": "名称",
"Natural": "自然",
@@ -375,6 +375,7 @@
"Remove": "移除",
"Remove background": "移除背景",
"Remove background: {0}": "移除背景:{0}",
+ "Remove lane": "移除轨道",
"Remove panel": "移除面板",
"Remove {0}": "移除 {0}",
"Renderer": "渲染器",
@@ -386,7 +387,7 @@
"Robot": "机器人",
"Room": "房间",
"Rotation": "旋转",
- "Row height for {0}": "{0} 的行高",
+ "Row height": "行高",
"Runs locally": "本地运行",
"Saturation": "饱和度",
"Save": "保存",
@@ -418,7 +419,7 @@
"Shifts the picture towards candlelight.": "让画面偏向烛光的色调。",
"Shifts the picture towards daylight shade.": "让画面偏向日光阴影的色调。",
"Show in folder": "在文件夹中显示",
- "Show {0}": "显示 {0}",
+ "Show lane": "显示轨道",
"Silent": "静音",
"Similarity": "相似度",
"Size": "大小",
@@ -492,8 +493,8 @@
"Treble": "高音",
"Type the narration to read aloud…": "输入要朗读的旁白…",
"Undo": "撤销",
- "Unlock {0}": "解锁 {0}",
- "Unmute {0}": "取消 {0} 静音",
+ "Unlock lane": "解锁轨道",
+ "Unmute lane": "取消轨道静音",
"Unpacking…": "正在解包…",
"Untitled project": "未命名项目",
"Up or down by semitones, the length untouched.": "按半音升高或降低,时长不变。",
diff --git a/engine/crates/concat/locales/zh-TW.json b/engine/crates/concat/locales/zh-TW.json
index 6d3f3ebd..a380d2ef 100644
--- a/engine/crates/concat/locales/zh-TW.json
+++ b/engine/crates/concat/locales/zh-TW.json
@@ -45,12 +45,11 @@
"at the playhead": "在播放頭位置",
"Audio": "音訊",
"audio effect": "音效",
- "Audio effects": "音效",
"Audio Effects": "音效",
+ "Audio effects": "音效",
"Audio track": "音軌",
- "Audio tracks": "音軌",
- "auto": "自動",
"Auto": "自動",
+ "auto": "自動",
"Auto captions from this clip's sound": "根據此片段的聲音自動產生字幕",
"Auto removal": "自動去背",
"Auto removal keeps what the model finds and drops the rest: a person, or the one thing the picture is of. Custom removal starts from the same mask and takes corrections painted on the monitor: the smart brush keeps the whole thing it touches and the smart eraser removes it, the plain ones do exactly what you paint; Apply ends the painting. Chroma key drops one colour instead; similarity is how far from the colour still counts, softness feathers the edge.": "[自動去背] 會保留模型辨識出的人物或畫面主體,移除其餘部分。[自訂去背] 以相同遮罩為起點,可在監看畫面上塗繪修正:[智慧筆刷] 會保留觸及的整個物體,[智慧橡皮擦] 則會移除它,一般工具完全依照塗繪範圍處理;點選 [套用] 即可結束塗繪。[色度去背] 則會移除指定顏色;[相似度] 決定可移除的顏色差異範圍,[柔和度] 則控制邊緣羽化。",
@@ -126,8 +125,8 @@
"Combo": "組合",
"Concat {0}": "Concat {0}",
"Content": "內容",
- "Contents": "內容",
"CONTENTS": "內容",
+ "Contents": "內容",
"Contrast": "對比度",
"Contrast Pop": "強化對比",
"Cool": "冷色調",
@@ -202,7 +201,6 @@
"Even": "均勻膚色",
"Every colour becomes its opposite.": "將所有顏色反相。",
"Every colour turned around the wheel by the same angle.": "將所有顏色沿色相環旋轉相同角度。",
- "Every track": "所有音軌",
"Everyday": "日常",
"Everything brighter than the threshold turns negative, as an over-exposed print does.": "將亮度超過臨界值的部分反相,呈現照片過度曝光般的效果。",
"Everything on this machine. Transcription and speech run against models you download here, and nothing about a project leaves the device.": "所有處理都在本機進行。語音轉文字與語音合成使用在此下載的模型,專案資料不會離開裝置。",
@@ -237,7 +235,6 @@
"Filters": "濾鏡",
"Finalising file": "正在完成檔案",
"Finding the subject… {0}%": "正在辨識主體… {0}%",
- "First track": "第一條音軌",
"Fisheye": "魚眼",
"Flash": "閃光",
"Flash In": "疾速開場",
@@ -274,7 +271,7 @@
"Headline": "大標題",
"Height": "高度",
"Hero": "英雄時刻",
- "Hide {0}": "隱藏 {0}",
+ "Hide lane": "隱藏軌道",
"High": "高",
"Higher and squeakier.": "讓聲音更高、更尖細。",
"Highlights": "亮部",
@@ -282,6 +279,7 @@
"Horizontal": "水平",
"Hue Shift": "色相偏移",
"Images": "圖片",
+ "Import": "匯入",
"Import a LUT (.cube)": "匯入 LUT(.cube)",
"Import LUT": "匯入 LUT",
"Import media": "匯入媒體",
@@ -311,7 +309,6 @@
"Lagoon": "潟湖",
"Language": "語言",
"Large": "大",
- "Last track": "最後一條音軌",
"Late light: a warm balance that keeps its brightness, orange in the highlights, a whisper of magenta in the shadows, blacks lifted a touch.": "傍晚光線:保留亮度的暖色調,亮部偏橘、陰影略帶洋紅,黑色稍微提亮。",
"Layer": "圖層",
"Layout": "版面",
@@ -332,8 +329,8 @@
"Lo-fi": "低傳真",
"Loading the model": "正在載入模型",
"Location": "位置",
+ "Lock lane": "鎖定軌道",
"Lock track": "鎖定軌道",
- "Lock {0}": "鎖定 {0}",
"Low contrast, pink and lavender in the light, and a soft bloom over it all. The dreamy one.": "低對比搭配亮處的粉紅與淡紫色,整體籠罩柔和光暈,營造夢幻氛圍。",
"Low light opened up: shadows lifted with the noise softened before it rises, whites held, the blue of the night kept.": "讓低光源畫面更清楚:先柔化雜訊再提亮陰影,保留白色亮度與夜晚的藍色調。",
"Lower and fuller.": "讓聲音更低沉、更飽滿。",
@@ -374,7 +371,7 @@
"Move {0} up": "將 {0} 上移",
"Multiply": "色彩增值",
"Mute": "靜音",
- "Mute {0}": "將 {0} 靜音",
+ "Mute lane": "將軌道靜音",
"Muted and green-teal through the midtones, a gentle film curve, warmth only where a face is. The quiet grade of an indie film.": "中間調淡雅偏藍綠,搭配柔和底片曲線,僅臉部保留暖意。呈現獨立電影般沉靜的調色。",
"My templates": "我的範本",
"Name": "名稱",
@@ -390,8 +387,8 @@
"No {0} matches that.": "找不到符合條件的{0}。",
"Noise": "雜訊",
"Noise Reduction": "降噪",
- "none": "無",
"None": "無",
+ "none": "無",
"None installed": "尚未安裝",
"Normal": "一般",
"Normalize Loudness": "響度正規化",
@@ -478,6 +475,7 @@
"Remove": "移除",
"Remove background": "移除背景",
"Remove background: {0}": "移除背景:{0}",
+ "Remove lane": "移除軌道",
"Remove panel": "移除面板",
"Remove {0}": "移除 {0}",
"Renderer": "算繪器",
@@ -491,7 +489,7 @@
"Robot": "機器人",
"Room": "房間殘響",
"Rotation": "旋轉",
- "Row height for {0}": "{0} 的列高",
+ "Row height": "列高",
"Runs locally": "在本機執行",
"Sage": "鼠尾草",
"Saturation": "飽和度",
@@ -527,7 +525,7 @@
"Shifts the picture towards candlelight.": "讓畫面偏向燭光般的暖色調。",
"Shifts the picture towards daylight shade.": "讓畫面偏向日光陰影般的冷色調。",
"Show in folder": "在資料夾中顯示",
- "Show {0}": "顯示 {0}",
+ "Show lane": "顯示軌道",
"Showing the look over the picture. Double-click the card, or its plus, to lay it on the timeline": "正在畫面上預覽調色風格。按兩下卡片,或點選其加號,即可加入時間軸",
"Silent": "靜音",
"Similarity": "相似度",
@@ -605,8 +603,8 @@
"These settings apply to the whole edit and cannot be changed later.": "這些設定會套用至整段剪輯,之後無法變更。",
"This clip has no file to transcribe": "此片段沒有可轉成文字的檔案",
"Threshold": "臨界值",
- "Timeline": "時間軸",
"TIMELINE": "時間軸",
+ "Timeline": "時間軸",
"Timeline 1": "時間軸 1",
"Tint": "色偏",
"Title": "標題",
@@ -628,8 +626,8 @@
"Type the words to put on screen…": "請輸入要顯示在畫面上的文字…",
"Umber": "棕褐",
"Undo": "復原",
- "Unlock {0}": "解除鎖定 {0}",
- "Unmute {0}": "取消 {0} 靜音",
+ "Unlock lane": "解除鎖定軌道",
+ "Unmute lane": "取消軌道靜音",
"Unpacking…": "正在解壓縮…",
"Untitled project": "未命名專案",
"Up or down by semitones, the length untouched.": "以半音為單位升降音高,維持片段長度。",
@@ -650,15 +648,14 @@
"Warmth": "暖色程度",
"Water": "水色",
"Water and sky turned aquamarine and brightened, sand and skin left warm and clean. The beach-day look creators reach for first.": "將水面與天空轉為明亮的海藍色,沙灘與膚色則維持溫暖自然。創作者拍攝海灘日常時的首選風格。",
- "What a clip plays when its file has more than one audio track, as a screen recording with the desktop and the microphone apart does. Every track puts each one on a sound lane of its own, the way Detach audio does. The Audio panel can change any clip afterwards.": "設定片段檔案含有多條音軌時要播放哪一條,例如將桌面音訊與麥克風聲音分開錄製的螢幕錄影。選擇 [所有音軌] 會將每條音軌分別放到獨立的聲音軌道上,如同 [分離音訊] 的效果。之後仍可在 [音訊] 面板中變更各片段的音軌。",
"Where should the project folder go?": "要將專案資料夾儲存在哪裡?",
"Whites": "白色",
"Width": "寬度",
"yesterday": "昨天",
"Zoom In": "放大",
"Zoom in": "放大",
- "Zoom out": "縮小",
"Zoom Out": "縮小",
+ "Zoom out": "縮小",
"Zoom to fit": "縮放至符合視窗",
"{0} channels": "{0} 個聲道",
"{0} days ago": "{0} 天前",
diff --git a/engine/crates/concat/src/lib.rs b/engine/crates/concat/src/lib.rs
index d3a2b607..7d25f53b 100644
--- a/engine/crates/concat/src/lib.rs
+++ b/engine/crates/concat/src/lib.rs
@@ -578,18 +578,6 @@ pub fn run() -> Result<(), slint::PlatformError> {
state.track_flags(row, visible, muted, locked);
}
));
- editor.on_track_renamed(on_window!(|state, row: i32, name: SharedString| {
- let trimmed = name.trim().to_string();
- let Some(id) = state.row_track(row).map(|track| track.id.clone()) else {
- return;
- };
- if !trimmed.is_empty() {
- state.apply(concat_project::Command::RenameTrack {
- track_id: id,
- name: trimmed,
- });
- }
- }));
editor.on_track_sized(on_window!(|state, row: i32, size: TrackSize| {
state.set_lane_size(row, size);
}));
@@ -957,12 +945,6 @@ pub fn run() -> Result<(), slint::PlatformError> {
}
state.prefs.save(&state.host.dirs);
}));
- app.on_settings_audio_tracks_changed(on_window!(|state, index: i32| {
- let choice = prefs::AudioTracks::from_row(index);
- state.settings.audio_tracks = choice.row();
- state.prefs.audio_tracks = choice;
- state.prefs.save(&state.host.dirs);
- }));
app.on_settings_playhead_stops_changed(on_window!(|state, on: bool| {
state.settings.playhead_stops = on;
state.prefs.playhead_stops_at_end = on;
diff --git a/engine/crates/concat/src/prefs.rs b/engine/crates/concat/src/prefs.rs
index 22c4e328..184cb239 100644
--- a/engine/crates/concat/src/prefs.rs
+++ b/engine/crates/concat/src/prefs.rs
@@ -30,54 +30,12 @@ pub struct Preferences {
/// library it happens to be filed in is not part of it.
#[serde(default)]
pub favourites: Vec<String>,
- /// What a clip plays when its file has several audio tracks.
- pub audio_tracks: AudioTracks,
/// The playhead stops at the end of the content instead of going where
/// it is put. Off by default: a click past the last clip lands there, so
/// a clip can be dropped at the playhead beyond everything else.
pub playhead_stops_at_end: bool,
}
-/// What a clip of a file with several audio tracks plays when it is placed
-/// from the bin - a screen recording that kept the desktop and the
-/// microphone apart, say. A file with one track has nothing to choose and
-/// is left alone whatever this says. The Audio panel changes a placed clip
-/// afterwards, per clip; this only sets what a fresh one starts on.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub enum AudioTracks {
- /// The first track in file order: what the engine plays unless told
- /// otherwise, and what every clip did before the choice existed.
- #[default]
- First,
- /// The last track in file order.
- Last,
- /// Every track, each as a sound clip of its own on its own lane, and
- /// the video muted - the same as detaching the audio by hand.
- Every,
-}
-
-impl AudioTracks {
- /// The choices, in the order the settings sheet lists them.
- pub const ALL: [AudioTracks; 3] = [AudioTracks::First, AudioTracks::Last, AudioTracks::Every];
-
- /// The row in the settings sheet.
- pub fn row(self) -> i32 {
- Self::ALL
- .iter()
- .position(|choice| *choice == self)
- .unwrap_or(0) as i32
- }
-
- /// The choice a row names; a row off the list is the default.
- pub fn from_row(row: i32) -> Self {
- usize::try_from(row)
- .ok()
- .and_then(|row| Self::ALL.get(row).copied())
- .unwrap_or_default()
- }
-}
-
impl Preferences {
/// Reads the file, or the defaults when there is none.
pub fn load(dirs: &AppDirs) -> Self {
diff --git a/engine/crates/concat/src/studio.rs b/engine/crates/concat/src/studio.rs
index 3be6e3c5..446df502 100644
--- a/engine/crates/concat/src/studio.rs
+++ b/engine/crates/concat/src/studio.rs
@@ -49,7 +49,7 @@ use crate::host::{
Host, MediaArt, cached_media_art, image_at, image_of, media_art, on_ui, spawn, spawn_art,
};
use crate::i18n::{self, t, tf};
-use crate::prefs::{AudioTracks, Preferences};
+use crate::prefs::Preferences;
use crate::presets::{self, TextPreset};
use crate::ui::*;
@@ -267,8 +267,6 @@ pub struct SettingsState {
pub open: bool,
pub tab: i32,
pub language: usize,
- /// Row of [`AudioTracks`] in the General page.
- pub audio_tracks: i32,
/// The switch that keeps the playhead inside the content.
pub playhead_stops: bool,
}
@@ -1398,7 +1396,6 @@ impl Studio {
.iter()
.position(|language| Some(language.code.as_str()) == studio.prefs.locale.as_deref())
.unwrap_or(0);
- studio.settings.audio_tracks = studio.prefs.audio_tracks.row();
studio.settings.playhead_stops = studio.prefs.playhead_stops_at_end;
studio.refresh_models();
studio
@@ -2456,8 +2453,7 @@ impl Studio {
})
};
if let Some(id) = created {
- self.selection = vec![id.clone()];
- self.settle_audio_tracks(&id);
+ self.selection = vec![id];
}
}
@@ -2485,51 +2481,7 @@ impl Studio {
})
};
if let Some(id) = created {
- self.selection = vec![id.clone()];
- self.settle_audio_tracks(&id);
- }
- }
-
- /// The Settings choice for a file with several audio tracks, applied to
- /// a clip just placed from the bin. Nothing for the first track: that
- /// is what a fresh clip plays. The last track is named on the clip; every
- /// track is the sound pulled out, one clip per track, as Detach audio
- /// does. A file with one track has nothing to choose, whatever the
- /// setting says. A second edit after the placement, so an undo takes the
- /// choice back and leaves the clip, the way a freeze frame's trim does.
- fn settle_audio_tracks(&mut self, clip_id: &str) {
- let choice = self.prefs.audio_tracks;
- if choice == AudioTracks::First {
- return;
- }
- let Some(media_id) = self.clip(clip_id).map(|clip| clip.media_id.clone()) else {
- return;
- };
- let tracks = self
- .project()
- .media
- .iter()
- .find(|item| item.id == media_id)
- .map(|item| item.audio_tracks.clone())
- .unwrap_or_default();
- if tracks.len() < 2 {
- return;
- }
- let clip_id = clip_id.to_owned();
- match choice {
- AudioTracks::First => {}
- AudioTracks::Last => {
- self.apply(Command::UpdateClip {
- clip_id,
- patch: ClipPatch {
- audio_stream: Some(tracks.last().map(|track| track.index)),
- ..ClipPatch::default()
- },
- });
- }
- AudioTracks::Every => {
- self.apply(Command::DetachAudio { clip_id });
- }
+ self.selection = vec![id];
}
}
@@ -5657,7 +5609,6 @@ impl Studio {
let height = self.lane_height(lane);
let row = TrackData {
id: lane.id.as_str().into(),
- name: lane.name.as_str().into(),
visible: lane.visible,
muted: lane.muted,
locked: self.locked(&lane.id),
@@ -6532,7 +6483,6 @@ impl Studio {
open: self.settings.open,
tab: self.settings.tab,
language: self.settings.language as i32,
- audio_tracks: self.settings.audio_tracks,
playhead_stops: self.settings.playhead_stops,
disk: {
let installed: Vec<&ModelState> = self
@@ -6974,9 +6924,7 @@ impl Studio {
.collect();
let start = f64::from(self.playhead.max(0.0));
for media_id in ids {
- if let Some(id) = self.apply(Command::AddClipAtFirstFree { media_id, start }) {
- self.settle_audio_tracks(&id);
- }
+ self.apply(Command::AddClipAtFirstFree { media_id, start });
}
}
diff --git a/engine/crates/concat/ui/app.slint b/engine/crates/concat/ui/app.slint
index 97315df4..2bd7a7be 100644
--- a/engine/crates/concat/ui/app.slint
+++ b/engine/crates/concat/ui/app.slint
@@ -184,7 +184,6 @@ export component App inherits Window {
callback settings-page-changed(index: int);
callback settings-language-changed(index: int);
callback settings-theme-changed(dark: bool);
- callback settings-audio-tracks-changed(index: int);
callback settings-playhead-stops-changed(on: bool);
callback model-activated(id: string);
callback model-download(id: string);
@@ -462,7 +461,6 @@ export component App inherits Window {
page-changed(index) => { root.settings-page-changed(index); }
language-changed(index) => { root.settings-language-changed(index); }
theme-changed(dark) => { root.settings-theme-changed(dark); }
- audio-tracks-changed(index) => { root.settings-audio-tracks-changed(index); }
playhead-stops-changed(on) => { root.settings-playhead-stops-changed(on); }
model-activated(id) => { root.model-activated(id); }
model-download(id) => { root.model-download(id); }
diff --git a/engine/crates/concat/ui/dialogs/settings.slint b/engine/crates/concat/ui/dialogs/settings.slint
index 0b1ad04f..73e879b2 100644
--- a/engine/crates/concat/ui/dialogs/settings.slint
+++ b/engine/crates/concat/ui/dialogs/settings.slint
@@ -48,9 +48,6 @@ export struct SettingsData {
/// 0 General, 1 Appearance, 2 Transcriber, 3 Speech, 4 About
tab: int,
language: int,
- /// what a clip of a file with several audio tracks plays when placed:
- /// 0 the first track, 1 the last, 2 every track as its own clip
- audio-tracks: int,
/// the playhead stops at the end of the content
playhead-stops: bool,
/// "3 installed · 612 MB on disk"
@@ -340,7 +337,6 @@ export component SettingsDialog inherits Modal {
/// say "the other one"; a page with two named options can say which one is
/// on, which is the whole reason it moved in here.
callback theme-changed(dark: bool);
- callback audio-tracks-changed(index: int);
callback playhead-stops-changed(on: bool);
callback model-activated(id: string);
callback model-download(id: string);
@@ -478,21 +474,6 @@ export component SettingsDialog inherits Modal {
}
}
}
-
- // A file with one audio track has nothing to choose, so this
- // only ever matters for a recording that kept the desktop and
- // the microphone apart. It sets what a placed clip starts on;
- // the Audio panel changes any one clip afterwards.
- DialogSection {
- title: I18n.t("Audio tracks");
- hint: I18n.t("What a clip plays when its file has more than one audio track, as a screen recording with the desktop and the microphone apart does. Every track puts each one on a sound lane of its own, the way Detach audio does. The Audio panel can change any clip afterwards.");
-
- SegmentedControl {
- options: [I18n.t("First track"), I18n.t("Last track"), I18n.t("Every track")];
- current: root.data.audio-tracks;
- changed(index) => { root.audio-tracks-changed(index); }
- }
- }
}
// Read straight off the Theme global rather than through
diff --git a/engine/crates/concat/ui/editor.slint b/engine/crates/concat/ui/editor.slint
index dcd07744..898cdc25 100644
--- a/engine/crates/concat/ui/editor.slint
+++ b/engine/crates/concat/ui/editor.slint
@@ -287,7 +287,6 @@ export global Editor {
callback track-flag-changed(index: int, visible: bool, muted: bool, locked: bool);
callback track-sized(index: int, size: TrackSize);
callback track-removed(index: int);
- callback track-renamed(index: int, name: string);
/// A tab dragged to a new place in the strip. `to` is counted with the
/// tab already out of its old slot, the way MoveTimeline counts.
callback tab-moved(from: int, to: int);
diff --git a/engine/crates/concat/ui/icons.slint b/engine/crates/concat/ui/icons.slint
index 299e7a46..3007e920 100644
--- a/engine/crates/concat/ui/icons.slint
+++ b/engine/crates/concat/ui/icons.slint
@@ -81,6 +81,9 @@ export enum Glyph {
export,
chevron-up,
search,
+ // what the bin is sorted by: when it came in, its name, its kind
+ clock,
+ tag,
// the timeline tray and its lane headers
pointer,
razor,
@@ -484,6 +487,20 @@ export component Icon inherits Rectangle {
size: root.size; tint: root.tint; weight: root.weight;
commands: "M16 9a7 7 0 1 1-14 0a7 7 0 1 1 14 0 M22 15a7 7 0 1 1-14 0a7 7 0 1 1 14 0";
}
+ // lucide/clock
+ if root.glyph == Glyph.clock: Stroked {
+ size: root.size; tint: root.tint; weight: root.weight;
+ commands: "M2 12a10 10 0 1 0 20 0a10 10 0 1 0 -20 0 M12 6v6l4 2";
+ }
+
+ // lucide/tag
+ if root.glyph == Glyph.tag: Stroked {
+ size: root.size; tint: root.tint; weight: root.weight;
+ commands: "M12.586 2.586A2 2 0 0 0 11.172 2H4a2 2 0 0 0-2 2v7.172a2 2 0 0 0"
+ + " .586 1.414l8.704 8.704a2.426 2.426 0 0 0 3.42 0l6.58-6.58a2.426"
+ + " 2.426 0 0 0 0-3.42z M7.5 7.5h.01";
+ }
+
// lucide/audio-lines
if root.glyph == Glyph.waveform: Stroked {
size: root.size; tint: root.tint; weight: root.weight;
diff --git a/engine/crates/concat/ui/primitives/select.slint b/engine/crates/concat/ui/primitives/select.slint
index 669edf92..813827e5 100644
--- a/engine/crates/concat/ui/primitives/select.slint
+++ b/engine/crates/concat/ui/primitives/select.slint
@@ -4,6 +4,7 @@
import { Theme } from "../theme/theme.slint";
import { Glyph, Icon } from "../icons.slint";
import { FocusRing } from "focus-ring.slint";
+import { Tip } from "tooltip.slint";
// Custom listbox dropdown rather than a native combo box, so options can carry
// icons and match the panel styling. Arrows, Home/End, Enter and Escape all
@@ -20,6 +21,14 @@ export component Select inherits Rectangle {
in property <string> placeholder: "Select";
/// leading adornment on the trigger
in property <Glyph> glyph: Glyph.none;
+ /// One mark per option, in the same order. Set it and the trigger shows
+ /// the current option's mark in place of its words — the words stay in
+ /// the list, where there is room for them, and each row carries its mark
+ /// beside them so the pairing is learnt by reading the list once. For a
+ /// control that is one of several against the edge of a row, where three
+ /// words of "Sort: Added" cost more room than they earn. Shorter than
+ /// `options` is fine; a row past its end simply has none.
+ in property <[Glyph]> icons;
in property <bool> enabled: true;
/// drop the field background, for a select used as panel chrome
in property <bool> flat;
@@ -36,6 +45,25 @@ export component Select inherits Rectangle {
property <string> label: (root.current >= 0 && root.current < root.options.length)
? root.options[root.current]
: root.placeholder;
+ /// the current option has a mark, so the trigger wears it instead of words
+ property <bool> marked: root.current >= 0 && root.current < root.icons.length;
+ property <Glyph> mark: root.marked ? root.icons[root.current] : Glyph.none;
+ /// the mark on the trigger, at the size of the glyph it replaces
+ property <length> mark-size: 14px;
+
+ /// What the trigger needs to show its options whole: the padding, the
+ /// chevron, the optional glyph, and the gaps between them. A select set
+ /// against the edge of a row takes this instead of a share of the row —
+ /// `width: self.natural-width` at the call site.
+ ///
+ /// Measured off the widest option rather than the current one, so the
+ /// control keeps its size as the selection moves from a long option to a
+ /// short one; a trigger that changed width when you picked from it would
+ /// walk the controls beside it across the row.
+ out property <length> natural-width: 8px + 6px + 12px + 6px
+ + (root.marked
+ ? root.mark-size
+ : measure.preferred-width + (root.glyph != Glyph.none ? 12px + 6px : 0px));
height: Theme.h;
min-width: 60px;
@@ -89,12 +117,30 @@ export component Select inherits Rectangle {
padding-right: 6px;
spacing: 6px;
- if root.glyph != Glyph.none: VerticalLayout {
+ if root.glyph != Glyph.none && !root.marked: VerticalLayout {
alignment: center;
Icon { glyph: root.glyph; size: 12px; tint: Theme.fg-dim; }
}
- Text {
+ // A layout of its own rather than the mark on its own, so a marked
+ // trigger given more width than it asked for keeps the mark at the
+ // leading edge and the chevron at the trailing one, the way the words
+ // it stands in for would have sat.
+ if root.marked: HorizontalLayout {
+ horizontal-stretch: 1;
+ alignment: start;
+
+ VerticalLayout {
+ alignment: center;
+ Icon {
+ glyph: root.mark;
+ size: root.mark-size;
+ tint: (root.open || trigger.has-hover) ? Theme.fg : Theme.fg-muted;
+ }
+ }
+ }
+
+ if !root.marked: Text {
horizontal-stretch: 1;
text: root.label;
color: root.current >= 0 ? (root.flat ? Theme.fg-muted : Theme.fg) : Theme.fg-dim;
@@ -109,6 +155,25 @@ export component Select inherits Rectangle {
}
}
+ // The ruler behind `natural-width`. Measured rather than estimated: a Text
+ // parked at the origin still reports the real width of its string in the
+ // real face — see TooltipLayer — and a child given an `x` is left out of
+ // its parent's constraints, so measuring the trigger cannot widen it. The
+ // rows are stacked because a VerticalLayout's preferred width is the
+ // widest of them, which is the only fold over a model the language has.
+ measure := VerticalLayout {
+ x: 0;
+ y: 0;
+ width: 0px;
+ height: 0px;
+ visible: false;
+
+ for option in root.options: Text {
+ text: option;
+ font-size: Theme.fs;
+ }
+ }
+
trigger := TouchArea {
enabled: root.enabled;
mouse-cursor: pointer;
@@ -123,6 +188,13 @@ export component Select inherits Rectangle {
radius: Theme.r;
}
+ // Only where the mark replaced the words. A trigger showing its label is
+ // already saying what a tip would say, and the open list says it too.
+ Tip {
+ text: root.marked ? root.label : "";
+ active: trigger.has-hover && root.enabled && !root.open;
+ }
+
list := PopupWindow {
x: 0;
y: root.height + 4px;
@@ -187,6 +259,15 @@ export component Select inherits Rectangle {
padding-right: 6px;
spacing: 6px;
+ if index < root.icons.length: VerticalLayout {
+ alignment: center;
+ Icon {
+ glyph: root.icons[index];
+ size: 13px;
+ tint: index == root.active ? Theme.on-accent : Theme.fg-dim;
+ }
+ }
+
Text {
horizontal-stretch: 1;
text: option;
diff --git a/engine/crates/concat/ui/timeline/model.slint b/engine/crates/concat/ui/timeline/model.slint
index 613fde46..55ea8c63 100644
--- a/engine/crates/concat/ui/timeline/model.slint
+++ b/engine/crates/concat/ui/timeline/model.slint
@@ -47,7 +47,6 @@ export enum TrackSize { auto, small, medium, large }
/// the other.
export struct TrackData {
id: string,
- name: string,
visible: bool,
muted: bool,
/// What the header's dropdown shows, and what `height` was resolved from.
diff --git a/engine/crates/concat/ui/timeline/track-header.slint b/engine/crates/concat/ui/timeline/track-header.slint
index 42f4acdb..a56a9b0c 100644
--- a/engine/crates/concat/ui/timeline/track-header.slint
+++ b/engine/crates/concat/ui/timeline/track-header.slint
@@ -3,13 +3,15 @@
import { I18n } from "../i18n.slint";
import { Theme } from "../theme/theme.slint";
-import { Focus } from "../util.slint";
import { Glyph, Icon } from "../icons.slint";
import { IconButton } from "../primitives/panel.slint";
import { ThinScrollbar } from "../primitives/scrollbar.slint";
import { TrackData, TrackSize } from "model.slint";
-// The lane labels, in a fixed column beside the lanes.
+// The lane switches, in a fixed column beside the lanes.
+//
+// No label on a row: the lanes are untyped, so there is no kind to name, and
+// a lane's place in the stack is the only handle anything needs on it.
//
// Both a visibility and a mute toggle on every row, because a track is not
// typed — the same lane can be carrying a video clip and an mp3 side by side,
@@ -31,7 +33,6 @@ import { TrackData, TrackSize } from "model.slint";
// it, so the row reads as one strip of controls.
component SizeMenu inherits Rectangle {
in property <TrackSize> current;
- in property <string> name;
callback picked(size: TrackSize);
@@ -57,7 +58,7 @@ component SizeMenu inherits Rectangle {
IconButton {
glyph: Glyph.rows;
- label: I18n.t1("Row height for {0}", "\{root.name}");
+ label: I18n.t("Row height");
icon-size: 12px;
// Lit only when the lane has been sized by hand: auto is the resting
// state, and a button lit on every row would say nothing.
@@ -130,12 +131,6 @@ component Header inherits Rectangle {
callback flag-changed(visible: bool, muted: bool, locked: bool);
callback sized(size: TrackSize);
callback removed();
- callback renamed(name: string);
-
- property <bool> renaming;
- /// Neither seen nor heard: the name goes dim, so a lane that contributes
- /// nothing to the render says so at a glance.
- property <bool> silent: !root.track.visible && root.track.muted;
Rectangle {
x: 0;
@@ -158,83 +153,19 @@ component Header inherits Rectangle {
// switches are start-aligned on the *cross* axis individually,
// which is the part that was actually wanted.
- VerticalLayout {
- alignment: start;
- horizontal-stretch: 1;
-
- Rectangle {
- height: 20px;
- horizontal-stretch: 1;
-
- name := Text {
- x: 0;
- y: (parent.height - self.height) / 2;
- width: parent.width;
- text: root.track.name;
- color: root.silent ? Theme.fg-dim : Theme.fg;
- font-size: Theme.fs;
- vertical-alignment: center;
- overflow: elide;
- visible: !root.renaming;
- }
-
- // Double-click to rename, commit on blur — the same rule
- // the tab strip follows.
- if !root.renaming: TouchArea {
- double-clicked => { root.renaming = true; }
- }
-
- if root.renaming: Rectangle {
- border-radius: Theme.r-xs;
- background: Theme.well;
- border-width: 1px;
- border-color: Theme.accent;
- clip: true;
-
- rename := TextInput {
- x: 4px;
- y: (parent.height - self.height) / 2;
- width: parent.width - 8px;
- text: root.track.name;
- color: Theme.fg;
- font-size: Theme.fs;
- single-line: true;
- selection-background-color: Theme.accent;
- selection-foreground-color: Theme.on-accent;
-
- init => {
- self.focus();
- self.select-all();
- }
-
- changed has-focus => {
- if (!self.has-focus && root.renaming) {
- root.renamed(self.text);
- root.renaming = false;
- }
- }
-
- accepted => { Focus.release(); }
-
- key-pressed(event) => {
- if (event.text == Key.Escape) {
- self.text = root.track.name;
- Focus.release();
- return EventResult.accept;
- }
- return EventResult.reject;
- }
- }
- }
- }
- }
+ // The lanes are deliberately untyped and no longer named, so
+ // nothing goes here. It stays as the row's give: the switches
+ // stay against the trailing edge at every column width, and a
+ // narrow column takes the gap away from here rather than from
+ // them.
+ Rectangle { horizontal-stretch: 1; }
// Revealed on hover, and never on the last lane standing.
- if root.removable && row.has-hover && !root.renaming: VerticalLayout {
+ if root.removable && row.has-hover: VerticalLayout {
alignment: start;
IconButton {
glyph: Glyph.close;
- label: I18n.t1("Remove {0}", "\{root.track.name}");
+ label: I18n.t("Remove lane");
icon-size: 11px;
danger: true;
clicked => { root.removed(); }
@@ -245,7 +176,6 @@ component Header inherits Rectangle {
alignment: start;
SizeMenu {
current: root.track.size;
- name: root.track.name;
picked(size) => { root.sized(size); }
}
}
@@ -254,8 +184,7 @@ component Header inherits Rectangle {
alignment: start;
IconButton {
glyph: root.track.locked ? Glyph.lock : Glyph.unlock;
- label: root.track.locked ? I18n.t1("Unlock {0}", "\{root.track.name}")
- : I18n.t1("Lock {0}", "\{root.track.name}");
+ label: root.track.locked ? I18n.t("Unlock lane") : I18n.t("Lock lane");
icon-size: 12px;
checked: root.track.locked;
clicked => {
@@ -272,8 +201,7 @@ component Header inherits Rectangle {
// something is being withheld, which is the state worth
// announcing.
glyph: root.track.visible ? Glyph.eye : Glyph.eye-off;
- label: root.track.visible ? I18n.t1("Hide {0}", "\{root.track.name}")
- : I18n.t1("Show {0}", "\{root.track.name}");
+ label: root.track.visible ? I18n.t("Hide lane") : I18n.t("Show lane");
icon-size: 12px;
checked: !root.track.visible;
clicked => {
@@ -287,8 +215,7 @@ component Header inherits Rectangle {
alignment: start;
IconButton {
glyph: root.track.muted ? Glyph.volume-off : Glyph.volume;
- label: root.track.muted ? I18n.t1("Unmute {0}", "\{root.track.name}")
- : I18n.t1("Mute {0}", "\{root.track.name}");
+ label: root.track.muted ? I18n.t("Unmute lane") : I18n.t("Mute lane");
icon-size: 12px;
checked: root.track.muted;
clicked => {
@@ -318,7 +245,6 @@ export component TrackHeaders inherits Rectangle {
callback flag-changed(index: int, visible: bool, muted: bool, locked: bool);
callback sized(index: int, size: TrackSize);
callback removed(index: int);
- callback renamed(index: int, name: string);
clip: true;
@@ -339,7 +265,6 @@ export component TrackHeaders inherits Rectangle {
}
sized(size) => { root.sized(index, size); }
removed => { root.removed(index); }
- renamed(name) => { root.renamed(index, name); }
}
// The bar, over the rows and under the corner. On the trailing edge,
diff --git a/engine/crates/concat/ui/workspace/media-pane.slint b/engine/crates/concat/ui/workspace/media-pane.slint
index 535fbb70..6fa7b36d 100644
--- a/engine/crates/concat/ui/workspace/media-pane.slint
+++ b/engine/crates/concat/ui/workspace/media-pane.slint
@@ -242,7 +242,7 @@ component ImportButton inherits Rectangle {
in property <bool> busy;
// Reused by the templates page as "save as template", so the words and
// the mark are parameters with the import ones as defaults.
- in property <string> label: I18n.t("Import media");
+ in property <string> label: I18n.t("Import");
in property <string> busy-label: I18n.t("Importing…");
in property <Glyph> glyph: Glyph.import;
@@ -286,6 +286,11 @@ component ImportButton inherits Rectangle {
HorizontalLayout {
alignment: center;
+ // Shoulders on the words, so a button sized to its own label — the
+ // media page's, which is one word — still reads as a zone to drop on
+ // rather than as the text with a box drawn round it.
+ padding-left: 18px;
+ padding-right: 18px;
spacing: 8px;
VerticalLayout {
@@ -1734,35 +1739,38 @@ export component MediaPane inherits Rectangle {
if root.tab == 0: HorizontalLayout {
padding: 8px;
spacing: 8px;
+ // Import holds the left edge at the width its own word
+ // needs; sort and filter are pushed against the right by
+ // the gap between, which is the only part of the row with
+ // any give in it.
ImportButton {
- horizontal-stretch: 1;
+ // The row holds one other control, and two controls
+ // side by side at two different heights read as two
+ // rows that failed to line up.
+ height: Theme.h;
+ horizontal-stretch: 0;
busy: root.importing;
clicked => { root.import-media(); }
}
- // Sort and filter live beside the import button, the way
- // the owner sketched it; the sidebar rows and the View
- // menu drive the same state underneath.
+ Rectangle { horizontal-stretch: 1; }
+ // Sort, and sort only: narrowing the bin by kind is the
+ // sidebar's, where each kind carries its count and the
+ // current one stays lit. A second control saying the same
+ // thing from the other side of the panel can only ever
+ // agree with it or contradict it.
+ //
+ // Marked rather than worded: at the end of a row this
+ // narrow, "Sort: Added" costs more room than it earns, and
+ // the list behind it still spells all three out.
Select {
horizontal-stretch: 0;
- width: 130px;
+ width: self.natural-width;
options: [I18n.t("Sort: Added"), I18n.t("Sort: Name"),
I18n.t("Sort: Type")];
+ icons: [Glyph.clock, Glyph.text-mark, Glyph.tag];
current: 0;
changed(index) => { root.sort-changed(index); }
}
- Select {
- horizontal-stretch: 0;
- width: 120px;
- options: [I18n.t("All media"), I18n.t("Video"),
- I18n.t("Audio"), I18n.t("Images")];
- current: 0;
- changed(index) => {
- root.filter-changed(index == 0 ? MediaFilter.all
- : index == 1 ? MediaFilter.video
- : index == 2 ? MediaFilter.audio
- : MediaFilter.images);
- }
- }
}
// Only worth a row when a multiple selection exists — one
diff --git a/engine/crates/concat/ui/workspace/seat.slint b/engine/crates/concat/ui/workspace/seat.slint
index 50fc263e..6593c155 100644
--- a/engine/crates/concat/ui/workspace/seat.slint
+++ b/engine/crates/concat/ui/workspace/seat.slint
@@ -357,7 +357,6 @@ export component Seat inherits Rectangle {
}
track-sized(index, size) => { Editor.track-sized(index, size); }
track-removed(index) => { Editor.track-removed(index); }
- track-renamed(index, name) => { Editor.track-renamed(index, name); }
}
// What says where the drop will land — and, on an edge, how much of the
diff --git a/engine/crates/concat/ui/workspace/timeline-pane.slint b/engine/crates/concat/ui/workspace/timeline-pane.slint
index 968573fa..09a6e47e 100644
--- a/engine/crates/concat/ui/workspace/timeline-pane.slint
+++ b/engine/crates/concat/ui/workspace/timeline-pane.slint
@@ -89,7 +89,6 @@ export component TimelinePane inherits Rectangle {
callback track-flag-changed(index: int, visible: bool, muted: bool, locked: bool);
callback track-sized(index: int, size: TrackSize);
callback track-removed(index: int);
- callback track-renamed(index: int, name: string);
/// The corner button: show something else in this pane's seat.
callback pane-picked(kind: PaneKind);
@@ -228,7 +227,6 @@ export component TimelinePane inherits Rectangle {
}
sized(index, size) => { root.track-sized(index, size); }
removed(index) => { root.track-removed(index); }
- renamed(index, name) => { root.track-renamed(index, name); }
}
HairlineSplitter {