Skip to content

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

feat(phone): pick several files in order and add them with one tap; the picture stays in view

Jareer1e6838825046
diff --git a/src/crates/concat/locales/ar.json b/src/crates/concat/locales/ar.json
index 7b92f085..96807835 100644
--- a/src/crates/concat/locales/ar.json
+++ b/src/crates/concat/locales/ar.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "إزالة اللوحة",
"paneSwitcher.timeline": "المخطط الزمني",
"phone.addATitle": "إضافة عنوان",
+ "phone.addPicked": "إضافة ({0})",
"phone.back": "رجوع",
"phone.canvas": "اللوحة",
"phone.canvasMainLaneOnly": "لا يملك خلفية إلا الفيديو والصور الثابتة على أدنى مسار للصور.",
@@ -387,12 +388,13 @@
"phone.more": "المزيد",
"phone.noEffectYet": "لا شيء على هذا المقطع بعد. انقر على تأثير بالأسفل لإضافته.",
"phone.noMediaYet": "لا شيء في الحاوية بعد. استورد فيديو أو صوتًا أو صورة للبدء.",
+ "phone.pickToAdd": "اضغط على الملفات بترتيب تشغيلها، ثم إضافة. توضع عند مؤشر التشغيل.",
+ "phone.pickToAddAtEnd": "اضغط على الملفات بترتيب تشغيلها، ثم إضافة. توضع في النهاية.",
"phone.project": "المشروع",
"phone.redo": "إعادة",
"phone.selectClipFirst": "انقر على مقطع في المخطط الزمني أولًا: يُطبَّق هذا على المقطع المحدّد.",
"phone.speak": "تحدّث",
"phone.split": "تقسيم",
- "phone.tapToAdd": "انقر على ملف لوضعه على المخطط الزمني عند مؤشر التشغيل.",
"phone.undo": "تراجع",
"phone.voiceover": "التعليق الصوتي",
"previewPane.backToTimeline": "العودة إلى المخطط الزمني",
diff --git a/src/crates/concat/locales/az.json b/src/crates/concat/locales/az.json
index 9be8168c..403d418d 100644
--- a/src/crates/concat/locales/az.json
+++ b/src/crates/concat/locales/az.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "Paneli sil",
"paneSwitcher.timeline": "Zaman xətti",
"phone.addATitle": "Yazı əlavə et",
+ "phone.addPicked": "Əlavə et ({0})",
"phone.back": "Geri",
"phone.canvas": "Fon",
"phone.canvasMainLaneOnly": "Fonu yalnız ən aşağı görüntü zolağındakı videolar və şəkillər olur.",
@@ -387,12 +388,13 @@
"phone.more": "Daha çox",
"phone.noEffectYet": "Bu klipdə hələ heç nə yoxdur. Əlavə etmək üçün aşağıdan bir effektə toxunun.",
"phone.noMediaYet": "Qutu hələ boşdur. Başlamaq üçün video, səs və ya şəkil idxal edin.",
+ "phone.pickToAdd": "Fayllara oynayacaqları ardıcıllıqla toxunun, sonra Əlavə et. Oynatma xəttinin yerinə düşürlər.",
+ "phone.pickToAddAtEnd": "Fayllara oynayacaqları ardıcıllıqla toxunun, sonra Əlavə et. Sona əlavə olunurlar.",
"phone.project": "Layihə",
"phone.redo": "Təkrarla",
"phone.selectClipFirst": "Əvvəlcə zaman xəttində bir klipə toxunun: bu, seçilmiş klipə tətbiq olunur.",
"phone.speak": "Səsləndir",
"phone.split": "Böl",
- "phone.tapToAdd": "Faylı oynatma göstəricisinin yerində zaman xəttinə qoymaq üçün ona toxunun.",
"phone.undo": "Geri al",
"phone.voiceover": "Səsləndirmə",
"previewPane.backToTimeline": "Zaman xəttinə qayıt",
diff --git a/src/crates/concat/locales/bn.json b/src/crates/concat/locales/bn.json
index 2f11f8d8..86de8537 100644
--- a/src/crates/concat/locales/bn.json
+++ b/src/crates/concat/locales/bn.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "প্যানেল সরান",
"paneSwitcher.timeline": "টাইমলাইন",
"phone.addATitle": "একটি টাইটেল যোগ করুন",
+ "phone.addPicked": "যোগ করুন ({0})",
"phone.back": "পেছনে",
"phone.canvas": "ক্যানভাস",
"phone.canvasMainLaneOnly": "কেবল সবচেয়ে নিচের ছবির লেনের ভিডিও ও স্থিরচিত্রের পটভূমি থাকে।",
@@ -387,12 +388,13 @@
"phone.more": "আরও",
"phone.noEffectYet": "এই ক্লিপে এখনও কিছু নেই। নিচে একটি ইফেক্ট ট্যাপ করে যোগ করুন।",
"phone.noMediaYet": "বিনে এখনও কিছু নেই। শুরু করতে একটি ভিডিও, সাউন্ড বা ছবি ইমপোর্ট করুন।",
+ "phone.pickToAdd": "যে ক্রমে চলবে সেই ক্রমে ফাইলে ট্যাপ করুন, তারপর যোগ করুন। সেগুলো প্লেহেডে বসবে।",
+ "phone.pickToAddAtEnd": "যে ক্রমে চলবে সেই ক্রমে ফাইলে ট্যাপ করুন, তারপর যোগ করুন। সেগুলো শেষে বসবে।",
"phone.project": "প্রজেক্ট",
"phone.redo": "পুনরায় করুন",
"phone.selectClipFirst": "আগে টাইমলাইনে একটি ক্লিপ ট্যাপ করুন: এটি নির্বাচিত ক্লিপে যাবে।",
"phone.speak": "বলুন",
"phone.split": "বিভক্ত করুন",
- "phone.tapToAdd": "টাইমলাইনে প্লেহেডের জায়গায় রাখতে একটি ফাইল ট্যাপ করুন।",
"phone.undo": "পূর্বাবস্থায় ফেরান",
"phone.voiceover": "ভয়েসওভার",
"previewPane.backToTimeline": "টাইমলাইনে ফিরে যান",
diff --git a/src/crates/concat/locales/de.json b/src/crates/concat/locales/de.json
index 6e620416..9e3619d7 100644
--- a/src/crates/concat/locales/de.json
+++ b/src/crates/concat/locales/de.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "Panel entfernen",
"paneSwitcher.timeline": "Zeitleiste",
"phone.addATitle": "Titel hinzufügen",
+ "phone.addPicked": "Hinzufügen ({0})",
"phone.back": "Zurück",
"phone.canvas": "Leinwand",
"phone.canvasMainLaneOnly": "Nur Videos und Standbilder auf der untersten Bildspur haben einen Hintergrund.",
@@ -387,12 +388,13 @@
"phone.more": "Mehr",
"phone.noEffectYet": "Noch nichts auf diesem Clip. Tippe unten auf einen Effekt, um ihn hinzuzufügen.",
"phone.noMediaYet": "Noch nichts in der Ablage. Importiere ein Video, einen Ton oder ein Bild, um zu beginnen.",
+ "phone.pickToAdd": "Tippe die Dateien in der Reihenfolge an, in der sie laufen, dann auf Hinzufügen. Sie landen am Abspielkopf.",
+ "phone.pickToAddAtEnd": "Tippe die Dateien in der Reihenfolge an, in der sie laufen, dann auf Hinzufügen. Sie landen am Ende.",
"phone.project": "Projekt",
"phone.redo": "Wiederholen",
"phone.selectClipFirst": "Tippe zuerst auf einen Clip in der Zeitleiste: das hier gilt für den ausgewählten Clip.",
"phone.speak": "Sprechen",
"phone.split": "Teilen",
- "phone.tapToAdd": "Tippe auf eine Datei, um sie am Abspielkopf auf die Zeitleiste zu legen.",
"phone.undo": "Rückgängig",
"phone.voiceover": "Voiceover",
"previewPane.backToTimeline": "Zurück zur Zeitleiste",
diff --git a/src/crates/concat/locales/en.json b/src/crates/concat/locales/en.json
index fbe2ae6d..9d6753ff 100644
--- a/src/crates/concat/locales/en.json
+++ b/src/crates/concat/locales/en.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "Remove panel",
"paneSwitcher.timeline": "Timeline",
"phone.addATitle": "Add a title",
+ "phone.addPicked": "Add ({0})",
"phone.back": "Back",
"phone.canvas": "Canvas",
"phone.canvasMainLaneOnly": "Only videos and stills on the lowest picture lane have a background.",
@@ -387,12 +388,13 @@
"phone.more": "More",
"phone.noEffectYet": "Nothing on this clip yet. Tap an effect below to add it.",
"phone.noMediaYet": "Nothing in the bin yet. Import a video, a sound or a picture to start.",
+ "phone.pickToAdd": "Tap files in the order they play, then Add. They go in at the playhead.",
+ "phone.pickToAddAtEnd": "Tap files in the order they play, then Add. They go at the end.",
"phone.project": "Project",
"phone.redo": "Redo",
"phone.selectClipFirst": "Tap a clip on the timeline first: this goes on the selected clip.",
"phone.speak": "Speak",
"phone.split": "Split",
- "phone.tapToAdd": "Tap a file to put it on the timeline at the playhead.",
"phone.undo": "Undo",
"phone.voiceover": "Voiceover",
"previewPane.backToTimeline": "Back to the timeline",
diff --git a/src/crates/concat/locales/es.json b/src/crates/concat/locales/es.json
index 4e5e3a62..778c58d7 100644
--- a/src/crates/concat/locales/es.json
+++ b/src/crates/concat/locales/es.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "Quitar panel",
"paneSwitcher.timeline": "Línea de tiempo",
"phone.addATitle": "Añadir un título",
+ "phone.addPicked": "Añadir ({0})",
"phone.back": "Atrás",
"phone.canvas": "Lienzo",
"phone.canvasMainLaneOnly": "Solo los vídeos e imágenes fijas de la pista de imagen más baja tienen fondo.",
@@ -387,12 +388,13 @@
"phone.more": "Más",
"phone.noEffectYet": "Aún no hay nada en este clip. Toca un efecto abajo para añadirlo.",
"phone.noMediaYet": "Aún no hay nada en la bandeja. Importa un vídeo, un sonido o una imagen para empezar.",
+ "phone.pickToAdd": "Toca los archivos en el orden en que se reproducen y luego Añadir. Entran en el cabezal de reproducción.",
+ "phone.pickToAddAtEnd": "Toca los archivos en el orden en que se reproducen y luego Añadir. Van al final.",
"phone.project": "Proyecto",
"phone.redo": "Rehacer",
"phone.selectClipFirst": "Toca primero un clip en la línea de tiempo: esto se aplica al clip seleccionado.",
"phone.speak": "Hablar",
"phone.split": "Dividir",
- "phone.tapToAdd": "Toca un archivo para ponerlo en la línea de tiempo en el cabezal.",
"phone.undo": "Deshacer",
"phone.voiceover": "Voz en off",
"previewPane.backToTimeline": "Volver a la línea de tiempo",
diff --git a/src/crates/concat/locales/fa.json b/src/crates/concat/locales/fa.json
index 3e9f02c9..533af159 100644
--- a/src/crates/concat/locales/fa.json
+++ b/src/crates/concat/locales/fa.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "حذف پنل",
"paneSwitcher.timeline": "تایم‌لاین",
"phone.addATitle": "افزودن عنوان",
+ "phone.addPicked": "افزودن ({0})",
"phone.back": "بازگشت",
"phone.canvas": "بوم",
"phone.canvasMainLaneOnly": "فقط ویدیوها و تصاویر ثابت پایین‌ترین شیار تصویر پس‌زمینه دارند.",
@@ -387,12 +388,13 @@
"phone.more": "بیشتر",
"phone.noEffectYet": "هنوز چیزی روی این کلیپ نیست. برای افزودن، روی یک جلوه در پایین بزنید.",
"phone.noMediaYet": "هنوز چیزی در مخزن نیست. برای شروع یک ویدیو، صدا یا تصویر وارد کنید.",
+ "phone.pickToAdd": "فایل‌ها را به ترتیب پخش لمس کنید، سپس افزودن. در محل نشانگر پخش قرار می‌گیرند.",
+ "phone.pickToAddAtEnd": "فایل‌ها را به ترتیب پخش لمس کنید، سپس افزودن. در انتها قرار می‌گیرند.",
"phone.project": "پروژه",
"phone.redo": "ازنو",
"phone.selectClipFirst": "ابتدا روی یک کلیپ در خط زمان بزنید: این روی کلیپ انتخاب‌شده اعمال می‌شود.",
"phone.speak": "گفتار",
"phone.split": "برش",
- "phone.tapToAdd": "روی یک فایل بزنید تا در جای هد پخش روی خط زمان قرار بگیرد.",
"phone.undo": "واگرد",
"phone.voiceover": "صداگذاری",
"previewPane.backToTimeline": "بازگشت به خط زمانی",
diff --git a/src/crates/concat/locales/fr.json b/src/crates/concat/locales/fr.json
index d5715607..d8d09734 100644
--- a/src/crates/concat/locales/fr.json
+++ b/src/crates/concat/locales/fr.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "Retirer le panneau",
"paneSwitcher.timeline": "Timeline",
"phone.addATitle": "Ajouter un titre",
+ "phone.addPicked": "Ajouter ({0})",
"phone.back": "Retour",
"phone.canvas": "Canevas",
"phone.canvasMainLaneOnly": "Seules les vidéos et images fixes de la piste d'image la plus basse ont un arrière-plan.",
@@ -387,12 +388,13 @@
"phone.more": "Plus",
"phone.noEffectYet": "Rien sur ce clip pour l’instant. Touchez un effet ci-dessous pour l’ajouter.",
"phone.noMediaYet": "Rien dans le chutier pour l’instant. Importez une vidéo, un son ou une image pour commencer.",
+ "phone.pickToAdd": "Touchez les fichiers dans l'ordre de lecture, puis Ajouter. Ils arrivent à la tête de lecture.",
+ "phone.pickToAddAtEnd": "Touchez les fichiers dans l'ordre de lecture, puis Ajouter. Ils vont à la fin.",
"phone.project": "Projet",
"phone.redo": "Rétablir",
"phone.selectClipFirst": "Touchez d’abord un clip sur la timeline : ceci s’applique au clip sélectionné.",
"phone.speak": "Parler",
"phone.split": "Scinder",
- "phone.tapToAdd": "Touchez un fichier pour le placer sur la timeline à la tête de lecture.",
"phone.undo": "Annuler",
"phone.voiceover": "Voix off",
"previewPane.backToTimeline": "Revenir à la timeline",
diff --git a/src/crates/concat/locales/he.json b/src/crates/concat/locales/he.json
index 7eed824d..bd915f17 100644
--- a/src/crates/concat/locales/he.json
+++ b/src/crates/concat/locales/he.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "הסרת חלונית",
"paneSwitcher.timeline": "ציר זמן",
"phone.addATitle": "הוספת כותרת",
+ "phone.addPicked": "הוספה ({0})",
"phone.back": "חזרה",
"phone.canvas": "קנבס",
"phone.canvasMainLaneOnly": "רק לסרטונים ולתמונות סטילס במסלול התמונה התחתון יש רקע.",
@@ -387,12 +388,13 @@
"phone.more": "עוד",
"phone.noEffectYet": "אין עדיין כלום על הקליפ הזה. יש להקיש על אפקט למטה כדי להוסיף אותו.",
"phone.noMediaYet": "אין עדיין כלום במאגר. אפשר לייבא וידאו, צליל או תמונה כדי להתחיל.",
+ "phone.pickToAdd": "הקישו על הקבצים בסדר שבו יתנגנו, ואז הוספה. הם נכנסים במיקום סמן ההפעלה.",
+ "phone.pickToAddAtEnd": "הקישו על הקבצים בסדר שבו יתנגנו, ואז הוספה. הם נכנסים בסוף.",
"phone.project": "פרויקט",
"phone.redo": "ביצוע מחדש",
"phone.selectClipFirst": "יש להקיש קודם על קליפ בציר הזמן: זה חל על הקליפ שנבחר.",
"phone.speak": "דיבור",
"phone.split": "פיצול",
- "phone.tapToAdd": "יש להקיש על קובץ כדי להניח אותו בציר הזמן בסמן ההפעלה.",
"phone.undo": "ביטול פעולה",
"phone.voiceover": "קריינות",
"previewPane.backToTimeline": "חזרה לציר הזמן",
diff --git a/src/crates/concat/locales/hi.json b/src/crates/concat/locales/hi.json
index c25f1bfb..33f51d1e 100644
--- a/src/crates/concat/locales/hi.json
+++ b/src/crates/concat/locales/hi.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "पैनल हटाएं",
"paneSwitcher.timeline": "टाइमलाइन",
"phone.addATitle": "टाइटल जोड़ें",
+ "phone.addPicked": "जोड़ें ({0})",
"phone.back": "वापस",
"phone.canvas": "कैनवास",
"phone.canvasMainLaneOnly": "केवल सबसे निचली चित्र लेन के वीडियो और स्थिर चित्रों की पृष्ठभूमि होती है।",
@@ -387,12 +388,13 @@
"phone.more": "और",
"phone.noEffectYet": "इस क्लिप पर अभी कुछ नहीं है। जोड़ने के लिए नीचे किसी इफ़ेक्ट पर टैप करें।",
"phone.noMediaYet": "बिन में अभी कुछ नहीं है। शुरू करने के लिए कोई वीडियो, ध्वनि या तस्वीर इंपोर्ट करें।",
+ "phone.pickToAdd": "फ़ाइलों को उसी क्रम में टैप करें जिसमें वे चलें, फिर जोड़ें। वे प्लेहेड पर आएँगी।",
+ "phone.pickToAddAtEnd": "फ़ाइलों को उसी क्रम में टैप करें जिसमें वे चलें, फिर जोड़ें। वे अंत में आएँगी।",
"phone.project": "प्रोजेक्ट",
"phone.redo": "फिर से करें",
"phone.selectClipFirst": "पहले टाइमलाइन पर किसी क्लिप पर टैप करें: यह चुनी गई क्लिप पर लागू होगा।",
"phone.speak": "बोलें",
"phone.split": "विभाजित करें",
- "phone.tapToAdd": "किसी फ़ाइल पर टैप करके उसे प्लेहेड पर टाइमलाइन में रखें।",
"phone.undo": "पहले जैसा करें",
"phone.voiceover": "वॉइसओवर",
"previewPane.backToTimeline": "टाइमलाइन पर वापस",
diff --git a/src/crates/concat/locales/hr.json b/src/crates/concat/locales/hr.json
index fac9e7ae..43b9f1ce 100644
--- a/src/crates/concat/locales/hr.json
+++ b/src/crates/concat/locales/hr.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "Ukloni ploču",
"paneSwitcher.timeline": "Vremenska linija",
"phone.addATitle": "Dodaj naslov",
+ "phone.addPicked": "Dodaj ({0})",
"phone.back": "Natrag",
"phone.canvas": "Platno",
"phone.canvasMainLaneOnly": "Pozadinu imaju samo videozapisi i slike na najnižoj stazi slike.",
@@ -387,12 +388,13 @@
"phone.more": "Više",
"phone.noEffectYet": "Na ovom isječku još nema ničega. Dodirni efekt ispod da ga dodaš.",
"phone.noMediaYet": "U spremniku još nema ničega. Uvezi video, zvuk ili sliku za početak.",
+ "phone.pickToAdd": "Dodirnite datoteke redom kojim se reproduciraju, zatim Dodaj. Umeću se na mjesto glave za reprodukciju.",
+ "phone.pickToAddAtEnd": "Dodirnite datoteke redom kojim se reproduciraju, zatim Dodaj. Dodaju se na kraj.",
"phone.project": "Projekt",
"phone.redo": "Ponovi",
"phone.selectClipFirst": "Prvo dodirni isječak na vremenskoj crti: ovo se primjenjuje na odabrani isječak.",
"phone.speak": "Izgovori",
"phone.split": "Razdvoji",
- "phone.tapToAdd": "Dodirni datoteku da je staviš na vremensku crtu na položaju glave.",
"phone.undo": "Poništi",
"phone.voiceover": "Glas",
"previewPane.backToTimeline": "Natrag na vremensku crtu",
diff --git a/src/crates/concat/locales/id.json b/src/crates/concat/locales/id.json
index 96ed2152..20541953 100644
--- a/src/crates/concat/locales/id.json
+++ b/src/crates/concat/locales/id.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "Hapus panel",
"paneSwitcher.timeline": "Linimasa",
"phone.addATitle": "Tambah judul",
+ "phone.addPicked": "Tambah ({0})",
"phone.back": "Kembali",
"phone.canvas": "Kanvas",
"phone.canvasMainLaneOnly": "Hanya video dan gambar diam di jalur gambar terbawah yang punya latar.",
@@ -387,12 +388,13 @@
"phone.more": "Lainnya",
"phone.noEffectYet": "Belum ada apa pun di klip ini. Ketuk efek di bawah untuk menambahkannya.",
"phone.noMediaYet": "Belum ada apa pun di bin. Impor video, suara, atau gambar untuk memulai.",
+ "phone.pickToAdd": "Ketuk file sesuai urutan putarnya, lalu Tambah. File masuk di playhead.",
+ "phone.pickToAddAtEnd": "Ketuk file sesuai urutan putarnya, lalu Tambah. File masuk di akhir.",
"phone.project": "Proyek",
"phone.redo": "Ulangi",
"phone.selectClipFirst": "Ketuk klip di linimasa dulu: ini diterapkan ke klip yang dipilih.",
"phone.speak": "Bicara",
"phone.split": "Pisahkan",
- "phone.tapToAdd": "Ketuk file untuk menaruhnya di linimasa pada penanda putar.",
"phone.undo": "Urungkan",
"phone.voiceover": "Sulih suara",
"previewPane.backToTimeline": "Kembali ke linimasa",
diff --git a/src/crates/concat/locales/it.json b/src/crates/concat/locales/it.json
index 91135ec3..0b299f1f 100644
--- a/src/crates/concat/locales/it.json
+++ b/src/crates/concat/locales/it.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "Rimuovi pannello",
"paneSwitcher.timeline": "Timeline",
"phone.addATitle": "Aggiungi un titolo",
+ "phone.addPicked": "Aggiungi ({0})",
"phone.back": "Indietro",
"phone.canvas": "Tela",
"phone.canvasMainLaneOnly": "Solo video e immagini fisse sulla traccia immagine più bassa hanno uno sfondo.",
@@ -387,12 +388,13 @@
"phone.more": "Altro",
"phone.noEffectYet": "Ancora niente su questa clip. Tocca un effetto qui sotto per aggiungerlo.",
"phone.noMediaYet": "Il cestello è ancora vuoto. Importa un video, un suono o un’immagine per iniziare.",
+ "phone.pickToAdd": "Tocca i file nell'ordine in cui vanno riprodotti, poi Aggiungi. Entrano alla testina.",
+ "phone.pickToAddAtEnd": "Tocca i file nell'ordine in cui vanno riprodotti, poi Aggiungi. Vanno in fondo.",
"phone.project": "Progetto",
"phone.redo": "Ripeti",
"phone.selectClipFirst": "Tocca prima una clip sulla timeline: questo si applica alla clip selezionata.",
"phone.speak": "Parla",
"phone.split": "Dividi",
- "phone.tapToAdd": "Tocca un file per metterlo sulla timeline alla testina.",
"phone.undo": "Annulla",
"phone.voiceover": "Voce fuori campo",
"previewPane.backToTimeline": "Torna alla timeline",
diff --git a/src/crates/concat/locales/ja.json b/src/crates/concat/locales/ja.json
index 7a4445c7..a0371520 100644
--- a/src/crates/concat/locales/ja.json
+++ b/src/crates/concat/locales/ja.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "パネルを削除",
"paneSwitcher.timeline": "タイムライン",
"phone.addATitle": "タイトルを追加",
+ "phone.addPicked": "追加 ({0})",
"phone.back": "戻る",
"phone.canvas": "キャンバス",
"phone.canvasMainLaneOnly": "背景を持てるのは、映像のある一番下のレーンの動画と静止画だけです。",
@@ -387,12 +388,13 @@
"phone.more": "その他",
"phone.noEffectYet": "このクリップにはまだ何もありません。下のエフェクトをタップして追加してください。",
"phone.noMediaYet": "ビンにはまだ何もありません。動画、音声、画像を読み込んで始めましょう。",
+ "phone.pickToAdd": "再生する順にファイルをタップして、追加をタップ。再生ヘッドの位置に入ります。",
+ "phone.pickToAddAtEnd": "再生する順にファイルをタップして、追加をタップ。最後に入ります。",
"phone.project": "プロジェクト",
"phone.redo": "やり直す",
"phone.selectClipFirst": "先にタイムラインのクリップをタップしてください。これは選択中のクリップに適用されます。",
"phone.speak": "読み上げ",
"phone.split": "分割",
- "phone.tapToAdd": "ファイルをタップすると、再生ヘッドの位置でタイムラインに置かれます。",
"phone.undo": "元に戻す",
"phone.voiceover": "ナレーション",
"previewPane.backToTimeline": "タイムラインに戻る",
diff --git a/src/crates/concat/locales/ko.json b/src/crates/concat/locales/ko.json
index 6dc15d77..58ecf379 100644
--- a/src/crates/concat/locales/ko.json
+++ b/src/crates/concat/locales/ko.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "패널 제거",
"paneSwitcher.timeline": "타임라인",
"phone.addATitle": "제목 추가",
+ "phone.addPicked": "추가 ({0})",
"phone.back": "뒤로",
"phone.canvas": "캔버스",
"phone.canvasMainLaneOnly": "가장 아래 영상 레인의 동영상과 정지 이미지만 배경을 가집니다.",
@@ -387,12 +388,13 @@
"phone.more": "더보기",
"phone.noEffectYet": "이 클립에는 아직 아무것도 없습니다. 아래 효과를 탭해 추가하세요.",
"phone.noMediaYet": "빈에 아직 아무것도 없습니다. 영상, 소리 또는 사진을 가져와 시작하세요.",
+ "phone.pickToAdd": "재생할 순서대로 파일을 탭한 다음 추가를 누르세요. 재생 헤드 위치에 들어갑니다.",
+ "phone.pickToAddAtEnd": "재생할 순서대로 파일을 탭한 다음 추가를 누르세요. 맨 끝에 들어갑니다.",
"phone.project": "프로젝트",
"phone.redo": "다시 실행",
"phone.selectClipFirst": "먼저 타임라인의 클립을 탭하세요. 이 항목은 선택한 클립에 적용됩니다.",
"phone.speak": "읽어주기",
"phone.split": "분할",
- "phone.tapToAdd": "파일을 탭하면 재생 헤드 위치에서 타임라인에 놓입니다.",
"phone.undo": "실행 취소",
"phone.voiceover": "내레이션",
"previewPane.backToTimeline": "타임라인으로 돌아가기",
diff --git a/src/crates/concat/locales/nl.json b/src/crates/concat/locales/nl.json
index 8b46fee0..ee01f0f0 100644
--- a/src/crates/concat/locales/nl.json
+++ b/src/crates/concat/locales/nl.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "Paneel verwijderen",
"paneSwitcher.timeline": "Tijdlijn",
"phone.addATitle": "Een titel toevoegen",
+ "phone.addPicked": "Toevoegen ({0})",
"phone.back": "Terug",
"phone.canvas": "Canvas",
"phone.canvasMainLaneOnly": "Alleen video's en stilstaande beelden op het laagste beeldspoor hebben een achtergrond.",
@@ -387,12 +388,13 @@
"phone.more": "Meer",
"phone.noEffectYet": "Nog niets op deze clip. Tik hieronder op een effect om het toe te voegen.",
"phone.noMediaYet": "Nog niets in de mediabak. Importeer een video, geluid of afbeelding om te beginnen.",
+ "phone.pickToAdd": "Tik de bestanden aan in de volgorde waarin ze spelen, dan Toevoegen. Ze komen bij de afspeelkop.",
+ "phone.pickToAddAtEnd": "Tik de bestanden aan in de volgorde waarin ze spelen, dan Toevoegen. Ze komen aan het eind.",
"phone.project": "Project",
"phone.redo": "Opnieuw",
"phone.selectClipFirst": "Tik eerst op een clip op de tijdlijn: dit komt op de geselecteerde clip.",
"phone.speak": "Uitspreken",
"phone.split": "Splitsen",
- "phone.tapToAdd": "Tik op een bestand om het bij de afspeelkop op de tijdlijn te zetten.",
"phone.undo": "Ongedaan maken",
"phone.voiceover": "Voice-over",
"previewPane.backToTimeline": "Terug naar de tijdlijn",
diff --git a/src/crates/concat/locales/pl.json b/src/crates/concat/locales/pl.json
index 0a9ad2ba..b1daa26b 100644
--- a/src/crates/concat/locales/pl.json
+++ b/src/crates/concat/locales/pl.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "Usuń panel",
"paneSwitcher.timeline": "Oś czasu",
"phone.addATitle": "Dodaj tytuł",
+ "phone.addPicked": "Dodaj ({0})",
"phone.back": "Wstecz",
"phone.canvas": "Płótno",
"phone.canvasMainLaneOnly": "Tło mają tylko filmy i obrazy na najniższej ścieżce obrazu.",
@@ -387,12 +388,13 @@
"phone.more": "Więcej",
"phone.noEffectYet": "Na tym klipie nic jeszcze nie ma. Stuknij efekt poniżej, aby go dodać.",
"phone.noMediaYet": "Pojemnik jest jeszcze pusty. Zaimportuj wideo, dźwięk lub obraz, aby zacząć.",
+ "phone.pickToAdd": "Stuknij pliki w kolejności odtwarzania, potem Dodaj. Trafią w miejsce głowicy.",
+ "phone.pickToAddAtEnd": "Stuknij pliki w kolejności odtwarzania, potem Dodaj. Trafią na koniec.",
"phone.project": "Projekt",
"phone.redo": "Ponów",
"phone.selectClipFirst": "Najpierw stuknij klip na osi czasu: to trafi na zaznaczony klip.",
"phone.speak": "Przeczytaj",
"phone.split": "Podziel",
- "phone.tapToAdd": "Stuknij plik, aby umieścić go na osi czasu w miejscu głowicy odtwarzania.",
"phone.undo": "Cofnij",
"phone.voiceover": "Lektor",
"previewPane.backToTimeline": "Wróć do osi czasu",
diff --git a/src/crates/concat/locales/pt-BR.json b/src/crates/concat/locales/pt-BR.json
index 5483e140..f5997eed 100644
--- a/src/crates/concat/locales/pt-BR.json
+++ b/src/crates/concat/locales/pt-BR.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "Remover painel",
"paneSwitcher.timeline": "Linha do tempo",
"phone.addATitle": "Adicionar um título",
+ "phone.addPicked": "Adicionar ({0})",
"phone.back": "Voltar",
"phone.canvas": "Tela",
"phone.canvasMainLaneOnly": "Só vídeos e imagens fixas na faixa de imagem mais baixa têm fundo.",
@@ -387,12 +388,13 @@
"phone.more": "Mais",
"phone.noEffectYet": "Ainda não há nada neste clipe. Toque em um efeito abaixo para adicioná-lo.",
"phone.noMediaYet": "Ainda não há nada na bandeja. Importe um vídeo, um som ou uma imagem para começar.",
+ "phone.pickToAdd": "Toque nos arquivos na ordem em que vão tocar e depois em Adicionar. Eles entram no cursor de reprodução.",
+ "phone.pickToAddAtEnd": "Toque nos arquivos na ordem em que vão tocar e depois em Adicionar. Eles entram no fim.",
"phone.project": "Projeto",
"phone.redo": "Refazer",
"phone.selectClipFirst": "Toque primeiro em um clipe na linha do tempo: isto se aplica ao clipe selecionado.",
"phone.speak": "Falar",
"phone.split": "Dividir",
- "phone.tapToAdd": "Toque em um arquivo para colocá-lo na linha do tempo, no cursor de reprodução.",
"phone.undo": "Desfazer",
"phone.voiceover": "Narração",
"previewPane.backToTimeline": "Voltar à linha do tempo",
diff --git a/src/crates/concat/locales/ru.json b/src/crates/concat/locales/ru.json
index a806443a..1a763d44 100644
--- a/src/crates/concat/locales/ru.json
+++ b/src/crates/concat/locales/ru.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "Убрать панель",
"paneSwitcher.timeline": "Таймлайн",
"phone.addATitle": "Добавить титр",
+ "phone.addPicked": "Добавить ({0})",
"phone.back": "Назад",
"phone.canvas": "Холст",
"phone.canvasMainLaneOnly": "Фон есть только у видео и картинок на самой нижней дорожке изображения.",
@@ -387,12 +388,13 @@
"phone.more": "Ещё",
"phone.noEffectYet": "На этом клипе пока ничего нет. Коснитесь эффекта ниже, чтобы добавить его.",
"phone.noMediaYet": "В корзине пока пусто. Импортируйте видео, звук или картинку, чтобы начать.",
+ "phone.pickToAdd": "Коснитесь файлов в порядке воспроизведения, затем «Добавить». Они встанут на место указателя.",
+ "phone.pickToAddAtEnd": "Коснитесь файлов в порядке воспроизведения, затем «Добавить». Они встанут в конец.",
"phone.project": "Проект",
"phone.redo": "Повторить",
"phone.selectClipFirst": "Сначала коснитесь клипа на таймлайне: это применяется к выбранному клипу.",
"phone.speak": "Озвучить",
"phone.split": "Разрезать",
- "phone.tapToAdd": "Коснитесь файла, чтобы поставить его на таймлайн в позицию курсора.",
"phone.undo": "Отменить",
"phone.voiceover": "Озвучка",
"previewPane.backToTimeline": "Вернуться к таймлайну",
diff --git a/src/crates/concat/locales/th.json b/src/crates/concat/locales/th.json
index 030f00d6..23226027 100644
--- a/src/crates/concat/locales/th.json
+++ b/src/crates/concat/locales/th.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "นำแผงออก",
"paneSwitcher.timeline": "ไทม์ไลน์",
"phone.addATitle": "เพิ่มไตเติล",
+ "phone.addPicked": "เพิ่ม ({0})",
"phone.back": "กลับ",
"phone.canvas": "แคนวาส",
"phone.canvasMainLaneOnly": "มีพื้นหลังเฉพาะวิดีโอและภาพนิ่งบนเลนภาพล่างสุด",
@@ -387,12 +388,13 @@
"phone.more": "เพิ่มเติม",
"phone.noEffectYet": "คลิปนี้ยังไม่มีอะไร แตะเอฟเฟกต์ด้านล่างเพื่อเพิ่ม",
"phone.noMediaYet": "คลังสื่อยังว่าง นำเข้าวิดีโอ เสียง หรือรูปภาพเพื่อเริ่มต้น",
+ "phone.pickToAdd": "แตะไฟล์ตามลำดับที่จะเล่น แล้วแตะเพิ่ม ไฟล์จะถูกวางที่หัวเล่น",
+ "phone.pickToAddAtEnd": "แตะไฟล์ตามลำดับที่จะเล่น แล้วแตะเพิ่ม ไฟล์จะถูกวางที่ท้ายสุด",
"phone.project": "โปรเจกต์",
"phone.redo": "ทำซ้ำ",
"phone.selectClipFirst": "แตะคลิปบนไทม์ไลน์ก่อน: รายการนี้จะใช้กับคลิปที่เลือก",
"phone.speak": "พูด",
"phone.split": "แยก",
- "phone.tapToAdd": "แตะไฟล์เพื่อวางบนไทม์ไลน์ที่ตำแหน่งหัวเล่น",
"phone.undo": "เลิกทำ",
"phone.voiceover": "เสียงพากย์",
"previewPane.backToTimeline": "กลับไปที่ไทม์ไลน์",
diff --git a/src/crates/concat/locales/tr.json b/src/crates/concat/locales/tr.json
index e6803998..8f0f9c23 100644
--- a/src/crates/concat/locales/tr.json
+++ b/src/crates/concat/locales/tr.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "Paneli kaldır",
"paneSwitcher.timeline": "Zaman çizelgesi",
"phone.addATitle": "Başlık ekle",
+ "phone.addPicked": "Ekle ({0})",
"phone.back": "Geri",
"phone.canvas": "Tuval",
"phone.canvasMainLaneOnly": "Yalnızca en alt görüntü şeridindeki videoların ve durağan görüntülerin arka planı olur.",
@@ -387,12 +388,13 @@
"phone.more": "Daha fazla",
"phone.noEffectYet": "Bu klipte henüz bir şey yok. Eklemek için aşağıdaki bir efekte dokunun.",
"phone.noMediaYet": "Kutuda henüz bir şey yok. Başlamak için bir video, ses ya da görsel içe aktarın.",
+ "phone.pickToAdd": "Dosyalara oynatılacakları sırayla dokunun, sonra Ekle'ye. Oynatma kafasına yerleşirler.",
+ "phone.pickToAddAtEnd": "Dosyalara oynatılacakları sırayla dokunun, sonra Ekle'ye. Sona eklenirler.",
"phone.project": "Proje",
"phone.redo": "Yinele",
"phone.selectClipFirst": "Önce zaman çizelgesinde bir klibe dokunun: bu, seçili klibe uygulanır.",
"phone.speak": "Seslendir",
"phone.split": "Böl",
- "phone.tapToAdd": "Bir dosyaya dokunarak onu oynatma kafasının olduğu yerde zaman çizelgesine koyun.",
"phone.undo": "Geri al",
"phone.voiceover": "Seslendirme",
"previewPane.backToTimeline": "Zaman çizelgesine dön",
diff --git a/src/crates/concat/locales/uk.json b/src/crates/concat/locales/uk.json
index 10b2a91d..5eb91ddf 100644
--- a/src/crates/concat/locales/uk.json
+++ b/src/crates/concat/locales/uk.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "Прибрати панель",
"paneSwitcher.timeline": "Часова шкала",
"phone.addATitle": "Додати титр",
+ "phone.addPicked": "Додати ({0})",
"phone.back": "Назад",
"phone.canvas": "Полотно",
"phone.canvasMainLaneOnly": "Тло мають лише відео та зображення на найнижчій доріжці зображення.",
@@ -387,12 +388,13 @@
"phone.more": "Більше",
"phone.noEffectYet": "На цьому кліпі ще нічого немає. Торкніться ефекту нижче, щоб додати його.",
"phone.noMediaYet": "У медіатеці ще порожньо. Імпортуйте відео, звук або зображення, щоб почати.",
+ "phone.pickToAdd": "Торкніться файлів у порядку відтворення, потім «Додати». Вони стануть на місце курсора.",
+ "phone.pickToAddAtEnd": "Торкніться файлів у порядку відтворення, потім «Додати». Вони стануть у кінець.",
"phone.project": "Проєкт",
"phone.redo": "Повторити",
"phone.selectClipFirst": "Спершу торкніться кліпу на часовій шкалі: це застосовується до вибраного кліпу.",
"phone.speak": "Озвучити",
"phone.split": "Розрізати",
- "phone.tapToAdd": "Торкніться файлу, щоб додати його на часову шкалу в позиції курсора.",
"phone.undo": "Скасувати",
"phone.voiceover": "Озвучення",
"previewPane.backToTimeline": "Назад до часової шкали",
diff --git a/src/crates/concat/locales/ur.json b/src/crates/concat/locales/ur.json
index bf53b050..36bcb5ba 100644
--- a/src/crates/concat/locales/ur.json
+++ b/src/crates/concat/locales/ur.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "پینل ہٹائیں",
"paneSwitcher.timeline": "ٹائم لائن",
"phone.addATitle": "ٹائٹل شامل کریں",
+ "phone.addPicked": "شامل کریں ({0})",
"phone.back": "واپس",
"phone.canvas": "کینوس",
"phone.canvasMainLaneOnly": "صرف سب سے نچلی تصویری لین کی ویڈیوز اور ساکن تصاویر کا پس منظر ہوتا ہے۔",
@@ -387,12 +388,13 @@
"phone.more": "مزید",
"phone.noEffectYet": "اس کلپ پر ابھی کچھ نہیں۔ شامل کرنے کے لیے نیچے کسی ایفیکٹ پر ٹیپ کریں۔",
"phone.noMediaYet": "بِن میں ابھی کچھ نہیں۔ شروع کرنے کے لیے کوئی ویڈیو، آواز یا تصویر امپورٹ کریں۔",
+ "phone.pickToAdd": "فائلوں کو اسی ترتیب سے ٹیپ کریں جس میں وہ چلیں، پھر شامل کریں۔ وہ پلے ہیڈ پر آئیں گی۔",
+ "phone.pickToAddAtEnd": "فائلوں کو اسی ترتیب سے ٹیپ کریں جس میں وہ چلیں، پھر شامل کریں۔ وہ آخر میں آئیں گی۔",
"phone.project": "پروجیکٹ",
"phone.redo": "دوبارہ کریں",
"phone.selectClipFirst": "پہلے ٹائم لائن پر کسی کلپ پر ٹیپ کریں: یہ منتخب کلپ پر لگتا ہے۔",
"phone.speak": "بولیں",
"phone.split": "تقسیم کریں",
- "phone.tapToAdd": "فائل پر ٹیپ کریں تاکہ وہ ٹائم لائن پر پلے ہیڈ کی جگہ لگ جائے۔",
"phone.undo": "واپس لیں",
"phone.voiceover": "وائس اوور",
"previewPane.backToTimeline": "ٹائم لائن پر واپس",
diff --git a/src/crates/concat/locales/vi.json b/src/crates/concat/locales/vi.json
index 227b3952..57473d46 100644
--- a/src/crates/concat/locales/vi.json
+++ b/src/crates/concat/locales/vi.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "Xóa bảng",
"paneSwitcher.timeline": "Dòng thời gian",
"phone.addATitle": "Thêm tiêu đề",
+ "phone.addPicked": "Thêm ({0})",
"phone.back": "Quay lại",
"phone.canvas": "Khung vẽ",
"phone.canvasMainLaneOnly": "Chỉ video và ảnh tĩnh trên làn hình thấp nhất mới có nền.",
@@ -387,12 +388,13 @@
"phone.more": "Thêm",
"phone.noEffectYet": "Clip này chưa có hiệu ứng. Nhấn vào hiệu ứng bên dưới để thêm.",
"phone.noMediaYet": "Chưa có gì trong thư viện. Nhập video, âm thanh hoặc hình ảnh để bắt đầu.",
+ "phone.pickToAdd": "Chạm vào các tệp theo thứ tự phát, rồi Thêm. Chúng được chèn tại đầu phát.",
+ "phone.pickToAddAtEnd": "Chạm vào các tệp theo thứ tự phát, rồi Thêm. Chúng được thêm vào cuối.",
"phone.project": "Dự án",
"phone.redo": "Làm lại",
"phone.selectClipFirst": "Trước tiên, hãy nhấn vào clip trên dòng thời gian; thao tác này áp dụng cho clip đã chọn.",
"phone.speak": "Đọc",
"phone.split": "Tách",
- "phone.tapToAdd": "Nhấn vào tệp để đặt lên dòng thời gian tại vị trí đầu phát.",
"phone.undo": "Hoàn tác",
"phone.voiceover": "Thuyết minh",
"previewPane.backToTimeline": "Quay lại dòng thời gian",
diff --git a/src/crates/concat/locales/zh-Hans.json b/src/crates/concat/locales/zh-Hans.json
index 28cd211b..82ceb675 100644
--- a/src/crates/concat/locales/zh-Hans.json
+++ b/src/crates/concat/locales/zh-Hans.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "移除面板",
"paneSwitcher.timeline": "时间线",
"phone.addATitle": "添加标题",
+ "phone.addPicked": "添加 ({0})",
"phone.back": "返回",
"phone.canvas": "画布",
"phone.canvasMainLaneOnly": "只有最下层画面轨道上的视频和图片才有背景。",
@@ -387,12 +388,13 @@
"phone.more": "更多",
"phone.noEffectYet": "这个片段上还没有任何效果。点按下方的效果即可添加。",
"phone.noMediaYet": "素材库还是空的。导入一段视频、音频或图片开始吧。",
+ "phone.pickToAdd": "按播放顺序点选文件,然后点添加。它们会插入到播放头处。",
+ "phone.pickToAddAtEnd": "按播放顺序点选文件,然后点添加。它们会接在最后。",
"phone.project": "项目",
"phone.redo": "重做",
"phone.selectClipFirst": "请先点按时间线上的片段:这会应用到所选片段。",
"phone.speak": "朗读",
"phone.split": "分割",
- "phone.tapToAdd": "点按文件,即可把它放到时间线上播放头所在的位置。",
"phone.undo": "撤销",
"phone.voiceover": "旁白",
"previewPane.backToTimeline": "返回时间线",
diff --git a/src/crates/concat/locales/zh-TW.json b/src/crates/concat/locales/zh-TW.json
index 70ff65dd..9cd0736b 100644
--- a/src/crates/concat/locales/zh-TW.json
+++ b/src/crates/concat/locales/zh-TW.json
@@ -373,6 +373,7 @@
"paneSwitcher.removePanel": "移除面板",
"paneSwitcher.timeline": "時間軸",
"phone.addATitle": "新增標題",
+ "phone.addPicked": "新增 ({0})",
"phone.back": "回上層",
"phone.canvas": "畫布",
"phone.canvasMainLaneOnly": "只有最下層畫面軌道上的影片與圖片才有背景。",
@@ -387,12 +388,13 @@
"phone.more": "更多",
"phone.noEffectYet": "這個片段上還沒有任何效果。點一下下方的效果即可加入。",
"phone.noMediaYet": "素材庫還是空的。匯入一段影片、音訊或圖片開始吧。",
+ "phone.pickToAdd": "依播放順序點選檔案,再點新增。它們會插入到播放頭處。",
+ "phone.pickToAddAtEnd": "依播放順序點選檔案,再點新增。它們會接在最後。",
"phone.project": "專案",
"phone.redo": "重做",
"phone.selectClipFirst": "請先點一下時間軸上的片段:這會套用到所選片段。",
"phone.speak": "朗讀",
"phone.split": "分割",
- "phone.tapToAdd": "點一下檔案,即可把它放到時間軸上播放磁頭所在的位置。",
"phone.undo": "復原",
"phone.voiceover": "旁白",
"previewPane.backToTimeline": "返回時間軸",
diff --git a/src/crates/concat/src/lib.rs b/src/crates/concat/src/lib.rs
index 752d5906..bde68ec0 100644
--- a/src/crates/concat/src/lib.rs
+++ b/src/crates/concat/src/lib.rs
@@ -933,6 +933,12 @@ fn start(project: Option<std::path::PathBuf>, smoke: bool) -> Result<(), slint::
editor.on_media_activate(on_window!(|state, id: i32| {
state.place_at_playhead(&format!("media:{id}"));
}));
+ editor.on_media_add_picked(on_window!(|state, at_end: bool| {
+ state.handle(Msg::Media(MediaMsg::AddPicked { at_end }));
+ }));
+ editor.on_media_clear_picks(on_window!(|state| {
+ state.handle(Msg::Media(MediaMsg::ClearPicks));
+ }));
editor.on_library_add_text(on_window!(|state, preset: SharedString| {
state.place_at_playhead(&format!("text:{preset}:Title"));
}));
diff --git a/src/crates/concat/src/panes/media_bin.rs b/src/crates/concat/src/panes/media_bin.rs
index 1dfa7de5..d7075b59 100644
--- a/src/crates/concat/src/panes/media_bin.rs
+++ b/src/crates/concat/src/panes/media_bin.rs
@@ -53,6 +53,12 @@ pub enum MediaMsg {
Imported(Vec<Result<MediaSummary, String>>),
/// Everything selected goes on the timeline at the playhead.
AddSelectedAtPlayhead,
+ /// The phone's Add: what was picked, in the order it was picked, onto
+ /// the main lane - at the playhead, or after the last picture on it
+ /// when `at_end` (the lanes' plus).
+ AddPicked { at_end: bool },
+ /// The phone's Media sheet opened: a pick starts from nothing.
+ ClearPicks,
}
/// The bin's state.
@@ -63,6 +69,11 @@ pub struct MediaBin {
rows: HashMap<String, i32>,
next_row: i32,
pub selected: HashSet<String>,
+ /// The selection in the order it was made, oldest first: the order a
+ /// phone's picks are numbered and laid down in, as every phone
+ /// editor's picker numbers them. May name what has since been let go
+ /// of; [`MediaBin::picked_in_order`] reads it against `selected`.
+ picked: Vec<String>,
pub filter: MediaFilter,
/// 0 = Added, 1 = Name, 2 = Kind
pub sort: usize,
@@ -81,6 +92,7 @@ impl Default for MediaBin {
rows: HashMap::new(),
next_row: 1,
selected: HashSet::new(),
+ picked: Vec::new(),
filter: MediaFilter::All,
sort: 0,
thumbs: HashMap::new(),
@@ -125,6 +137,8 @@ impl MediaBin {
(from_row, to_row),
additive,
);
+ let selected = &self.selected;
+ self.picked.retain(|id| selected.contains(id));
}
MediaMsg::Remove(row) => {
if let Some(id) = self
@@ -174,7 +188,29 @@ impl MediaBin {
}
let added = commands.len();
if !commands.is_empty() {
+ let before: HashSet<String> = studio
+ .project()
+ .media
+ .iter()
+ .map(|item| item.id.clone())
+ .collect();
studio.apply(Command::Batch { commands });
+ // On a phone the files just brought in come back picked,
+ // in the order the system's picker gave them, so Add is
+ // the one tap left between the picker and the timeline.
+ if crate::platform::phone() {
+ let fresh: Vec<String> = studio
+ .project()
+ .media
+ .iter()
+ .filter(|item| !before.contains(&item.id))
+ .map(|item| item.id.clone())
+ .collect();
+ if !fresh.is_empty() {
+ self.selected = fresh.iter().cloned().collect();
+ self.picked = fresh;
+ }
+ }
}
if let Some(error) = failures.first() {
studio.notify(&probe_error(error), true);
@@ -209,6 +245,120 @@ impl MediaBin {
ripple: false,
});
}
+ MediaMsg::AddPicked { at_end } => self.add_picked(studio, at_end),
+ MediaMsg::ClearPicks => {
+ self.selected.clear();
+ self.picked.clear();
+ }
+ }
+ }
+
+ /// The selection in the order it was picked: what was picked one by
+ /// one first, then anything selected another way, in the bin's order.
+ pub fn picked_in_order(&self, project: &Project) -> Vec<String> {
+ let mut ids: Vec<String> = Vec::new();
+ for id in &self.picked {
+ if self.selected.contains(id)
+ && !ids.contains(id)
+ && project.media_by_id(id).is_some()
+ {
+ ids.push(id.clone());
+ }
+ }
+ for item in &project.media {
+ if self.selected.contains(&item.id) && !ids.contains(&item.id) {
+ ids.push(item.id.clone());
+ }
+ }
+ ids
+ }
+
+ /// The phone's Add. Pictures go onto the main lane - the lowest one
+ /// holding a picture, CapCut's main track - inserted where the playhead
+ /// is (at the nearer edge of the clip under it, the rest of the lane
+ /// moved along to make room) or after the lane's last clip, never past
+ /// it into a gap; a timeline with no picture yet starts one. Anything
+ /// with a sound file in it keeps the desk's rule, on the lowest lane
+ /// free at the playhead for the whole run, since a song inserted into
+ /// the picture would push the cut apart. The playhead goes to the last
+ /// frame of what landed, so the next Add follows on, and the picks are
+ /// let go of.
+ fn add_picked(&mut self, studio: &mut Studio, at_end: bool) {
+ let project = studio.project();
+ let ids = self.picked_in_order(project);
+ if ids.is_empty() {
+ return;
+ }
+ let sound = ids.iter().any(|id| {
+ project
+ .media_by_id(id)
+ .is_some_and(|item| item.kind == model::MediaKind::Audio)
+ });
+ let timeline = studio.timeline();
+ let playhead = f64::from(studio.playhead.max(0.0));
+ let lane = if sound {
+ None
+ } else {
+ timeline.background_lane().map(str::to_owned)
+ };
+ let (track_id, start, ripple) = match lane {
+ Some(lane) => {
+ let end = timeline
+ .clips
+ .iter()
+ .filter(|clip| clip.track_id == lane)
+ .map(|clip| clip.start + clip.duration)
+ .fold(0.0, f64::max);
+ // Under a clip, the nearer of its two edges: a playhead a
+ // second into a long take means before it, not after it.
+ let start = if at_end {
+ end
+ } else {
+ timeline
+ .clips
+ .iter()
+ .find(|clip| {
+ clip.track_id == lane
+ && clip.start < playhead
+ && playhead < clip.start + clip.duration
+ })
+ .map_or(playhead.min(end), |clip| {
+ if playhead - clip.start < clip.duration / 2.0 {
+ clip.start
+ } else {
+ clip.start + clip.duration
+ }
+ })
+ };
+ (Some(lane), start, true)
+ }
+ None if at_end && !sound => (None, f64::from(studio.duration()), false),
+ None => (None, playhead, false),
+ };
+ let before: HashSet<String> = timeline.clips.iter().map(|clip| clip.id.clone()).collect();
+ // Onto the timeline: the monitor goes back to it.
+ studio.close_source();
+ studio.apply(Command::AddClipsInSequence {
+ media_ids: ids,
+ track_id,
+ start,
+ ripple,
+ });
+ let landed = studio
+ .timeline()
+ .clips
+ .iter()
+ .filter(|clip| !before.contains(&clip.id))
+ .map(|clip| clip.start + clip.duration)
+ .fold(None, |end: Option<f64>, at| Some(end.map_or(at, |end| end.max(at))));
+ self.selected.clear();
+ self.picked.clear();
+ // A frame short of the end, so the monitor shows the last of what
+ // landed rather than the black past it, and the next Add - nearer
+ // that clip's end than its start - follows on after it.
+ if let Some(end) = landed {
+ let frame = 1.0 / f64::from(studio.frame_rate().max(1.0));
+ studio.seek((end - frame).max(0.0) as f32);
}
}
@@ -253,12 +403,17 @@ impl MediaBin {
/// A click: the one card, or toggled into what is held.
fn select(&mut self, id: String, additive: bool) {
if additive {
- if !self.selected.remove(&id) {
- self.selected.insert(id);
+ if self.selected.remove(&id) {
+ self.picked.retain(|held| *held != id);
+ } else {
+ self.selected.insert(id.clone());
+ self.picked.retain(|held| *held != id);
+ self.picked.push(id);
}
} else {
self.selected.clear();
- self.selected.insert(id);
+ self.selected.insert(id.clone());
+ self.picked = vec![id];
}
}
@@ -321,6 +476,7 @@ impl MediaBin {
/// The cards, as Slint shows them.
pub fn rows(&self, studio: &Studio) -> Vec<MediaItemData> {
+ let order = self.picked_in_order(studio.project());
self.visible(studio.project())
.into_iter()
.map(|item| {
@@ -362,6 +518,10 @@ impl MediaBin {
thumbnail: self.thumbs.get(&item.id).cloned().unwrap_or_default(),
wave,
selected: self.selected.contains(&item.id),
+ pick: order
+ .iter()
+ .position(|id| *id == item.id)
+ .map_or(0, |at| at as i32 + 1),
}
})
.collect()
@@ -496,6 +656,27 @@ mod tests {
assert!(!bin.selected.contains("a"));
}
+ #[test]
+ fn picks_are_numbered_in_the_order_they_were_made() {
+ let mut bin = MediaBin::default();
+ let project = project();
+ bin.select("i1".into(), true);
+ bin.select("v1".into(), true);
+ bin.select("a1".into(), true);
+ assert_eq!(bin.picked_in_order(&project), ["i1", "v1", "a1"]);
+ // Let go of and picked again, it goes to the back of the line.
+ bin.select("i1".into(), true);
+ assert_eq!(bin.picked_in_order(&project), ["v1", "a1"]);
+ bin.select("i1".into(), true);
+ assert_eq!(bin.picked_in_order(&project), ["v1", "a1", "i1"]);
+ // Selected some other way, it follows in the bin's order.
+ bin.selected.insert("v2".into());
+ assert_eq!(bin.picked_in_order(&project), ["v1", "a1", "i1", "v2"]);
+ // A plain click starts over.
+ bin.select("v2".into(), false);
+ assert_eq!(bin.picked_in_order(&project), ["v2"]);
+ }
+
#[test]
fn a_band_walks_the_filtered_grid_and_survives_zero_columns() {
let mut bin = MediaBin::default();
diff --git a/src/crates/concat/ui/editor.slint b/src/crates/concat/ui/editor.slint
index a4638d0c..80fa7d81 100644
--- a/src/crates/concat/ui/editor.slint
+++ b/src/crates/concat/ui/editor.slint
@@ -97,6 +97,11 @@ export global Editor {
callback media-remove(id: int);
callback media-remove-selected();
callback media-activate(id: int);
+ /// The phone's Add: what is picked, in the order it was picked, onto
+ /// the main lane at the playhead - or after its last clip, `at-end`.
+ callback media-add-picked(at-end: bool);
+ /// The phone's Media sheet opened: nothing is picked yet.
+ callback media-clear-picks();
/// Right-click on a card in the bin: Rust fills `menu-items` for the
/// file and bumps `menu-token`, the same round trip as `clip-context`.
callback media-context(id: int);
diff --git a/src/crates/concat/ui/phone/editor.slint b/src/crates/concat/ui/phone/editor.slint
index f133f24e..27293c62 100644
--- a/src/crates/concat/ui/phone/editor.slint
+++ b/src/crates/concat/ui/phone/editor.slint
@@ -55,9 +55,11 @@ import { Sounds, SoundList, VoiceList } from "../workspace/audio-page.slint";
// the way the seats do it; there is no phone-only state on the Rust side
// beyond the two facts named above.
-/// A grid of the bin's cards for a finger: a tap on a card puts the file
-/// on the timeline at the playhead, which on a phone is the whole of what
-/// the bin is for - there is nowhere to drag a card to.
+/// A grid of the bin's cards for a finger. A tap picks a card or lets it
+/// go, and a picked card wears its place in the order - 1, 2, 3 - the way
+/// every phone editor's picker numbers them, since that is the order Add
+/// lays them down in. Five photos are five taps and an Add, not five trips
+/// in and out of the sheet; there is nowhere to drag a card to.
component PhoneMediaGrid inherits Rectangle {
in property <[MediaItemData]> items;
@@ -81,8 +83,32 @@ component PhoneMediaGrid inherits Rectangle {
item: entry;
removable: false;
+ // A second tap toggles back; a double tap is two taps, not a third
+ // thing.
clicked(additive) => { root.picked(entry.id); }
- activated => { root.picked(entry.id); }
+ }
+
+ // The pick's mark, over the picture's corner. Draws only: the card under
+ // it takes the tap. Empty for a card not picked, so it reads as
+ // something to tap.
+ for entry[index] in root.items: Rectangle {
+ x: Math.mod(index, root.cols) * (root.card-w + root.gap) + root.card-w - self.width - 6px;
+ y: Math.floor(index / root.cols) * (root.card-h + root.gap) + 6px;
+ width: 24px;
+ height: 24px;
+ border-radius: 12px;
+ background: entry.pick > 0 ? Theme.accent : #00000059;
+ border-width: entry.pick > 0 ? 0px : 1.5px;
+ border-color: #ffffffd9;
+
+ if entry.pick > 0: Text {
+ text: entry.pick;
+ color: Theme.on-accent;
+ font-size: Theme.fs-sm;
+ font-weight: Theme.weight-title;
+ horizontal-alignment: center;
+ vertical-alignment: center;
+ }
}
}
@@ -356,6 +382,9 @@ export component PhoneEditor inherits Rectangle {
changed close-asked => { root.hide(); }
/// The Audio sheet's shelf: 0 my sounds, 1 voices, 2 styles.
property <int> audio-shelf;
+ /// The Media sheet was opened from the lanes' plus: Add goes after the
+ /// main lane's last clip rather than at the playhead.
+ property <bool> media-at-end;
/// The sheet up is one of the clip's, and goes with the clip.
property <bool> sheet-needs-clip;
@@ -389,6 +418,12 @@ export component PhoneEditor inherits Rectangle {
root.sheet = "";
root.sheet-needs-clip = false;
}
+ /// The bin, with nothing picked yet.
+ function show-media(at-end: bool) {
+ Editor.media-clear-picks();
+ root.media-at-end = at-end;
+ root.show("media", false);
+ }
pure function sheet-title(name: string) -> string {
return name == "media" ? I18n.t("common.media")
@@ -426,6 +461,18 @@ export component PhoneEditor inherits Rectangle {
property <length> bar-h: 74px;
property <length> lanes-y: root.height - root.bar-h - root.lanes-h;
property <length> transport-y: root.lanes-y - root.transport-h;
+ /// How tall the sheet is when one is up. The bin's is lower: it is a
+ /// grid to pick from, and the picture is what the picks are judged in.
+ property <length> sheet-h: root.sheet == "media" ? root.height * 0.52 : root.height * 0.6;
+ /// The foot of the monitor: the transport's head, or the sheet's while
+ /// one is up - the monitor shrinks to the room left above the sheet
+ /// rather than going under it, so the whole picture stays in view
+ /// while a sheet works on it.
+ property <length> monitor-foot: root.sheet != ""
+ ? Math.min(root.transport-y, root.height - root.sheet-h)
+ : root.transport-y;
+ /// The Add bar under the bin while something is picked.
+ property <length> add-bar-h: 68px;
// ── the top bar ──────────────────────────────────────────────────
Rectangle {
@@ -529,7 +576,7 @@ export component PhoneEditor inherits Rectangle {
x: 0;
y: root.top-h;
width: root.width;
- height: Math.max(0px, root.transport-y - root.top-h);
+ height: Math.max(0px, root.monitor-foot - root.top-h);
monitor := PreviewPane {
x: 8px;
@@ -708,17 +755,21 @@ export component PhoneEditor inherits Rectangle {
// The stack scrolls here rather than in Rust, as it does in the
// timeline pane and for the same reason: it is a property of
- // looking at the lanes, not of the edit. Clamped on read, so a
- // stack that gets shorter cannot leave the view parked past its
- // end.
- property <length> track-scroll;
+ // looking at the lanes, not of the edit. Measured up from the
+ // foot, where the main lane is: CapCut's main track is the row
+ // always in view, with the overlays stacked above it, and a stack
+ // read from its head left the main lane - the video, and every
+ // picture added to it - below the card once there were four lanes.
+ // Clamped on read, so a stack that gets shorter cannot leave the
+ // view parked past its end.
+ property <length> lift;
property <length> stack-h: Editor.tracks.length > 0
? Editor.tracks[Editor.tracks.length - 1].top
+ Editor.tracks[Editor.tracks.length - 1].height
: 0px;
property <length> overflow: Math.max(0px,
self.stack-h - Math.max(0px, lanes.height - lanes.ruler-height));
- property <length> at: Math.max(0px, Math.min(self.overflow, self.track-scroll));
+ property <length> at: Math.max(0px, self.overflow - Math.min(self.overflow, self.lift));
Rectangle {
x: 8px;
@@ -779,8 +830,8 @@ export component PhoneEditor inherits Rectangle {
}
scrolled(seconds) => { Editor.scrolled(seconds); }
track-scrolled(pixels) => {
- stack.track-scroll = Math.max(0px,
- Math.min(stack.overflow, stack.at + pixels));
+ stack.lift = Math.max(0px,
+ Math.min(stack.overflow, stack.overflow - stack.at - pixels));
}
zoomed(factor, anchor) => { Editor.zoom(factor, anchor); }
drag-hovered(payload, seconds, row) => {
@@ -806,6 +857,34 @@ export component PhoneEditor inherits Rectangle {
wrap: word-wrap;
}
+ // The way in from the lanes: CapCut's plus at the end of the
+ // main track. The bin, and Add lays the picks after the main
+ // lane's last clip, wherever the playhead is.
+ add-media := Rectangle {
+ x: parent.width - self.width - 8px;
+ y: lanes.ruler-height
+ + Math.max(4px, (parent.height - lanes.ruler-height - 50px - self.height) / 2);
+ width: 44px;
+ height: 44px;
+ border-radius: Theme.r;
+ background: add-touch.pressed ? Theme.accent-hover : Theme.accent;
+ drop-shadow-blur: 8px;
+ drop-shadow-color: #00000066;
+
+ Icon {
+ x: (parent.width - self.width) / 2;
+ y: (parent.height - self.height) / 2;
+ glyph: Glyph.plus;
+ size: 20px;
+ weight: 2.4;
+ tint: Theme.on-accent;
+ }
+
+ add-touch := TouchArea {
+ clicked => { root.show-media(true); }
+ }
+ }
+
// The zoom, about the playhead - which is the middle, so the
// cut grows and shrinks around what is under it.
HorizontalLayout {
@@ -856,7 +935,7 @@ export component PhoneEditor inherits Rectangle {
glyph: Glyph.film;
label: I18n.t("common.media");
current: root.sheet == "media";
- clicked => { root.show("media", false); }
+ clicked => { root.show-media(false); }
}
// Beside Media, as CapCut keeps it: the user's own sounds.
ToolItem {
@@ -1114,11 +1193,12 @@ export component PhoneEditor inherits Rectangle {
// panel bound to the Editor global the way the seats bind it; the
// library's pages close themselves once something is placed, so what
// was placed is seen, and the inspector's stay up to be worked in.
- PhoneSheet {
+ sheet := PhoneSheet {
x: 0;
y: 0;
width: root.width;
height: root.height;
+ sheet-height: root.sheet-h;
open: root.sheet != "";
title: root.sheet-title(root.sheet);
closed => { root.hide(); }
@@ -1136,15 +1216,17 @@ export component PhoneEditor inherits Rectangle {
clicked => { Editor.import-media(); }
}
SheetNote {
- text: Editor.media.length == 0
- ? I18n.t("phone.noMediaYet") : I18n.t("phone.tapToAdd");
+ text: Editor.media.length == 0 ? I18n.t("phone.noMediaYet")
+ : root.media-at-end ? I18n.t("phone.pickToAddAtEnd")
+ : I18n.t("phone.pickToAdd");
}
PhoneMediaGrid {
items: Editor.media;
- picked(id) => {
- Editor.media-activate(id);
- root.hide();
- }
+ picked(id) => { Editor.media-select(id, true); }
+ }
+ // Room under the last row for the Add bar over it.
+ if Editor.media-selected-count > 0: Rectangle {
+ height: root.add-bar-h - 12px;
}
}
@@ -1559,6 +1641,49 @@ export component PhoneEditor inherits Rectangle {
}
}
+ // ── the Add bar ──────────────────────────────────────────────────
+ //
+ // Pinned to the foot of the bin while anything is picked, over the
+ // grid rather than in its scroll, so it is under the thumb however far
+ // down the picks are; it follows the sheet when the sheet is dragged.
+ if root.sheet == "media" && Editor.media-selected-count > 0: Rectangle {
+ x: 0;
+ y: root.height - root.add-bar-h + sheet.drag;
+ width: root.width;
+ height: root.add-bar-h;
+ background: Theme.panel;
+
+ Rectangle {
+ x: 0;
+ y: 0;
+ width: parent.width;
+ height: 1px;
+ background: Theme.line;
+ }
+
+ // Swallows the presses around the button, so they do not fall
+ // through to the grid under the bar.
+ TouchArea { }
+
+ HorizontalLayout {
+ padding-left: 12px;
+ padding-right: 12px;
+ padding-top: 12px;
+ padding-bottom: 12px;
+
+ SheetButton {
+ horizontal-stretch: 1;
+ glyph: Glyph.plus;
+ primary: true;
+ label: I18n.t1("phone.addPicked", Editor.media-selected-count);
+ clicked => {
+ Editor.media-add-picked(root.media-at-end);
+ root.hide();
+ }
+ }
+ }
+ }
+
// ── the clip's menu ──────────────────────────────────────────────────
//
// Over everything, so it can hang above the bar. Opened by the token
diff --git a/src/crates/concat/ui/phone/sheet.slint b/src/crates/concat/ui/phone/sheet.slint
index 80f0864c..9feaa309 100644
--- a/src/crates/concat/ui/phone/sheet.slint
+++ b/src/crates/concat/ui/phone/sheet.slint
@@ -29,7 +29,7 @@ export component PhoneSheet inherits Rectangle {
/// How far the header has been dragged down, while it is held: the
/// sheet follows the finger, and past `dismiss-at` on release it is
/// closed, as a phone's sheets are. Zero when nothing is held.
- property <length> drag;
+ out property <length> drag;
property <length> dismiss-at: 80px;
visible: root.open;
diff --git a/src/crates/concat/ui/workspace/media-pane.slint b/src/crates/concat/ui/workspace/media-pane.slint
index ef62cee2..a46d01af 100644
--- a/src/crates/concat/ui/workspace/media-pane.slint
+++ b/src/crates/concat/ui/workspace/media-pane.slint
@@ -75,6 +75,10 @@ export struct MediaItemData {
/// a file should look like itself wherever it is drawn.
wave: string,
selected: bool,
+ /// Where the file is in the order of the selection, from 1, or 0 when
+ /// it is not selected: the number a phone's pick wears, and the order
+ /// Add lays the picks down in.
+ pick: int,
}
// ── the page strip ───────────────────────────────────────────────────────────