Skip to content

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

feat(library): a Stickers page with shapes, and a page strip that scrolls

Jareer21855a7409dd
diff --git a/src/crates/concat-export/src/flatten.rs b/src/crates/concat-export/src/flatten.rs
index 84adc318..1e62e48a 100644
--- a/src/crates/concat-export/src/flatten.rs
+++ b/src/crates/concat-export/src/flatten.rs
@@ -44,7 +44,9 @@ pub fn flatten_timeline_in(
.clips
.iter()
.filter_map(|clip| {
- if clip.kind == ModelClipKind::Text {
+ // Titles and shapes rasterise separately and rejoin as stills;
+ // see concat-host's titles.
+ if matches!(clip.kind, ModelClipKind::Text | ModelClipKind::Shape) {
return None;
}
let index = timeline
@@ -77,7 +79,7 @@ pub fn flatten_timeline_in(
ModelClipKind::Image => ClipKind::Image,
// Handled above; unreachable spelled as a skip so a new
// kind fails soft.
- ModelClipKind::Text | ModelClipKind::Layer => return None,
+ ModelClipKind::Text | ModelClipKind::Layer | ModelClipKind::Shape => return None,
};
Some(ExportClip {
path: media.path.clone(),
diff --git a/src/crates/concat-host/src/titles.rs b/src/crates/concat-host/src/titles.rs
index dcfd9834..0cfb183f 100644
--- a/src/crates/concat-host/src/titles.rs
+++ b/src/crates/concat-host/src/titles.rs
@@ -1,20 +1,21 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-FileCopyrightText: 2026 Jareer and Concat contributors
-//! Titles, rendered and remembered.
+//! Titles and shapes, rendered and remembered.
//!
-//! The flattener leaves text clips out on purpose: the compositor only knows
-//! pictures. This is where a title becomes one. Each text clip's style is
-//! painted by `concat-text` onto a frame-sized transparent PNG in the app's
-//! data directory, and the clip rejoins the flattened list as an image clip
-//! pointing at that file, carrying the text clip's timing, transform and
-//! opacity. The monitor, playback prefetch and the exporter then treat it as
-//! any other still.
+//! The flattener leaves text and shape clips out on purpose: the compositor
+//! only knows pictures. This is where a title or a shape becomes one. Each
+//! clip's style is painted by `concat-text` onto a frame-sized transparent
+//! PNG in the app's data directory, and the clip rejoins the flattened list
+//! as an image clip pointing at that file, carrying the clip's timing,
+//! transform and opacity. The monitor, playback prefetch and the exporter
+//! then treat it as any other still.
//!
//! The file is keyed by everything that changes the pixels - the style, the
//! frame size, the fonts the project carries - so a title that has not
//! changed is never painted twice, across sessions included. What a title
//! does *not* key on is where it sits or when it plays: moving one is free.
+//! A shape is a title with no words, as far as this file is concerned.
use std::collections::{HashMap, HashSet};
use std::path::{Path, PathBuf};
@@ -24,15 +25,17 @@ use concat_core::frame::Frame;
use concat_core::shader::RevealMap;
use concat_export::{ClipKind, ExportClip};
-use concat_project::model::{ClipKind as ModelClipKind, Project, TextAlign, TextStyle};
-use concat_text::{Align, Fonts, TitleStyle, WordRect};
+use concat_project::model::{
+ ClipKind as ModelClipKind, Project, ShapeKind, ShapeStyle, TextAlign, TextStyle,
+};
+use concat_text::{Align, Figure, Fonts, TitleStyle, WordRect};
use crate::dirs::AppDirs;
-/// One title, ready for the compositor.
+/// One title or shape, ready for the compositor.
#[derive(Clone)]
pub struct TitleClip {
- /// The text clip this was painted from.
+ /// The text or shape clip this was painted from.
pub clip_id: String,
/// The image clip that stands in for it.
pub clip: ExportClip,
@@ -49,6 +52,14 @@ pub struct TitleClip {
pub frame: Option<Arc<Frame>>,
}
+/// What is painted: a title's words or a shape's figure. One painter for
+/// both, since they are cached, keyed and handed on the same way.
+#[derive(Clone, Copy)]
+enum Painting<'a> {
+ Title(&'a TextStyle),
+ Shape(&'a ShapeStyle),
+}
+
/// What one render left behind.
#[derive(Clone, Debug)]
struct Art {
@@ -95,9 +106,9 @@ impl Titles {
}
}
- /// Every text clip on the active timeline, as an image clip each, for a
- /// `width` × `height` frame. A title that fails to paint is left out and
- /// said once on stderr; the rest of the edit still renders.
+ /// Every text and shape clip on the active timeline, as an image clip
+ /// each, for a `width` × `height` frame. One that fails to paint is left
+ /// out and said once on stderr; the rest of the edit still renders.
pub fn clips(&self, project: &Project, width: u32, height: u32) -> Vec<TitleClip> {
self.clips_with(project, width, height, false)
}
@@ -116,9 +127,18 @@ impl Titles {
let timeline = project.active();
let mut out = Vec::new();
for clip in &timeline.clips {
- if clip.kind != ModelClipKind::Text {
- continue;
- }
+ let (text, shape);
+ let painting = match clip.kind {
+ ModelClipKind::Text => {
+ text = clip.text.clone().unwrap_or_default();
+ Painting::Title(&text)
+ }
+ ModelClipKind::Shape => {
+ shape = clip.shape.clone().unwrap_or_default();
+ Painting::Shape(&shape)
+ }
+ _ => continue,
+ };
let Some(index) = timeline
.tracks
.iter()
@@ -127,12 +147,11 @@ impl Titles {
continue;
};
let track = &timeline.tracks[index];
- let text = clip.text.clone().unwrap_or_default();
let painted = if live {
- self.painted_live(project, &text, width, height)
+ self.painted_live(project, painting, width, height)
.map(|(path, art, frame)| (path, art, Some(frame)))
} else {
- self.painted(project, &text, width, height)
+ self.painted(project, painting, width, height)
.map(|(path, art)| (path, art, None))
};
let (path, art, frame) = match painted {
@@ -164,15 +183,30 @@ impl Titles {
// to make a long caption fit, and honouring it here
// kept those captions squashed after the wrap arrived.
// https://github.com/jub0t/Concat/issues/119
- stretch_x: 1.0,
- stretch_y: 1.0,
+ // A shape is pulled: that is how a square becomes
+ // the rectangle that was wanted.
+ stretch_x: match painting {
+ Painting::Title(_) => 1.0,
+ Painting::Shape(_) => clip.stretch_x,
+ },
+ stretch_y: match painting {
+ Painting::Title(_) => 1.0,
+ Painting::Shape(_) => clip.stretch_y,
+ },
// The style's own opacity multiplies the clip's: a
// half-transparent title fades to half, not to solid.
- opacity: (clip.opacity * text.opacity).clamp(0.0, 1.0),
+ opacity: match painting {
+ Painting::Title(text) => (clip.opacity * text.opacity).clamp(0.0, 1.0),
+ Painting::Shape(_) => clip.opacity.clamp(0.0, 1.0),
+ },
media_width: Some(width),
media_height: Some(height),
has_audio: Some(false),
- reveal_map: Some(Arc::clone(&art.reveal)),
+ // A shape has no words to reveal one at a time.
+ reveal_map: match painting {
+ Painting::Title(_) => Some(Arc::clone(&art.reveal)),
+ Painting::Shape(_) => None,
+ },
..ExportClip::blank(ClipKind::Image, clip.start, clip.duration, index)
},
block: art.block,
@@ -188,11 +222,11 @@ impl Titles {
fn painted_live(
&self,
project: &Project,
- style: &TextStyle,
+ painting: Painting<'_>,
width: u32,
height: u32,
) -> Result<(PathBuf, Art, Arc<Frame>), String> {
- let key = key_of(project, style, width, height);
+ let key = key_of(project, painting, width, height);
let path = PathBuf::from(format!("memory://titles/{key:016x}"));
if let Some((art, frame)) = self
.live
@@ -203,18 +237,18 @@ impl Titles {
{
return Ok((path, art.clone(), Arc::clone(frame)));
}
- let title = title_style(style);
- let rendered = {
- let mut fonts = self.fonts.lock().unwrap_or_else(|e| e.into_inner());
- let fonts = fonts.get_or_insert_with(Fonts::new);
- let mut loaded = self.loaded_files.lock().unwrap_or_else(|e| e.into_inner());
- for font in &project.fonts {
- if !font.path.is_empty() && loaded.insert(font.path.clone()) {
- fonts.add_file(Path::new(&font.path));
- }
+ let rendered = match painting {
+ Painting::Title(style) => {
+ let title = title_style(style);
+ let mut fonts = self.fonts.lock().unwrap_or_else(|e| e.into_inner());
+ let fonts = self.fonts_for(project, &mut fonts);
+ concat_text::render_frame(fonts, &title, width, height)
+ .map_err(|error| error.to_string())?
+ }
+ Painting::Shape(style) => {
+ concat_text::render_shape_frame(&shape_style(style), width, height)
+ .map_err(|error| error.to_string())?
}
- concat_text::render_frame(fonts, &title, width, height)
- .map_err(|error| error.to_string())?
};
let art = Art {
block: (rendered.block_width, rendered.block_height),
@@ -246,11 +280,11 @@ impl Titles {
fn painted(
&self,
project: &Project,
- style: &TextStyle,
+ painting: Painting<'_>,
width: u32,
height: u32,
) -> Result<(PathBuf, Art), String> {
- let key = key_of(project, style, width, height);
+ let key = key_of(project, painting, width, height);
let png = self.dir.join(format!("{key:016x}.png"));
let side = self.dir.join(format!("{key:016x}.json"));
@@ -273,18 +307,16 @@ impl Titles {
return Ok((png, art));
}
- let title = title_style(style);
- let rendered = {
- let mut fonts = self.fonts.lock().unwrap_or_else(|e| e.into_inner());
- let fonts = fonts.get_or_insert_with(Fonts::new);
- // The project's own files, each loaded once for the process.
- let mut loaded = self.loaded_files.lock().unwrap_or_else(|e| e.into_inner());
- for font in &project.fonts {
- if !font.path.is_empty() && loaded.insert(font.path.clone()) {
- fonts.add_file(Path::new(&font.path));
- }
+ let rendered = match painting {
+ Painting::Title(style) => {
+ let title = title_style(style);
+ let mut fonts = self.fonts.lock().unwrap_or_else(|e| e.into_inner());
+ let fonts = self.fonts_for(project, &mut fonts);
+ concat_text::render(fonts, &title, width, height)
+ .map_err(|error| error.to_string())?
}
- concat_text::render(fonts, &title, width, height).map_err(|error| error.to_string())?
+ Painting::Shape(style) => concat_text::render_shape(&shape_style(style), width, height)
+ .map_err(|error| error.to_string())?,
};
std::fs::create_dir_all(&self.dir).map_err(|error| error.to_string())?;
std::fs::write(&png, &rendered.png).map_err(|error| error.to_string())?;
@@ -313,6 +345,19 @@ impl Titles {
Ok((png, art))
}
+ /// The faces, loaded once, with the project's own files added - each
+ /// loaded once for the process.
+ fn fonts_for<'a>(&self, project: &Project, held: &'a mut Option<Fonts>) -> &'a Fonts {
+ let fonts = held.get_or_insert_with(Fonts::new);
+ let mut loaded = self.loaded_files.lock().unwrap_or_else(|e| e.into_inner());
+ for font in &project.fonts {
+ if !font.path.is_empty() && loaded.insert(font.path.clone()) {
+ fonts.add_file(Path::new(&font.path));
+ }
+ }
+ fonts
+ }
+
fn remember(&self, key: u64, art: Art) {
self.memo
.lock()
@@ -327,11 +372,20 @@ impl Titles {
/// FNV-1a over the bytes, as the other caches on disk are keyed, because a
/// file's name has to mean the same thing after a toolchain upgrade and the
/// standard hasher makes no such promise.
-fn key_of(project: &Project, style: &TextStyle, width: u32, height: u32) -> u64 {
+fn key_of(project: &Project, painting: Painting<'_>, width: u32, height: u32) -> u64 {
let mut bytes = Vec::new();
// The style as JSON: every field, in a stable order, with no need to
- // keep a serialiser in step with the struct.
- bytes.extend_from_slice(serde_json::to_string(style).unwrap_or_default().as_bytes());
+ // keep a serialiser in step with the struct. A shape's is prefixed, so
+ // it can never collide with a title's.
+ match painting {
+ Painting::Title(style) => {
+ bytes.extend_from_slice(serde_json::to_string(style).unwrap_or_default().as_bytes());
+ }
+ Painting::Shape(style) => {
+ bytes.extend_from_slice(b"shape:");
+ bytes.extend_from_slice(serde_json::to_string(style).unwrap_or_default().as_bytes());
+ }
+ }
bytes.push(0);
bytes.extend_from_slice(&width.to_le_bytes());
bytes.extend_from_slice(&height.to_le_bytes());
@@ -446,13 +500,33 @@ fn title_style(style: &TextStyle) -> TitleStyle {
}
}
+/// The document's shape, in the painter's terms.
+fn shape_style(style: &ShapeStyle) -> concat_text::ShapeStyle {
+ concat_text::ShapeStyle {
+ figure: match style.kind {
+ ShapeKind::Square => Figure::Square,
+ ShapeKind::Circle => Figure::Circle,
+ ShapeKind::Triangle => Figure::Triangle,
+ ShapeKind::Parallelogram => Figure::Parallelogram,
+ ShapeKind::Trapezoid => Figure::Trapezoid,
+ ShapeKind::Line => Figure::Line,
+ ShapeKind::Arrow => Figure::Arrow,
+ },
+ size: style.size,
+ fill: style.fill.clone(),
+ stroke: style.stroke.clone(),
+ stroke_width: style.stroke_width,
+ }
+}
+
#[cfg(test)]
mod tests {
use super::*;
use concat_project::{Command, Editor};
- fn scratch() -> AppDirs {
- let dir = std::env::temp_dir().join(format!("concat-titles-test-{}", std::process::id()));
+ fn scratch(name: &str) -> AppDirs {
+ let dir =
+ std::env::temp_dir().join(format!("concat-titles-test-{name}-{}", std::process::id()));
let _ = std::fs::remove_dir_all(&dir);
AppDirs {
config: dir.join("config"),
@@ -466,7 +540,7 @@ mod tests {
/// https://github.com/jub0t/Concat/issues/119
#[test]
fn a_title_is_never_stretched_whatever_its_clip_says() {
- let dirs = scratch();
+ let dirs = scratch("title");
let mut editor = Editor::new();
let id = editor
.apply(Command::AddTextClip {
@@ -511,7 +585,7 @@ mod tests {
/// same title paints nothing new.
#[test]
fn a_title_rejoins_as_a_still() {
- let dirs = scratch();
+ let dirs = scratch("a_title_rejo");
let mut editor = Editor::new();
let id = editor
.apply(Command::AddTextClip {
@@ -592,4 +666,50 @@ mod tests {
);
let _ = std::fs::remove_dir_all(dirs.data.parent().unwrap());
}
+
+
+ /// A shape clip rejoins the flattened list as a still at its clip's
+ /// stretch - that is how a square becomes a rectangle - with the
+ /// figure's box reported and no words to reveal.
+ #[test]
+ fn a_shape_rejoins_as_a_still_and_keeps_its_stretch() {
+ let dirs = scratch("shape");
+ let mut editor = Editor::new();
+ let id = editor
+ .apply(Command::AddShapeClip {
+ above: true,
+ track_id: None,
+ start: 0.0,
+ style: None,
+ duration: Some(3.0),
+ name: "Square".to_owned(),
+ })
+ .expect("a shape is added")
+ .created_id
+ .expect("with an id");
+ editor
+ .apply(Command::SetClipTransform {
+ clip_id: id.clone(),
+ scale: None,
+ offset_x: None,
+ offset_y: None,
+ rotation: None,
+ stretch_x: Some(2.0),
+ stretch_y: Some(0.5),
+ })
+ .expect("pulled wide");
+
+ let out = Titles::new(&dirs).clips(editor.project(), 640, 360);
+ assert_eq!(out.len(), 1);
+ assert_eq!(out[0].clip_id, id);
+ assert!(matches!(out[0].clip.kind, ClipKind::Image));
+ assert_eq!((out[0].clip.stretch_x, out[0].clip.stretch_y), (2.0, 0.5));
+ assert_eq!(out[0].block, (126, 126), "35 % of 360, squared");
+ assert_eq!(out[0].offset, (0, 0));
+ assert!(out[0].clip.reveal_map.is_none());
+ assert!(
+ Path::new(&out[0].clip.path).is_file(),
+ "painted to disk like a title"
+ );
+ }
}
diff --git a/src/crates/concat-project/src/commands/clips.rs b/src/crates/concat-project/src/commands/clips.rs
index 860f663b..71a07639 100644
--- a/src/crates/concat-project/src/commands/clips.rs
+++ b/src/crates/concat-project/src/commands/clips.rs
@@ -119,6 +119,54 @@ pub(super) fn apply(
})
}
+ Command::AddShapeClip {
+ track_id,
+ above,
+ start,
+ style,
+ duration,
+ name,
+ } => {
+ let style = style.unwrap_or_default().tidy();
+ let duration = duration
+ .unwrap_or(DEFAULT_TEXT_DURATION)
+ .max(MIN_CLIP_DURATION);
+ let timeline = project.active_mut();
+ let track_id = match track_id {
+ Some(id) if timeline.track(&id).is_some() => id,
+ Some(_) => return Err(CommandError::TrackGone),
+ None if above => match first_free_track_above(timeline, start, duration) {
+ Some(id) => id,
+ None => {
+ let id = mint.next("t");
+ timeline.tracks.push(Track {
+ id: id.clone(),
+ visible: true,
+ muted: false,
+ extra: Default::default(),
+ });
+ id
+ }
+ },
+ None => {
+ first_free_track(timeline, start, duration).ok_or(CommandError::NoTracks)?
+ }
+ };
+ let id = mint.next("c");
+ let name = if name.trim().is_empty() {
+ style.kind.id().to_owned()
+ } else {
+ name
+ };
+ let mut clip = Clip::blank(id.clone(), track_id, ClipKind::Shape, name, start, duration);
+ clip.shape = Some(style);
+ timeline.clips.push(Arc::new(clip));
+ Ok(Outcome {
+ created_id: Some(id),
+ applied: true,
+ })
+ }
+
Command::AddLayerClip {
track_id,
start,
diff --git a/src/crates/concat-project/src/commands/mod.rs b/src/crates/concat-project/src/commands/mod.rs
index 689495a9..8b5564dd 100644
--- a/src/crates/concat-project/src/commands/mod.rs
+++ b/src/crates/concat-project/src/commands/mod.rs
@@ -15,7 +15,7 @@ use serde::{Deserialize, Serialize};
use crate::model::{
AppliedFilter, AudioTrack, Clip, ClipKind, ColorRange, ColorSpace, Crop, CustomFont, Cutout,
CutoutMode, KeyEase, KeyProperty, MediaItem, MediaKind, MediaOrigin, Project, SpeedPoint,
- Stroke, TextStyle, Timeline, Track, Transition, VideoSettings,
+ ShapeStyle, Stroke, TextStyle, Timeline, Track, Transition, VideoSettings,
};
mod audio;
@@ -322,6 +322,27 @@ pub enum Command {
#[serde(default)]
offset_y: Option<f64>,
},
+ /// Places a shape: a clip with no media behind it that draws one
+ /// figure over the picture, minting a "c" id. Lands the way a title
+ /// does - above the picture - since a shape is drawn over it.
+ AddShapeClip {
+ /// The lane to place it on; None picks a lane as `above` says, as
+ /// [`Command::AddTextClip`] does.
+ track_id: Option<String>,
+ /// See [`Command::AddTextClip::above`].
+ #[serde(default)]
+ above: bool,
+ /// Timeline position in seconds, floored at 0.
+ start: f64,
+ /// The figure and its paint. None means [`ShapeStyle::default`].
+ style: Option<ShapeStyle>,
+ /// Seconds on the timeline; the editorial default when absent.
+ #[serde(default)]
+ duration: Option<f64>,
+ /// What the lane calls it: the figure's name in the interface's
+ /// language, which the document cannot know.
+ name: String,
+ },
/// Places a layer: a look or an effect over a span of the timeline that
/// treats everything beneath it. No media; the chain starts as the one
/// package named, at its defaults, and the clip's opacity is how hard it
@@ -865,6 +886,18 @@ impl Command {
Command::AddClip { start, .. } | Command::AddClipAtFirstFree { start, .. } => {
bad([*start])
}
+ Command::AddShapeClip {
+ start,
+ duration,
+ style,
+ ..
+ } => {
+ bad([*start])
+ || bad(*duration)
+ || style
+ .iter()
+ .any(|style| bad([style.size, style.stroke_width]))
+ }
Command::AddTextClip {
start,
duration,
@@ -1019,6 +1052,7 @@ pub fn apply(
command @ (Command::AddClip { .. }
| Command::AddClipAtFirstFree { .. }
| Command::AddTextClip { .. }
+ | Command::AddShapeClip { .. }
| Command::AddLayerClip { .. }
| Command::MoveClips { .. }
| Command::TrimClip { .. }
diff --git a/src/crates/concat-project/src/doc.rs b/src/crates/concat-project/src/doc.rs
index 8fc26d38..bcc3dd08 100644
--- a/src/crates/concat-project/src/doc.rs
+++ b/src/crates/concat-project/src/doc.rs
@@ -262,7 +262,7 @@ fn settle_clip(
return None;
}
match clip.kind {
- ClipKind::Text | ClipKind::Layer => clip.media_id.clear(),
+ ClipKind::Text | ClipKind::Layer | ClipKind::Shape => clip.media_id.clear(),
ClipKind::Video | ClipKind::Audio | ClipKind::Image => {
if !media.iter().any(|item| item.id == clip.media_id) {
return None;
@@ -272,6 +272,9 @@ fn settle_clip(
if clip.kind != ClipKind::Text {
clip.text = None;
}
+ if clip.kind != ClipKind::Shape {
+ clip.shape = None;
+ }
Some(clip.tidy())
}
diff --git a/src/crates/concat-project/src/lib.rs b/src/crates/concat-project/src/lib.rs
index 109aaf98..a9794771 100644
--- a/src/crates/concat-project/src/lib.rs
+++ b/src/crates/concat-project/src/lib.rs
@@ -3788,4 +3788,64 @@ mod tests {
let missing = project.missing_media();
assert_eq!(missing.len(), 0);
}
+
+
+ #[test]
+ fn shape_clips_survive_without_media_and_carry_their_figure() {
+ use crate::model::{ClipKind, ShapeKind, ShapeStyle};
+ let mut editor = Editor::new();
+ let clip_id = editor
+ .apply(Command::AddShapeClip {
+ above: true,
+ track_id: None,
+ start: 1.0,
+ style: Some(ShapeStyle {
+ kind: ShapeKind::Arrow,
+ fill: "#ff8800".to_owned(),
+ ..ShapeStyle::default()
+ }),
+ duration: Some(2.5),
+ name: "Flèche".to_owned(),
+ })
+ .expect("adds")
+ .created_id
+ .expect("id");
+ {
+ let clip = editor.project().active().clip(&clip_id).expect("exists");
+ assert_eq!(clip.kind, ClipKind::Shape);
+ assert_eq!(clip.name, "Flèche", "named by the caller, in its language");
+ assert_eq!(clip.duration, 2.5, "a stated duration lands directly");
+ assert!(clip.media_id.is_empty(), "no file behind it");
+ let shape = clip.shape.as_ref().expect("carries its figure");
+ assert_eq!(shape.kind, ShapeKind::Arrow);
+ assert_eq!(shape.fill, "#ff8800");
+ }
+
+ let document = editor.to_document(&settings());
+ let restored = Editor::from_document(&document).expect("loads");
+ assert_eq!(restored.project(), editor.project());
+
+ // A number out of range is pulled back in, not refused: the reader
+ // runs the same tidy over a hand-edited file.
+ let wild = editor
+ .apply(Command::AddShapeClip {
+ above: false,
+ track_id: None,
+ start: 0.0,
+ style: Some(ShapeStyle {
+ size: 40.0,
+ stroke_width: -1.0,
+ ..ShapeStyle::default()
+ }),
+ duration: None,
+ name: String::new(),
+ })
+ .expect("adds")
+ .created_id
+ .expect("id");
+ let clip = editor.project().active().clip(&wild).expect("exists");
+ let shape = clip.shape.as_ref().expect("figure");
+ assert_eq!((shape.size, shape.stroke_width), (2.0, 0.0));
+ assert_eq!(clip.name, "square", "an empty name falls back to the figure's");
+ }
}
diff --git a/src/crates/concat-project/src/model.rs b/src/crates/concat-project/src/model.rs
index 957ff762..5112006b 100644
--- a/src/crates/concat-project/src/model.rs
+++ b/src/crates/concat-project/src/model.rs
@@ -62,6 +62,10 @@ pub enum ClipKind {
/// lives in [`Clip::video_effects`], its strength in [`Clip::opacity`]
/// and its ramps in the fades.
Layer,
+ /// A shape: a square, a circle, an arrow, drawn over the picture. No
+ /// media behind it; what it is and how it is painted lives in
+ /// [`Clip::shape`], and it is placed and scaled like a still.
+ Shape,
}
impl ClipKind {
@@ -837,6 +841,118 @@ pub enum TextAlign {
Right,
}
+/// Which figure a shape clip draws. The names are written into project
+/// files, so they are stable for ever.
+#[derive(Clone, Copy, PartialEq, Eq, Debug, Default, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum ShapeKind {
+ /// Four equal sides; the default, and what the reader falls back to.
+ #[default]
+ Square,
+ /// A disc.
+ Circle,
+ /// Equilateral, point up.
+ Triangle,
+ /// A slanted rectangle, leaning right.
+ Parallelogram,
+ /// A rectangle narrower at the top.
+ Trapezoid,
+ /// A horizontal rule, `stroke_width` thick.
+ Line,
+ /// A horizontal rule with a head on its right end.
+ Arrow,
+}
+
+impl ShapeKind {
+ /// The name a document writes, and what a library payload carries.
+ pub fn id(self) -> &'static str {
+ match self {
+ ShapeKind::Square => "square",
+ ShapeKind::Circle => "circle",
+ ShapeKind::Triangle => "triangle",
+ ShapeKind::Parallelogram => "parallelogram",
+ ShapeKind::Trapezoid => "trapezoid",
+ ShapeKind::Line => "line",
+ ShapeKind::Arrow => "arrow",
+ }
+ }
+
+ /// The figure `id` names, if this build knows it.
+ pub fn parse(id: &str) -> Option<ShapeKind> {
+ [
+ ShapeKind::Square,
+ ShapeKind::Circle,
+ ShapeKind::Triangle,
+ ShapeKind::Parallelogram,
+ ShapeKind::Trapezoid,
+ ShapeKind::Line,
+ ShapeKind::Arrow,
+ ]
+ .into_iter()
+ .find(|kind| kind.id() == id)
+ }
+}
+
+/// How a shape clip is painted. Sizes are fractions of the frame's height,
+/// as a title's are, so a shape composed against 1080p is the same shape at
+/// 4K. A style arriving in a command needs only the fields it changes.
+#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct ShapeStyle {
+ /// The figure.
+ #[serde(deserialize_with = "wire::shape_kind")]
+ pub kind: ShapeKind,
+ /// The figure's longer side, as a fraction of frame height.
+ pub size: f64,
+ /// The inside's colour as `#rrggbb[aa]`; empty for an outline alone.
+ pub fill: String,
+ /// The outline's colour, drawn when `stroke_width` is above zero. A
+ /// line and an arrow are all stroke, drawn in this colour, and fall
+ /// back to `fill` when it is empty.
+ pub stroke: String,
+ /// The outline's thickness as a fraction of frame height; zero for a
+ /// figure with no outline. A line's and an arrow's own thickness.
+ pub stroke_width: f64,
+}
+
+impl ShapeStyle {
+ /// The default look of one figure: solid white, no outline.
+ pub fn of(kind: ShapeKind) -> ShapeStyle {
+ ShapeStyle {
+ kind,
+ ..ShapeStyle::default()
+ }
+ }
+
+ /// Every number back in its range; see [`TextStyle::tidy`].
+ pub fn tidy(mut self) -> ShapeStyle {
+ fn finite(value: f64, fallback: f64) -> f64 {
+ if value.is_finite() { value } else { fallback }
+ }
+ let base = ShapeStyle::default();
+ self.size = finite(self.size, base.size).clamp(0.01, 2.0);
+ self.stroke_width = finite(self.stroke_width, base.stroke_width).clamp(0.0, 0.5);
+ self
+ }
+}
+
+impl Default for ShapeStyle {
+ fn default() -> ShapeStyle {
+ ShapeStyle {
+ kind: ShapeKind::Square,
+ // A third of the frame's height: big enough to be the point of
+ // the frame, small enough to leave the picture around it.
+ size: 0.35,
+ fill: "#ffffff".to_owned(),
+ stroke: String::new(),
+ // A line or an arrow is nothing but its stroke, so the default
+ // is a visible rule and not zero; a filled figure ignores it
+ // until it is given an outline colour.
+ stroke_width: 0.012,
+ }
+ }
+}
+
/// A title's styling. Sizes are fractions of the frame, so a title composed
/// against 1080p lands correctly exported at 4K. A style arriving in a
/// command needs only the fields it changes; the rest are the default's, so
@@ -976,7 +1092,7 @@ pub(crate) mod wire {
use serde::{Deserialize, Deserializer};
use serde_json::Value;
- use super::{ClipKind, ColorSpace, MediaKind, ParamKey, TextAlign};
+ use super::{ClipKind, ColorSpace, MediaKind, ParamKey, ShapeKind, TextAlign};
/// The entries of a list that parse, in order; not a list at all is
/// an empty one.
@@ -1063,6 +1179,12 @@ pub(crate) mod wire {
let value = Value::deserialize(deserializer)?;
Ok(serde_json::from_value(value).unwrap_or(TextAlign::Center))
}
+
+ /// A shape by name, a square for one this build does not know.
+ pub fn shape_kind<'de, D: Deserializer<'de>>(deserializer: D) -> Result<ShapeKind, D::Error> {
+ let value = Value::deserialize(deserializer)?;
+ Ok(serde_json::from_value(value).unwrap_or_default())
+ }
}
/// The ranges a clip's numbers are held in. One set, used by every
@@ -1215,6 +1337,10 @@ pub struct Clip {
#[serde(default, skip_serializing_if = "Option::is_none")]
#[serde(deserialize_with = "wire::maybe")]
pub text: Option<TextStyle>,
+ /// The figure, when this is a shape clip.
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ #[serde(deserialize_with = "wire::maybe")]
+ pub shape: Option<ShapeStyle>,
/// Fields this build does not know, kept so a document written by a
/// newer or a different build round-trips through this one intact.
#[serde(flatten, default, skip_serializing_if = "Map::is_empty")]
@@ -1309,6 +1435,7 @@ impl Clip {
detached_from: None,
transition_in: None,
text: None,
+ shape: None,
extra: Map::new(),
}
}
@@ -1381,6 +1508,7 @@ impl Clip {
}
}
self.text = self.text.take().map(TextStyle::tidy);
+ self.shape = self.shape.take().map(ShapeStyle::tidy);
if self.muted == Some(false) {
self.muted = None;
}
diff --git a/src/crates/concat-text/src/lib.rs b/src/crates/concat-text/src/lib.rs
index bb6a1faf..75f52dd6 100644
--- a/src/crates/concat-text/src/lib.rs
+++ b/src/crates/concat-text/src/lib.rs
@@ -865,19 +865,8 @@ pub fn render_frame(
height: u32,
) -> Result<RenderedFrame, Error> {
let (canvas, block, words) = paint(fonts, style, width, height)?;
- // tiny-skia keeps premultiplied pixels; a frame carries straight alpha.
- let mut rgba = Vec::with_capacity(canvas.pixels().len() * 4);
- for pixel in canvas.pixels() {
- let straight = pixel.demultiply();
- rgba.extend_from_slice(&[
- straight.red(),
- straight.green(),
- straight.blue(),
- straight.alpha(),
- ]);
- }
Ok(RenderedFrame {
- rgba,
+ rgba: straight_rgba(&canvas),
width,
height,
block_width: block.0,
@@ -1167,6 +1156,247 @@ fn push_rounded_rect(builder: &mut PathBuilder, rect: Rect, radius: f32) {
builder.close();
}
+// ── shapes ───────────────────────────────────────────────────────────────────
+//
+// A shape clip is a figure and its paint; the compositor wants a picture, the
+// same frame-sized transparent canvas a title gets, for the same reasons (see
+// the module docs). The figure is centred on the canvas, so the clip's offset
+// and rotation mean what they mean for a title, and `Rendered::block_*` is
+// the figure's own box, for a monitor to outline.
+
+/// The figures a shape clip can be. Mirrors the document's own list; this
+/// crate does not depend on the document.
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub enum Figure {
+ /// Four equal sides.
+ Square,
+ /// A disc.
+ Circle,
+ /// Equilateral, point up.
+ Triangle,
+ /// A slanted rectangle, leaning right.
+ Parallelogram,
+ /// A rectangle narrower at the top.
+ Trapezoid,
+ /// A horizontal rule.
+ Line,
+ /// A horizontal rule with a head on its right end.
+ Arrow,
+}
+
+/// Everything about a shape's look, in the document's terms: sizes are
+/// fractions of the frame's height.
+#[derive(Clone, PartialEq, Debug)]
+pub struct ShapeStyle {
+ /// Which figure.
+ pub figure: Figure,
+ /// The figure's longer side.
+ pub size: f64,
+ /// The inside's colour, `#rrggbb[aa]`; empty for an outline alone.
+ pub fill: String,
+ /// The outline's colour; a line or an arrow is drawn in this, falling
+ /// back to `fill` when it is empty.
+ pub stroke: String,
+ /// The outline's thickness, and a line's or an arrow's own.
+ pub stroke_width: f64,
+}
+
+/// Paints `style` centred on a `width` × `height` transparent canvas and
+/// returns it PNG-encoded with the figure's box. The counterpart of
+/// [`render`] for a shape.
+pub fn render_shape(style: &ShapeStyle, width: u32, height: u32) -> Result<Rendered, Error> {
+ let (canvas, block) = paint_shape(style, width, height)?;
+ let png = canvas
+ .encode_png()
+ .map_err(|error| Error::Encode(error.to_string()))?;
+ Ok(Rendered {
+ png,
+ width,
+ height,
+ block_width: block.0,
+ block_height: block.1,
+ block_dx: block.2,
+ block_dy: block.3,
+ words: Vec::new(),
+ })
+}
+
+/// [`render_shape`], but the pixels rather than a PNG of them; the
+/// counterpart of [`render_frame`].
+pub fn render_shape_frame(
+ style: &ShapeStyle,
+ width: u32,
+ height: u32,
+) -> Result<RenderedFrame, Error> {
+ let (canvas, block) = paint_shape(style, width, height)?;
+ Ok(RenderedFrame {
+ rgba: straight_rgba(&canvas),
+ width,
+ height,
+ block_width: block.0,
+ block_height: block.1,
+ block_dx: block.2,
+ block_dy: block.3,
+ words: Vec::new(),
+ })
+}
+
+/// tiny-skia keeps premultiplied pixels; a frame carries straight alpha.
+fn straight_rgba(canvas: &Pixmap) -> Vec<u8> {
+ let mut rgba = Vec::with_capacity(canvas.pixels().len() * 4);
+ for pixel in canvas.pixels() {
+ let straight = pixel.demultiply();
+ rgba.extend_from_slice(&[
+ straight.red(),
+ straight.green(),
+ straight.blue(),
+ straight.alpha(),
+ ]);
+ }
+ rgba
+}
+
+/// The canvas with the figure on it, and the figure's box.
+fn paint_shape(style: &ShapeStyle, width: u32, height: u32) -> Result<(Pixmap, Block), Error> {
+ let mut canvas = Pixmap::new(width, height).ok_or(Error::Canvas(width, height))?;
+ let frame_h = height as f32;
+ let size = (style.size.clamp(0.01, 2.0) as f32) * frame_h;
+ // The outline's thickness in pixels, never under a pixel once it is
+ // asked for at all, so a hairline at 480p is still a line.
+ let rule = {
+ let asked = (style.stroke_width.max(0.0) as f32) * frame_h;
+ if asked > 0.0 { asked.max(1.0) } else { 0.0 }
+ };
+ let cx = width as f32 / 2.0;
+ let cy = frame_h / 2.0;
+
+ // The figure's own box, before any outline: (w, h), centred.
+ let (w, h) = match style.figure {
+ Figure::Square | Figure::Circle => (size, size),
+ Figure::Triangle => (size, size * 0.866),
+ Figure::Parallelogram | Figure::Trapezoid => (size, size * 0.6),
+ Figure::Line => (size, rule),
+ Figure::Arrow => (size, (rule * 4.0).max(size * 0.18)),
+ };
+ let (left, top) = (cx - w / 2.0, cy - h / 2.0);
+ let (right, bottom) = (left + w, top + h);
+
+ let mut path = PathBuilder::new();
+ let closed = match style.figure {
+ Figure::Square => {
+ path.push_rect(Rect::from_ltrb(left, top, right, bottom).ok_or(Error::Canvas(width, height))?);
+ true
+ }
+ Figure::Circle => {
+ path.push_circle(cx, cy, size / 2.0);
+ true
+ }
+ Figure::Triangle => {
+ path.move_to(cx, top);
+ path.line_to(right, bottom);
+ path.line_to(left, bottom);
+ path.close();
+ true
+ }
+ Figure::Parallelogram => {
+ let lean = w * 0.2;
+ path.move_to(left + lean, top);
+ path.line_to(right, top);
+ path.line_to(right - lean, bottom);
+ path.line_to(left, bottom);
+ path.close();
+ true
+ }
+ Figure::Trapezoid => {
+ let inset = w * 0.2;
+ path.move_to(left + inset, top);
+ path.line_to(right - inset, top);
+ path.line_to(right, bottom);
+ path.line_to(left, bottom);
+ path.close();
+ true
+ }
+ Figure::Line => {
+ path.move_to(left + rule / 2.0, cy);
+ path.line_to(right - rule / 2.0, cy);
+ false
+ }
+ Figure::Arrow => {
+ // The head's arms are the box's half-height long, at 45°, so the
+ // head is as tall as the box says and the shaft stops short of
+ // the tip by what the stroke's round cap adds.
+ let arm = h / 2.0;
+ let tip = right - rule / 2.0;
+ path.move_to(left + rule / 2.0, cy);
+ path.line_to(tip, cy);
+ path.move_to(tip - arm, cy - arm);
+ path.line_to(tip, cy);
+ path.line_to(tip - arm, cy + arm);
+ false
+ }
+ };
+ let Some(path) = path.finish() else {
+ return Ok((canvas, (0, 0, 0, 0)));
+ };
+
+ let stroke = |colour: Color| {
+ let mut paint = Paint::default();
+ paint.set_color(colour);
+ paint.anti_alias = true;
+ paint
+ };
+ let line_style = |width: f32| Stroke {
+ width,
+ line_cap: LineCap::Round,
+ line_join: LineJoin::Round,
+ ..Stroke::default()
+ };
+
+ let fill = colour(&style.fill);
+ let edge = colour(&style.stroke);
+ if closed {
+ if let Some(fill) = fill {
+ canvas.fill_path(
+ &path,
+ &stroke(fill),
+ FillRule::Winding,
+ Transform::identity(),
+ None,
+ );
+ }
+ if rule > 0.0 && let Some(edge) = edge {
+ canvas.stroke_path(
+ &path,
+ &stroke(edge),
+ &line_style(rule),
+ Transform::identity(),
+ None,
+ );
+ }
+ } else if rule > 0.0 && let Some(ink) = edge.or(fill) {
+ // A line or an arrow is all stroke, in the outline's colour when
+ // one is set, else the fill's.
+ canvas.stroke_path(
+ &path,
+ &stroke(ink),
+ &line_style(rule),
+ Transform::identity(),
+ None,
+ );
+ }
+
+ // The box the monitor outlines: the figure, plus the outline that
+ // straddles its edge.
+ let grown = if closed && rule > 0.0 && edge.is_some() { rule } else { 0.0 };
+ let block = (
+ (w + grown).ceil().max(1.0) as u32,
+ (h + grown).ceil().max(1.0) as u32,
+ 0,
+ 0,
+ );
+ Ok((canvas, block))
+}
+
#[cfg(test)]
mod tests {
use super::*;
@@ -1697,4 +1927,48 @@ mod tests {
assert!(plated.block_width > one.block_width);
assert!(plated.block_height > one.block_height);
}
+
+
+ /// A shape is painted centred, at the size the style says, and a rule
+ /// is all stroke in the fill's colour when no outline colour is given.
+ #[test]
+ fn a_shape_is_painted_centred_at_its_size() {
+ let square = ShapeStyle {
+ figure: Figure::Square,
+ size: 0.5,
+ fill: "#ff0000".to_owned(),
+ stroke: String::new(),
+ stroke_width: 0.0,
+ };
+ let frame = render_shape_frame(&square, 400, 200).expect("paints");
+ assert_eq!((frame.block_width, frame.block_height), (100, 100));
+ let px = |x: u32, y: u32| {
+ let at = ((y * 400 + x) * 4) as usize;
+ (frame.rgba[at], frame.rgba[at + 3])
+ };
+ assert_eq!(px(200, 100), (255, 255), "the centre is red and solid");
+ assert_eq!(px(140, 100).1, 0, "ten pixels past the edge is clear");
+ assert_eq!(px(10, 10).1, 0, "and so is the corner");
+
+ let line = ShapeStyle {
+ figure: Figure::Line,
+ size: 0.5,
+ fill: "#00ff00".to_owned(),
+ stroke: String::new(),
+ stroke_width: 0.05,
+ };
+ let frame = render_shape_frame(&line, 400, 200).expect("paints");
+ assert_eq!((frame.block_width, frame.block_height), (100, 10));
+ let at = ((100 * 400 + 200) * 4) as usize;
+ assert_eq!(
+ (frame.rgba[at + 1], frame.rgba[at + 3]),
+ (255, 255),
+ "the rule runs through the centre in the fill's green"
+ );
+ let at = ((100 * 400 + 140) * 4) as usize;
+ assert_eq!(frame.rgba[at + 3], 0, "and stops at its length");
+
+ let png = render_shape(&square, 64, 64).expect("encodes");
+ assert!(png.png.starts_with(b"\x89PNG"));
+ }
}
diff --git a/src/crates/concat/locales/de.json b/src/crates/concat/locales/de.json
index efc1d1d1..769821b3 100644
--- a/src/crates/concat/locales/de.json
+++ b/src/crates/concat/locales/de.json
@@ -168,6 +168,7 @@
"configPane.timeline": "ZEITLEISTE",
"configPane.timelineOne": "Zeitleiste 1",
"configPane.tracks": "Spuren",
+ "configPane.vectorImage": "Vektorbild",
"controls.centred": "zentriert",
"controls.hertz": "{0} Hz",
"controls.kelvin": "{0} K",
@@ -576,9 +577,9 @@
"export.showInFolder": "Im Ordner zeigen",
"export.smallest": "Am kleinsten",
"export.summary": "Zusammenfassung",
- "export.timelineSize": "Zeitleiste",
"export.targetBitrate": "Target bitrate",
"export.tenBitColour": "10-Bit-Farbe",
+ "export.timelineSize": "Zeitleiste",
"export.toneMapped": "Tonegemappt, läuft überall",
"export.vbr": "VBR",
"export.videoYoutube": "Video, YouTube",
@@ -631,10 +632,19 @@
"mediaPane.processed": "Verarbeitet",
"mediaPane.reloadCustomEffects": "Eigene Effekte neu laden",
"mediaPane.saveProjectTemplate": "Dieses Projekt als Vorlage speichern",
+ "mediaPane.shapeArrow": "Pfeil",
+ "mediaPane.shapeCircle": "Kreis",
+ "mediaPane.shapeLine": "Linie",
+ "mediaPane.shapeParallelogram": "Parallelogramm",
+ "mediaPane.shapeSquare": "Quadrat",
+ "mediaPane.shapeTrapezoid": "Trapez",
+ "mediaPane.shapeTriangle": "Dreieck",
+ "mediaPane.shapes": "Formen",
"mediaPane.soon": "Bald",
"mediaPane.sortAdded": "Sort: Added",
"mediaPane.sortName": "Sort: Name",
"mediaPane.sortType": "Sort: Type",
+ "mediaPane.stickers": "Sticker",
"mediaPane.templates": "Vorlagen",
"mediaPane.titles": "Titel",
"mediaPane.transition": "Übergang",
@@ -680,11 +690,11 @@
"previewPane.half": "Halb",
"previewPane.nextFrame": "Nächstes Bild",
"previewPane.nothingUnderThePlayhead": "Nichts unter dem Abspielkopf",
- "previewPane.saveFrameAs": "Videobild speichern unter…",
"previewPane.pause": "Pause",
"previewPane.play": "Wiedergabe",
"previewPane.previousFrame": "Vorheriges Bild",
"previewPane.quarter": "Viertel",
+ "previewPane.saveFrameAs": "Videobild speichern unter…",
"project.hdrMonitorNote": "Der Monitor zeigt eine HDR-Timeline auf SDR tonegemappt, bis die HDR-Vorschau kommt.",
"project.output": "Ausgabe · {0}",
"project.project": "Projekt",
@@ -733,18 +743,18 @@
"settings.installedMbOnDisk": "{0} installiert · {1} MB belegt",
"settings.installerOpened": "Das Installationsprogramm für Concat {0} ist geöffnet. Concat wird jetzt geschlossen, damit es fertig werden kann.",
"settings.language": "Sprache",
- "settings.logLevel": "Protokollstufe",
- "settings.logLevelHint": "Was das Protokoll festhält. Normal reicht für die meisten Berichte; Debug oder Alles, wenn ein Bericht danach fragt - die Datei wächst dann schneller. CONCAT_LOG in der Umgebung übersteuert dies für einen Lauf.",
- "settings.logErrors": "Nur Fehler",
- "settings.logWarnings": "Warnungen",
- "settings.logNormal": "Normal",
- "settings.logDebug": "Debug",
- "settings.logEverything": "Alles",
"settings.light": "Hell",
"settings.lime": "Limette",
"settings.lineAcrossLanesMarks": "Die Linie quer über die Spuren, die die aktuelle Zeit markiert. Wähle eine beliebige Farbe dafür, oder den ersten Punkt, um zur Farbe des Designs zurückzukehren.",
"settings.listeningOnConnected": "Lauscht auf {0} · {1} verbunden",
"settings.localAddressWarning": "127.0.0.1 ist nur dieser Rechner. Jede andere Adresse ist aus dem Netzwerk erreichbar, braucht ein Token und ist trotzdem nicht verschlüsselt.",
+ "settings.logDebug": "Debug",
+ "settings.logErrors": "Nur Fehler",
+ "settings.logEverything": "Alles",
+ "settings.logLevel": "Protokollstufe",
+ "settings.logLevelHint": "Was das Protokoll festhält. Normal reicht für die meisten Berichte; Debug oder Alles, wenn ein Bericht danach fragt - die Datei wächst dann schneller. CONCAT_LOG in der Umgebung übersteuert dies für einen Lauf.",
+ "settings.logNormal": "Normal",
+ "settings.logWarnings": "Warnungen",
"settings.mbOfMb": "{0} MB von {1} MB",
"settings.mint": "Minze",
"settings.mirrorOwn": "Ein eigener Spiegel",
@@ -857,11 +867,10 @@
"studio.closeProject": "Projekt schließen",
"studio.closeWindow": "Fenster schließen",
"studio.couldNotExportAudio": "Audio konnte nicht exportiert werden: {0}",
- "studio.couldNotSaveFrame": "Das Bild konnte nicht gespeichert werden: {0}",
- "studio.frameSaved": "Bild gespeichert unter {0}",
"studio.couldNotImport": "Could not import {0}: {1}",
"studio.couldNotRead": "{0} konnte nicht gelesen werden",
"studio.couldNotSave": "Speichern nicht möglich: {0}",
+ "studio.couldNotSaveFrame": "Das Bild konnte nicht gespeichert werden: {0}",
"studio.customPackageDidNot": "Ein eigenes Paket wurde nicht geladen: {0}",
"studio.customPackagesDidNot": "{0} eigene Pakete wurden nicht geladen; das erste: {1}",
"studio.deleteClip": "Clip löschen",
@@ -876,9 +885,9 @@
"studio.export": "Exportieren…",
"studio.exportAudio": "Audio speichern unter…",
"studio.exportingAudio": "Audio wird exportiert…",
- "studio.savingFrame": "Bild wird gespeichert…",
"studio.fileHasNoPicture": "Diese Datei hat kein Bild zum Verbessern",
"studio.fontImported": "{0} importiert; steht ab jetzt in der Schriftliste",
+ "studio.frameSaved": "Bild gespeichert unter {0}",
"studio.importLut": "Import LUT",
"studio.importMedia": "Medien importieren…",
"studio.importedLooksFindThem": "Imported {0} look(s); find them under Imported",
@@ -905,6 +914,7 @@
"studio.save": "Speichern",
"studio.saveAsTemplate": "Als Vorlage speichern…",
"studio.savedTemplate": "Vorlage „{0}“ gespeichert",
+ "studio.savingFrame": "Bild wird gespeichert…",
"studio.selectClipTimelineFirst": "Wähle zuerst einen Clip auf der Zeitleiste",
"studio.selectClipTransitionLeads": "Wähle den Clip, in den der Übergang führt",
"studio.selectTwoClipsMerge": "Wähle zwei Clips zum Zusammenführen",
diff --git a/src/crates/concat/locales/en.json b/src/crates/concat/locales/en.json
index 31997b69..d89a29f0 100644
--- a/src/crates/concat/locales/en.json
+++ b/src/crates/concat/locales/en.json
@@ -168,6 +168,7 @@
"configPane.timeline": "TIMELINE",
"configPane.timelineOne": "Timeline 1",
"configPane.tracks": "Tracks",
+ "configPane.vectorImage": "Vector Image",
"controls.centred": "centred",
"controls.hertz": "{0} Hz",
"controls.kelvin": "{0} K",
@@ -576,9 +577,9 @@
"export.showInFolder": "Show in folder",
"export.smallest": "Smallest",
"export.summary": "Summary",
- "export.timelineSize": "Timeline",
"export.targetBitrate": "Target bitrate",
"export.tenBitColour": "10-bit colour",
+ "export.timelineSize": "Timeline",
"export.toneMapped": "Tone-mapped, plays anywhere",
"export.vbr": "VBR",
"export.videoYoutube": "Video, YouTube",
@@ -631,10 +632,19 @@
"mediaPane.processed": "Processed",
"mediaPane.reloadCustomEffects": "Reload custom effects",
"mediaPane.saveProjectTemplate": "Save this project as a template",
+ "mediaPane.shapeArrow": "Arrow",
+ "mediaPane.shapeCircle": "Circle",
+ "mediaPane.shapeLine": "Line",
+ "mediaPane.shapeParallelogram": "Parallelogram",
+ "mediaPane.shapeSquare": "Square",
+ "mediaPane.shapeTrapezoid": "Trapezoid",
+ "mediaPane.shapeTriangle": "Triangle",
+ "mediaPane.shapes": "Shapes",
"mediaPane.soon": "Soon",
"mediaPane.sortAdded": "Sort: Added",
"mediaPane.sortName": "Sort: Name",
"mediaPane.sortType": "Sort: Type",
+ "mediaPane.stickers": "Stickers",
"mediaPane.templates": "Templates",
"mediaPane.titles": "Titles",
"mediaPane.transition": "transition",
@@ -680,11 +690,11 @@
"previewPane.half": "Half",
"previewPane.nextFrame": "Next frame",
"previewPane.nothingUnderThePlayhead": "Nothing under the playhead",
- "previewPane.saveFrameAs": "Save Video Frame As…",
"previewPane.pause": "Pause",
"previewPane.play": "Play",
"previewPane.previousFrame": "Previous frame",
"previewPane.quarter": "Quarter",
+ "previewPane.saveFrameAs": "Save Video Frame As…",
"project.hdrMonitorNote": "The monitor shows an HDR timeline tone-mapped to SDR, until HDR preview arrives.",
"project.output": "Output · {0}",
"project.project": "Project",
@@ -733,18 +743,18 @@
"settings.installedMbOnDisk": "{0} installed · {1} MB on disk",
"settings.installerOpened": "The installer for Concat {0} is open. Concat closes now so it can finish.",
"settings.language": "Language",
- "settings.logLevel": "Log level",
- "settings.logLevelHint": "What the log records. Normal is enough for most reports; Debug or Everything when a report asks for it, and the file grows faster. CONCAT_LOG in the environment overrides this for one run.",
- "settings.logErrors": "Errors only",
- "settings.logWarnings": "Warnings",
- "settings.logNormal": "Normal",
- "settings.logDebug": "Debug",
- "settings.logEverything": "Everything",
"settings.light": "Light",
"settings.lime": "Lime",
"settings.lineAcrossLanesMarks": "The line across the lanes that marks the current time. Pick any colour for it, or the first dot to go back to the theme's own.",
"settings.listeningOnConnected": "Listening on {0} · {1} connected",
"settings.localAddressWarning": "127.0.0.1 is this machine only. Any other address is reachable from the network, needs a token, and is still not encrypted.",
+ "settings.logDebug": "Debug",
+ "settings.logErrors": "Errors only",
+ "settings.logEverything": "Everything",
+ "settings.logLevel": "Log level",
+ "settings.logLevelHint": "What the log records. Normal is enough for most reports; Debug or Everything when a report asks for it, and the file grows faster. CONCAT_LOG in the environment overrides this for one run.",
+ "settings.logNormal": "Normal",
+ "settings.logWarnings": "Warnings",
"settings.mbOfMb": "{0} MB of {1} MB",
"settings.mint": "Mint",
"settings.mirrorOwn": "A mirror of your own",
@@ -857,11 +867,10 @@
"studio.closeProject": "Close project",
"studio.closeWindow": "Close window",
"studio.couldNotExportAudio": "Could not export the audio: {0}",
- "studio.couldNotSaveFrame": "Could not save the frame: {0}",
- "studio.frameSaved": "Saved the frame to {0}",
"studio.couldNotImport": "Could not import {0}: {1}",
"studio.couldNotRead": "Could not read {0}",
"studio.couldNotSave": "Could not save: {0}",
+ "studio.couldNotSaveFrame": "Could not save the frame: {0}",
"studio.customPackageDidNot": "A custom package did not load: {0}",
"studio.customPackagesDidNot": "{0} custom packages did not load; the first: {1}",
"studio.deleteClip": "Delete clip",
@@ -876,9 +885,9 @@
"studio.export": "Export…",
"studio.exportAudio": "Save Audio As…",
"studio.exportingAudio": "Exporting the audio…",
- "studio.savingFrame": "Saving the frame…",
"studio.fileHasNoPicture": "This file has no picture to enhance",
"studio.fontImported": "{0} imported; it is in the font list from now on",
+ "studio.frameSaved": "Saved the frame to {0}",
"studio.importLut": "Import LUT",
"studio.importMedia": "Import media…",
"studio.importedLooksFindThem": "Imported {0} look(s); find them under Imported",
@@ -905,6 +914,7 @@
"studio.save": "Save",
"studio.saveAsTemplate": "Save as template…",
"studio.savedTemplate": "Saved template “{0}”",
+ "studio.savingFrame": "Saving the frame…",
"studio.selectClipTimelineFirst": "Select a clip on the timeline first",
"studio.selectClipTransitionLeads": "Select the clip the transition leads into",
"studio.selectTwoClipsMerge": "Select two clips to merge",
diff --git a/src/crates/concat/locales/es.json b/src/crates/concat/locales/es.json
index 201d86e5..bf241568 100644
--- a/src/crates/concat/locales/es.json
+++ b/src/crates/concat/locales/es.json
@@ -168,6 +168,7 @@
"configPane.timeline": "LÍNEA DE TIEMPO",
"configPane.timelineOne": "Línea de tiempo 1",
"configPane.tracks": "Pistas",
+ "configPane.vectorImage": "Imagen vectorial",
"controls.centred": "centrado",
"controls.hertz": "{0} Hz",
"controls.kelvin": "{0} K",
@@ -576,9 +577,9 @@
"export.showInFolder": "Mostrar en la carpeta",
"export.smallest": "El más pequeño",
"export.summary": "Resumen",
- "export.timelineSize": "Línea de tiempo",
"export.targetBitrate": "Target bitrate",
"export.tenBitColour": "Color de 10 bits",
+ "export.timelineSize": "Línea de tiempo",
"export.toneMapped": "Convertido a SDR, se ve en todas partes",
"export.vbr": "VBR",
"export.videoYoutube": "Vídeo, YouTube",
@@ -631,10 +632,19 @@
"mediaPane.processed": "Procesado",
"mediaPane.reloadCustomEffects": "Recargar los efectos personalizados",
"mediaPane.saveProjectTemplate": "Guardar este proyecto como plantilla",
+ "mediaPane.shapeArrow": "Flecha",
+ "mediaPane.shapeCircle": "Círculo",
+ "mediaPane.shapeLine": "Línea",
+ "mediaPane.shapeParallelogram": "Paralelogramo",
+ "mediaPane.shapeSquare": "Cuadrado",
+ "mediaPane.shapeTrapezoid": "Trapecio",
+ "mediaPane.shapeTriangle": "Triángulo",
+ "mediaPane.shapes": "Formas",
"mediaPane.soon": "Pronto",
"mediaPane.sortAdded": "Sort: Added",
"mediaPane.sortName": "Sort: Name",
"mediaPane.sortType": "Sort: Type",
+ "mediaPane.stickers": "Stickers",
"mediaPane.templates": "Plantillas",
"mediaPane.titles": "Títulos",
"mediaPane.transition": "transición",
@@ -680,11 +690,11 @@
"previewPane.half": "Media",
"previewPane.nextFrame": "Fotograma siguiente",
"previewPane.nothingUnderThePlayhead": "Nada bajo el cabezal",
- "previewPane.saveFrameAs": "Guardar fotograma como…",
"previewPane.pause": "Pausa",
"previewPane.play": "Reproducir",
"previewPane.previousFrame": "Fotograma anterior",
"previewPane.quarter": "Un cuarto",
+ "previewPane.saveFrameAs": "Guardar fotograma como…",
"project.hdrMonitorNote": "El monitor muestra una línea de tiempo HDR convertida a SDR hasta que llegue la vista previa HDR.",
"project.output": "Salida · {0}",
"project.project": "Proyecto",
@@ -733,18 +743,18 @@
"settings.installedMbOnDisk": "{0} instalados · {1} MB en disco",
"settings.installerOpened": "El instalador de Concat {0} está abierto. Concat se cierra ahora para que pueda terminar.",
"settings.language": "Idioma",
- "settings.logLevel": "Nivel de registro",
- "settings.logLevelHint": "Qué anota el registro. Normal basta para la mayoría de los informes; Depuración o Todo cuando un informe lo pida, y el archivo crece más rápido. CONCAT_LOG en el entorno lo anula durante una ejecución.",
- "settings.logErrors": "Solo errores",
- "settings.logWarnings": "Avisos",
- "settings.logNormal": "Normal",
- "settings.logDebug": "Depuración",
- "settings.logEverything": "Todo",
"settings.light": "Claro",
"settings.lime": "Lima",
"settings.lineAcrossLanesMarks": "La línea que cruza las pistas y marca el tiempo actual. Elige cualquier color para ella, o el primer punto para volver al color del tema.",
"settings.listeningOnConnected": "Escuchando en {0} · {1} conectados",
"settings.localAddressWarning": "127.0.0.1 es solo este equipo. Cualquier otra dirección es accesible desde la red, necesita un token y aun así no va cifrada.",
+ "settings.logDebug": "Depuración",
+ "settings.logErrors": "Solo errores",
+ "settings.logEverything": "Todo",
+ "settings.logLevel": "Nivel de registro",
+ "settings.logLevelHint": "Qué anota el registro. Normal basta para la mayoría de los informes; Depuración o Todo cuando un informe lo pida, y el archivo crece más rápido. CONCAT_LOG en el entorno lo anula durante una ejecución.",
+ "settings.logNormal": "Normal",
+ "settings.logWarnings": "Avisos",
"settings.mbOfMb": "{0} MB de {1} MB",
"settings.mint": "Menta",
"settings.mirrorOwn": "Un espejo propio",
@@ -857,11 +867,10 @@
"studio.closeProject": "Cerrar proyecto",
"studio.closeWindow": "Cerrar ventana",
"studio.couldNotExportAudio": "No se pudo exportar el audio: {0}",
- "studio.couldNotSaveFrame": "No se pudo guardar el fotograma: {0}",
- "studio.frameSaved": "Fotograma guardado en {0}",
"studio.couldNotImport": "Could not import {0}: {1}",
"studio.couldNotRead": "No se pudo leer {0}",
"studio.couldNotSave": "No se pudo guardar: {0}",
+ "studio.couldNotSaveFrame": "No se pudo guardar el fotograma: {0}",
"studio.customPackageDidNot": "Un paquete personalizado no se cargó: {0}",
"studio.customPackagesDidNot": "{0} paquetes personalizados no se cargaron; el primero: {1}",
"studio.deleteClip": "Eliminar clip",
@@ -876,9 +885,9 @@
"studio.export": "Exportar…",
"studio.exportAudio": "Guardar audio como…",
"studio.exportingAudio": "Exportando el audio…",
- "studio.savingFrame": "Guardando el fotograma…",
"studio.fileHasNoPicture": "Este archivo no tiene imagen que mejorar",
"studio.fontImported": "{0} importada; desde ahora está en la lista de fuentes",
+ "studio.frameSaved": "Fotograma guardado en {0}",
"studio.importLut": "Import LUT",
"studio.importMedia": "Importar medios…",
"studio.importedLooksFindThem": "Imported {0} look(s); find them under Imported",
@@ -905,6 +914,7 @@
"studio.save": "Guardar",
"studio.saveAsTemplate": "Guardar como plantilla…",
"studio.savedTemplate": "Plantilla «{0}» guardada",
+ "studio.savingFrame": "Guardando el fotograma…",
"studio.selectClipTimelineFirst": "Selecciona primero un clip en la línea de tiempo",
"studio.selectClipTransitionLeads": "Selecciona el clip al que lleva la transición",
"studio.selectTwoClipsMerge": "Selecciona dos clips para unirlos",
diff --git a/src/crates/concat/locales/fa.json b/src/crates/concat/locales/fa.json
index 990146fb..da7703a1 100644
--- a/src/crates/concat/locales/fa.json
+++ b/src/crates/concat/locales/fa.json
@@ -168,6 +168,7 @@
"configPane.timeline": "تایم‌لاین",
"configPane.timelineOne": "تایم‌لاین 1",
"configPane.tracks": "ترک‌ها",
+ "configPane.vectorImage": "تصویر برداری",
"controls.centred": "وسط‌چین",
"controls.hertz": "{0} Hz",
"controls.kelvin": "{0} K",
@@ -576,9 +577,9 @@
"export.showInFolder": "نمایش در پوشه",
"export.smallest": "کوچک‌ترین",
"export.summary": "خلاصه",
- "export.timelineSize": "خط زمان",
"export.targetBitrate": "نرخ بیت هدف",
"export.tenBitColour": "رنگ 10-bit",
+ "export.timelineSize": "خط زمان",
"export.toneMapped": "با Tone Mapping، همه‌جا پخش می‌شود",
"export.vbr": "VBR",
"export.videoYoutube": "ویدئو، YouTube",
@@ -631,10 +632,19 @@
"mediaPane.processed": "پردازش‌شده",
"mediaPane.reloadCustomEffects": "بارگذاری مجدد افکت‌های سفارشی",
"mediaPane.saveProjectTemplate": "ذخیره این پروژه به‌عنوان قالب",
+ "mediaPane.shapeArrow": "پیکان",
+ "mediaPane.shapeCircle": "دایره",
+ "mediaPane.shapeLine": "خط",
+ "mediaPane.shapeParallelogram": "متوازی‌الاضلاع",
+ "mediaPane.shapeSquare": "مربع",
+ "mediaPane.shapeTrapezoid": "ذوزنقه",
+ "mediaPane.shapeTriangle": "مثلث",
+ "mediaPane.shapes": "شکل‌ها",
"mediaPane.soon": "به‌زودی",
"mediaPane.sortAdded": "مرتب‌سازی: زمان افزودن",
"mediaPane.sortName": "مرتب‌سازی: نام",
"mediaPane.sortType": "مرتب‌سازی: نوع",
+ "mediaPane.stickers": "استیکرها",
"mediaPane.templates": "قالب‌ها",
"mediaPane.titles": "عنوان‌ها",
"mediaPane.transition": "Transition",
@@ -680,11 +690,11 @@
"previewPane.half": "نصف",
"previewPane.nextFrame": "فریم بعدی",
"previewPane.nothingUnderThePlayhead": "چیزی زیر نشانگر پخش نیست",
- "previewPane.saveFrameAs": "ذخیرهٔ فریم ویدیو به‌عنوان…",
"previewPane.pause": "مکث",
"previewPane.play": "پخش",
"previewPane.previousFrame": "فریم قبلی",
"previewPane.quarter": "یک‌چهارم",
+ "previewPane.saveFrameAs": "ذخیرهٔ فریم ویدیو به‌عنوان…",
"project.hdrMonitorNote": "مانیتور تا رسیدن پیش‌نمایش HDR، تایم‌لاین HDR را با Tone Mapping به SDR نشان می‌دهد.",
"project.output": "خروجی · {0}",
"project.project": "پروژه",
@@ -733,18 +743,18 @@
"settings.installedMbOnDisk": "{0} نصب شده · {1} MB روی دیسک",
"settings.installerOpened": "نصب‌کنندهٔ Concat {0} باز است. Concat اکنون بسته می‌شود تا نصب تمام شود.",
"settings.language": "زبان",
- "settings.logLevel": "سطح گزارش",
- "settings.logLevelHint": "آنچه گزارش ثبت می‌کند. «عادی» برای بیشتر گزارش‌ها کافی است؛ «اشکال‌زدایی» یا «همه‌چیز» وقتی گزارشی آن را بخواهد، و فایل سریع‌تر بزرگ می‌شود. CONCAT_LOG در محیط برای یک اجرا این را لغو می‌کند.",
- "settings.logErrors": "فقط خطاها",
- "settings.logWarnings": "هشدارها",
- "settings.logNormal": "عادی",
- "settings.logDebug": "اشکال‌زدایی",
- "settings.logEverything": "همه‌چیز",
"settings.light": "روشن",
"settings.lime": "لیمویی",
"settings.lineAcrossLanesMarks": "خطی که از روی ترک‌ها می‌گذرد و زمان فعلی را نشان می‌دهد. هر رنگی را برای آن انتخاب کنید، یا نقطهٔ اول را برای بازگشت به رنگ خود تم.",
"settings.listeningOnConnected": "در حال Listening روی {0} · {1} متصل",
"settings.localAddressWarning": "127.0.0.1 فقط همین دستگاه است. هر آدرس دیگری از طریق شبکه قابل دسترسی است، به Token نیاز دارد و همچنان رمزگذاری‌شده نیست.",
+ "settings.logDebug": "اشکال‌زدایی",
+ "settings.logErrors": "فقط خطاها",
+ "settings.logEverything": "همه‌چیز",
+ "settings.logLevel": "سطح گزارش",
+ "settings.logLevelHint": "آنچه گزارش ثبت می‌کند. «عادی» برای بیشتر گزارش‌ها کافی است؛ «اشکال‌زدایی» یا «همه‌چیز» وقتی گزارشی آن را بخواهد، و فایل سریع‌تر بزرگ می‌شود. CONCAT_LOG در محیط برای یک اجرا این را لغو می‌کند.",
+ "settings.logNormal": "عادی",
+ "settings.logWarnings": "هشدارها",
"settings.mbOfMb": "{0} MB از {1} MB",
"settings.mint": "نعنایی",
"settings.mirrorOwn": "آینه‌ای از تصویر خودتان",
@@ -857,11 +867,10 @@
"studio.closeProject": "بستن پروژه",
"studio.closeWindow": "بستن پنجره",
"studio.couldNotExportAudio": "خروجی گرفتن از صدا ممکن نشد: {0}",
- "studio.couldNotSaveFrame": "فریم ذخیره نشد: {0}",
- "studio.frameSaved": "فریم در {0} ذخیره شد",
"studio.couldNotImport": "وارد کردن کردن {0} ممکن نشد: {1}",
"studio.couldNotRead": "{0} خوانده نشد",
"studio.couldNotSave": "ذخیره ممکن نشد: {0}",
+ "studio.couldNotSaveFrame": "فریم ذخیره نشد: {0}",
"studio.customPackageDidNot": "یک بسته سفارشی بارگذاری نشد: {0}",
"studio.customPackagesDidNot": "{0} بسته سفارشی بارگذاری نشدند؛ اولین مورد: {1}",
"studio.deleteClip": "حذف کلیپ",
@@ -876,9 +885,9 @@
"studio.export": "خروجی گرفتن…",
"studio.exportAudio": "ذخیره صدا به‌عنوان…",
"studio.exportingAudio": "در حال خروجی گرفتن از صدا…",
- "studio.savingFrame": "در حال ذخیرهٔ فریم…",
"studio.fileHasNoPicture": "این فایل تصویری برای بهبود کیفیت ندارد",
"studio.fontImported": "{0} وارد شد؛ از این پس در فهرست قلم‌ها است",
+ "studio.frameSaved": "فریم در {0} ذخیره شد",
"studio.importLut": "وارد کردن LUT",
"studio.importMedia": "وارد کردن رسانه…",
"studio.importedLooksFindThem": "{0} ظاهر وارد کردن شد؛ آن‌ها را در بخش Imported پیدا کنید",
@@ -905,6 +914,7 @@
"studio.save": "ذخیره",
"studio.saveAsTemplate": "ذخیره به‌عنوان قالب…",
"studio.savedTemplate": "قالب «{0}» ذخیره شد",
+ "studio.savingFrame": "در حال ذخیرهٔ فریم…",
"studio.selectClipTimelineFirst": "ابتدا یک کلیپ را روی تایم‌لاین انتخاب کنید",
"studio.selectClipTransitionLeads": "کلیپی را که Transition به آن وارد می‌شود انتخاب کنید",
"studio.selectTwoClipsMerge": "دو کلیپ را برای ادغام انتخاب کنید",
diff --git a/src/crates/concat/locales/fr.json b/src/crates/concat/locales/fr.json
index 144f5614..c291a283 100644
--- a/src/crates/concat/locales/fr.json
+++ b/src/crates/concat/locales/fr.json
@@ -168,6 +168,7 @@
"configPane.timeline": "TIMELINE",
"configPane.timelineOne": "Timeline 1",
"configPane.tracks": "Pistes",
+ "configPane.vectorImage": "Image vectorielle",
"controls.centred": "centré",
"controls.hertz": "{0} Hz",
"controls.kelvin": "{0} K",
@@ -576,9 +577,9 @@
"export.showInFolder": "Afficher dans le dossier",
"export.smallest": "Le plus petit",
"export.summary": "Résumé",
- "export.timelineSize": "Timeline",
"export.targetBitrate": "Target bitrate",
"export.tenBitColour": "Couleur 10 bits",
+ "export.timelineSize": "Timeline",
"export.toneMapped": "Ramené en SDR, lisible partout",
"export.vbr": "VBR",
"export.videoYoutube": "Vidéo, YouTube",
@@ -631,10 +632,19 @@
"mediaPane.processed": "Traité",
"mediaPane.reloadCustomEffects": "Recharger les effets personnalisés",
"mediaPane.saveProjectTemplate": "Enregistrer ce projet comme modèle",
+ "mediaPane.shapeArrow": "Flèche",
+ "mediaPane.shapeCircle": "Cercle",
+ "mediaPane.shapeLine": "Ligne",
+ "mediaPane.shapeParallelogram": "Parallélogramme",
+ "mediaPane.shapeSquare": "Carré",
+ "mediaPane.shapeTrapezoid": "Trapèze",
+ "mediaPane.shapeTriangle": "Triangle",
+ "mediaPane.shapes": "Formes",
"mediaPane.soon": "Bientôt",
"mediaPane.sortAdded": "Sort: Added",
"mediaPane.sortName": "Sort: Name",
"mediaPane.sortType": "Sort: Type",
+ "mediaPane.stickers": "Stickers",
"mediaPane.templates": "Modèles",
"mediaPane.titles": "Titres",
"mediaPane.transition": "transition",
@@ -680,11 +690,11 @@
"previewPane.half": "Moitié",
"previewPane.nextFrame": "Image suivante",
"previewPane.nothingUnderThePlayhead": "Rien sous la tête de lecture",
- "previewPane.saveFrameAs": "Enregistrer l’image vidéo sous…",
"previewPane.pause": "Pause",
"previewPane.play": "Lecture",
"previewPane.previousFrame": "Image précédente",
"previewPane.quarter": "Quart",
+ "previewPane.saveFrameAs": "Enregistrer l’image vidéo sous…",
"project.hdrMonitorNote": "Le moniteur affiche une timeline HDR ramenée en SDR, en attendant l'aperçu HDR.",
"project.output": "Sortie · {0}",
"project.project": "Projet",
@@ -733,18 +743,18 @@
"settings.installedMbOnDisk": "{0} installés · {1} Mo sur le disque",
"settings.installerOpened": "L'installateur de Concat {0} est ouvert. Concat se ferme maintenant pour le laisser terminer.",
"settings.language": "Langue",
- "settings.logLevel": "Niveau de journalisation",
- "settings.logLevelHint": "Ce que le journal enregistre. Normal suffit pour la plupart des rapports ; Débogage ou Tout quand un rapport le demande, et le fichier grossit plus vite. CONCAT_LOG dans l’environnement prend le dessus pour une exécution.",
- "settings.logErrors": "Erreurs seulement",
- "settings.logWarnings": "Avertissements",
- "settings.logNormal": "Normal",
- "settings.logDebug": "Débogage",
- "settings.logEverything": "Tout",
"settings.light": "Clair",
"settings.lime": "Citron vert",
"settings.lineAcrossLanesMarks": "La ligne qui traverse les pistes et marque l'instant courant. Choisissez n'importe quelle couleur, ou le premier point pour revenir à celle du thème.",
"settings.listeningOnConnected": "À l'écoute sur {0} · {1} connecté(s)",
"settings.localAddressWarning": "127.0.0.1, c'est cette machine seulement. Toute autre adresse est joignable depuis le réseau, exige un jeton et n'est toujours pas chiffrée.",
+ "settings.logDebug": "Débogage",
+ "settings.logErrors": "Erreurs seulement",
+ "settings.logEverything": "Tout",
+ "settings.logLevel": "Niveau de journalisation",
+ "settings.logLevelHint": "Ce que le journal enregistre. Normal suffit pour la plupart des rapports ; Débogage ou Tout quand un rapport le demande, et le fichier grossit plus vite. CONCAT_LOG dans l’environnement prend le dessus pour une exécution.",
+ "settings.logNormal": "Normal",
+ "settings.logWarnings": "Avertissements",
"settings.mbOfMb": "{0} Mo sur {1} Mo",
"settings.mint": "Menthe",
"settings.mirrorOwn": "Un miroir à vous",
@@ -857,11 +867,10 @@
"studio.closeProject": "Fermer le projet",
"studio.closeWindow": "Fermer la fenêtre",
"studio.couldNotExportAudio": "Impossible d’exporter l’audio : {0}",
- "studio.couldNotSaveFrame": "Impossible d’enregistrer l’image : {0}",
- "studio.frameSaved": "Image enregistrée dans {0}",
"studio.couldNotImport": "Could not import {0}: {1}",
"studio.couldNotRead": "Lecture impossible de {0}",
"studio.couldNotSave": "Enregistrement impossible : {0}",
+ "studio.couldNotSaveFrame": "Impossible d’enregistrer l’image : {0}",
"studio.customPackageDidNot": "Un paquet personnalisé n'a pas été chargé : {0}",
"studio.customPackagesDidNot": "{0} paquets personnalisés n'ont pas été chargés ; le premier : {1}",
"studio.deleteClip": "Supprimer le clip",
@@ -876,9 +885,9 @@
"studio.export": "Exporter…",
"studio.exportAudio": "Enregistrer l’audio sous…",
"studio.exportingAudio": "Export de l’audio…",
- "studio.savingFrame": "Enregistrement de l’image…",
"studio.fileHasNoPicture": "Ce fichier n'a pas d'image à améliorer",
"studio.fontImported": "{0} importée ; elle figure désormais dans la liste des polices",
+ "studio.frameSaved": "Image enregistrée dans {0}",
"studio.importLut": "Import LUT",
"studio.importMedia": "Importer des médias…",
"studio.importedLooksFindThem": "Imported {0} look(s); find them under Imported",
@@ -905,6 +914,7 @@
"studio.save": "Enregistrer",
"studio.saveAsTemplate": "Enregistrer comme modèle…",
"studio.savedTemplate": "Modèle « {0} » enregistré",
+ "studio.savingFrame": "Enregistrement de l’image…",
"studio.selectClipTimelineFirst": "Sélectionnez d'abord un clip sur la timeline",
"studio.selectClipTransitionLeads": "Sélectionnez le clip vers lequel mène la transition",
"studio.selectTwoClipsMerge": "Sélectionnez deux clips à fusionner",
diff --git a/src/crates/concat/locales/hr.json b/src/crates/concat/locales/hr.json
index 61f7a818..ea9b4107 100644
--- a/src/crates/concat/locales/hr.json
+++ b/src/crates/concat/locales/hr.json
@@ -168,6 +168,7 @@
"configPane.timeline": "VREMENSKA LINIJA",
"configPane.timelineOne": "Vremenska linija 1",
"configPane.tracks": "Trake",
+ "configPane.vectorImage": "Vektorska slika",
"controls.centred": "centrirano",
"controls.hertz": "{0} Hz",
"controls.kelvin": "{0} K",
@@ -576,9 +577,9 @@
"export.showInFolder": "Prikaži u mapi",
"export.smallest": "Najmanje",
"export.summary": "Sažetak",
- "export.timelineSize": "Vremenska crta",
"export.targetBitrate": "Target bitrate",
"export.tenBitColour": "10-bitna boja",
+ "export.timelineSize": "Vremenska crta",
"export.toneMapped": "Mapirano u SDR, radi svugdje",
"export.vbr": "VBR",
"export.videoYoutube": "Video, YouTube",
@@ -631,10 +632,19 @@
"mediaPane.processed": "Obrađeno",
"mediaPane.reloadCustomEffects": "Ponovno učitaj prilagođene efekte",
"mediaPane.saveProjectTemplate": "Spremi ovaj projekt kao predložak",
+ "mediaPane.shapeArrow": "Strelica",
+ "mediaPane.shapeCircle": "Krug",
+ "mediaPane.shapeLine": "Linija",
+ "mediaPane.shapeParallelogram": "Paralelogram",
+ "mediaPane.shapeSquare": "Kvadrat",
+ "mediaPane.shapeTrapezoid": "Trapez",
+ "mediaPane.shapeTriangle": "Trokut",
+ "mediaPane.shapes": "Oblici",
"mediaPane.soon": "Uskoro",
"mediaPane.sortAdded": "Sort: Added",
"mediaPane.sortName": "Sort: Name",
"mediaPane.sortType": "Sort: Type",
+ "mediaPane.stickers": "Naljepnice",
"mediaPane.templates": "Predlošci",
"mediaPane.titles": "Naslovi",
"mediaPane.transition": "prijelaz",
@@ -680,11 +690,11 @@
"previewPane.half": "Pola",
"previewPane.nextFrame": "Sljedeća sličica",
"previewPane.nothingUnderThePlayhead": "Ništa pod playheadom",
- "previewPane.saveFrameAs": "Spremi sličicu videa kao…",
"previewPane.pause": "Pauza",
"previewPane.play": "Reprodukcija",
"previewPane.previousFrame": "Prethodna sličica",
"previewPane.quarter": "Četvrtina",
+ "previewPane.saveFrameAs": "Spremi sličicu videa kao…",
"project.hdrMonitorNote": "Monitor prikazuje HDR vremensku crtu mapiranu u SDR, dok ne stigne HDR pregled.",
"project.output": "Izlaz · {0}",
"project.project": "Projekt",
@@ -733,18 +743,18 @@
"settings.installedMbOnDisk": "{0} instalirano · {1} MB na disku",
"settings.installerOpened": "Instalacijski program za Concat {0} je otvoren. Concat se sada zatvara kako bi mogao završiti.",
"settings.language": "Jezik",
- "settings.logLevel": "Razina zapisnika",
- "settings.logLevelHint": "Što zapisnik bilježi. Normalno je dovoljno za većinu prijava; Otklanjanje grešaka ili Sve kad prijava to traži, a datoteka brže raste. CONCAT_LOG u okruženju nadjačava ovo za jedno pokretanje.",
- "settings.logErrors": "Samo greške",
- "settings.logWarnings": "Upozorenja",
- "settings.logNormal": "Normalno",
- "settings.logDebug": "Otklanjanje grešaka",
- "settings.logEverything": "Sve",
"settings.light": "Svijetlo",
"settings.lime": "Limeta",
"settings.lineAcrossLanesMarks": "Crta preko traka koja označava trenutno vrijeme. Odaberite bilo koju boju za nju, ili prvu točku za povratak na boju teme.",
"settings.listeningOnConnected": "Sluša na {0} · {1} povezano",
"settings.localAddressWarning": "127.0.0.1 je samo ovo računalo. Svaka druga adresa dostupna je s mreže, treba token i svejedno nije šifrirana.",
+ "settings.logDebug": "Otklanjanje grešaka",
+ "settings.logErrors": "Samo greške",
+ "settings.logEverything": "Sve",
+ "settings.logLevel": "Razina zapisnika",
+ "settings.logLevelHint": "Što zapisnik bilježi. Normalno je dovoljno za većinu prijava; Otklanjanje grešaka ili Sve kad prijava to traži, a datoteka brže raste. CONCAT_LOG u okruženju nadjačava ovo za jedno pokretanje.",
+ "settings.logNormal": "Normalno",
+ "settings.logWarnings": "Upozorenja",
"settings.mbOfMb": "{0} MB od {1} MB",
"settings.mint": "Menta",
"settings.mirrorOwn": "Vlastito zrcalo",
@@ -857,11 +867,10 @@
"studio.closeProject": "Zatvori projekt",
"studio.closeWindow": "Zatvori prozor",
"studio.couldNotExportAudio": "Zvuk nije moguće izvesti: {0}",
- "studio.couldNotSaveFrame": "Sličica nije spremljena: {0}",
- "studio.frameSaved": "Sličica spremljena u {0}",
"studio.couldNotImport": "Nije moguće uvesti {0}: {1}",
"studio.couldNotRead": "Nije moguće pročitati {0}",
"studio.couldNotSave": "Nije moguće spremiti: {0}",
+ "studio.couldNotSaveFrame": "Sličica nije spremljena: {0}",
"studio.customPackageDidNot": "Prilagođeni paket nije se učitao: {0}",
"studio.customPackagesDidNot": "{0} prilagođenih paketa nije se učitalo; prvi: {1}",
"studio.deleteClip": "Obriši klip",
@@ -876,9 +885,9 @@
"studio.export": "Izvoz…",
"studio.exportAudio": "Spremi zvuk kao…",
"studio.exportingAudio": "Izvoz zvuka…",
- "studio.savingFrame": "Spremanje sličice…",
"studio.fileHasNoPicture": "Ova datoteka nema slike za poboljšanje",
"studio.fontImported": "{0} uvezen; od sada je na popisu fontova",
+ "studio.frameSaved": "Sličica spremljena u {0}",
"studio.importLut": "Uvezi LUT",
"studio.importMedia": "Uvezi medije…",
"studio.importedLooksFindThem": "Uvezeno {0} izgleda; naći ćete ih pod Uvezeno",
@@ -905,6 +914,7 @@
"studio.save": "Spremi",
"studio.saveAsTemplate": "Spremi kao predložak…",
"studio.savedTemplate": "Spremljen predložak “{0}”",
+ "studio.savingFrame": "Spremanje sličice…",
"studio.selectClipTimelineFirst": "Prvo odaberite klip na vremenskoj liniji",
"studio.selectClipTransitionLeads": "Odaberite klip u koji prijelaz ulazi",
"studio.selectTwoClipsMerge": "Odaberite dva klipa za spajanje",
diff --git a/src/crates/concat/locales/it.json b/src/crates/concat/locales/it.json
index 21c6b9d2..f5cafbb7 100644
--- a/src/crates/concat/locales/it.json
+++ b/src/crates/concat/locales/it.json
@@ -168,6 +168,7 @@
"configPane.timeline": "TIMELINE",
"configPane.timelineOne": "Timeline 1",
"configPane.tracks": "Tracce",
+ "configPane.vectorImage": "Immagine vettoriale",
"controls.centred": "centrato",
"controls.hertz": "{0} Hz",
"controls.kelvin": "{0} K",
@@ -576,9 +577,9 @@
"export.showInFolder": "Mostra nella cartella",
"export.smallest": "Il più piccolo",
"export.summary": "Riepilogo",
- "export.timelineSize": "Timeline",
"export.targetBitrate": "Target bitrate",
"export.tenBitColour": "Colore a 10 bit",
+ "export.timelineSize": "Timeline",
"export.toneMapped": "Convertito in SDR, si vede ovunque",
"export.vbr": "VBR",
"export.videoYoutube": "Video, YouTube",
@@ -631,10 +632,19 @@
"mediaPane.processed": "Elaborati",
"mediaPane.reloadCustomEffects": "Ricarica gli effetti personalizzati",
"mediaPane.saveProjectTemplate": "Salva questo progetto come modello",
+ "mediaPane.shapeArrow": "Freccia",
+ "mediaPane.shapeCircle": "Cerchio",
+ "mediaPane.shapeLine": "Linea",
+ "mediaPane.shapeParallelogram": "Parallelogramma",
+ "mediaPane.shapeSquare": "Quadrato",
+ "mediaPane.shapeTrapezoid": "Trapezio",
+ "mediaPane.shapeTriangle": "Triangolo",
+ "mediaPane.shapes": "Forme",
"mediaPane.soon": "Presto",
"mediaPane.sortAdded": "Sort: Added",
"mediaPane.sortName": "Sort: Name",
"mediaPane.sortType": "Sort: Type",
+ "mediaPane.stickers": "Sticker",
"mediaPane.templates": "Modelli",
"mediaPane.titles": "Titoli",
"mediaPane.transition": "transizione",
@@ -680,11 +690,11 @@
"previewPane.half": "Metà",
"previewPane.nextFrame": "Fotogramma successivo",
"previewPane.nothingUnderThePlayhead": "Niente sotto la testina",
- "previewPane.saveFrameAs": "Salva fotogramma come…",
"previewPane.pause": "Pausa",
"previewPane.play": "Riproduci",
"previewPane.previousFrame": "Fotogramma precedente",
"previewPane.quarter": "Un quarto",
+ "previewPane.saveFrameAs": "Salva fotogramma come…",
"project.hdrMonitorNote": "Il monitor mostra una timeline HDR convertita in SDR, finché non arriva l'anteprima HDR.",
"project.output": "Uscita · {0}",
"project.project": "Progetto",
@@ -733,18 +743,18 @@
"settings.installedMbOnDisk": "{0} installati · {1} MB su disco",
"settings.installerOpened": "Il programma di installazione di Concat {0} è aperto. Concat si chiude ora perché possa completarsi.",
"settings.language": "Lingua",
- "settings.logLevel": "Livello del log",
- "settings.logLevelHint": "Cosa registra il log. Normale basta per la maggior parte delle segnalazioni; Debug o Tutto quando una segnalazione lo chiede, e il file cresce più in fretta. CONCAT_LOG nell’ambiente lo scavalca per un’esecuzione.",
- "settings.logErrors": "Solo errori",
- "settings.logWarnings": "Avvisi",
- "settings.logNormal": "Normale",
- "settings.logDebug": "Debug",
- "settings.logEverything": "Tutto",
"settings.light": "Chiaro",
"settings.lime": "Lime",
"settings.lineAcrossLanesMarks": "La linea che attraversa le tracce e segna il tempo corrente. Scegli un colore qualsiasi, o il primo punto per tornare a quello del tema.",
"settings.listeningOnConnected": "In ascolto su {0} · {1} connessi",
"settings.localAddressWarning": "127.0.0.1 è solo questo computer. Qualsiasi altro indirizzo è raggiungibile dalla rete, richiede un token e comunque non è cifrato.",
+ "settings.logDebug": "Debug",
+ "settings.logErrors": "Solo errori",
+ "settings.logEverything": "Tutto",
+ "settings.logLevel": "Livello del log",
+ "settings.logLevelHint": "Cosa registra il log. Normale basta per la maggior parte delle segnalazioni; Debug o Tutto quando una segnalazione lo chiede, e il file cresce più in fretta. CONCAT_LOG nell’ambiente lo scavalca per un’esecuzione.",
+ "settings.logNormal": "Normale",
+ "settings.logWarnings": "Avvisi",
"settings.mbOfMb": "{0} MB di {1} MB",
"settings.mint": "Menta",
"settings.mirrorOwn": "Un mirror tuo",
@@ -857,11 +867,10 @@
"studio.closeProject": "Chiudi progetto",
"studio.closeWindow": "Chiudi finestra",
"studio.couldNotExportAudio": "Impossibile esportare l’audio: {0}",
- "studio.couldNotSaveFrame": "Impossibile salvare il fotogramma: {0}",
- "studio.frameSaved": "Fotogramma salvato in {0}",
"studio.couldNotImport": "Could not import {0}: {1}",
"studio.couldNotRead": "Impossibile leggere {0}",
"studio.couldNotSave": "Impossibile salvare: {0}",
+ "studio.couldNotSaveFrame": "Impossibile salvare il fotogramma: {0}",
"studio.customPackageDidNot": "Un pacchetto personalizzato non si è caricato: {0}",
"studio.customPackagesDidNot": "{0} pacchetti personalizzati non si sono caricati; il primo: {1}",
"studio.deleteClip": "Elimina clip",
@@ -876,9 +885,9 @@
"studio.export": "Esporta…",
"studio.exportAudio": "Salva audio come…",
"studio.exportingAudio": "Esportazione dell’audio…",
- "studio.savingFrame": "Salvataggio del fotogramma…",
"studio.fileHasNoPicture": "Questo file non ha un'immagine da migliorare",
"studio.fontImported": "{0} importato; da ora è nell’elenco dei font",
+ "studio.frameSaved": "Fotogramma salvato in {0}",
"studio.importLut": "Import LUT",
"studio.importMedia": "Importa media…",
"studio.importedLooksFindThem": "Imported {0} look(s); find them under Imported",
@@ -905,6 +914,7 @@
"studio.save": "Salva",
"studio.saveAsTemplate": "Salva come modello…",
"studio.savedTemplate": "Modello «{0}» salvato",
+ "studio.savingFrame": "Salvataggio del fotogramma…",
"studio.selectClipTimelineFirst": "Seleziona prima una clip sulla timeline",
"studio.selectClipTransitionLeads": "Seleziona la clip in cui porta la transizione",
"studio.selectTwoClipsMerge": "Seleziona due clip da unire",
diff --git a/src/crates/concat/locales/ja.json b/src/crates/concat/locales/ja.json
index 6758e874..ce9c3135 100644
--- a/src/crates/concat/locales/ja.json
+++ b/src/crates/concat/locales/ja.json
@@ -168,6 +168,7 @@
"configPane.timeline": "タイムライン",
"configPane.timelineOne": "タイムライン 1",
"configPane.tracks": "トラック",
+ "configPane.vectorImage": "ベクター画像",
"controls.centred": "中央",
"controls.hertz": "{0} Hz",
"controls.kelvin": "{0} K",
@@ -576,9 +577,9 @@
"export.showInFolder": "フォルダで表示",
"export.smallest": "最小",
"export.summary": "概要",
- "export.timelineSize": "タイムライン",
"export.targetBitrate": "Target bitrate",
"export.tenBitColour": "10ビットカラー",
+ "export.timelineSize": "タイムライン",
"export.toneMapped": "トーンマッピング済み、どこでも再生可",
"export.vbr": "VBR",
"export.videoYoutube": "ビデオ、YouTube",
@@ -631,10 +632,19 @@
"mediaPane.processed": "処理済み",
"mediaPane.reloadCustomEffects": "カスタムエフェクトを再読み込み",
"mediaPane.saveProjectTemplate": "このプロジェクトをテンプレートとして保存",
+ "mediaPane.shapeArrow": "矢印",
+ "mediaPane.shapeCircle": "円",
+ "mediaPane.shapeLine": "直線",
+ "mediaPane.shapeParallelogram": "平行四辺形",
+ "mediaPane.shapeSquare": "正方形",
+ "mediaPane.shapeTrapezoid": "台形",
+ "mediaPane.shapeTriangle": "三角形",
+ "mediaPane.shapes": "図形",
"mediaPane.soon": "近日",
"mediaPane.sortAdded": "Sort: Added",
"mediaPane.sortName": "Sort: Name",
"mediaPane.sortType": "Sort: Type",
+ "mediaPane.stickers": "ステッカー",
"mediaPane.templates": "テンプレート",
"mediaPane.titles": "タイトル",
"mediaPane.transition": "トランジション",
@@ -680,11 +690,11 @@
"previewPane.half": "1/2",
"previewPane.nextFrame": "次のフレーム",
"previewPane.nothingUnderThePlayhead": "再生ヘッドの下に何もありません",
- "previewPane.saveFrameAs": "ビデオフレームを別名で保存…",
"previewPane.pause": "一時停止",
"previewPane.play": "再生",
"previewPane.previousFrame": "前のフレーム",
"previewPane.quarter": "1/4",
+ "previewPane.saveFrameAs": "ビデオフレームを別名で保存…",
"project.hdrMonitorNote": "HDR プレビューに対応するまで、モニターは HDR タイムラインを SDR にトーンマッピングして表示します。",
"project.output": "出力 · {0}",
"project.project": "プロジェクト",
@@ -733,18 +743,18 @@
"settings.installedMbOnDisk": "{0} 個インストール済み · ディスク上 {1} MB",
"settings.installerOpened": "Concat {0} のインストーラーが開きました。完了できるように Concat を終了します。",
"settings.language": "言語",
- "settings.logLevel": "ログレベル",
- "settings.logLevelHint": "ログに記録する内容。通常はほとんどの報告に十分です。報告で求められたときはデバッグかすべてにしますが、ファイルは早く大きくなります。環境変数 CONCAT_LOG は一回の起動に限りこれを上書きします。",
- "settings.logErrors": "エラーのみ",
- "settings.logWarnings": "警告",
- "settings.logNormal": "通常",
- "settings.logDebug": "デバッグ",
- "settings.logEverything": "すべて",
"settings.light": "ライト",
"settings.lime": "ライム",
"settings.lineAcrossLanesMarks": "トラックを横切って現在の時間を示す線です。好きな色を選ぶか、最初の点でテーマ本来の色に戻します。",
"settings.listeningOnConnected": "{0} で待ち受け中 · {1} 接続",
"settings.localAddressWarning": "127.0.0.1 はこのマシンだけです。それ以外のアドレスはネットワークから到達でき、トークンが必要で、それでも暗号化はされません。",
+ "settings.logDebug": "デバッグ",
+ "settings.logErrors": "エラーのみ",
+ "settings.logEverything": "すべて",
+ "settings.logLevel": "ログレベル",
+ "settings.logLevelHint": "ログに記録する内容。通常はほとんどの報告に十分です。報告で求められたときはデバッグかすべてにしますが、ファイルは早く大きくなります。環境変数 CONCAT_LOG は一回の起動に限りこれを上書きします。",
+ "settings.logNormal": "通常",
+ "settings.logWarnings": "警告",
"settings.mbOfMb": "{0} MB / {1} MB",
"settings.mint": "ミント",
"settings.mirrorOwn": "自分のミラー",
@@ -857,11 +867,10 @@
"studio.closeProject": "プロジェクトを閉じる",
"studio.closeWindow": "ウィンドウを閉じる",
"studio.couldNotExportAudio": "音声を書き出せませんでした: {0}",
- "studio.couldNotSaveFrame": "フレームを保存できませんでした: {0}",
- "studio.frameSaved": "フレームを {0} に保存しました",
"studio.couldNotImport": "Could not import {0}: {1}",
"studio.couldNotRead": "{0} を読み込めませんでした",
"studio.couldNotSave": "保存できませんでした:{0}",
+ "studio.couldNotSaveFrame": "フレームを保存できませんでした: {0}",
"studio.customPackageDidNot": "カスタムパッケージを読み込めませんでした:{0}",
"studio.customPackagesDidNot": "{0} 個のカスタムパッケージを読み込めませんでした。最初のもの:{1}",
"studio.deleteClip": "クリップを削除",
@@ -876,9 +885,9 @@
"studio.export": "書き出し…",
"studio.exportAudio": "音声を別名で保存…",
"studio.exportingAudio": "音声を書き出しています…",
- "studio.savingFrame": "フレームを保存中…",
"studio.fileHasNoPicture": "このファイルには高画質化する映像がありません",
"studio.fontImported": "{0} を読み込みました。これ以降フォント一覧に表示されます",
+ "studio.frameSaved": "フレームを {0} に保存しました",
"studio.importLut": "Import LUT",
"studio.importMedia": "メディアを読み込む…",
"studio.importedLooksFindThem": "Imported {0} look(s); find them under Imported",
@@ -905,6 +914,7 @@
"studio.save": "保存",
"studio.saveAsTemplate": "テンプレートとして保存…",
"studio.savedTemplate": "テンプレート「{0}」を保存しました",
+ "studio.savingFrame": "フレームを保存中…",
"studio.selectClipTimelineFirst": "まずタイムラインでクリップを選択してください",
"studio.selectClipTransitionLeads": "トランジションの先になるクリップを選択してください",
"studio.selectTwoClipsMerge": "結合するクリップを二つ選択してください",
diff --git a/src/crates/concat/locales/ko.json b/src/crates/concat/locales/ko.json
index 9788d0c8..3ded924a 100644
--- a/src/crates/concat/locales/ko.json
+++ b/src/crates/concat/locales/ko.json
@@ -168,6 +168,7 @@
"configPane.timeline": "타임라인",
"configPane.timelineOne": "타임라인 1",
"configPane.tracks": "트랙",
+ "configPane.vectorImage": "벡터 이미지",
"controls.centred": "가운데",
"controls.hertz": "{0} Hz",
"controls.kelvin": "{0} K",
@@ -576,9 +577,9 @@
"export.showInFolder": "폴더에서 보기",
"export.smallest": "가장 작음",
"export.summary": "요약",
- "export.timelineSize": "타임라인",
"export.targetBitrate": "Target bitrate",
"export.tenBitColour": "10비트 색상",
+ "export.timelineSize": "타임라인",
"export.toneMapped": "톤 매핑, 어디서나 재생",
"export.vbr": "VBR",
"export.videoYoutube": "비디오, YouTube",
@@ -631,10 +632,19 @@
"mediaPane.processed": "처리됨",
"mediaPane.reloadCustomEffects": "사용자 지정 효과 다시 불러오기",
"mediaPane.saveProjectTemplate": "이 프로젝트를 템플릿으로 저장",
+ "mediaPane.shapeArrow": "화살표",
+ "mediaPane.shapeCircle": "원",
+ "mediaPane.shapeLine": "선",
+ "mediaPane.shapeParallelogram": "평행사변형",
+ "mediaPane.shapeSquare": "정사각형",
+ "mediaPane.shapeTrapezoid": "사다리꼴",
+ "mediaPane.shapeTriangle": "삼각형",
+ "mediaPane.shapes": "도형",
"mediaPane.soon": "준비 중",
"mediaPane.sortAdded": "Sort: Added",
"mediaPane.sortName": "Sort: Name",
"mediaPane.sortType": "Sort: Type",
+ "mediaPane.stickers": "스티커",
"mediaPane.templates": "템플릿",
"mediaPane.titles": "자막",
"mediaPane.transition": "전환",
@@ -680,11 +690,11 @@
"previewPane.half": "1/2",
"previewPane.nextFrame": "다음 프레임",
"previewPane.nothingUnderThePlayhead": "재생 헤드 아래에 아무것도 없습니다",
- "previewPane.saveFrameAs": "비디오 프레임을 다른 이름으로 저장…",
"previewPane.pause": "일시 정지",
"previewPane.play": "재생",
"previewPane.previousFrame": "이전 프레임",
"previewPane.quarter": "1/4",
+ "previewPane.saveFrameAs": "비디오 프레임을 다른 이름으로 저장…",
"project.hdrMonitorNote": "HDR 미리보기가 나오기 전까지 모니터는 HDR 타임라인을 SDR로 톤 매핑해 보여 줍니다.",
"project.output": "출력 · {0}",
"project.project": "프로젝트",
@@ -733,18 +743,18 @@
"settings.installedMbOnDisk": "{0}개 설치됨 · 디스크 {1} MB",
"settings.installerOpened": "Concat {0} 설치 프로그램이 열렸습니다. 설치를 마칠 수 있도록 Concat을 종료합니다.",
"settings.language": "언어",
- "settings.logLevel": "로그 수준",
- "settings.logLevelHint": "로그에 기록할 내용입니다. 대부분의 보고에는 보통이면 충분합니다. 보고에서 요청하면 디버그나 모두로 올리되, 파일이 더 빨리 커집니다. 환경 변수 CONCAT_LOG는 한 번의 실행에 한해 이 설정을 덮어씁니다.",
- "settings.logErrors": "오류만",
- "settings.logWarnings": "경고",
- "settings.logNormal": "보통",
- "settings.logDebug": "디버그",
- "settings.logEverything": "모두",
"settings.light": "라이트",
"settings.lime": "라임",
"settings.lineAcrossLanesMarks": "트랙을 가로질러 현재 시간을 표시하는 선입니다. 원하는 색을 고르거나, 첫 번째 점을 눌러 테마 본래의 색으로 돌아갑니다.",
"settings.listeningOnConnected": "{0}에서 수신 중 · {1}개 연결됨",
"settings.localAddressWarning": "127.0.0.1은 이 컴퓨터만입니다. 다른 주소는 네트워크에서 접근할 수 있고, 토큰이 필요하며, 그래도 암호화되지 않습니다.",
+ "settings.logDebug": "디버그",
+ "settings.logErrors": "오류만",
+ "settings.logEverything": "모두",
+ "settings.logLevel": "로그 수준",
+ "settings.logLevelHint": "로그에 기록할 내용입니다. 대부분의 보고에는 보통이면 충분합니다. 보고에서 요청하면 디버그나 모두로 올리되, 파일이 더 빨리 커집니다. 환경 변수 CONCAT_LOG는 한 번의 실행에 한해 이 설정을 덮어씁니다.",
+ "settings.logNormal": "보통",
+ "settings.logWarnings": "경고",
"settings.mbOfMb": "{0} MB / {1} MB",
"settings.mint": "민트",
"settings.mirrorOwn": "직접 운영하는 미러",
@@ -857,11 +867,10 @@
"studio.closeProject": "프로젝트 닫기",
"studio.closeWindow": "창 닫기",
"studio.couldNotExportAudio": "오디오를 내보낼 수 없습니다: {0}",
- "studio.couldNotSaveFrame": "프레임을 저장하지 못했습니다: {0}",
- "studio.frameSaved": "프레임을 {0}에 저장했습니다",
"studio.couldNotImport": "Could not import {0}: {1}",
"studio.couldNotRead": "{0}을(를) 읽을 수 없습니다",
"studio.couldNotSave": "저장할 수 없습니다: {0}",
+ "studio.couldNotSaveFrame": "프레임을 저장하지 못했습니다: {0}",
"studio.customPackageDidNot": "사용자 지정 패키지를 불러오지 못했습니다: {0}",
"studio.customPackagesDidNot": "사용자 지정 패키지 {0}개를 불러오지 못했습니다. 첫 번째: {1}",
"studio.deleteClip": "클립 삭제",
@@ -876,9 +885,9 @@
"studio.export": "내보내기…",
"studio.exportAudio": "오디오를 다른 이름으로 저장…",
"studio.exportingAudio": "오디오를 내보내는 중…",
- "studio.savingFrame": "프레임 저장 중…",
"studio.fileHasNoPicture": "이 파일에는 향상할 영상이 없습니다",
"studio.fontImported": "{0}을(를) 가져왔습니다. 이제부터 글꼴 목록에 표시됩니다",
+ "studio.frameSaved": "프레임을 {0}에 저장했습니다",
"studio.importLut": "Import LUT",
"studio.importMedia": "미디어 가져오기…",
"studio.importedLooksFindThem": "Imported {0} look(s); find them under Imported",
@@ -905,6 +914,7 @@
"studio.save": "저장",
"studio.saveAsTemplate": "템플릿으로 저장…",
"studio.savedTemplate": "템플릿 “{0}”을(를) 저장했습니다",
+ "studio.savingFrame": "프레임 저장 중…",
"studio.selectClipTimelineFirst": "먼저 타임라인에서 클립을 선택하세요",
"studio.selectClipTransitionLeads": "전환이 이어지는 클립을 선택하세요",
"studio.selectTwoClipsMerge": "합칠 클립 두 개를 선택하세요",
diff --git a/src/crates/concat/locales/pt-BR.json b/src/crates/concat/locales/pt-BR.json
index d5a0575f..45820d9c 100644
--- a/src/crates/concat/locales/pt-BR.json
+++ b/src/crates/concat/locales/pt-BR.json
@@ -168,6 +168,7 @@
"configPane.timeline": "LINHA DO TEMPO",
"configPane.timelineOne": "Linha do tempo 1",
"configPane.tracks": "Faixas",
+ "configPane.vectorImage": "Imagem vetorial",
"controls.centred": "centralizado",
"controls.hertz": "{0} Hz",
"controls.kelvin": "{0} K",
@@ -576,9 +577,9 @@
"export.showInFolder": "Mostrar na pasta",
"export.smallest": "O menor",
"export.summary": "Resumo",
- "export.timelineSize": "Linha do tempo",
"export.targetBitrate": "Target bitrate",
"export.tenBitColour": "Cor de 10 bits",
+ "export.timelineSize": "Linha do tempo",
"export.toneMapped": "Convertido para SDR, toca em qualquer lugar",
"export.vbr": "VBR",
"export.videoYoutube": "Vídeo, YouTube",
@@ -631,10 +632,19 @@
"mediaPane.processed": "Processado",
"mediaPane.reloadCustomEffects": "Recarregar efeitos personalizados",
"mediaPane.saveProjectTemplate": "Salvar este projeto como modelo",
+ "mediaPane.shapeArrow": "Seta",
+ "mediaPane.shapeCircle": "Círculo",
+ "mediaPane.shapeLine": "Linha",
+ "mediaPane.shapeParallelogram": "Paralelogramo",
+ "mediaPane.shapeSquare": "Quadrado",
+ "mediaPane.shapeTrapezoid": "Trapézio",
+ "mediaPane.shapeTriangle": "Triângulo",
+ "mediaPane.shapes": "Formas",
"mediaPane.soon": "Em breve",
"mediaPane.sortAdded": "Sort: Added",
"mediaPane.sortName": "Sort: Name",
"mediaPane.sortType": "Sort: Type",
+ "mediaPane.stickers": "Adesivos",
"mediaPane.templates": "Modelos",
"mediaPane.titles": "Títulos",
"mediaPane.transition": "transição",
@@ -680,11 +690,11 @@
"previewPane.half": "Metade",
"previewPane.nextFrame": "Próximo quadro",
"previewPane.nothingUnderThePlayhead": "Nada sob o cursor",
- "previewPane.saveFrameAs": "Salvar quadro do vídeo como…",
"previewPane.pause": "Pausar",
"previewPane.play": "Reproduzir",
"previewPane.previousFrame": "Quadro anterior",
"previewPane.quarter": "Um quarto",
+ "previewPane.saveFrameAs": "Salvar quadro do vídeo como…",
"project.hdrMonitorNote": "O monitor mostra uma linha do tempo HDR convertida para SDR até chegar a prévia em HDR.",
"project.output": "Saída · {0}",
"project.project": "Projeto",
@@ -733,18 +743,18 @@
"settings.installedMbOnDisk": "{0} instalados · {1} MB em disco",
"settings.installerOpened": "O instalador do Concat {0} está aberto. O Concat fecha agora para que ele possa terminar.",
"settings.language": "Idioma",
- "settings.logLevel": "Nível de log",
- "settings.logLevelHint": "O que o log registra. Normal basta para a maioria dos relatos; Depuração ou Tudo quando um relato pedir, e o arquivo cresce mais rápido. CONCAT_LOG no ambiente sobrepõe isto por uma execução.",
- "settings.logErrors": "Só erros",
- "settings.logWarnings": "Avisos",
- "settings.logNormal": "Normal",
- "settings.logDebug": "Depuração",
- "settings.logEverything": "Tudo",
"settings.light": "Claro",
"settings.lime": "Limão",
"settings.lineAcrossLanesMarks": "A linha que cruza as faixas e marca o tempo atual. Escolha qualquer cor para ela, ou o primeiro ponto para voltar à cor do tema.",
"settings.listeningOnConnected": "Ouvindo em {0} · {1} conectado(s)",
"settings.localAddressWarning": "127.0.0.1 é só esta máquina. Qualquer outro endereço fica acessível pela rede, exige um token e mesmo assim não é criptografado.",
+ "settings.logDebug": "Depuração",
+ "settings.logErrors": "Só erros",
+ "settings.logEverything": "Tudo",
+ "settings.logLevel": "Nível de log",
+ "settings.logLevelHint": "O que o log registra. Normal basta para a maioria dos relatos; Depuração ou Tudo quando um relato pedir, e o arquivo cresce mais rápido. CONCAT_LOG no ambiente sobrepõe isto por uma execução.",
+ "settings.logNormal": "Normal",
+ "settings.logWarnings": "Avisos",
"settings.mbOfMb": "{0} MB de {1} MB",
"settings.mint": "Menta",
"settings.mirrorOwn": "Um espelho seu",
@@ -857,11 +867,10 @@
"studio.closeProject": "Fechar projeto",
"studio.closeWindow": "Fechar janela",
"studio.couldNotExportAudio": "Não foi possível exportar o áudio: {0}",
- "studio.couldNotSaveFrame": "Não foi possível salvar o quadro: {0}",
- "studio.frameSaved": "Quadro salvo em {0}",
"studio.couldNotImport": "Could not import {0}: {1}",
"studio.couldNotRead": "Não foi possível ler {0}",
"studio.couldNotSave": "Não foi possível salvar: {0}",
+ "studio.couldNotSaveFrame": "Não foi possível salvar o quadro: {0}",
"studio.customPackageDidNot": "Um pacote personalizado não carregou: {0}",
"studio.customPackagesDidNot": "{0} pacotes personalizados não carregaram; o primeiro: {1}",
"studio.deleteClip": "Excluir clipe",
@@ -876,9 +885,9 @@
"studio.export": "Exportar…",
"studio.exportAudio": "Salvar áudio como…",
"studio.exportingAudio": "Exportando o áudio…",
- "studio.savingFrame": "Salvando o quadro…",
"studio.fileHasNoPicture": "Este arquivo não tem imagem para melhorar",
"studio.fontImported": "{0} importada; a partir de agora está na lista de fontes",
+ "studio.frameSaved": "Quadro salvo em {0}",
"studio.importLut": "Import LUT",
"studio.importMedia": "Importar mídia…",
"studio.importedLooksFindThem": "Imported {0} look(s); find them under Imported",
@@ -905,6 +914,7 @@
"studio.save": "Salvar",
"studio.saveAsTemplate": "Salvar como modelo…",
"studio.savedTemplate": "Modelo “{0}” salvo",
+ "studio.savingFrame": "Salvando o quadro…",
"studio.selectClipTimelineFirst": "Selecione primeiro um clipe na linha do tempo",
"studio.selectClipTransitionLeads": "Selecione o clipe para o qual a transição leva",
"studio.selectTwoClipsMerge": "Selecione dois clipes para unir",
diff --git a/src/crates/concat/locales/ru.json b/src/crates/concat/locales/ru.json
index 98939960..927f75da 100644
--- a/src/crates/concat/locales/ru.json
+++ b/src/crates/concat/locales/ru.json
@@ -168,6 +168,7 @@
"configPane.timeline": "ТАЙМЛАЙН",
"configPane.timelineOne": "Таймлайн 1",
"configPane.tracks": "Дорожки",
+ "configPane.vectorImage": "Векторное изображение",
"controls.centred": "по центру",
"controls.hertz": "{0} Гц",
"controls.kelvin": "{0} K",
@@ -576,9 +577,9 @@
"export.showInFolder": "Показать в папке",
"export.smallest": "Самый маленький",
"export.summary": "Сводка",
- "export.timelineSize": "Таймлайн",
"export.targetBitrate": "Целевой битрейт",
"export.tenBitColour": "10-битный цвет",
+ "export.timelineSize": "Таймлайн",
"export.toneMapped": "Приведено к SDR, играет везде",
"export.vbr": "VBR",
"export.videoYoutube": "Видео, YouTube",
@@ -631,10 +632,19 @@
"mediaPane.processed": "Обработанное",
"mediaPane.reloadCustomEffects": "Перезагрузить пользовательские эффекты",
"mediaPane.saveProjectTemplate": "Сохранить этот проект как шаблон",
+ "mediaPane.shapeArrow": "Стрелка",
+ "mediaPane.shapeCircle": "Круг",
+ "mediaPane.shapeLine": "Линия",
+ "mediaPane.shapeParallelogram": "Параллелограмм",
+ "mediaPane.shapeSquare": "Квадрат",
+ "mediaPane.shapeTrapezoid": "Трапеция",
+ "mediaPane.shapeTriangle": "Треугольник",
+ "mediaPane.shapes": "Фигуры",
"mediaPane.soon": "Скоро",
"mediaPane.sortAdded": "Сортировка: по добавлению",
"mediaPane.sortName": "Сортировка: по имени",
"mediaPane.sortType": "Сортировка: по типу",
+ "mediaPane.stickers": "Стикеры",
"mediaPane.templates": "Шаблоны",
"mediaPane.titles": "Титры",
"mediaPane.transition": "переход",
@@ -680,11 +690,11 @@
"previewPane.half": "Половина",
"previewPane.nextFrame": "Следующий кадр",
"previewPane.nothingUnderThePlayhead": "Под курсором ничего нет",
- "previewPane.saveFrameAs": "Сохранить кадр как…",
"previewPane.pause": "Пауза",
"previewPane.play": "Воспроизвести",
"previewPane.previousFrame": "Предыдущий кадр",
"previewPane.quarter": "Четверть",
+ "previewPane.saveFrameAs": "Сохранить кадр как…",
"project.hdrMonitorNote": "Пока нет HDR-просмотра, монитор показывает HDR-таймлайн, приведённый к SDR.",
"project.output": "Вывод · {0}",
"project.project": "Проект",
@@ -733,18 +743,18 @@
"settings.installedMbOnDisk": "Установлено: {0} · {1} МБ на диске",
"settings.installerOpened": "Установщик Concat {0} открыт. Concat сейчас закроется, чтобы установка могла завершиться.",
"settings.language": "Язык",
- "settings.logLevel": "Уровень журнала",
- "settings.logLevelHint": "Что записывает журнал. Обычного хватает для большинства отчётов; Отладка или Всё - когда об этом просят в отчёте, и файл растёт быстрее. CONCAT_LOG в окружении переопределяет это на один запуск.",
- "settings.logErrors": "Только ошибки",
- "settings.logWarnings": "Предупреждения",
- "settings.logNormal": "Обычный",
- "settings.logDebug": "Отладка",
- "settings.logEverything": "Всё",
"settings.light": "Светлая",
"settings.lime": "Лайм",
"settings.lineAcrossLanesMarks": "Линия поперёк дорожек, отмечающая текущее время. Выберите для неё любой цвет или первую точку, чтобы вернуть цвет темы.",
"settings.listeningOnConnected": "Слушает {0} · подключено: {1}",
"settings.localAddressWarning": "127.0.0.1 — только этот компьютер. Любой другой адрес доступен из сети, требует токен и всё равно не шифруется.",
+ "settings.logDebug": "Отладка",
+ "settings.logErrors": "Только ошибки",
+ "settings.logEverything": "Всё",
+ "settings.logLevel": "Уровень журнала",
+ "settings.logLevelHint": "Что записывает журнал. Обычного хватает для большинства отчётов; Отладка или Всё - когда об этом просят в отчёте, и файл растёт быстрее. CONCAT_LOG в окружении переопределяет это на один запуск.",
+ "settings.logNormal": "Обычный",
+ "settings.logWarnings": "Предупреждения",
"settings.mbOfMb": "{0} МБ из {1} МБ",
"settings.mint": "Мята",
"settings.mirrorOwn": "Собственное зеркало",
@@ -857,11 +867,10 @@
"studio.closeProject": "Закрыть проект",
"studio.closeWindow": "Закрыть окно",
"studio.couldNotExportAudio": "Не удалось экспортировать звук: {0}",
- "studio.couldNotSaveFrame": "Не удалось сохранить кадр: {0}",
- "studio.frameSaved": "Кадр сохранён в {0}",
"studio.couldNotImport": "Не удалось импортировать {0}: {1}",
"studio.couldNotRead": "Не удалось прочитать {0}",
"studio.couldNotSave": "Не удалось сохранить: {0}",
+ "studio.couldNotSaveFrame": "Не удалось сохранить кадр: {0}",
"studio.customPackageDidNot": "Пользовательский пакет не загрузился: {0}",
"studio.customPackagesDidNot": "Не загрузились пользовательские пакеты: {0}; первый: {1}",
"studio.deleteClip": "Удалить клип",
@@ -876,9 +885,9 @@
"studio.export": "Экспорт…",
"studio.exportAudio": "Сохранить аудио как…",
"studio.exportingAudio": "Экспорт звука…",
- "studio.savingFrame": "Сохранение кадра…",
"studio.fileHasNoPicture": "В этом файле нет картинки для улучшения",
"studio.fontImported": "{0} импортирован; теперь он в списке шрифтов",
+ "studio.frameSaved": "Кадр сохранён в {0}",
"studio.importLut": "Импорт LUT",
"studio.importMedia": "Импорт медиа…",
"studio.importedLooksFindThem": "Импортировано стилей: {0}; они в разделе «Импортированные»",
@@ -905,6 +914,7 @@
"studio.save": "Сохранить",
"studio.saveAsTemplate": "Сохранить как шаблон…",
"studio.savedTemplate": "Шаблон «{0}» сохранён",
+ "studio.savingFrame": "Сохранение кадра…",
"studio.selectClipTimelineFirst": "Сначала выберите клип на таймлайне",
"studio.selectClipTransitionLeads": "Выберите клип, в который ведёт переход",
"studio.selectTwoClipsMerge": "Выберите два клипа для объединения",
diff --git a/src/crates/concat/locales/tr.json b/src/crates/concat/locales/tr.json
index b6845656..12acbd7f 100644
--- a/src/crates/concat/locales/tr.json
+++ b/src/crates/concat/locales/tr.json
@@ -168,6 +168,7 @@
"configPane.timeline": "ZAMAN ÇIZELGESI",
"configPane.timelineOne": "Zaman çizelgesi 1",
"configPane.tracks": "Parçalar",
+ "configPane.vectorImage": "Vektör görsel",
"controls.centred": "ortada",
"controls.hertz": "{0} Hz",
"controls.kelvin": "{0} K",
@@ -576,9 +577,9 @@
"export.showInFolder": "Klasörde göster",
"export.smallest": "En küçük",
"export.summary": "Özet",
- "export.timelineSize": "Zaman çizelgesi",
"export.targetBitrate": "Target bitrate",
"export.tenBitColour": "10 bit renk",
+ "export.timelineSize": "Zaman çizelgesi",
"export.toneMapped": "Ton eşlemeli, her yerde oynar",
"export.vbr": "VBR",
"export.videoYoutube": "Video, YouTube",
@@ -631,10 +632,19 @@
"mediaPane.processed": "İşlenmiş",
"mediaPane.reloadCustomEffects": "Özel efektleri yeniden yükle",
"mediaPane.saveProjectTemplate": "Bu projeyi şablon olarak kaydet",
+ "mediaPane.shapeArrow": "Ok",
+ "mediaPane.shapeCircle": "Daire",
+ "mediaPane.shapeLine": "Çizgi",
+ "mediaPane.shapeParallelogram": "Paralelkenar",
+ "mediaPane.shapeSquare": "Kare",
+ "mediaPane.shapeTrapezoid": "Yamuk",
+ "mediaPane.shapeTriangle": "Üçgen",
+ "mediaPane.shapes": "Şekiller",
"mediaPane.soon": "Yakında",
"mediaPane.sortAdded": "Sort: Added",
"mediaPane.sortName": "Sort: Name",
"mediaPane.sortType": "Sort: Type",
+ "mediaPane.stickers": "Çıkartmalar",
"mediaPane.templates": "Şablonlar",
"mediaPane.titles": "Yazılar",
"mediaPane.transition": "geçiş",
@@ -680,11 +690,11 @@
"previewPane.half": "Yarım",
"previewPane.nextFrame": "Sonraki kare",
"previewPane.nothingUnderThePlayhead": "Oynatma imlecinin altında bir şey yok",
- "previewPane.saveFrameAs": "Video karesini farklı kaydet…",
"previewPane.pause": "Duraklat",
"previewPane.play": "Oynat",
"previewPane.previousFrame": "Önceki kare",
"previewPane.quarter": "Çeyrek",
+ "previewPane.saveFrameAs": "Video karesini farklı kaydet…",
"project.hdrMonitorNote": "HDR önizleme gelene kadar monitör, HDR zaman çizelgesini SDR'ye ton eşlemeli gösterir.",
"project.output": "Çıkış · {0}",
"project.project": "Proje",
@@ -733,18 +743,18 @@
"settings.installedMbOnDisk": "{0} kurulu · diskte {1} MB",
"settings.installerOpened": "Concat {0} yükleyicisi açıldı. Yüklemenin bitebilmesi için Concat şimdi kapanıyor.",
"settings.language": "Dil",
- "settings.logLevel": "Günlük düzeyi",
- "settings.logLevelHint": "Günlüğün neyi kaydettiği. Çoğu rapor için Normal yeter; bir rapor istediğinde Hata ayıklama ya da Her şey, dosya daha hızlı büyür. Ortamdaki CONCAT_LOG bunu bir çalıştırma için geçersiz kılar.",
- "settings.logErrors": "Yalnızca hatalar",
- "settings.logWarnings": "Uyarılar",
- "settings.logNormal": "Normal",
- "settings.logDebug": "Hata ayıklama",
- "settings.logEverything": "Her şey",
"settings.light": "Açık",
"settings.lime": "Limon yeşili",
"settings.lineAcrossLanesMarks": "Parçaları boydan boya geçen ve geçerli zamanı gösteren çizgi. Ona istediğiniz rengi seçin ya da temanın kendi rengine dönmek için ilk noktayı.",
"settings.listeningOnConnected": "{0} dinleniyor · {1} bağlı",
"settings.localAddressWarning": "127.0.0.1 yalnızca bu makinedir. Başka her adres ağdan erişilebilir, bir belirteç ister ve yine de şifrelenmez.",
+ "settings.logDebug": "Hata ayıklama",
+ "settings.logErrors": "Yalnızca hatalar",
+ "settings.logEverything": "Her şey",
+ "settings.logLevel": "Günlük düzeyi",
+ "settings.logLevelHint": "Günlüğün neyi kaydettiği. Çoğu rapor için Normal yeter; bir rapor istediğinde Hata ayıklama ya da Her şey, dosya daha hızlı büyür. Ortamdaki CONCAT_LOG bunu bir çalıştırma için geçersiz kılar.",
+ "settings.logNormal": "Normal",
+ "settings.logWarnings": "Uyarılar",
"settings.mbOfMb": "{0} MB / {1} MB",
"settings.mint": "Nane",
"settings.mirrorOwn": "Kendi yansınız",
@@ -857,11 +867,10 @@
"studio.closeProject": "Projeyi kapat",
"studio.closeWindow": "Pencereyi kapat",
"studio.couldNotExportAudio": "Ses dışa aktarılamadı: {0}",
- "studio.couldNotSaveFrame": "Kare kaydedilemedi: {0}",
- "studio.frameSaved": "Kare {0} konumuna kaydedildi",
"studio.couldNotImport": "Could not import {0}: {1}",
"studio.couldNotRead": "{0} okunamadı",
"studio.couldNotSave": "Kaydedilemedi: {0}",
+ "studio.couldNotSaveFrame": "Kare kaydedilemedi: {0}",
"studio.customPackageDidNot": "Bir özel paket yüklenemedi: {0}",
"studio.customPackagesDidNot": "{0} özel paket yüklenemedi; ilki: {1}",
"studio.deleteClip": "Klibi sil",
@@ -876,9 +885,9 @@
"studio.export": "Dışa aktar…",
"studio.exportAudio": "Sesi farklı kaydet…",
"studio.exportingAudio": "Ses dışa aktarılıyor…",
- "studio.savingFrame": "Kare kaydediliyor…",
"studio.fileHasNoPicture": "Bu dosyanın iyileştirilecek görüntüsü yok",
"studio.fontImported": "{0} içe aktarıldı; artık yazı tipi listesinde",
+ "studio.frameSaved": "Kare {0} konumuna kaydedildi",
"studio.importLut": "Import LUT",
"studio.importMedia": "Medya içe aktar…",
"studio.importedLooksFindThem": "Imported {0} look(s); find them under Imported",
@@ -905,6 +914,7 @@
"studio.save": "Kaydet",
"studio.saveAsTemplate": "Şablon olarak kaydet…",
"studio.savedTemplate": "“{0}” şablonu kaydedildi",
+ "studio.savingFrame": "Kare kaydediliyor…",
"studio.selectClipTimelineFirst": "Önce zaman çizelgesinde bir klip seçin",
"studio.selectClipTransitionLeads": "Geçişin götürdüğü klibi seçin",
"studio.selectTwoClipsMerge": "Birleştirmek için iki klip seçin",
diff --git a/src/crates/concat/locales/zh-Hans.json b/src/crates/concat/locales/zh-Hans.json
index 6b12b522..ab57c1f3 100644
--- a/src/crates/concat/locales/zh-Hans.json
+++ b/src/crates/concat/locales/zh-Hans.json
@@ -168,6 +168,7 @@
"configPane.timeline": "时间线",
"configPane.timelineOne": "时间线 1",
"configPane.tracks": "轨道",
+ "configPane.vectorImage": "矢量图像",
"controls.centred": "居中",
"controls.hertz": "{0} Hz",
"controls.kelvin": "{0} K",
@@ -576,9 +577,9 @@
"export.showInFolder": "在文件夹中显示",
"export.smallest": "最小",
"export.summary": "摘要",
- "export.timelineSize": "时间线",
"export.targetBitrate": "目标码率",
"export.tenBitColour": "10 位色彩",
+ "export.timelineSize": "时间线",
"export.toneMapped": "色调映射,随处可播",
"export.vbr": "VBR",
"export.videoYoutube": "视频、YouTube",
@@ -631,10 +632,19 @@
"mediaPane.processed": "已处理",
"mediaPane.reloadCustomEffects": "重新加载自定义效果",
"mediaPane.saveProjectTemplate": "将此项目保存为模板",
+ "mediaPane.shapeArrow": "箭头",
+ "mediaPane.shapeCircle": "圆形",
+ "mediaPane.shapeLine": "直线",
+ "mediaPane.shapeParallelogram": "平行四边形",
+ "mediaPane.shapeSquare": "正方形",
+ "mediaPane.shapeTrapezoid": "梯形",
+ "mediaPane.shapeTriangle": "三角形",
+ "mediaPane.shapes": "形状",
"mediaPane.soon": "即将推出",
"mediaPane.sortAdded": "排序:添加时间",
"mediaPane.sortName": "排序:名称",
"mediaPane.sortType": "排序:类型",
+ "mediaPane.stickers": "贴纸",
"mediaPane.templates": "模板",
"mediaPane.titles": "标题",
"mediaPane.transition": "转场",
@@ -680,11 +690,11 @@
"previewPane.half": "一半",
"previewPane.nextFrame": "下一帧",
"previewPane.nothingUnderThePlayhead": "播放头下没有内容",
- "previewPane.saveFrameAs": "视频帧另存为…",
"previewPane.pause": "暂停",
"previewPane.play": "播放",
"previewPane.previousFrame": "上一帧",
"previewPane.quarter": "四分之一",
+ "previewPane.saveFrameAs": "视频帧另存为…",
"project.hdrMonitorNote": "在支持 HDR 预览之前,监视器会把 HDR 时间线色调映射为 SDR 显示。",
"project.output": "输出 · {0}",
"project.project": "项目",
@@ -733,18 +743,18 @@
"settings.installedMbOnDisk": "已安装 {0} 个 · 占用磁盘 {1} MB",
"settings.installerOpened": "Concat {0} 的安装程序已打开。Concat 现在将关闭,以便安装完成。",
"settings.language": "语言",
- "settings.logLevel": "日志级别",
- "settings.logLevelHint": "日志记录的内容。多数报告用“正常”即可;报告要求时再选“调试”或“全部”,文件会增长得更快。环境变量 CONCAT_LOG 可在单次运行中覆盖此设置。",
- "settings.logErrors": "仅错误",
- "settings.logWarnings": "警告",
- "settings.logNormal": "正常",
- "settings.logDebug": "调试",
- "settings.logEverything": "全部",
"settings.light": "光",
"settings.lime": "青柠",
"settings.lineAcrossLanesMarks": "横跨轨道、标记当前时间的那条线。可为它选择任意颜色,或点第一个圆点回到主题自带的颜色。",
"settings.listeningOnConnected": "正在监听 {0} · 已连接 {1} 个",
"settings.localAddressWarning": "127.0.0.1 仅限本机。其他任何地址都可从网络访问,需要令牌,且仍未加密。",
+ "settings.logDebug": "调试",
+ "settings.logErrors": "仅错误",
+ "settings.logEverything": "全部",
+ "settings.logLevel": "日志级别",
+ "settings.logLevelHint": "日志记录的内容。多数报告用“正常”即可;报告要求时再选“调试”或“全部”,文件会增长得更快。环境变量 CONCAT_LOG 可在单次运行中覆盖此设置。",
+ "settings.logNormal": "正常",
+ "settings.logWarnings": "警告",
"settings.mbOfMb": "{0} MB / {1} MB",
"settings.mint": "薄荷",
"settings.mirrorOwn": "你自己的镜像",
@@ -857,11 +867,10 @@
"studio.closeProject": "关闭项目",
"studio.closeWindow": "关闭窗口",
"studio.couldNotExportAudio": "无法导出音频:{0}",
- "studio.couldNotSaveFrame": "无法保存帧:{0}",
- "studio.frameSaved": "已将帧保存到 {0}",
"studio.couldNotImport": "无法导入 {0}:{1}",
"studio.couldNotRead": "无法读取 {0}",
"studio.couldNotSave": "无法保存:{0}",
+ "studio.couldNotSaveFrame": "无法保存帧:{0}",
"studio.customPackageDidNot": "自定义包未能加载:{0}",
"studio.customPackagesDidNot": "{0} 个自定义包未能加载;第一个:{1}",
"studio.deleteClip": "删除片段",
@@ -876,9 +885,9 @@
"studio.export": "导出…",
"studio.exportAudio": "音频另存为…",
"studio.exportingAudio": "正在导出音频…",
- "studio.savingFrame": "正在保存帧…",
"studio.fileHasNoPicture": "此文件没有可增强的画面",
"studio.fontImported": "已导入 {0},从现在起会出现在字体列表中",
+ "studio.frameSaved": "已将帧保存到 {0}",
"studio.importLut": "导入 LUT",
"studio.importMedia": "导入媒体…",
"studio.importedLooksFindThem": "已导入 {0} 个风格,可在“已导入”中找到",
@@ -905,6 +914,7 @@
"studio.save": "保存",
"studio.saveAsTemplate": "保存为模板…",
"studio.savedTemplate": "已保存模板“{0}”",
+ "studio.savingFrame": "正在保存帧…",
"studio.selectClipTimelineFirst": "请先在时间线上选择一个片段",
"studio.selectClipTransitionLeads": "选择转场所过渡到的片段",
"studio.selectTwoClipsMerge": "选择两个片段进行合并",
diff --git a/src/crates/concat/locales/zh-TW.json b/src/crates/concat/locales/zh-TW.json
index 6b9a314d..1757ca04 100644
--- a/src/crates/concat/locales/zh-TW.json
+++ b/src/crates/concat/locales/zh-TW.json
@@ -168,6 +168,7 @@
"configPane.timeline": "時間軸",
"configPane.timelineOne": "時間軸 1",
"configPane.tracks": "軌道",
+ "configPane.vectorImage": "向量圖像",
"controls.centred": "置中",
"controls.hertz": "{0} Hz",
"controls.kelvin": "{0} K",
@@ -576,9 +577,9 @@
"export.showInFolder": "在資料夾中顯示",
"export.smallest": "最小",
"export.summary": "摘要",
- "export.timelineSize": "時間軸",
"export.targetBitrate": "目標位元率",
"export.tenBitColour": "10 位元色彩",
+ "export.timelineSize": "時間軸",
"export.toneMapped": "色調映射,到處可播",
"export.vbr": "VBR",
"export.videoYoutube": "影片、YouTube",
@@ -631,10 +632,19 @@
"mediaPane.processed": "已處理",
"mediaPane.reloadCustomEffects": "重新載入自訂效果",
"mediaPane.saveProjectTemplate": "將此專案儲存為範本",
+ "mediaPane.shapeArrow": "箭頭",
+ "mediaPane.shapeCircle": "圓形",
+ "mediaPane.shapeLine": "直線",
+ "mediaPane.shapeParallelogram": "平行四邊形",
+ "mediaPane.shapeSquare": "正方形",
+ "mediaPane.shapeTrapezoid": "梯形",
+ "mediaPane.shapeTriangle": "三角形",
+ "mediaPane.shapes": "形狀",
"mediaPane.soon": "即將推出",
"mediaPane.sortAdded": "排序:加入時間",
"mediaPane.sortName": "排序:名稱",
"mediaPane.sortType": "排序:類型",
+ "mediaPane.stickers": "貼圖",
"mediaPane.templates": "範本",
"mediaPane.titles": "標題",
"mediaPane.transition": "轉場",
@@ -680,11 +690,11 @@
"previewPane.half": "一半",
"previewPane.nextFrame": "下一個影格",
"previewPane.nothingUnderThePlayhead": "播放磁頭下沒有內容",
- "previewPane.saveFrameAs": "影片畫格另存為…",
"previewPane.pause": "暫停",
"previewPane.play": "播放",
"previewPane.previousFrame": "上一個影格",
"previewPane.quarter": "四分之一",
+ "previewPane.saveFrameAs": "影片畫格另存為…",
"project.hdrMonitorNote": "在支援 HDR 預覽之前,監看器會把 HDR 時間軸色調映射為 SDR 顯示。",
"project.output": "輸出 · {0}",
"project.project": "專案",
@@ -733,18 +743,18 @@
"settings.installedMbOnDisk": "已安裝 {0} 個 · 佔用磁碟 {1} MB",
"settings.installerOpened": "Concat {0} 的安裝程式已開啟。Concat 現在會關閉,讓安裝得以完成。",
"settings.language": "語言",
- "settings.logLevel": "日誌層級",
- "settings.logLevelHint": "日誌記錄的內容。多數回報用「正常」即可;回報要求時再選「偵錯」或「全部」,檔案會增長得更快。環境變數 CONCAT_LOG 可在單次執行中覆寫此設定。",
- "settings.logErrors": "僅錯誤",
- "settings.logWarnings": "警告",
- "settings.logNormal": "正常",
- "settings.logDebug": "偵錯",
- "settings.logEverything": "全部",
"settings.light": "光",
"settings.lime": "萊姆",
"settings.lineAcrossLanesMarks": "橫跨軌道、標記目前時間的那條線。可為它選擇任意顏色,或點第一個圓點回到主題原本的顏色。",
"settings.listeningOnConnected": "正在監聽 {0} · 已連線 {1} 個",
"settings.localAddressWarning": "127.0.0.1 僅限本機。其他任何位址都可從網路存取,需要權杖,且仍未加密。",
+ "settings.logDebug": "偵錯",
+ "settings.logErrors": "僅錯誤",
+ "settings.logEverything": "全部",
+ "settings.logLevel": "日誌層級",
+ "settings.logLevelHint": "日誌記錄的內容。多數回報用「正常」即可;回報要求時再選「偵錯」或「全部」,檔案會增長得更快。環境變數 CONCAT_LOG 可在單次執行中覆寫此設定。",
+ "settings.logNormal": "正常",
+ "settings.logWarnings": "警告",
"settings.mbOfMb": "{0} MB / {1} MB",
"settings.mint": "薄荷",
"settings.mirrorOwn": "你自己的鏡像",
@@ -857,11 +867,10 @@
"studio.closeProject": "關閉專案",
"studio.closeWindow": "關閉視窗",
"studio.couldNotExportAudio": "無法匯出音訊:{0}",
- "studio.couldNotSaveFrame": "無法儲存畫格:{0}",
- "studio.frameSaved": "已將畫格儲存到 {0}",
"studio.couldNotImport": "無法匯入 {0}:{1}",
"studio.couldNotRead": "無法讀取 {0}",
"studio.couldNotSave": "無法儲存:{0}",
+ "studio.couldNotSaveFrame": "無法儲存畫格:{0}",
"studio.customPackageDidNot": "自訂套件未能載入:{0}",
"studio.customPackagesDidNot": "{0} 個自訂套件未能載入;第一個:{1}",
"studio.deleteClip": "刪除片段",
@@ -876,9 +885,9 @@
"studio.export": "匯出…",
"studio.exportAudio": "音訊另存為…",
"studio.exportingAudio": "正在匯出音訊…",
- "studio.savingFrame": "正在儲存畫格…",
"studio.fileHasNoPicture": "此檔案沒有可增強的畫面",
"studio.fontImported": "已匯入 {0},從現在起會出現在字型清單中",
+ "studio.frameSaved": "已將畫格儲存到 {0}",
"studio.importLut": "匯入 LUT",
"studio.importMedia": "匯入媒體…",
"studio.importedLooksFindThem": "已匯入 {0} 個風格,可在「已匯入」中找到",
@@ -905,6 +914,7 @@
"studio.save": "儲存",
"studio.saveAsTemplate": "儲存為範本…",
"studio.savedTemplate": "已儲存範本「{0}」",
+ "studio.savingFrame": "正在儲存畫格…",
"studio.selectClipTimelineFirst": "請先在時間軸上選取一個片段",
"studio.selectClipTransitionLeads": "選取轉場所銜接的下一個片段",
"studio.selectTwoClipsMerge": "選取兩個片段進行合併",
diff --git a/src/crates/concat/src/chips.rs b/src/crates/concat/src/chips.rs
index 693bf1f3..4de26607 100644
--- a/src/crates/concat/src/chips.rs
+++ b/src/crates/concat/src/chips.rs
@@ -28,6 +28,11 @@ pub fn chip_glyph(kind: ClipKind) -> &'static str {
ClipKind::Text => "M12 4v16 M4 7V5a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1v2 M9 20h6",
// lucide/audio-lines
ClipKind::Filter => "M2 10v3 M6 6v11 M10 3v18 M14 8v7 M18 5v13 M22 10v3",
+ // lucide/shapes
+ ClipKind::Shape => {
+ "M8.3 10a.7.7 0 0 1-.626-1.079L11.4 3a.7.7 0 0 1 1.198-.043L16.3 8.9a.7.7 0 0 1-.572 1.1Z \
+ M3 14h7v7H3z M14 17.5a3.5 3.5 0 1 0 7 0a3.5 3.5 0 1 0 -7 0"
+ }
}
}
diff --git a/src/crates/concat/src/lib.rs b/src/crates/concat/src/lib.rs
index 52e88a97..af5700b7 100644
--- a/src/crates/concat/src/lib.rs
+++ b/src/crates/concat/src/lib.rs
@@ -693,6 +693,12 @@ pub fn run() -> Result<(), slint::PlatformError> {
editor.on_library_add_text(on_window!(|state, preset: SharedString| {
state.place_at_playhead(&format!("text:{preset}:Title"));
}));
+ // A figure from the Stickers page, named in the interface's language.
+ editor.on_library_add_shape(on_window!(
+ |state, shape: SharedString, label: SharedString| {
+ state.place_at_playhead(&format!("shape:{shape}:{label}"));
+ }
+ ));
// A filter is a layer over a span of the timeline; an effect goes on
// the selected clip's chain, and audio on the sound's.
editor.on_library_apply_filter(on_window!(
@@ -1732,6 +1738,7 @@ pub fn run() -> Result<(), slint::PlatformError> {
ClipKind::Image => (theme.get_kind_image(), theme.get_kind_image_well()),
ClipKind::Text => (theme.get_kind_text(), theme.get_kind_text_well()),
ClipKind::Filter => (theme.get_kind_filter(), theme.get_kind_filter_well()),
+ ClipKind::Shape => (theme.get_kind_shape(), theme.get_kind_shape_well()),
};
let wave = studio
.peaks
diff --git a/src/crates/concat/src/studio.rs b/src/crates/concat/src/studio.rs
index 621c1324..f369f8d4 100644
--- a/src/crates/concat/src/studio.rs
+++ b/src/crates/concat/src/studio.rs
@@ -964,6 +964,7 @@ fn kind_of(clip: &Clip) -> ClipKind {
model::ClipKind::Image => ClipKind::Image,
model::ClipKind::Text => ClipKind::Text,
model::ClipKind::Layer => ClipKind::Filter,
+ model::ClipKind::Shape => ClipKind::Shape,
}
}
@@ -2064,8 +2065,11 @@ impl Studio {
model::ClipKind::Video | model::ClipKind::Image => LANE_LARGE,
model::ClipKind::Audio => LANE_MEDIUM,
// A title is its name strip alone; a layer has no
- // picture at all. Neither needs a body's height.
- model::ClipKind::Text | model::ClipKind::Layer => LANE_SMALL,
+ // picture at all; a shape's name says what it is.
+ // None needs a body's height.
+ model::ClipKind::Text
+ | model::ClipKind::Layer
+ | model::ClipKind::Shape => LANE_SMALL,
})
.fold(0.0_f32, f32::max);
if tallest > 0.0 { tallest } else { LANE_MEDIUM }
@@ -3103,6 +3107,17 @@ impl Studio {
duration: LAYER_DURATION,
row: 0,
}),
+ // A figure from the Stickers page: the shape's name rides
+ // where a file's media id would, and the label is what the
+ // lane will call it.
+ "shape" => Some(DropPlan {
+ kind: ClipKind::Shape,
+ label: label.to_owned(),
+ media: model::ShapeKind::parse(id)?.id().to_owned(),
+ start: 0.0,
+ duration: LAYER_DURATION,
+ row: 0,
+ }),
// A look dragged from the Filters page: a layer over a span.
// The package id rides in `media`, there being no file.
"filter" => Some(DropPlan {
@@ -3149,6 +3164,14 @@ impl Studio {
f64::from(plan.duration),
&plan.media,
)
+ } else if plan.kind == ClipKind::Shape {
+ self.add_shape(
+ Some(track_id),
+ f64::from(plan.start),
+ f64::from(plan.duration),
+ &plan.media,
+ &plan.label,
+ )
} else if plan.kind == ClipKind::Filter {
self.apply(Command::AddLayerClip {
track_id: Some(track_id),
@@ -3179,6 +3202,8 @@ impl Studio {
let start = f64::from(self.playhead.max(0.0));
let created = if plan.kind == ClipKind::Text {
self.add_title(None, start, f64::from(plan.duration), &plan.media)
+ } else if plan.kind == ClipKind::Shape {
+ self.add_shape(None, start, f64::from(plan.duration), &plan.media, &plan.label)
} else if plan.kind == ClipKind::Filter {
self.apply(Command::AddLayerClip {
track_id: None,
@@ -3237,6 +3262,27 @@ impl Studio {
}
}
+ /// A shape from the Stickers page, placed the way a title is: over
+ /// the picture, on the first free lane above it.
+ fn add_shape(
+ &mut self,
+ track_id: Option<String>,
+ start: f64,
+ duration: f64,
+ shape: &str,
+ name: &str,
+ ) -> Option<String> {
+ let kind = model::ShapeKind::parse(shape).unwrap_or_default();
+ self.apply(Command::AddShapeClip {
+ track_id,
+ above: true,
+ start,
+ style: Some(model::ShapeStyle::of(kind)),
+ duration: Some(duration),
+ name: name.to_owned(),
+ })
+ }
+
/// The selected clip's id, when exactly one is selected.
/// The clips the inspector's knobs write to: the one selected clip, or
/// every selected clip when two or more are selected and all of them
@@ -3302,7 +3348,10 @@ impl Studio {
let Some(clip) = self.clip(&clip_id).cloned() else {
return;
};
- if video && !(clip.kind.is_visual() || clip.kind == model::ClipKind::Text) {
+ if video
+ && !(clip.kind.is_visual()
+ || matches!(clip.kind, model::ClipKind::Text | model::ClipKind::Shape))
+ {
self.notify(&t("studio.selectVideoImageText"), true);
return;
}
@@ -4600,7 +4649,7 @@ impl Studio {
pub fn footprint(&self, clip: &Clip) -> Footprint {
let (width, height) = self.output_size();
let (width, height) = (f64::from(width.max(1)), f64::from(height.max(1)));
- let painted = (clip.kind == model::ClipKind::Text)
+ let painted = matches!(clip.kind, model::ClipKind::Text | model::ClipKind::Shape)
.then(|| self.title_blocks.get(&clip.id).copied())
.flatten();
let (w, h) = if let Some(((bw, bh), _)) = painted {
@@ -4629,6 +4678,21 @@ impl Studio {
(longest * glyph + 0.6 * em) * clip.scale / width,
(rows * em * text.line_height.max(0.5) + 0.5 * em) * clip.scale / height,
)
+ } else if clip.kind == model::ClipKind::Shape {
+ // Not painted yet: the figure's box from its style, the way the
+ // painter sizes it, until the painter says.
+ let shape = clip.shape.clone().unwrap_or_default();
+ let side = shape.size.clamp(0.01, 2.0) * height;
+ let (w, h) = match shape.kind {
+ model::ShapeKind::Square | model::ShapeKind::Circle => (side, side),
+ model::ShapeKind::Triangle => (side, side * 0.866),
+ model::ShapeKind::Parallelogram | model::ShapeKind::Trapezoid => {
+ (side, side * 0.6)
+ }
+ model::ShapeKind::Line => (side, shape.stroke_width * height),
+ model::ShapeKind::Arrow => (side, (shape.stroke_width * 4.0).max(0.18) * side),
+ };
+ (w * clip.scale / width, h * clip.scale / height)
} else {
let media = self.project().media_by_id(&clip.media_id);
let source = media
@@ -4720,7 +4784,8 @@ impl Studio {
.iter()
.map(|clip| clip.as_ref())
.filter(|clip| {
- (clip.kind.is_visual() || clip.kind == model::ClipKind::Text)
+ (clip.kind.is_visual()
+ || matches!(clip.kind, model::ClipKind::Text | model::ClipKind::Shape))
&& showing.contains(clip.track_id.as_str())
&& clip.start <= playhead
&& playhead < clip.start + clip.duration
@@ -6341,6 +6406,20 @@ impl Studio {
}
return;
}
+ if source.kind == model::ClipKind::Shape {
+ let created = self.apply(Command::AddShapeClip {
+ above: false,
+ track_id: Some(source.track_id.clone()),
+ start: end,
+ style: source.shape.clone(),
+ duration: Some(source.duration),
+ name: source.name.clone(),
+ });
+ if let Some(id) = created {
+ self.selection = vec![id];
+ }
+ return;
+ }
let Some(created) = self.apply(Command::AddClip {
media_id: source.media_id.clone(),
track_id: source.track_id.clone(),
@@ -7144,7 +7223,8 @@ impl Studio {
.clips
.iter()
.filter(|clip| {
- (clip.kind.is_visual() || clip.kind == model::ClipKind::Text)
+ (clip.kind.is_visual()
+ || matches!(clip.kind, model::ClipKind::Text | model::ClipKind::Shape))
&& clip.start <= playhead
&& playhead < clip.start + clip.duration
})
diff --git a/src/crates/concat/ui/editor.slint b/src/crates/concat/ui/editor.slint
index b5171572..6a713185 100644
--- a/src/crates/concat/ui/editor.slint
+++ b/src/crates/concat/ui/editor.slint
@@ -107,6 +107,9 @@ export global Editor {
/// A title placed at the playhead in the look `preset` names;
/// "default" is the plain title.
callback library-add-text(preset: string);
+ /// The Stickers page placed a shape: which figure, and what to call
+ /// the clip, in the interface's language.
+ callback library-add-shape(shape: string, label: string);
callback library-apply-effect(effect-id: string);
callback library-apply-transition(transition-id: string);
/// Filters page: lay the look down as a layer at the playhead.
diff --git a/src/crates/concat/ui/icons.slint b/src/crates/concat/ui/icons.slint
index 2e8ac910..bf92a2f2 100644
--- a/src/crates/concat/ui/icons.slint
+++ b/src/crates/concat/ui/icons.slint
@@ -47,6 +47,10 @@ export enum Glyph {
check,
chevron-down,
chevron-left,
+ /// the Stickers page: a peeling square with a face
+ sticker,
+ /// a shape clip's badge: a triangle, a square and a circle
+ shapes,
chevron-right,
sparkle,
eye,
@@ -252,6 +256,20 @@ export component Icon inherits Rectangle {
commands: "M9 18l6-6-6-6";
}
+ // lucide/sticker
+ if root.glyph == Glyph.sticker: Stroked {
+ size: root.size; tint: root.tint; weight: root.weight;
+ commands: "M15.5 3H5a2 2 0 0 0-2 2v14c0 1.1.9 2 2 2h14a2 2 0 0 0 2-2V8.5L15.5 3Z"
+ + " M14 3v4a2 2 0 0 0 2 2h4 M8 13h.01 M16 13h.01 M10 16s.8 1 2 1c1.3 0 2-1 2-1";
+ }
+
+ // lucide/shapes
+ if root.glyph == Glyph.shapes: Stroked {
+ size: root.size; tint: root.tint; weight: root.weight;
+ commands: "M8.3 10a.7.7 0 0 1-.626-1.079L11.4 3a.7.7 0 0 1 1.198-.043L16.3 8.9"
+ + "a.7.7 0 0 1-.572 1.1Z M3 14h7v7H3z M14 17.5a3.5 3.5 0 1 0 7 0a3.5 3.5 0 1 0 -7 0";
+ }
+
// lucide/chevron-up
if root.glyph == Glyph.chevron-up: Stroked {
size: root.size; tint: root.tint; weight: root.weight;
diff --git a/src/crates/concat/ui/phone/editor.slint b/src/crates/concat/ui/phone/editor.slint
index c7d70b0b..82a72579 100644
--- a/src/crates/concat/ui/phone/editor.slint
+++ b/src/crates/concat/ui/phone/editor.slint
@@ -217,6 +217,9 @@ export component PhoneEditor inherits Rectangle {
property <bool> is-image: root.kind == ClipKind.image;
property <bool> is-text: root.kind == ClipKind.text;
property <bool> is-layer: root.kind == ClipKind.filter;
+ /// A shape has a placement and nothing else a picture has: no colour
+ /// to adjust, no chain, no transition, no frame to freeze.
+ property <bool> is-shape: root.kind == ClipKind.shape;
/// A picture: what has a placement, a colour and a chain of effects.
property <bool> is-picture: root.is-video || root.is-image;
@@ -722,7 +725,7 @@ export component PhoneEditor inherits Rectangle {
label: I18n.t("common.delete");
clicked => { Editor.delete-selected(); }
}
- if root.is-picture: ToolItem {
+ if root.is-picture || root.is-shape: ToolItem {
glyph: Glyph.fit;
label: I18n.t("phone.edit");
current: root.sheet == "clip-video";
@@ -787,13 +790,13 @@ export component PhoneEditor inherits Rectangle {
enabled: Editor.reversible;
clicked => { Editor.shortcut("reverse"); }
}
- if root.is-picture: ToolItem {
+ if root.is-picture || root.is-shape: ToolItem {
glyph: Glyph.flip-h;
label: I18n.t("timelinePane.mirror");
enabled: Editor.picture-selected;
clicked => { Editor.shortcut("mirror"); }
}
- if root.is-picture: ToolItem {
+ if root.is-picture || root.is-shape: ToolItem {
glyph: Glyph.rotate;
label: I18n.t("timelinePane.rotate");
enabled: Editor.picture-selected;
diff --git a/src/crates/concat/ui/theme/dark.slint b/src/crates/concat/ui/theme/dark.slint
index 81047511..4474b9e0 100644
--- a/src/crates/concat/ui/theme/dark.slint
+++ b/src/crates/concat/ui/theme/dark.slint
@@ -189,6 +189,11 @@ export global Dark {
// laid over the picture".
out property <color> kind-filter: #6d63e8;
out property <color> kind-filter-well: #23204a;
+ // A shape wears amber: warm where every medium is cool, so a square
+ // over the picture is told from the picture's own clips at a glance,
+ // and the colour the consumer editors already give their shapes.
+ out property <color> kind-shape: #d4a24b;
+ out property <color> kind-shape-well: #3a2d14;
// timeline
//
diff --git a/src/crates/concat/ui/theme/light.slint b/src/crates/concat/ui/theme/light.slint
index 588055d2..d6aafc46 100644
--- a/src/crates/concat/ui/theme/light.slint
+++ b/src/crates/concat/ui/theme/light.slint
@@ -151,6 +151,8 @@ export global Light {
out property <color> kind-text-well: #fce6f2;
out property <color> kind-filter: #5a4fd1;
out property <color> kind-filter-well: #e9e6fd;
+ out property <color> kind-shape: #b8862e;
+ out property <color> kind-shape-well: #fbefd6;
// timeline
//
diff --git a/src/crates/concat/ui/theme/theme.slint b/src/crates/concat/ui/theme/theme.slint
index f1db2919..aaf62953 100644
--- a/src/crates/concat/ui/theme/theme.slint
+++ b/src/crates/concat/ui/theme/theme.slint
@@ -225,6 +225,8 @@ export global Theme {
out property <color> kind-text-well: dark ? Dark.kind-text-well : Light.kind-text-well;
out property <color> kind-filter: dark ? Dark.kind-filter : Light.kind-filter;
out property <color> kind-filter-well: dark ? Dark.kind-filter-well : Light.kind-filter-well;
+ out property <color> kind-shape: dark ? Dark.kind-shape : Light.kind-shape;
+ out property <color> kind-shape-well: dark ? Dark.kind-shape-well : Light.kind-shape-well;
// timeline
out property <color> lane: dark ? Dark.lane : Light.lane;
diff --git a/src/crates/concat/ui/timeline/lanes.slint b/src/crates/concat/ui/timeline/lanes.slint
index 103ef534..3a6edb90 100644
--- a/src/crates/concat/ui/timeline/lanes.slint
+++ b/src/crates/concat/ui/timeline/lanes.slint
@@ -33,6 +33,7 @@ global Paint {
: kind == ClipKind.image ? Theme.kind-image
: kind == ClipKind.text ? Theme.kind-text
: kind == ClipKind.filter ? Theme.kind-filter
+ : kind == ClipKind.shape ? Theme.kind-shape
: Theme.kind-video;
}
public pure function well(kind: ClipKind) -> color {
@@ -40,6 +41,7 @@ global Paint {
: kind == ClipKind.image ? Theme.kind-image-well
: kind == ClipKind.text ? Theme.kind-text-well
: kind == ClipKind.filter ? Theme.kind-filter-well
+ : kind == ClipKind.shape ? Theme.kind-shape-well
: Theme.kind-video-well;
}
public pure function badge(kind: ClipKind) -> Glyph {
@@ -47,6 +49,7 @@ global Paint {
: kind == ClipKind.image ? Glyph.image
: kind == ClipKind.text ? Glyph.text-mark
: kind == ClipKind.filter ? Glyph.filter
+ : kind == ClipKind.shape ? Glyph.shapes
: Glyph.film;
}
}
@@ -158,9 +161,11 @@ component Clip inherits Rectangle {
/// is all strip: its name is its words, and a body under it would show
/// the same words a second time in a taller clip. A filter layer is all
/// strip too - one bar, the look's mark before its name - since it has
- /// no picture and no sound to show under a header.
+ /// no picture and no sound to show under a header. A shape is all strip
+ /// for the title's reason: its name says what it is.
property <bool> all-strip: root.item.kind == ClipKind.text
- || root.item.kind == ClipKind.filter;
+ || root.item.kind == ClipKind.filter
+ || root.item.kind == ClipKind.shape;
property <length> header-h: root.all-strip ? root.height : 17px;
/// An all-strip clip wears its kind's mark before its name, the way a
/// look or a title is told from a sound on the lanes at a glance.
diff --git a/src/crates/concat/ui/timeline/model.slint b/src/crates/concat/ui/timeline/model.slint
index ffa3defc..95b19a7a 100644
--- a/src/crates/concat/ui/timeline/model.slint
+++ b/src/crates/concat/ui/timeline/model.slint
@@ -12,8 +12,9 @@
/// Wider than MediaKind: a title has no file behind it, it *is* its content,
/// and a filter has no file either — it is a preset dragged from the library's
/// Filters page that covers a span of time and treats whatever plays under it,
-/// the way a filter bar does in the consumer editors.
-export enum ClipKind { video, audio, image, text, filter }
+/// the way a filter bar does in the consumer editors. A shape is a figure
+/// from the Stickers page, drawn over the picture like a title is.
+export enum ClipKind { video, audio, image, text, filter, shape }
/// What a press on a clip means. One tool since the razor went - a cut
/// is made at the playhead, by B or the tray - and the type stays for the
diff --git a/src/crates/concat/ui/workspace/config-pane.slint b/src/crates/concat/ui/workspace/config-pane.slint
index 3f30948a..3fb4d327 100644
--- a/src/crates/concat/ui/workspace/config-pane.slint
+++ b/src/crates/concat/ui/workspace/config-pane.slint
@@ -213,6 +213,10 @@ export component ConfigPane inherits Rectangle {
// on a title would be panels that can only say "nothing here".
property <bool> is-text: root.selected.kind == ClipKind.text;
property <bool> is-image: root.selected.kind == ClipKind.image;
+ /// A shape gets one tab, Vector Image, with the placement panel
+ /// alone: it has no sound, no rate, no colour to adjust and no chain
+ /// of effects - a figure is its fill and its outline, nothing more.
+ property <bool> is-shape: root.selected.kind == ClipKind.shape;
property <bool> is-audio: root.selected.kind == ClipKind.audio;
/// A filter layer gets its own lone tab for the same reason a title does:
/// it has no transform, no gain and no rate, and every other tab could
@@ -220,6 +224,7 @@ export component ConfigPane inherits Rectangle {
property <bool> is-layer: root.selected.kind == ClipKind.filter;
property <[string]> tabs: root.is-text ? ["Text"]
: root.is-layer ? ["Filter"]
+ : root.is-shape ? ["Video"]
: root.is-image ? ["Video", "Effects"]
: root.is-audio ? ["Audio"]
: ["Video", "Audio", "Effects"];
@@ -227,6 +232,7 @@ export component ConfigPane inherits Rectangle {
/// because the panels are picked by comparing against it.
property <[string]> tabs-shown: root.is-text ? [I18n.t("common.text")]
: root.is-layer ? [I18n.t("configPane.filter")]
+ : root.is-shape ? [I18n.t("configPane.vectorImage")]
: root.is-image ? [I18n.t("common.video"), I18n.t("common.effects")]
: root.is-audio ? [I18n.t("common.audio")]
: [I18n.t("common.video"), I18n.t("common.audio"), I18n.t("common.effects")];
@@ -257,7 +263,8 @@ export component ConfigPane inherits Rectangle {
/// The sections of the current tab, as the dropdown lists them.
property <[string]> sections: root.heading == "Video"
- ? (root.is-image ? ["Basic", "Adjust"]
+ ? (root.is-shape ? ["Basic"]
+ : root.is-image ? ["Basic", "Adjust"]
: ["Basic", "Speed", "Adjust"])
: root.heading == "Audio"
? (root.is-audio ? ["Sound", "Speed"] : ["Sound"])
@@ -266,7 +273,8 @@ export component ConfigPane inherits Rectangle {
: ["Layer"];
/// The sections as the dropdown shows them; see `tabs-shown`.
property <[string]> sections-shown: root.heading == "Video"
- ? (root.is-image ? [I18n.t("configPane.basic"), I18n.t("common.adjust")]
+ ? (root.is-shape ? [I18n.t("configPane.basic")]
+ : root.is-image ? [I18n.t("configPane.basic"), I18n.t("common.adjust")]
: [I18n.t("configPane.basic"), I18n.t("common.speed"), I18n.t("common.adjust")])
: root.heading == "Audio"
? (root.is-audio ? [I18n.t("configPane.sound"), I18n.t("common.speed")] : [I18n.t("configPane.sound")])
diff --git a/src/crates/concat/ui/workspace/media-pane.slint b/src/crates/concat/ui/workspace/media-pane.slint
index e314b26d..eebf5628 100644
--- a/src/crates/concat/ui/workspace/media-pane.slint
+++ b/src/crates/concat/ui/workspace/media-pane.slint
@@ -149,6 +149,43 @@ component LibraryTab inherits Rectangle {
}
}
+// One end of the page strip: a slim button that moves the chips along by
+// most of a track, fading the chips out under itself so a chip half under
+// it reads as continuing rather than cut.
+component StripEnd inherits Rectangle {
+ in property <Glyph> glyph;
+ in property <brush> fade;
+
+ callback clicked();
+
+ y: 0;
+ width: 22px;
+ background: root.fade;
+
+ Rectangle {
+ x: root.glyph == Glyph.chevron-left ? 2px : parent.width - self.width - 2px;
+ y: (parent.height - self.height) / 2;
+ width: 16px;
+ height: 16px;
+ border-radius: Theme.r-xs;
+ background: touch.has-hover ? Theme.field-hover : Theme.field;
+
+ Icon {
+ x: (parent.width - self.width) / 2;
+ y: (parent.height - self.height) / 2;
+ glyph: root.glyph;
+ size: 10px;
+ weight: 2.4;
+ tint: touch.has-hover ? Theme.fg : Theme.fg-muted;
+ }
+ }
+
+ touch := TouchArea {
+ mouse-cursor: pointer;
+ clicked => { root.clicked(); }
+ }
+}
+
// ── the category sidebar ─────────────────────────────────────────────────────
// The heading over a list of category rows, and the control that collapses
@@ -1375,6 +1412,141 @@ export component PresetGrid inherits Rectangle {
}
}
+// ── the stickers page ────────────────────────────────────────────────────────
+
+/// One figure the Shapes shelf offers: its id, which the document stores,
+/// the name under its card, and the outline the card draws, on lucide's 24
+/// grid like every other mark in the app.
+struct ShapeCardData {
+ id: string,
+ label: string,
+ commands: string,
+}
+
+// One figure, as a card: its outline in ink on a square tile, the name
+// underneath. The outline and not a filled figure, so the card says which
+// shape and not which colour - the colour is the clip's to set.
+component ShapeCard inherits Rectangle {
+ in property <ShapeCardData> shape;
+
+ callback placed();
+
+ opacity: drag.dragging ? 0.45 : 1.0;
+
+ property <string> payload: "shape:\{root.shape.id}:\{root.shape.label}";
+
+ drag := DragArea {
+ data: Payload.of(root.payload);
+ drag-image: Payload.preview(root.payload);
+ drag-image-offset-x: -8;
+ drag-image-offset-y: -4;
+ allow-copy: true;
+
+ touch := TouchArea {
+ mouse-cursor: pointer;
+ clicked => { root.placed(); }
+ double-clicked => { root.placed(); }
+
+ tile := Rectangle {
+ y: 0;
+ height: root.width;
+ border-radius: Theme.r;
+ background: Theme.field;
+ border-width: 1px;
+ border-color: touch.has-hover ? Theme.line-strong : Theme.line;
+
+ Path {
+ x: (parent.width - self.width) / 2;
+ y: (parent.height - self.height) / 2;
+ width: parent.width * 0.5;
+ height: self.width;
+ viewbox-width: 24;
+ viewbox-height: 24;
+ commands: root.shape.commands;
+ fill: transparent;
+ stroke: touch.has-hover ? Theme.fg : Theme.fg-muted;
+ // Lucide's weight on the 24 grid, scaled with the
+ // mark, the way `Stroked` does it.
+ stroke-width: self.width * 1.6 / 24;
+ stroke-line-cap: round;
+ stroke-line-join: round;
+ }
+
+ if touch.has-hover: Rectangle {
+ x: parent.width - self.width - 4px;
+ y: parent.height - self.height - 4px;
+ width: 20px;
+ height: 20px;
+ border-radius: Theme.r-xs;
+ background: Theme.scrim;
+
+ Icon {
+ x: (parent.width - self.width) / 2;
+ y: (parent.height - self.height) / 2;
+ glyph: Glyph.plus;
+ size: 11px;
+ tint: Theme.on-scrim;
+ }
+ }
+ }
+
+ Text {
+ x: 0;
+ y: tile.height + 4px;
+ width: root.width;
+ height: 14px;
+ text: root.shape.label;
+ color: Theme.fg-muted;
+ font-size: Theme.fs-sm;
+ vertical-alignment: center;
+ overflow: elide;
+ }
+ }
+ }
+}
+
+// The Shapes shelf: the figures a shape clip can be, with the same
+// auto-fill arithmetic as PresetGrid.
+export component ShapeGrid inherits Rectangle {
+ /// Placed by a click; a drag carries the same payload itself.
+ callback placed(shape: string, label: string);
+
+ // The ids are written into project files, so they are stable for ever;
+ // see ShapeKind in concat-project.
+ property <[ShapeCardData]> shapes: [
+ { id: "square", label: I18n.t("mediaPane.shapeSquare"), commands: "M4 4h16v16H4z" },
+ { id: "circle", label: I18n.t("mediaPane.shapeCircle"),
+ commands: "M2 12a10 10 0 1 0 20 0a10 10 0 1 0 -20 0" },
+ { id: "triangle", label: I18n.t("mediaPane.shapeTriangle"), commands: "M12 4l9 16H3z" },
+ { id: "parallelogram", label: I18n.t("mediaPane.shapeParallelogram"),
+ commands: "M8 5h13l-5 14H3z" },
+ { id: "trapezoid", label: I18n.t("mediaPane.shapeTrapezoid"), commands: "M8 5h8l5 14H3z" },
+ { id: "line", label: I18n.t("mediaPane.shapeLine"), commands: "M3 12h18" },
+ { id: "arrow", label: I18n.t("mediaPane.shapeArrow"), commands: "M3 12h18 M15 6l6 6-6 6" },
+ ];
+
+ property <length> gap: 8px;
+ property <length> min-card: 88px;
+ property <int> cols: Math.max(1,
+ Math.floor((root.width + root.gap) / (root.min-card + root.gap)));
+ property <length> card-w: (root.width - (root.cols - 1) * root.gap) / root.cols;
+ // A square tile, then the name under it.
+ property <length> card-h: root.card-w + 4px + 14px;
+ property <int> rows: Math.ceil(root.shapes.length / root.cols);
+
+ height: root.rows > 0 ? root.rows * (root.card-h + root.gap) - root.gap : 0px;
+
+ for entry[index] in root.shapes: ShapeCard {
+ x: Math.mod(index, root.cols) * (root.card-w + root.gap);
+ y: Math.floor(index / root.cols) * (root.card-h + root.gap);
+ width: root.card-w;
+ height: root.card-h;
+ shape: entry;
+
+ placed => { root.placed(entry.id, entry.label); }
+ }
+}
+
// ── the pane ─────────────────────────────────────────────────────────────────
// Centred placeholder for a page with nothing on it.
@@ -1463,6 +1635,9 @@ export component MediaPane inherits Rectangle {
in property <[string]> transition-groups;
/// Text page: add a title at the playhead, in the look `preset` names.
callback add-text(preset: string);
+ /// Stickers page: add the figure `shape` names at the playhead, as a
+ /// clip called `label`.
+ callback add-shape(shape: string, label: string);
/// Catalogue pages: apply to the selected clip; Rust validates & explains.
callback apply-effect(effect-id: string);
callback apply-transition(transition-id: string);
@@ -1493,11 +1668,15 @@ export component MediaPane inherits Rectangle {
callback pane-removed();
property <int> tab;
+ /// How far left the page strip can be pushed: nothing, while its chips
+ /// fit. See `strip`.
+ property <length> strip-floor: Math.min(0px, strip.width - strip.content-width);
property <bool> categories-open: true;
property <bool> generated-open: true;
property <bool> text-open: true;
/// 0 = Titles, 1 = Presets
property <int> text-category;
+ property <bool> stickers-open: true;
property <bool> transitions-open: true;
property <bool> effects-open: true;
property <bool> filters-open: true;
@@ -1566,13 +1745,46 @@ export component MediaPane inherits Rectangle {
// separates it from `SegmentedControl`, where the border is
// doing real work because that control sits loose in a form
// row with nothing else to bound it.
- Rectangle {
+ track := Rectangle {
background: Theme.well;
border-radius: Theme.r;
+ clip: true;
+
+ // The chips share the track's width while they fit, and
+ // run past its end when they do not: seven pages in a
+ // narrow seat would otherwise be seven labels elided to
+ // nothing. What runs past is reached by the two end
+ // buttons below, not a scrollbar - a bar under a row of
+ // chips 40px tall is a second row where there is no room
+ // for one.
+ strip := Flickable {
+ x: 0;
+ y: 0;
+ width: parent.width;
+ height: parent.height;
+ // A chip is clicked, not flicked: a Flickable that
+ // took the drag would take it off the chips, and
+ // the buttons do the moving.
+ interactive: false;
+ content-width: Math.max(self.width, chips.preferred-width);
+ content-height: self.height;
+
+ animate content-x { duration: 180ms; easing: cubic-bezier(0.4, 0, 0.2, 1); }
+
+ // A seat widened while the strip was scrolled would
+ // keep the chips pushed left of a track that now
+ // has room for them.
+ changed width => {
+ self.content-x = Math.max(root.strip-floor, Math.min(0px, self.content-x));
+ }
- HorizontalLayout {
- padding: 2px;
- spacing: 2px;
+ chips := HorizontalLayout {
+ x: 0;
+ y: 0;
+ width: strip.content-width;
+ height: strip.height;
+ padding: 2px;
+ spacing: 2px;
LibraryTab {
glyph: Glyph.film;
@@ -1587,29 +1799,57 @@ export component MediaPane inherits Rectangle {
clicked => { root.tab = 1; }
}
LibraryTab {
- glyph: Glyph.transition;
- label: I18n.t("mediaPane.transitions");
+ glyph: Glyph.sticker;
+ label: I18n.t("mediaPane.stickers");
current: root.tab == 2;
clicked => { root.tab = 2; }
}
LibraryTab {
- glyph: Glyph.sparkle;
- label: I18n.t("common.effects");
+ glyph: Glyph.transition;
+ label: I18n.t("mediaPane.transitions");
current: root.tab == 3;
clicked => { root.tab = 3; }
}
LibraryTab {
- glyph: Glyph.filter;
- label: I18n.t("mediaPane.filters");
+ glyph: Glyph.sparkle;
+ label: I18n.t("common.effects");
current: root.tab == 4;
clicked => { root.tab = 4; }
}
LibraryTab {
- glyph: Glyph.slot;
- label: I18n.t("mediaPane.templates");
+ glyph: Glyph.filter;
+ label: I18n.t("mediaPane.filters");
current: root.tab == 5;
clicked => { root.tab = 5; }
}
+ LibraryTab {
+ glyph: Glyph.slot;
+ label: I18n.t("mediaPane.templates");
+ current: root.tab == 6;
+ clicked => { root.tab = 6; }
+ }
+ }
+ }
+
+ // The end buttons, over the strip, each there only while
+ // there is something past its end to go to.
+ if strip.content-x < 0px: StripEnd {
+ x: 0;
+ height: parent.height;
+ glyph: Glyph.chevron-left;
+ fade: @linear-gradient(90deg, Theme.well 60%, transparent);
+ clicked => {
+ strip.content-x = Math.min(0px, strip.content-x + strip.width * 0.6);
+ }
+ }
+ if strip.content-x > root.strip-floor: StripEnd {
+ x: parent.width - self.width;
+ height: parent.height;
+ glyph: Glyph.chevron-right;
+ fade: @linear-gradient(270deg, Theme.well 60%, transparent);
+ clicked => {
+ strip.content-x = Math.max(root.strip-floor, strip.content-x - strip.width * 0.6);
+ }
}
}
@@ -1775,7 +2015,25 @@ export component MediaPane inherits Rectangle {
}
}
+ // Stickers: the one shelf there is, Shapes, so its row
+ // is always the current one. Pictures and animated
+ // stickers are shelves for another day.
if root.tab == 2: VerticalLayout {
+ spacing: 1px;
+ CategoryHeading {
+ height: 26px;
+ title: I18n.t("mediaPane.stickers");
+ open: root.stickers-open;
+ toggled => { root.stickers-open = !root.stickers-open; }
+ }
+ if root.stickers-open: CategoryRow {
+ height: 24px;
+ label: I18n.t("mediaPane.shapes");
+ current: true;
+ }
+ }
+
+ if root.tab == 3: VerticalLayout {
spacing: 1px;
CategoryHeading {
height: 26px;
@@ -1796,7 +2054,7 @@ export component MediaPane inherits Rectangle {
// The picture's shelves and the sound's, from the
// catalogue's own groups, on one page called Effects.
- if root.tab == 3: VerticalLayout {
+ if root.tab == 4: VerticalLayout {
spacing: 1px;
CategoryHeading {
height: 26px;
@@ -1839,7 +2097,7 @@ export component MediaPane inherits Rectangle {
// Filters are colour looks, the way every video editor's
// users understand the word. What a voice or a room does
// to the sound is on the Effects page.
- if root.tab == 4: VerticalLayout {
+ if root.tab == 5: VerticalLayout {
spacing: 1px;
CategoryHeading {
height: 26px;
@@ -1858,7 +2116,7 @@ export component MediaPane inherits Rectangle {
}
}
- if root.tab == 5: VerticalLayout {
+ if root.tab == 6: VerticalLayout {
spacing: 1px;
CategoryHeading {
height: 26px;
@@ -2037,7 +2295,18 @@ export component MediaPane inherits Rectangle {
}
}
- if root.tab == 2: VerticalLayout {
+ // The figures. Each card is one shape, placed at the
+ // playhead on a click or dragged onto a lane.
+ if root.tab == 2: HorizontalLayout {
+ padding: 8px;
+
+ ShapeGrid {
+ horizontal-stretch: 1;
+ placed(shape, label) => { root.add-shape(shape, label); }
+ }
+ }
+
+ if root.tab == 3: VerticalLayout {
padding: 8px;
ShelfSearch {
@@ -2053,7 +2322,7 @@ export component MediaPane inherits Rectangle {
}
}
- if root.tab == 3: VerticalLayout {
+ if root.tab == 4: VerticalLayout {
padding: 8px;
ShelfSearch {
@@ -2096,7 +2365,7 @@ export component MediaPane inherits Rectangle {
}
}
- if root.tab == 4: VerticalLayout {
+ if root.tab == 5: VerticalLayout {
padding: 8px;
// A filter is a layer over a span of the timeline,
@@ -2136,7 +2405,7 @@ export component MediaPane inherits Rectangle {
// Templates: the save affordance, then the gallery of saved
// templates, which shows its empty state until one is saved.
- if root.tab == 5: HorizontalLayout {
+ if root.tab == 6: HorizontalLayout {
padding: 8px;
ImportButton {
@@ -2146,7 +2415,7 @@ export component MediaPane inherits Rectangle {
}
}
- if root.tab == 5: Empty {
+ if root.tab == 6: Empty {
glyph: Glyph.slot;
text: I18n.t("mediaPane.noTemplatesYetMark");
}
diff --git a/src/crates/concat/ui/workspace/seat.slint b/src/crates/concat/ui/workspace/seat.slint
index 56a0540b..d015c31d 100644
--- a/src/crates/concat/ui/workspace/seat.slint
+++ b/src/crates/concat/ui/workspace/seat.slint
@@ -137,6 +137,7 @@ export component Seat inherits Rectangle {
filter-groups: Editor.filter-groups;
transition-groups: Editor.transition-groups;
add-text(preset) => { Editor.library-add-text(preset); }
+ add-shape(shape, label) => { Editor.library-add-shape(shape, label); }
apply-effect(id) => { Editor.library-apply-effect(id); }
apply-transition(id) => { Editor.library-apply-transition(id); }
apply-filter(id, label) => { Editor.library-apply-filter(id, label); }