From dd6a91533d8c2c29bc65b2fc0a8e69269b2afbb0 Mon Sep 17 00:00:00 2001 From: jeromehzl <51324719+jeromehzl@users.noreply.github.com> Date: Thu, 29 Oct 2026 11:49:25 +0000 Subject: [PATCH] Standard parts: Resize Part says what it works on, Parts opens Insert Part (#8735) (#8801) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Resize Part: say what it works on instead of a parameter error; Parts opens the library (#8735) Resize Part (parts.resize) started with no standard part selected, as the ribbon starts it, ran the command with no parameters and showed "`component` must be an id or a name". It now says to select an inserted standard part, and that Scale resizes a body. Parts (parts.library) only listed the library, so its button did nothing: it opens the Insert Part dialog. The German and Dutch button labels said "scale" ("Teil skalieren", "Onderdeel schalen"), like the Scale command: they now say change size. Co-Authored-By: Claude Opus 5.5 * Resize Part: the German label matches the command, and the test checks that nothing ran (#8735) The German ribbon label reads "Bauteilgröße ändern", the name the command, its dialog and its messages already use. The hint for a missing standard part is now one function shared by the ribbon start and the Browser's Change Part Size. The regression test also checks that the design and its history stay as they were and no message carries the command's own error, that a scripted parts.library still only lists the library, and that with a standard part picked Change Part Size opens on it. --------- Co-authored-by: semmelrinde <124386289+semmelrinde@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 --- assets/locales/de.json | 2 +- assets/locales/nl.json | 2 +- .../pending/part-size-needs-a-part.json | 92 +++++++++++++++++++ crates/ui-egui/src/dialogs_part_size.rs | 47 +++++++++- crates/ui-egui/src/dialogs_parts.rs | 4 +- crates/ui-egui/src/lib.rs | 5 + 6 files changed, 148 insertions(+), 4 deletions(-) create mode 100644 assets/locales/pending/part-size-needs-a-part.json diff --git a/assets/locales/de.json b/assets/locales/de.json index a1326d59b..de160c846 100644 --- a/assets/locales/de.json +++ b/assets/locales/de.json @@ -490,7 +490,7 @@ "Report text copied. Paste it into GitHub and submit your report there.": "Berichtstext kopiert. Fügen Sie ihn auf GitHub ein und reichen Sie den Bericht dort ein.", "Reports are public. A GitHub account is required.": "Berichte sind öffentlich. Ein GitHub-Konto ist erforderlich.", "Reset Toolbar": "Symbolleiste zurücksetzen", - "Resize Part": "Teil skalieren", + "Resize Part": "Bauteilgröße ändern", "Restore View": "Ansicht wiederherstellen", "Restore outer boundary": "Äußere Begrenzung wiederherstellen", "Restore the inherited component or physical material appearance": "Das geerbte Erscheinungsbild der Komponente oder des physikalischen Materials wiederherstellen", diff --git a/assets/locales/nl.json b/assets/locales/nl.json index bacf067ca..72639c602 100644 --- a/assets/locales/nl.json +++ b/assets/locales/nl.json @@ -496,7 +496,7 @@ "Report text copied. Paste it into GitHub and submit your report there.": "Rapporttekst gekopieerd. Plak de tekst in GitHub en dien uw rapport daar in.", "Reports are public. A GitHub account is required.": "Rapporten zijn openbaar. Een GitHub-account is vereist.", "Reset Toolbar": "Werkbalk herstellen", - "Resize Part": "Onderdeel schalen", + "Resize Part": "Onderdeelgrootte wijzigen", "Restore View": "Weergave herstellen", "Restore outer boundary": "Buitenste begrenzing herstellen", "Restore the inherited component or physical material appearance": "Het overgeërfde component- of fysieke materiaaluiterlijk herstellen", diff --git a/assets/locales/pending/part-size-needs-a-part.json b/assets/locales/pending/part-size-needs-a-part.json new file mode 100644 index 000000000..a8b9114d6 --- /dev/null +++ b/assets/locales/pending/part-size-needs-a-part.json @@ -0,0 +1,92 @@ +{ + "en": { + "ui.part_size_needs_a_part": "Select an inserted standard part (a screw, nut, washer or pin) to change its size. To make a body larger or smaller, use Scale." + }, + "ar": { + "ui.part_size_needs_a_part": "حدّد قطعة قياسية مُدرجة (برغياً أو صامولة أو حلقة أو مسماراً) لتغيير مقاسها. لتكبير جسم أو تصغيره، استخدم تحجيم." + }, + "bs": { + "ui.part_size_needs_a_part": "Odaberite umetnuti standardni dio (vijak, maticu, podlošku ili zatik) da biste mu promijenili veličinu. Da tijelo povećate ili smanjite, koristite Skaliraj." + }, + "cs": { + "ui.part_size_needs_a_part": "Vyberte vložený normalizovaný díl (šroub, matici, podložku nebo kolík), jehož velikost chcete změnit. Těleso zvětšíte nebo zmenšíte příkazem Měřítko." + }, + "da": { + "ui.part_size_needs_a_part": "Vælg en indsat standarddel (en skrue, møtrik, skive eller stift) for at ændre dens størrelse. Brug Skalering til at gøre et emne større eller mindre." + }, + "de": { + "ui.part_size_needs_a_part": "Wählen Sie ein eingefügtes Standardbauteil (Schraube, Mutter, Scheibe oder Stift) aus, um seine Größe zu ändern. Einen Körper vergrößern oder verkleinern Sie mit Skalieren." + }, + "es": { + "ui.part_size_needs_a_part": "Seleccione una pieza normalizada insertada (un tornillo, una tuerca, una arandela o un pasador) para cambiar su tamaño. Para agrandar o reducir un cuerpo, use Escala." + }, + "fr": { + "ui.part_size_needs_a_part": "Sélectionnez une pièce standard insérée (vis, écrou, rondelle ou goupille) pour changer sa taille. Pour agrandir ou réduire un corps, utilisez Échelle." + }, + "gl": { + "ui.part_size_needs_a_part": "Selecciona unha peza normalizada inserida (un parafuso, unha porca, unha arandela ou un pasador) para cambiar o seu tamaño. Para agrandar ou reducir un corpo, usa Escala." + }, + "he": { + "ui.part_size_needs_a_part": "בחרו חלק סטנדרטי שהוכנס (בורג, אום, דסקית או פין) כדי לשנות את גודלו. כדי להגדיל או להקטין גוף, השתמשו בשינוי קנה מידה." + }, + "hr": { + "ui.part_size_needs_a_part": "Odaberite umetnuti standardni dio (vijak, maticu, podlošku ili zatik) da biste mu promijenili veličinu. Da tijelo povećate ili smanjite, koristite Skaliraj." + }, + "hu": { + "ui.part_size_needs_a_part": "Jelöljön ki egy beillesztett szabványos alkatrészt (csavart, anyát, alátétet vagy csapot) a méretének módosításához. Test nagyításához vagy kicsinyítéséhez használja az Átlépték parancsot." + }, + "id": { + "ui.part_size_needs_a_part": "Pilih part standar yang disisipkan (sekrup, mur, ring, atau pin) untuk mengubah ukurannya. Untuk memperbesar atau memperkecil bodi, gunakan Skala." + }, + "it": { + "ui.part_size_needs_a_part": "Seleziona una parte standard inserita (vite, dado, rondella o spina) per cambiarne le dimensioni. Per ingrandire o rimpicciolire un corpo usa Scala." + }, + "ja": { + "ui.part_size_needs_a_part": "サイズを変更する挿入済みの標準パーツ(ねじ、ナット、座金、ピン)を選択してください。ボディを拡大・縮小するには尺度を使います。" + }, + "ko": { + "ui.part_size_needs_a_part": "크기를 바꿀 삽입된 표준 부품(나사, 너트, 와셔 또는 핀)을 선택하십시오. 바디를 키우거나 줄이려면 축척을 사용하십시오." + }, + "ms": { + "ui.part_size_needs_a_part": "Pilih bahagian piawai yang disisipkan (skru, nat, sesendal atau pin) untuk mengubah saiznya. Untuk membesarkan atau mengecilkan jasad, gunakan Skala." + }, + "nb": { + "ui.part_size_needs_a_part": "Velg en innsatt standarddel (en skrue, mutter, skive eller stift) for å endre størrelsen. Bruk Skaler for å gjøre en kropp større eller mindre." + }, + "nl": { + "ui.part_size_needs_a_part": "Selecteer een ingevoegd standaardonderdeel (een schroef, moer, sluitring of pen) om de grootte te wijzigen. Gebruik Schalen om een lichaam groter of kleiner te maken." + }, + "pl": { + "ui.part_size_needs_a_part": "Zaznacz wstawioną część znormalizowaną (śrubę, nakrętkę, podkładkę lub kołek), aby zmienić jej rozmiar. Aby powiększyć lub pomniejszyć bryłę, użyj polecenia Skala." + }, + "pt-BR": { + "ui.part_size_needs_a_part": "Selecione uma peça padrão inserida (um parafuso, uma porca, uma arruela ou um pino) para alterar o tamanho. Para aumentar ou diminuir um corpo, use Escala." + }, + "ro": { + "ui.part_size_needs_a_part": "Selectați o piesă standard inserată (un șurub, o piuliță, o șaibă sau un știft) pentru a-i schimba dimensiunea. Pentru a mări sau micșora un corp, folosiți Scalare." + }, + "ru": { + "ui.part_size_needs_a_part": "Выберите вставленную стандартную деталь (винт, гайку, шайбу или штифт), чтобы изменить её размер. Чтобы увеличить или уменьшить тело, используйте «Масштаб»." + }, + "sr": { + "ui.part_size_needs_a_part": "Изаберите уметнути стандардни део (завртањ, навртку, подлошку или чивију) да бисте му променили величину. Да тело повећате или смањите, користите Скалирај." + }, + "sv": { + "ui.part_size_needs_a_part": "Välj en infogad standarddel (en skruv, mutter, bricka eller ett stift) för att ändra dess storlek. Använd Skala för att göra en kropp större eller mindre." + }, + "tr": { + "ui.part_size_needs_a_part": "Boyutunu değiştirmek için eklenmiş bir standart parça (vida, somun, pul veya pim) seçin. Bir gövdeyi büyütmek veya küçültmek için Ölçekle'yi kullanın." + }, + "uk": { + "ui.part_size_needs_a_part": "Виберіть вставлену стандартну деталь (гвинт, гайку, шайбу або штифт), щоб змінити її розмір. Щоб збільшити або зменшити тіло, скористайтеся «Масштаб»." + }, + "vi": { + "ui.part_size_needs_a_part": "Hãy chọn một chi tiết tiêu chuẩn đã chèn (vít, đai ốc, vòng đệm hoặc chốt) để đổi kích thước. Để phóng to hoặc thu nhỏ một thân khối, hãy dùng Thay đổi tỷ lệ." + }, + "zh": { + "ui.part_size_needs_a_part": "请选择已插入的标准零件(螺钉、螺母、垫圈或销)以更改其尺寸。要放大或缩小实体,请使用缩放。" + }, + "zh-TW": { + "ui.part_size_needs_a_part": "請選取已插入的標準零件(螺絲、螺帽、墊圈或銷)以變更其尺寸。要放大或縮小實體,請使用縮放。" + } +} diff --git a/crates/ui-egui/src/dialogs_part_size.rs b/crates/ui-egui/src/dialogs_part_size.rs index bad1eb8d7..65584450a 100644 --- a/crates/ui-egui/src/dialogs_part_size.rs +++ b/crates/ui-egui/src/dialogs_part_size.rs @@ -157,10 +157,17 @@ pub fn start(app: &SolveApp, id: &str) -> Option<(Kind, Vec)> { Some((Kind::PartSize(Resize::new(app, selected_component(app)?)?), vec![])) } +/// Change Part Size has no standard part to work on: say what it takes, not the command's +/// "`component` must be an id or a name" (#8735). +pub(crate) fn needs_a_part(app: &mut SolveApp) { + let hint = app.tr("ui.part_size_needs_a_part").to_owned(); + app.set_status(hint, true); +} + /// Select the context menu's exact target before using the normal command-start lifecycle. pub fn open(app: &mut SolveApp, component: u64) { if Resize::new(app, component).is_none() { - app.set_status("Select an inserted standard part to change its size", true); + needs_a_part(app); return; } app.session.selection.clear(); @@ -388,6 +395,44 @@ mod tests { assert!(!context_menu::items(&app, &Target::Component { id: 0 }).iter().any(|i| i.id == "parts.resize")); } + /// Change Part Size started with no standard part selected (nothing, or a plain body), as + /// the command search starts it, says what it works on instead of the command's + /// "`component` must be an id or a name"; Standard Parts opens the Insert Part dialog instead + /// of doing nothing (#8735). + #[test] + fn part_size_without_a_part_explains_itself_and_standard_parts_opens_the_library() { + let mut app = SolveApp::new(Session::default(), crate::Services::default()); + app.run("solid.box", json!({"length": 10, "width": 10, "height": 10})).unwrap(); + let body = app.session.world_state().bodies.first().map(|b| b.name.clone()).unwrap(); + for selection in [vec![], vec![Sel::Body { name: body }]] { + app.session.selection = selection; + app.status = None; + let (doc, undo) = (app.session.doc.clone(), app.session.undo.len()); + app.start("parts.resize"); + assert!(app.dialog.is_none()); + let (text, _, error) = app.status.clone().expect("a status message"); + assert!(error); + assert_eq!(text, app.tr("ui.part_size_needs_a_part")); + // Nothing ran: the design and its history are as they were, and no message carries + // the command's own error. + assert_eq!(app.session.doc, doc); + assert_eq!(app.session.undo.len(), undo); + assert!(app.messages.iter().all(|m| !m.text.contains("must be an id or a name"))); + } + app.session.selection.clear(); + app.start("parts.library"); + assert!(matches!(app.dialog.as_ref().map(|d| &d.kind), Some(Kind::Part(_)))); + + let (mut app, id) = part("hex_nut", "M5", None); + // Run as a command (a script, an agent), Standard Parts still only lists the library. + let listing = app.run("parts.library", json!({})).unwrap(); + assert!(listing.get("families").is_some() && app.dialog.is_none()); + // With a standard part picked, Change Part Size opens on it rather than saying it needs one. + app.tree.picked_components = vec![id]; + app.start("parts.resize"); + assert_eq!(editor(&app).component, id); + } + #[test] fn part_size_cancel_and_preview_do_not_change_the_design_or_history() { let (mut app, id) = part("hex_bolt", "M6", Some(20.0)); diff --git a/crates/ui-egui/src/dialogs_parts.rs b/crates/ui-egui/src/dialogs_parts.rs index bb53b007a..c07b7bb67 100644 --- a/crates/ui-egui/src/dialogs_parts.rs +++ b/crates/ui-egui/src/dialogs_parts.rs @@ -75,7 +75,9 @@ pub struct Pt { /// The dialog for Insert Part. pub fn start(_app: &SolveApp, id: &str) -> Option<(Kind, Vec)> { - matches!(id, "parts.fastener" | "parts.insert").then(|| { + // Standard Parts itself only lists the library: started from the app it opens the dialog + // that shows it (#8735), which did nothing before. + matches!(id, "parts.fastener" | "parts.insert" | "parts.library").then(|| { ( Kind::Part(Pt { family: 0, size: 0, length: None, name: String::new(), picture: None, lib: None }), vec![SelInput::new("Hole (optional)", FACES | EDGES, false)], diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs index 803e95187..c6de10303 100644 --- a/crates/ui-egui/src/lib.rs +++ b/crates/ui-egui/src/lib.rs @@ -1760,6 +1760,11 @@ impl SolveApp { let _ = self.run_heavy(id, json!({})); return; } + // Change Part Size with no standard part selected (its dialog had nothing to open on). + if id == "parts.resize" { + dialogs_part_size::needs_a_part(self); + return; + } let _ = self.run(id, json!({})); }