diff --git a/crates/ui-egui/src/dialogs/char_style_options.rs b/crates/ui-egui/src/dialogs/char_style_options.rs index e1f564d08a..2011d2616a 100644 --- a/crates/ui-egui/src/dialogs/char_style_options.rs +++ b/crates/ui-egui/src/dialogs/char_style_options.rs @@ -804,19 +804,19 @@ fn paint_choice(ui: &mut egui::Ui, d: &mut Dialog, key: &str) { /// the stroke Weight and Overprint Fill and Overprint Stroke, each unset or set. pub(crate) fn color_body(ui: &mut egui::Ui, d: &mut Dialog) { egui::Grid::new("character-style-color").num_columns(2).spacing([18.0, 8.0]).show(ui, |ui| { - for (key, caption) in [("fill", tl!("Fill")), ("stroke", tl!("Stroke"))] { + for (key, caption, tint_name) in [("fill", tl!("Fill"), tl!("Fill Tint")), ("stroke", tl!("Stroke"), tl!("Stroke Tint"))] { let row = ui.label(caption); ui.label_inputs_by(row.id, |ui| paint_choice(ui, d, key)); ui.end_row(); let tint_key = format!("{key}_tint"); - let row = ui.label(tl!("Tint")); + ui.label(tl!("Tint")); if d.fields.get(&tint_key).is_none_or(Value::is_null) { d.fields.insert(tint_key.clone(), json!("")); } let linked = d.fields.get(key).and_then(|p| p.get("swatch")).is_some_and(Value::is_string); ui.add_enabled_ui(linked, |ui| { ui.horizontal(|ui| { - ui.label_inputs_by(row.id, |ui| form::text(ui, d, &tint_key, 160.0)); + form::text_named(ui, d, &tint_key, tint_name, 160.0); ui.label("%"); }); }); @@ -1893,6 +1893,46 @@ mod tests { } } + #[test] + fn fill_and_stroke_tint_fields_have_distinct_names() { + use egui::accesskit::Role; + use egui_kittest::kittest::{NodeT, Queryable}; + for new_style in [false, true] { + let mut app = app(); + app.run("swatch.new", json!({"name": "Brand", "color": "#2050a0", "global": true})).unwrap(); + if new_style { + app.run("ui.newCharStyle", json!({})).unwrap(); + } else { + app.run("charStyle.new", json!({"name": "Body", "attrs": {}})).unwrap(); + open(&mut app, "Body").unwrap(); + } + let brand = json!(app.session.doc().unwrap().doc.tint_paint("Brand", 1.0).unwrap()); + { + let d = app.ui.dialog.as_mut().unwrap(); + d.fields.insert("section".into(), json!("color")); + d.fields.insert("fill".into(), brand.clone()); + d.fields.insert("stroke".into(), brand); + } + let mut fonts = false; + let mut h = egui_kittest::Harness::builder().with_size(egui::vec2(1100.0, 900.0)).build_ui_state( + move |ui, app: &mut VectorcraftApp| { + if !std::mem::replace(&mut fonts, true) { + crate::theme::install_fonts(ui.ctx()); + return; + } + super::super::show(app, ui.ctx()); + }, + app, + ); + h.run_steps(4); + for name in ["Fill Tint", "Stroke Tint"] { + let field = h.get_by_role_and_label(Role::TextInput, name); + assert!(!field.accesskit_node().is_disabled(), "new {new_style}: {name} is enabled for a linked swatch"); + } + assert!(h.query_by_role_and_label(Role::TextInput, "Tint").is_none(), "new {new_style}: a field is named only Tint"); + } + } + #[test] fn invalid_number_keeps_last_valid_preview() { let mut app = app(); diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv index b66844e926..602bc20a7c 100644 --- a/crates/ui-egui/src/i18n/bg.tsv +++ b/crates/ui-egui/src/i18n/bg.tsv @@ -3488,6 +3488,8 @@ digits Malayalam Малаялам Tiles are numbered across, then down; leave the range empty for every tile. Плочките се номерират напречно, след това надолу; оставете диапазона празен за всяка плочка. Copies per Sheet (as many as fit, in a grid) Копия на лист (колкото се побират, в мрежа) Tint Оттенък + Fill Tint Оттенък на запълване + Stroke Tint Оттенък на щриха Tip extends past the end point Връхът продължава след крайната точка Tip on the end point Връх върху крайната точка Title Case Заглавни букви diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv index e289743ad9..9dda9c2c98 100644 --- a/crates/ui-egui/src/i18n/bs.tsv +++ b/crates/ui-egui/src/i18n/bs.tsv @@ -2258,6 +2258,8 @@ digits Malayalam Malajalam Green Zelena Shifts the tints of global and spot colors; other colors stay. Pomjera nijanse globalnih i spot boja; ostale boje ostaju. Tint Preliv + Fill Tint Preliv ispune + Stroke Tint Preliv poteza Color Guide Options Opcije vodiča za boje Less Manje Steps: Koraci: diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv index ad709dd8ba..85ceed05f6 100644 --- a/crates/ui-egui/src/i18n/ca.tsv +++ b/crates/ui-egui/src/i18n/ca.tsv @@ -4478,6 +4478,8 @@ digits Malayalam Malaiàlam Tilt Inclinació Time (hhmmss) Hora (hhmmss) Tint To + Fill Tint To de farciment + Stroke Tint To del traç Tint Reduction Reducció de to Tints Tons Tints and Shades Tons i ombres diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index 6b9f9ff82b..4fbbd523f4 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -2285,6 +2285,8 @@ digits Malayalam Malajálamské Green Zelená Shifts the tints of global and spot colors; other colors stay. Posune tóny globálních a přímých barev; ostatní barvy zůstanou. Tint Tón + Fill Tint Tón výplně + Stroke Tint Tón tahu Color Guide Options Možnosti průvodce barvami Less Méně Steps: Kroky: diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv index 74579212b6..15ce8a99ff 100644 --- a/crates/ui-egui/src/i18n/da.tsv +++ b/crates/ui-egui/src/i18n/da.tsv @@ -2091,6 +2091,8 @@ digits Malayalam Malayalam Green Grøn Shifts the tints of global and spot colors; other colors stay. Flytter nuancerne af globale farver og spotfarver; andre farver forbliver uændrede. Tint Nuance + Fill Tint Fyldnuance + Stroke Tint Stregnuance Color Guide Options Indstillinger for farveguide Less Mindre Steps: Trin: diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv index 4a62e92591..b60b622165 100644 --- a/crates/ui-egui/src/i18n/de.tsv +++ b/crates/ui-egui/src/i18n/de.tsv @@ -3520,6 +3520,8 @@ effect Points Punkte Copies per Sheet (as many as fit, in a grid) Kopien pro Blatt (so viele wie passen, im Raster) Gutter: Zwischenraum: Tint Tonwert + Fill Tint Flächentonwert + Stroke Tint Konturtonwert Tip extends past the end point Spitze ragt über den Endpunkt hinaus Tip on the end point Spitze auf dem Endpunkt Title Case Wortanfänge groß diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv index 663fd672a1..c2145c61c7 100644 --- a/crates/ui-egui/src/i18n/el.tsv +++ b/crates/ui-egui/src/i18n/el.tsv @@ -2085,6 +2085,8 @@ font-technology Variable Μεταβλητές Threshold Κατώφλι Tile Παράθεση Tint Χρωματική απόχρωση + Fill Tint Χρωματική απόχρωση γεμίσματος + Stroke Tint Χρωματική απόχρωση περιγράμματος Tolerance Ανοχή Tolerance: Ανοχή: Tool Options… Επιλογές εργαλείου… diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index a999b3e671..f91e8ac2fc 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -3575,6 +3575,8 @@ digits Malayalam Malayálam Copies per Sheet (as many as fit, in a grid) Copias por hoja (tantas como quepan, en cuadrícula) Gutter: Medianil: Tint Matiz + Fill Tint Matiz de relleno + Stroke Tint Matiz de trazo Tip extends past the end point La punta se extiende más allá del punto final Tip on the end point Punta en el punto final Title Case Tipo Título diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv index 38c3caadb6..a8b2062d75 100644 --- a/crates/ui-egui/src/i18n/fi.tsv +++ b/crates/ui-egui/src/i18n/fi.tsv @@ -2244,6 +2244,8 @@ digits Malayalam Malajalam Green Vihreä Shifts the tints of global and spot colors; other colors stay. Siirtää globaalien värien ja spottivärien sävyjä; muut värit säilyvät. Tint Sävy + Fill Tint Täytön sävy + Stroke Tint Viivan sävy Color Guide Options Väriopasteen asetukset Less Vähemmän Steps: Vaiheet: diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index 36970cf631..37fb556c60 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -3566,6 +3566,8 @@ digits Malayalam Malayalam Copies per Sheet (as many as fit, in a grid) Copies par feuille (autant qu’il en tient, en grille) Tiles are numbered across, then down; leave the range empty for every tile. Les carreaux sont numérotés de gauche à droite, puis de haut en bas ; laissez la plage vide pour tous les carreaux. Tint Teinte + Fill Tint Teinte du fond + Stroke Tint Teinte du contour Tip extends past the end point La pointe dépasse le point d’extrémité Tip on the end point Pointe sur le point d’extrémité Title Case Majuscule à chaque mot diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv index 372ff3cb3c..1b8eb92c6b 100644 --- a/crates/ui-egui/src/i18n/hi.tsv +++ b/crates/ui-egui/src/i18n/hi.tsv @@ -4853,6 +4853,8 @@ antiAlias Sharp शार्प Tilt झुकाव Time (hhmmss) समय (hhmms) Tint टिंट + Fill Tint फ़िल टिंट + Stroke Tint स्ट्रोक टिंट Tint Reduction टिंट में कमी Tints टिंट्स Tints and Shades टिंट्स और शेड्स diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv index cd8c4e7aa0..7884c05f6b 100644 --- a/crates/ui-egui/src/i18n/hu.tsv +++ b/crates/ui-egui/src/i18n/hu.tsv @@ -4249,6 +4249,8 @@ mark-style Japanese Japán Tilt Dőlés Copies per Sheet (as many as fit, in a grid) Példány laponként (ahány elfér, rácsban) Tint Tónus + Fill Tint Kitöltés tónusa + Stroke Tint Körvonal tónusa Tints Tónusok Tints and Shades Tónusok és árnyalatok Tips Tippek diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv index 2d1ceb658b..4de51c5496 100644 --- a/crates/ui-egui/src/i18n/id.tsv +++ b/crates/ui-egui/src/i18n/id.tsv @@ -2091,6 +2091,8 @@ digits Malayalam Malayalam Green Hijau Shifts the tints of global and spot colors; other colors stay. Menggeser tint warna global dan warna spot; warna lainnya tetap. Tint Tint + Fill Tint Tint isian + Stroke Tint Tint stroke Color Guide Options Opsi panduan warna Less Lebih sedikit Steps: Langkah: diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index 1635bde5fc..dc8dc1faf5 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -3612,6 +3612,8 @@ digits Malayalam Malayalam Copies per Sheet (as many as fit, in a grid) Copie per foglio (quante ne entrano, in griglia) Gutter: Spazio intermedio: Tint Tinta + Fill Tint Tinta riempimento + Stroke Tint Tinta traccia Tip extends past the end point La punta si estende oltre il punto finale Tip on the end point Punta sul punto finale Title Case Iniziali maiuscole diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index 14c88c5b2a..8935be5296 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -3890,6 +3890,8 @@ file-filter Templates テンプレート Text Wrap Options テキストの回り込みオプション Tile Full Pages ページ全体を分割 Tint 濃度 + Fill Tint 濃度 (塗り) + Stroke Tint 濃度 (線) Tip extends past the end point 先端をパスの端点より先に伸ばす Tip on the end point 先端をパスの端点に合わせる Top 上 diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index 52e0c9042f..64f744b884 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -1995,6 +1995,8 @@ digits Malayalam მალაიალამური Green მწვანე Shifts the tints of global and spot colors; other colors stay. ცვლის გლობალური და სპოტ-ფერების ტონირებებს; სხვა ფერები უცვლელი რჩება. Tint ტონირება + Fill Tint შევსების ტონირება + Stroke Tint კონტურის ტონირება Color Guide Options ფერის გზამკვლევის პარამეტრები Less ნაკლები Steps: ბიჯები: diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index 88936e4fd3..88adb5a86b 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -3878,6 +3878,8 @@ file-filter Templates 템플릿 Text Wrap Options 텍스트 감싸기 옵션 Tile Full Pages 전체 페이지 타일링 Tint 색조 + Fill Tint 칠 색조 + Stroke Tint 선 색조 Tip extends past the end point 끝이 끝점을 지나 연장됨 Tip on the end point 끝이 끝점에 위치 Top 위쪽 diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv index 73b56d7797..ffced05d3c 100644 --- a/crates/ui-egui/src/i18n/nl.tsv +++ b/crates/ui-egui/src/i18n/nl.tsv @@ -2105,6 +2105,8 @@ digits Malayalam Malayalam Green Groen Shifts the tints of global and spot colors; other colors stay. Verschuift de tinten van globale kleuren en spotkleuren; andere kleuren blijven ongewijzigd. Tint Tint + Fill Tint Vultint + Stroke Tint Contourtint Color Guide Options Opties voor kleurengids Less Minder Steps: Stappen: diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index f373c2e713..d73f5ca7e3 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -2201,6 +2201,8 @@ digits Malayalam Malajalam Green Zielony Shifts the tints of global and spot colors; other colors stay. Przesuwa tinty kolorów globalnych i dodatkowych; pozostałe kolory bez zmian. Tint Tinta + Fill Tint Tinta wypełnienia + Stroke Tint Tinta obrysu Color Guide Options Opcje przewodnika kolorów Less Mniej Steps: Kroki: diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv index 07b582ae8e..1cbf595ae9 100644 --- a/crates/ui-egui/src/i18n/pt-br.tsv +++ b/crates/ui-egui/src/i18n/pt-br.tsv @@ -5019,6 +5019,8 @@ axis Both Ambos Text Wrap Options Opções de Quebra de Texto Tile Full Pages Dividir em Páginas Inteiras Tint Tom + Fill Tint Tom de Preenchimento + Stroke Tint Tom do Traçado Tip extends past the end point A ponta se estende além do ponto final Tip on the end point Ponta no ponto final Toolbar: Add Tool Barra de Ferramentas: Adicionar Ferramenta diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index d35bf7fe39..53f1707a79 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -3606,6 +3606,8 @@ digits Malayalam Малаялам Tiles are numbered across, then down; leave the range empty for every tile. Плитки нумеруются слева направо, затем вниз; оставьте диапазон пустым для всех плиток. Copies per Sheet (as many as fit, in a grid) Копий на лист (сколько поместится, сеткой) Tint Оттенок + Fill Tint Оттенок заливки + Stroke Tint Оттенок обводки Tip extends past the end point Кончик выходит за конечную точку Tip on the end point Кончик на конечной точке Title Case Как в заголовке diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv index e813aa138f..3a62522958 100644 --- a/crates/ui-egui/src/i18n/sv.tsv +++ b/crates/ui-egui/src/i18n/sv.tsv @@ -3496,6 +3496,8 @@ digits Malayalam Malayalam Tiles are numbered across, then down; leave the range empty for every tile. Rutorna numreras från vänster till höger och sedan nedåt. Lämna omfånget tomt för att få med alla rutor. Copies per Sheet (as many as fit, in a grid) Kopior per ark (så många som får plats, i ett rutnät) Tint Färgton + Fill Tint Fyllnadsfärgton + Stroke Tint Konturfärgton Tip extends past the end point Spetsen sträcker sig förbi slutpunkten Tip on the end point Spetsen på slutpunkten Title Case Inledande versaler diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv index 5e4c285b27..9e5300b238 100644 --- a/crates/ui-egui/src/i18n/tr.tsv +++ b/crates/ui-egui/src/i18n/tr.tsv @@ -3385,6 +3385,8 @@ digits Malayalam Malayalam tile {number} kiremit {number} Tiles are numbered across, then down; leave the range empty for every tile. Fayanslar önce baştan sonra aşağı doğru numaralandırılır; aralığı her döşeme için boş bırakın. Tint Renk tonu + Fill Tint Dolgu Renk Tonu + Stroke Tint Kontur Renk Tonu Tip extends past the end point İpucu bitiş noktasının ötesine uzanıyor Tip on the end point Bitiş noktasına dair ipucu Title Case Başlık Durumu diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index 82db56ae22..053be196bb 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -3605,6 +3605,8 @@ effect Points Точки Copies per Sheet (as many as fit, in a grid) Копій на аркуш (скільки поміститься, сіткою) Gutter: Проміжок: Tint Відтінок + Fill Tint Відтінок заливки + Stroke Tint Відтінок обведення Tip extends past the end point Кінчик виходить за кінцеву точку Tip on the end point Кінчик на кінцевій точці Title Case Як у заголовку diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv index a41b815c89..7e2989339f 100644 --- a/crates/ui-egui/src/i18n/vi.tsv +++ b/crates/ui-egui/src/i18n/vi.tsv @@ -3952,6 +3952,8 @@ mark-style Japanese Kiểu Nhật Copies per Sheet (as many as fit, in a grid) Nhiều bản sao trên một tờ (xếp vừa bao nhiêu in bấy nhiêu, theo lưới) Gutter: Khoảng cách: Tint Tông màu + Fill Tint Tông màu tô + Stroke Tint Tông màu nét Tints Sắc pha Tints and Shades Sắc pha và bóng Tips Mẹo diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index d1fc2f53d7..14be622f9b 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -3438,6 +3438,8 @@ digits Malayalam 马拉雅拉姆数字 Tiles are numbered across, then down; leave the range empty for every tile. 拼贴先由左至右再由上至下编号；范围留空表示全部拼贴。 Copies per Sheet (as many as fit, in a grid) 每张纸印多份 (尽量排满，按网格排列) Tint 色调 + Fill Tint 填色色调 + Stroke Tint 描边色调 Tip extends past the end point 箭头超出端点 Tip on the end point 箭头位于端点 Title Case 词首大写 diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index 95735aec81..f111796d4c 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -4553,6 +4553,8 @@ digits Malayalam 馬來亞拉姆數字 Copies per Sheet (as many as fit, in a grid) 每張紙印多份 (盡量排滿，以格點排列) Gutter: 間距： Tint 色調 + Fill Tint 填色色調 + Stroke Tint 筆畫色調 Tip extends past the end point 尖端延伸超過終點 Tip on the end point 尖端位於終點 Title Case 標題式大小寫