Strings in code stay English and are the lookup keys; `crates/ui-egui/src/i18n` maps them to display text at render time from one `*.tsv` catalog per language (`LANGUAGES` registry, `tl!`/`t`/`tr`/`tr_ctx`/`tr_id`/`tn`/`fmt`). Command ids, menu paths, `ui.menu.list`, the control channel, the CLI, MCP, status messages and undo labels never see translated text, so agents, scripts and the existing tests are unaffected (under `cargo test` the UI is always English). Wired: in-window menus and the macOS native menu (rebuilt on a language change), dynamic labels (Undo X, Reset X, Last Effect: X as templates), the command palette (matches English and translated text), dock tabs, panel tooltips, the toolbar (category names now cut by characters, not bytes), the dialog frame, the shared widgets, the Preferences dialog, the shortcut editor, the hint and status bars, the Home screen, and the literals of every panel and dialog. Preference `interfaceLanguage` (User Interface › Language): `auto` or a code. `auto` follows `VECTORCRAFT_LOCALE`, `LC_ALL`/`LC_MESSAGES`/`LANG`/`LANGUAGE`, the macOS preferred languages and, on Windows (which sets no `LANG`), the user locale from `HKCU\Control Panel\International`. `zh-TW`/`zh-HK`/`zh-MO`/ `zh-Hant-*` resolve to `zh-hant`; Simplified locales stay English until a `zh-hans` catalog exists. `zh-hant.tsv` (~2,850 rows) is clean-room, in the vocabulary used in Taiwan; terms shared with PhotoCraft reuse its wording, vector terms use everyday vector-drawing vocabulary. Tests: catalog well-formedness (placeholders, ellipses, command ids, no Simplified characters), locale resolution, and two coverage tests that fail when a menu string, panel/tool/preference label, dialog button, hint-bar fragment or `tl!` literal has no row in a language marked `complete_menus`. `VECTORCRAFT_I18N_DUMP=file cargo test -p vectorcraft-ui-egui dump_source_strings` lists the strings for translators. Also: two clippy findings under rustc 1.97 fixed in passing. Integrated with main (squashed onto it, 42 commits on): the Czech interface (#213) moves from its Rust table to `i18n/cs.tsv` on the registry (all 556 rows, Czech plural rule, its menu-coverage and glyph tests kept); Find Font's resolution notes and the canvas context menu's labels are translated and covered by the catalog tests (`menus::CONTEXT_LABELS`); the glyph test checks CJK text only when the craft-fonts build input is embedded (#220 moved the Japanese fonts out of this repository); a language saved by an older version carries over to `interfaceLanguage`; Windows' locale lookup runs reg.exe by its full path. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
125 lines
5.5 KiB
Rust
125 lines
5.5 KiB
Rust
//! Transform dialogs: Move, Rotate, Scale, Reflect and Shear (with Copy; Scale also has Uniform,
|
|
//! Scale Corners and Scale Strokes & Effects).
|
|
|
|
use serde_json::{Value, json};
|
|
|
|
use super::{DialogSpec, form, run_and_close};
|
|
use crate::VectorcraftApp;
|
|
use crate::state::Dialog;
|
|
|
|
pub(super) const SPEC: DialogSpec = DialogSpec { heading: |d| title(&d.kind).into(), body, confirm, ..DialogSpec::FORM };
|
|
|
|
fn title(kind: &str) -> &'static str {
|
|
match kind {
|
|
"move" => tl!("Move"),
|
|
"rotate" => tl!("Rotate"),
|
|
"scale" => tl!("Scale"),
|
|
"reflect" => tl!("Reflect"),
|
|
_ => tl!("Shear"),
|
|
}
|
|
}
|
|
|
|
fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool {
|
|
form::grid(ui, d, app.session.general_unit());
|
|
ui.add_space(6.0);
|
|
if d.kind == "scale" {
|
|
form::check(ui, d, "uniform", tl!("Uniform"));
|
|
scale_options(app, ui, d);
|
|
}
|
|
form::check(ui, d, "copy", tl!("Copy (make a transformed copy)"));
|
|
false
|
|
}
|
|
|
|
/// The scale options: (dialog field, preference, label).
|
|
const SCALE_OPTIONS: [(&str, &str, &str); 2] = [("corners", "scaleCorners", "Scale Corners"), ("strokes", "scaleStrokes", "Scale Strokes & Effects")];
|
|
|
|
/// A scale option's value: the dialog's field, else the preference.
|
|
fn scale_option(app: &VectorcraftApp, d: &Dialog, field: &str) -> bool {
|
|
let prefs = &app.session.prefs;
|
|
d.fields.get(field).and_then(Value::as_bool).unwrap_or(if field == "corners" { prefs.scale_corners } else { prefs.scale_strokes })
|
|
}
|
|
|
|
/// The Scale Corners and Scale Strokes & Effects checkboxes (fields `corners` and `strokes`),
|
|
/// starting from the preferences.
|
|
pub(super) fn scale_options(app: &VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) {
|
|
for (field, _, label) in SCALE_OPTIONS {
|
|
let on = scale_option(app, d, field);
|
|
d.fields.insert(field.into(), Value::Bool(on));
|
|
form::check(ui, d, field, tl!(label));
|
|
}
|
|
}
|
|
|
|
/// Add the dialog's scale options to command `params`.
|
|
pub(super) fn add_scale_options(app: &VectorcraftApp, d: &Dialog, params: &mut Value) {
|
|
for (field, _, _) in SCALE_OPTIONS {
|
|
params[field] = json!(scale_option(app, d, field));
|
|
}
|
|
}
|
|
|
|
/// `params` with the dialog's scale options, which also become the preferences (they are shared
|
|
/// with the Transform panel and Preferences, as in the reference app).
|
|
pub(super) fn with_scale_options(app: &mut VectorcraftApp, d: &Dialog, mut params: Value) -> Result<Value, String> {
|
|
add_scale_options(app, d, &mut params);
|
|
let prefs: serde_json::Map<String, Value> = SCALE_OPTIONS.iter().map(|(field, pref, _)| (pref.to_string(), params[*field].clone())).collect();
|
|
app.run("prefs.set", json!({ "values": prefs }))?;
|
|
Ok(params)
|
|
}
|
|
|
|
/// Pass a tool-chosen reference point (origin) through to transform commands.
|
|
fn origin_params(d: &Dialog, mut p: Value) -> Value {
|
|
if let Some(o) = d.fields.get("origin") {
|
|
p["origin"] = o.clone();
|
|
}
|
|
p
|
|
}
|
|
|
|
fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result<Value, String> {
|
|
let copy = d.bool("copy");
|
|
let (id, params) = match d.kind.as_str() {
|
|
"move" => return run_and_close(app, "object.move", json!({"dx": d.f64("dx", 0.0), "dy": d.f64("dy", 0.0), "copy": copy})),
|
|
"rotate" => ("object.rotate", json!({"angle": d.f64("angle", 0.0), "copy": copy})),
|
|
"scale" => {
|
|
let sx = d.f64("sx", 100.0);
|
|
let sy = if d.bool("uniform") { sx } else { d.f64("sy", 100.0) };
|
|
("object.scale", with_scale_options(app, d, json!({"sx": sx, "sy": sy, "copy": copy}))?)
|
|
}
|
|
"reflect" => ("object.reflect", json!({"axis": d.fields.get("axis").cloned().unwrap_or(json!("vertical")), "copy": copy})),
|
|
_ => ("object.shear", json!({"angle": d.f64("angle", 0.0), "axis": d.str("axis"), "copy": copy})),
|
|
};
|
|
run_and_close(app, id, origin_params(d, params))
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use serde_json::json;
|
|
use vectorcraft_engine::Session;
|
|
|
|
use crate::VectorcraftApp;
|
|
|
|
#[test]
|
|
fn scale_options_start_from_and_update_the_preferences() {
|
|
let mut app = VectorcraftApp::new(Session::new(), Default::default());
|
|
app.run("file.new", json!({"width": 300, "height": 300})).unwrap();
|
|
app.run("shape.rectangle", json!({"x": 0, "y": 0, "width": 50, "height": 50, "radius": 5})).unwrap();
|
|
app.run("select.all", json!({})).unwrap();
|
|
app.run("prefs.set", json!({"values": {"scaleStrokes": true, "scaleCorners": false}})).unwrap();
|
|
crate::menus::invoke(&mut app, "object.scale", json!({}));
|
|
let ctx = egui::Context::default();
|
|
crate::theme::install_fonts(&ctx);
|
|
let mut out = ctx.run_ui(egui::RawInput::default(), |ui| crate::dialogs::show(&mut app, ui.ctx()));
|
|
out.textures_delta.clear();
|
|
let d = app.ui.dialog.as_mut().unwrap();
|
|
assert_eq!((&d.fields["strokes"], &d.fields["corners"]), (&json!(true), &json!(false)));
|
|
d.fields.insert("sx".into(), json!(200));
|
|
d.fields.insert("strokes".into(), json!(false));
|
|
d.fields.insert("corners".into(), json!(true));
|
|
crate::dialogs::confirm(&mut app).unwrap();
|
|
let prefs = &app.session.prefs;
|
|
assert_eq!((prefs.scale_strokes, prefs.scale_corners), (false, true));
|
|
let n = &app.session.doc().unwrap().doc.layers[0].children().unwrap()[0];
|
|
assert_eq!(n.appearance.stroke_width(), 1.0);
|
|
let (cmd, p) = app.session.journal.last().unwrap();
|
|
assert_eq!((cmd.as_str(), &p["strokes"], &p["corners"]), ("object.scale", &json!(false), &json!(true)));
|
|
}
|
|
}
|