From df4f9d35291a2779a2422f84bd77bfa5134bc4af Mon Sep 17 00:00:00 2001 From: bherbruck Date: Wed, 4 Nov 2026 20:12:36 +0000 Subject: [PATCH] Inspect menu: Component Colors is a normal on/off item with a check mark (#11854) * Inspect menu: Component Colors is a normal on/off item The Component Colors entry in Inspect > Check was labelled "Enable Component Colors" and swapped to "Disable Component Colors" with a different icon while on. It is now labelled "Component Colors" in both states, keeps one icon, and shows a check mark when on, like Draft Analysis and the other toggles beside it. The command id and parameters are unchanged. The now-unused "disable" strings and the colored_components_off icon are removed. Other languages' old "Enable ..." wording is dropped so they fall back to English until retranslated. Co-Authored-By: Claude Opus 5.5 * Keep the Component Colors label in the fully translated catalogs Co-Authored-By: Claude Opus 5.5 * Checkable menu rows tell screen readers whether they are on Co-Authored-By: Claude Opus 5.5 * Georgian: Component Colors loses its Enable/Disable wording Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 --- ATTRIBUTION.md | 1 - assets/icons/ui/design/requested_icons.txt | 1 - .../svg/model/colored_components_off.svg | 21 ---------- assets/locales/ar.json | 3 +- assets/locales/bs.json | 2 - assets/locales/cs.json | 2 - assets/locales/da.json | 2 - assets/locales/de.json | 2 - assets/locales/en-GB.json | 3 +- assets/locales/en.json | 3 +- assets/locales/es.json | 2 - assets/locales/fi.json | 2 - assets/locales/fr.json | 2 - assets/locales/gl.json | 2 - assets/locales/he.json | 3 +- assets/locales/hr.json | 2 - assets/locales/hu.json | 2 - assets/locales/id.json | 2 - assets/locales/it.json | 2 - assets/locales/ja.json | 3 +- assets/locales/ka.json | 3 +- assets/locales/ms.json | 2 - assets/locales/nb.json | 2 - assets/locales/nl.json | 2 - assets/locales/pl.json | 2 - assets/locales/ro.json | 2 - assets/locales/ru.json | 2 - assets/locales/sr.json | 2 - assets/locales/sv.json | 2 - assets/locales/tr.json | 2 - assets/locales/uk.json | 2 - assets/locales/vi.json | 3 +- assets/locales/zh-TW.json | 2 - assets/locales/zh.json | 3 +- crates/engine/src/cmd/component.rs | 2 +- crates/engine/src/cmd/inspect.rs | 2 +- crates/engine/src/cmd/mod.rs | 8 +--- crates/ui-egui/src/toolbar.rs | 38 +++++++++++++------ .../ui-egui/src/viewport_appearance_tests.rs | 20 +++++++--- 39 files changed, 54 insertions(+), 109 deletions(-) delete mode 100644 assets/icons/ui/design/svg/model/colored_components_off.svg diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md index 968aa7257..74ff0494d 100644 --- a/ATTRIBUTION.md +++ b/ATTRIBUTION.md @@ -317,7 +317,6 @@ Editable drawing code, native projects and shipped exports are collected under ` | assets/icons/ui/design/svg/model/circle_ttt.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 | | assets/icons/ui/design/svg/model/coil.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 | | assets/icons/ui/design/svg/model/colored_components.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 | -| assets/icons/ui/design/svg/model/colored_components_off.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 | | assets/icons/ui/design/svg/model/combine.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 | | assets/icons/ui/design/svg/model/component.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 | diff --git a/assets/icons/ui/design/requested_icons.txt b/assets/icons/ui/design/requested_icons.txt index 1e5c788fc..3cbf6d22c 100644 --- a/assets/icons/ui/design/requested_icons.txt +++ b/assets/icons/ui/design/requested_icons.txt @@ -60,7 +60,6 @@ circle_ttt false close false coil false colored_components false -colored_components_off false combine false compare false component false diff --git a/assets/icons/ui/design/svg/model/colored_components_off.svg b/assets/icons/ui/design/svg/model/colored_components_off.svg deleted file mode 100644 index 01565a01b..000000000 --- a/assets/icons/ui/design/svg/model/colored_components_off.svg +++ /dev/null @@ -1,21 +0,0 @@ - - Disable component colors - - - - - - - - - - - - - - - - - - - diff --git a/assets/locales/ar.json b/assets/locales/ar.json index b82c6904b..3ecc59a60 100644 --- a/assets/locales/ar.json +++ b/assets/locales/ar.json @@ -964,8 +964,7 @@ "cmd.inspect_analysis": "تحليل العرض", "cmd.inspect_center_of_mass": "مركز الكتلة", "cmd.inspect_clearance": "الخلوص", - "cmd.inspect_colored_components": "تفعيل ألوان المكوّنات", - "cmd.inspect_colored_components_disable": "تعطيل ألوان المكوّنات", + "cmd.inspect_colored_components": "ألوان المكوّنات", "cmd.inspect_compare": "مقارنة الأجسام", "cmd.inspect_compare_picture": "مقارنة بصورة مرجعية", "cmd.inspect_continuity": "تحليل الاستمرارية", diff --git a/assets/locales/bs.json b/assets/locales/bs.json index c620fbe2d..94e641a35 100644 --- a/assets/locales/bs.json +++ b/assets/locales/bs.json @@ -957,8 +957,6 @@ "cmd.inspect_accessibility": "Analiza dostupnosti", "cmd.inspect_center_of_mass": "Centar mase", "cmd.inspect_clearance": "Provjera zazora", - "cmd.inspect_colored_components": "Omogući boje komponenti", - "cmd.inspect_colored_components_disable": "Onemogući boje komponenti", "cmd.inspect_compare": "Uporedi tijela", "cmd.inspect_compare_picture": "Uporedi sliku", "cmd.inspect_continuity": "Analiza kontinuiteta", diff --git a/assets/locales/cs.json b/assets/locales/cs.json index fe43f6af8..34bb4a41a 100644 --- a/assets/locales/cs.json +++ b/assets/locales/cs.json @@ -957,8 +957,6 @@ "cmd.inspect_accessibility": "Analýza přístupnosti", "cmd.inspect_center_of_mass": "Těžiště", "cmd.inspect_clearance": "Vůle", - "cmd.inspect_colored_components": "Zapnout barvy komponent", - "cmd.inspect_colored_components_disable": "Vypnout barvy komponent", "cmd.inspect_compare": "Porovnat tělesa", "cmd.inspect_compare_picture": "Porovnat obrázek", "cmd.inspect_continuity": "Analýza spojitosti", diff --git a/assets/locales/da.json b/assets/locales/da.json index cb62fd775..f012006b6 100644 --- a/assets/locales/da.json +++ b/assets/locales/da.json @@ -957,8 +957,6 @@ "cmd.inspect_accessibility": "Tilgængelighedsanalyse", "cmd.inspect_center_of_mass": "Massecentrum", "cmd.inspect_clearance": "Frigangskontrol", - "cmd.inspect_colored_components": "Aktivér komponentfarver", - "cmd.inspect_colored_components_disable": "Deaktivér komponentfarver", "cmd.inspect_compare": "Sammenlign emner", "cmd.inspect_compare_picture": "Sammenlign billede", "cmd.inspect_continuity": "Kontinuitetsanalyse", diff --git a/assets/locales/de.json b/assets/locales/de.json index c2148fdee..fd78d9670 100644 --- a/assets/locales/de.json +++ b/assets/locales/de.json @@ -960,8 +960,6 @@ "cmd.inspect_accessibility": "Zugänglichkeitsanalyse", "cmd.inspect_center_of_mass": "Massenschwerpunkt", "cmd.inspect_clearance": "Freiraum", - "cmd.inspect_colored_components": "Komponentenfarben einschalten", - "cmd.inspect_colored_components_disable": "Komponentenfarben ausschalten", "cmd.inspect_compare": "Körper vergleichen", "cmd.inspect_continuity": "Kontinuitätsprüfung", "cmd.inspect_curvature_comb": "Krümmungskamm-Analyse", diff --git a/assets/locales/en-GB.json b/assets/locales/en-GB.json index 85b9dd31b..b524fb023 100644 --- a/assets/locales/en-GB.json +++ b/assets/locales/en-GB.json @@ -22,8 +22,7 @@ "cmd.component_cycle_color": "Cycle Component Colour", "cmd.construct_point_center": "Point At Centre Of Circle/Sphere/Torus", "cmd.inspect_center_of_mass": "Centre of Mass", - "cmd.inspect_colored_components": "Enable Component Colours", - "cmd.inspect_colored_components_disable": "Disable Component Colours", + "cmd.inspect_colored_components": "Component Colours", "cmd.parameters_favorite": "Favourite Parameter", "cmd.render_aging_describe": "Layered Surface Aging", "cmd.render_effects_describe": "Lens and Creative Effects", diff --git a/assets/locales/en.json b/assets/locales/en.json index 532423263..e6e68e6ec 100644 --- a/assets/locales/en.json +++ b/assets/locales/en.json @@ -964,8 +964,7 @@ "cmd.inspect_analysis": "View Analysis", "cmd.inspect_center_of_mass": "Center of Mass", "cmd.inspect_clearance": "Clearance", - "cmd.inspect_colored_components": "Enable Component Colors", - "cmd.inspect_colored_components_disable": "Disable Component Colors", + "cmd.inspect_colored_components": "Component Colors", "cmd.inspect_compare": "Compare Bodies", "cmd.inspect_compare_picture": "Compare Picture", "cmd.inspect_continuity": "Continuity Analysis", diff --git a/assets/locales/es.json b/assets/locales/es.json index f0b61ffec..3cd854ff7 100644 --- a/assets/locales/es.json +++ b/assets/locales/es.json @@ -963,8 +963,6 @@ "cmd.inspect_analysis": "Análisis de vista", "cmd.inspect_center_of_mass": "Centro de masas", "cmd.inspect_clearance": "Holgura", - "cmd.inspect_colored_components": "Activar colores de componente", - "cmd.inspect_colored_components_disable": "Desactivar colores de componente", "cmd.inspect_compare": "Comparar cuerpos", "cmd.inspect_compare_picture": "Comparar imagen", "cmd.inspect_continuity": "Análisis de continuidad", diff --git a/assets/locales/fi.json b/assets/locales/fi.json index a3992cf9e..c549c3b92 100644 --- a/assets/locales/fi.json +++ b/assets/locales/fi.json @@ -964,8 +964,6 @@ "cmd.inspect_analysis": "Näytä analyysi", "cmd.inspect_center_of_mass": "Massakeskipiste", "cmd.inspect_clearance": "Välys", - "cmd.inspect_colored_components": "Ota komponenttivärit käyttöön", - "cmd.inspect_colored_components_disable": "Poista komponenttivärit käytöstä", "cmd.inspect_compare": "Vertaa kappaleita", "cmd.inspect_compare_picture": "Vertaa kuvaa", "cmd.inspect_continuity": "Jatkuvuusanalyysi", diff --git a/assets/locales/fr.json b/assets/locales/fr.json index 7feae89f0..d779b0ae4 100644 --- a/assets/locales/fr.json +++ b/assets/locales/fr.json @@ -956,8 +956,6 @@ "cmd.inspect_accessibility": "Analyse d'accessibilité", "cmd.inspect_center_of_mass": "Centre de gravité", "cmd.inspect_clearance": "Jeu", - "cmd.inspect_colored_components": "Activer les couleurs des composants", - "cmd.inspect_colored_components_disable": "Désactiver les couleurs des composants", "cmd.inspect_compare": "Comparer les corps", "cmd.inspect_compare_picture": "Comparer les images", "cmd.inspect_continuity": "Analyse de continuité", diff --git a/assets/locales/gl.json b/assets/locales/gl.json index c7726c46a..f6c62eb71 100644 --- a/assets/locales/gl.json +++ b/assets/locales/gl.json @@ -957,8 +957,6 @@ "cmd.inspect_accessibility": "Análise de accesibilidade", "cmd.inspect_center_of_mass": "Centro de masas", "cmd.inspect_clearance": "Folga", - "cmd.inspect_colored_components": "Activar as cores dos compoñentes", - "cmd.inspect_colored_components_disable": "Desactivar as cores dos compoñentes", "cmd.inspect_compare": "Comparar corpos", "cmd.inspect_compare_picture": "Comparar a imaxe", "cmd.inspect_continuity": "Análise de continuidade", diff --git a/assets/locales/he.json b/assets/locales/he.json index 2793f7741..502ca0533 100644 --- a/assets/locales/he.json +++ b/assets/locales/he.json @@ -964,8 +964,7 @@ "cmd.inspect_analysis": "ניתוח תצוגה", "cmd.inspect_center_of_mass": "מרכז מסה", "cmd.inspect_clearance": "מרווח", - "cmd.inspect_colored_components": "הפעלת צבעי רכיבים", - "cmd.inspect_colored_components_disable": "ביטול צבעי רכיבים", + "cmd.inspect_colored_components": "צבעי רכיבים", "cmd.inspect_compare": "השוואת גופים", "cmd.inspect_compare_picture": "השוואה לתמונת ייחוס", "cmd.inspect_continuity": "ניתוח רציפות", diff --git a/assets/locales/hr.json b/assets/locales/hr.json index 01836c358..ca40e8df9 100644 --- a/assets/locales/hr.json +++ b/assets/locales/hr.json @@ -957,8 +957,6 @@ "cmd.inspect_accessibility": "Analiza dostupnosti", "cmd.inspect_center_of_mass": "Središte mase", "cmd.inspect_clearance": "Provjera zazora", - "cmd.inspect_colored_components": "Omogući boje komponenti", - "cmd.inspect_colored_components_disable": "Onemogući boje komponenti", "cmd.inspect_compare": "Usporedi tijela", "cmd.inspect_compare_picture": "Usporedi sliku", "cmd.inspect_continuity": "Analiza kontinuiteta", diff --git a/assets/locales/hu.json b/assets/locales/hu.json index bda2dc4e3..7e1283aee 100644 --- a/assets/locales/hu.json +++ b/assets/locales/hu.json @@ -957,8 +957,6 @@ "cmd.inspect_accessibility": "Hozzáférhetőség-elemzés", "cmd.inspect_center_of_mass": "Tömegközéppont", "cmd.inspect_clearance": "Hézag", - "cmd.inspect_colored_components": "Komponensszínek bekapcsolása", - "cmd.inspect_colored_components_disable": "Komponensszínek kikapcsolása", "cmd.inspect_compare": "Testek összehasonlítása", "cmd.inspect_compare_picture": "Kép összehasonlítása", "cmd.inspect_continuity": "Folytonosságelemzés", diff --git a/assets/locales/id.json b/assets/locales/id.json index 4df00ea85..d3b47ba07 100644 --- a/assets/locales/id.json +++ b/assets/locales/id.json @@ -957,8 +957,6 @@ "cmd.inspect_accessibility": "Analisis Aksesibilitas", "cmd.inspect_center_of_mass": "Pusat Massa", "cmd.inspect_clearance": "Kelonggaran", - "cmd.inspect_colored_components": "Aktifkan Warna Komponen", - "cmd.inspect_colored_components_disable": "Nonaktifkan Warna Komponen", "cmd.inspect_compare": "Bandingkan Bodi", "cmd.inspect_compare_picture": "Bandingkan dengan Gambar", "cmd.inspect_continuity": "Analisis Kontinuitas", diff --git a/assets/locales/it.json b/assets/locales/it.json index 244a73c08..62419fc24 100644 --- a/assets/locales/it.json +++ b/assets/locales/it.json @@ -957,8 +957,6 @@ "cmd.inspect_accessibility": "Analisi di accessibilità", "cmd.inspect_center_of_mass": "Centro di massa", "cmd.inspect_clearance": "Distanza libera", - "cmd.inspect_colored_components": "Attiva colori dei componenti", - "cmd.inspect_colored_components_disable": "Disattiva colori dei componenti", "cmd.inspect_compare": "Confronta corpi", "cmd.inspect_compare_picture": "Confronta immagine", "cmd.inspect_continuity": "Analisi di continuità", diff --git a/assets/locales/ja.json b/assets/locales/ja.json index 593c40821..d3f463ada 100644 --- a/assets/locales/ja.json +++ b/assets/locales/ja.json @@ -964,8 +964,7 @@ "cmd.inspect_analysis": "表示解析", "cmd.inspect_center_of_mass": "重心", "cmd.inspect_clearance": "クリアランス", - "cmd.inspect_colored_components": "コンポーネントの色分けを有効化", - "cmd.inspect_colored_components_disable": "コンポーネントの色分けを無効化", + "cmd.inspect_colored_components": "コンポーネントの色分け", "cmd.inspect_compare": "ボディを比較", "cmd.inspect_compare_picture": "参考画像と比較", "cmd.inspect_continuity": "連続性解析", diff --git a/assets/locales/ka.json b/assets/locales/ka.json index 896abe6d8..51cd26ef4 100644 --- a/assets/locales/ka.json +++ b/assets/locales/ka.json @@ -963,8 +963,7 @@ "cmd.inspect_analysis": "ანალიზის ნახვა", "cmd.inspect_center_of_mass": "მასის ცენტრი", "cmd.inspect_clearance": "ღრეჩო", - "cmd.inspect_colored_components": "კომპონენტების ფერების ჩართვა", - "cmd.inspect_colored_components_disable": "კომპონენტების ფერების გამორთვა", + "cmd.inspect_colored_components": "კომპონენტების ფერები", "cmd.inspect_compare": "სხეულების შედარება", "cmd.inspect_compare_picture": "სურათთან შედარება", "cmd.inspect_continuity": "უწყვეტობის ანალიზი", diff --git a/assets/locales/ms.json b/assets/locales/ms.json index 9f63b34f1..dd9e171ab 100644 --- a/assets/locales/ms.json +++ b/assets/locales/ms.json @@ -957,8 +957,6 @@ "cmd.inspect_accessibility": "Analisis Kebolehcapaian", "cmd.inspect_center_of_mass": "Pusat Jisim", "cmd.inspect_clearance": "Kelegaan", - "cmd.inspect_colored_components": "Aktifkan Warna Komponen", - "cmd.inspect_colored_components_disable": "Nyahaktifkan Warna Komponen", "cmd.inspect_compare": "Bandingkan Jasad", "cmd.inspect_compare_picture": "Banding dengan Imej", "cmd.inspect_continuity": "Analisis Keselanjaran", diff --git a/assets/locales/nb.json b/assets/locales/nb.json index 997a1bf7a..20d201214 100644 --- a/assets/locales/nb.json +++ b/assets/locales/nb.json @@ -957,8 +957,6 @@ "cmd.inspect_accessibility": "Tilgjengelighetsanalyse", "cmd.inspect_center_of_mass": "Massesenter", "cmd.inspect_clearance": "Klaring", - "cmd.inspect_colored_components": "Aktiver komponentfarger", - "cmd.inspect_colored_components_disable": "Deaktiver komponentfarger", "cmd.inspect_compare": "Sammenlign kropper", "cmd.inspect_compare_picture": "Sammenlign bilde", "cmd.inspect_continuity": "Kontinuitetsanalyse", diff --git a/assets/locales/nl.json b/assets/locales/nl.json index 6a53a3e10..a6cf36ae1 100644 --- a/assets/locales/nl.json +++ b/assets/locales/nl.json @@ -957,8 +957,6 @@ "cmd.inspect_accessibility": "Toegankelijkheidsanalyse", "cmd.inspect_center_of_mass": "Zwaartepunt", "cmd.inspect_clearance": "Speling", - "cmd.inspect_colored_components": "Componentkleuren inschakelen", - "cmd.inspect_colored_components_disable": "Componentkleuren uitschakelen", "cmd.inspect_compare": "Lichamen vergelijken", "cmd.inspect_compare_picture": "Afbeelding vergelijken", "cmd.inspect_continuity": "Continuïteitsanalyse", diff --git a/assets/locales/pl.json b/assets/locales/pl.json index 7dfaa4671..8424fec9f 100644 --- a/assets/locales/pl.json +++ b/assets/locales/pl.json @@ -934,8 +934,6 @@ "cmd.inspect_accessibility": "Analiza dostępności", "cmd.inspect_center_of_mass": "Środek masy", "cmd.inspect_clearance": "Prześwit", - "cmd.inspect_colored_components": "Włącz kolory komponentów", - "cmd.inspect_colored_components_disable": "Wyłącz kolory komponentów", "cmd.inspect_compare": "Porównaj bryły", "cmd.inspect_continuity": "Analiza ciągłości", "cmd.inspect_curvature_comb": "Analiza grzebienia krzywizny", diff --git a/assets/locales/ro.json b/assets/locales/ro.json index 61c2342e9..1ec62714f 100644 --- a/assets/locales/ro.json +++ b/assets/locales/ro.json @@ -957,8 +957,6 @@ "cmd.inspect_accessibility": "Analiza accesibilității", "cmd.inspect_center_of_mass": "Centru de masă", "cmd.inspect_clearance": "Joc", - "cmd.inspect_colored_components": "Activează culorile componentelor", - "cmd.inspect_colored_components_disable": "Dezactivează culorile componentelor", "cmd.inspect_compare": "Compară corpurile", "cmd.inspect_compare_picture": "Compară imaginea", "cmd.inspect_continuity": "Analiza continuității", diff --git a/assets/locales/ru.json b/assets/locales/ru.json index 07d1bb231..c8d821c68 100644 --- a/assets/locales/ru.json +++ b/assets/locales/ru.json @@ -956,8 +956,6 @@ "cmd.inspect_accessibility": "Анализ доступности", "cmd.inspect_center_of_mass": "Центр масс", "cmd.inspect_clearance": "Зазор", - "cmd.inspect_colored_components": "Включить цвета компонентов", - "cmd.inspect_colored_components_disable": "Отключить цвета компонентов", "cmd.inspect_compare": "Сравнить тела", "cmd.inspect_compare_picture": "Сравнить с изображением", "cmd.inspect_continuity": "Анализ непрерывности", diff --git a/assets/locales/sr.json b/assets/locales/sr.json index fde184562..25ca5fc05 100644 --- a/assets/locales/sr.json +++ b/assets/locales/sr.json @@ -957,8 +957,6 @@ "cmd.inspect_accessibility": "Анализа доступности", "cmd.inspect_center_of_mass": "Центар масе", "cmd.inspect_clearance": "Провера зазора", - "cmd.inspect_colored_components": "Омогући боје компоненти", - "cmd.inspect_colored_components_disable": "Онемогући боје компоненти", "cmd.inspect_compare": "Упореди тела", "cmd.inspect_compare_picture": "Упореди слику", "cmd.inspect_continuity": "Анализа континуитета", diff --git a/assets/locales/sv.json b/assets/locales/sv.json index cc68dca25..3a09a3a10 100644 --- a/assets/locales/sv.json +++ b/assets/locales/sv.json @@ -957,8 +957,6 @@ "cmd.inspect_accessibility": "Tillgänglighetsanalys", "cmd.inspect_center_of_mass": "Masscentrum", "cmd.inspect_clearance": "Frigång", - "cmd.inspect_colored_components": "Aktivera komponentfärger", - "cmd.inspect_colored_components_disable": "Inaktivera komponentfärger", "cmd.inspect_compare": "Jämför kroppar", "cmd.inspect_compare_picture": "Jämför bild", "cmd.inspect_continuity": "Kontinuitetsanalys", diff --git a/assets/locales/tr.json b/assets/locales/tr.json index c1b1d4302..de182e95a 100644 --- a/assets/locales/tr.json +++ b/assets/locales/tr.json @@ -957,8 +957,6 @@ "cmd.inspect_accessibility": "Erişilebilirlik analizi", "cmd.inspect_center_of_mass": "Kütle merkezi", "cmd.inspect_clearance": "Açıklık", - "cmd.inspect_colored_components": "Bileşen Renklerini Etkinleştir", - "cmd.inspect_colored_components_disable": "Bileşen Renklerini Devre Dışı Bırak", "cmd.inspect_compare": "Gövdeleri karşılaştır", "cmd.inspect_compare_picture": "Görüntüyle karşılaştır", "cmd.inspect_continuity": "Süreklilik kontrolü", diff --git a/assets/locales/uk.json b/assets/locales/uk.json index 7a0974b25..43c5173b9 100644 --- a/assets/locales/uk.json +++ b/assets/locales/uk.json @@ -963,8 +963,6 @@ "cmd.inspect_analysis": "Перегляд аналізу", "cmd.inspect_center_of_mass": "Центр мас", "cmd.inspect_clearance": "Зазор", - "cmd.inspect_colored_components": "Увімкнути кольори компонентів", - "cmd.inspect_colored_components_disable": "Вимкнути кольори компонентів", "cmd.inspect_compare": "Порівняти тіла", "cmd.inspect_compare_picture": "Порівняти зображення", "cmd.inspect_continuity": "Аналіз неперервності", diff --git a/assets/locales/vi.json b/assets/locales/vi.json index a1f5312d9..75943ee58 100644 --- a/assets/locales/vi.json +++ b/assets/locales/vi.json @@ -964,8 +964,7 @@ "cmd.inspect_analysis": "Phân tích khung nhìn", "cmd.inspect_center_of_mass": "Trọng tâm", "cmd.inspect_clearance": "Khoảng cách an toàn", - "cmd.inspect_colored_components": "Bật màu cụm chi tiết", - "cmd.inspect_colored_components_disable": "Tắt màu cụm chi tiết", + "cmd.inspect_colored_components": "Màu cụm chi tiết", "cmd.inspect_compare": "So sánh các thân khối", "cmd.inspect_compare_picture": "So sánh với ảnh tham chiếu", "cmd.inspect_continuity": "Phân tích độ liên tục mặt", diff --git a/assets/locales/zh-TW.json b/assets/locales/zh-TW.json index 24104b2fe..e54d24ffa 100644 --- a/assets/locales/zh-TW.json +++ b/assets/locales/zh-TW.json @@ -957,8 +957,6 @@ "cmd.inspect_accessibility": "可達性分析", "cmd.inspect_center_of_mass": "質心", "cmd.inspect_clearance": "間隙", - "cmd.inspect_colored_components": "啟用元件顏色", - "cmd.inspect_colored_components_disable": "停用元件顏色", "cmd.inspect_compare": "比較實體", "cmd.inspect_compare_picture": "與圖片比較", "cmd.inspect_continuity": "連續性分析", diff --git a/assets/locales/zh.json b/assets/locales/zh.json index b3aa3e6ae..ba3641015 100644 --- a/assets/locales/zh.json +++ b/assets/locales/zh.json @@ -964,8 +964,7 @@ "cmd.inspect_analysis": "视图分析", "cmd.inspect_center_of_mass": "质心", "cmd.inspect_clearance": "间隙", - "cmd.inspect_colored_components": "启用组件颜色", - "cmd.inspect_colored_components_disable": "禁用组件颜色", + "cmd.inspect_colored_components": "组件颜色", "cmd.inspect_compare": "比较实体", "cmd.inspect_compare_picture": "比较参考图", "cmd.inspect_continuity": "连续性分析", diff --git a/crates/engine/src/cmd/component.rs b/crates/engine/src/cmd/component.rs index 9caeb0c5e..97f6a47fb 100644 --- a/crates/engine/src/cmd/component.rs +++ b/crates/engine/src/cmd/component.rs @@ -60,7 +60,7 @@ mod occurrence_tests; pub static COMMANDS: &[CommandSpec] = &[ CommandSpec::new("component.cycle_color", "Cycle Component Color", cycle_color) .icon("colored_components").doc_only() - .params("component: id or name; saves the next identification colour and enables Component Colors; shared by every instance, separate from appearances"), + .params("component: id or name; saves the next identification colour and turns Component Colors on; shared by every instance, separate from appearances"), CommandSpec::new("component.hide_history", "Hide Component History", hide_history) .icon("eye").doc_only() .params("component: id or name; keeps the component's features in the design but leaves them out of the History bar (#10393)"), diff --git a/crates/engine/src/cmd/inspect.rs b/crates/engine/src/cmd/inspect.rs index 5db90bd69..1b78da739 100644 --- a/crates/engine/src/cmd/inspect.rs +++ b/crates/engine/src/cmd/inspect.rs @@ -27,7 +27,7 @@ mod appearance_chain; pub(super) mod appearance_gestures; pub static COMMANDS: &[CommandSpec] = &[ - CommandSpec::new("inspect.colored_components", "Enable Component Colors", colored_components) + CommandSpec::new("inspect.colored_components", "Component Colors", colored_components) .at("SOLID", "INSPECT").icon("colored_components").noundo() .params("enabled?: bool (omitted: toggle); temporary component colours, without changing appearances"), CommandSpec::new("inspect.measure", "Measure", measure) diff --git a/crates/engine/src/cmd/mod.rs b/crates/engine/src/cmd/mod.rs index 250ab5960..46cce46fb 100644 --- a/crates/engine/src/cmd/mod.rs +++ b/crates/engine/src/cmd/mod.rs @@ -261,16 +261,12 @@ impl CommandSpec { } pub fn info(&self, s: &Session) -> CommandInfo { let e = (self.enabled)(s); - let (label, icon) = match self.id { - "inspect.colored_components" if s.colored_components.is_some() => ("Disable Component Colors", "colored_components_off"), - _ => (self.label, self.icon), - }; CommandInfo { id: self.id, - label, + label: self.label, tab: self.tab, panel: self.panel, - icon, + icon: self.icon, shortcut: self.shortcut, params: self.params, enabled: e.is_ok(), diff --git a/crates/ui-egui/src/toolbar.rs b/crates/ui-egui/src/toolbar.rs index 9fa02f9bf..adb030a1b 100644 --- a/crates/ui-egui/src/toolbar.rs +++ b/crates/ui-egui/src/toolbar.rs @@ -1152,16 +1152,26 @@ const PERSISTENT_COMMANDS: &[&str] = &[ "inspect.zebra", ]; +/// Component Colors is a plain on/off display setting: it shows pressed like the effects above, +/// but is no status item (nothing to clear with Esc), so it stays out of the list. +const COMPONENT_COLORS: &str = "inspect.colored_components"; + fn persistent_command(id: &str) -> bool { - PERSISTENT_COMMANDS.contains(&id) + PERSISTENT_COMMANDS.contains(&id) || id == COMPONENT_COLORS } fn persistent_available(app: &SolveApp, id: &str) -> bool { persistent_command(id) && (id != "inspect.section" || app.preferences.viewport_section_status) } -fn persistent_pressed(app: &SolveApp, id: &str) -> bool { - app.preferences.persistent_ribbon_pressed && persistent_available(app, id) && app.session.status_items().iter().any(|item| item.command == id) +pub(crate) fn persistent_pressed(app: &SolveApp, id: &str) -> bool { + app.preferences.persistent_ribbon_pressed + && persistent_available(app, id) + && if id == COMPONENT_COLORS { + app.session.colored_components.is_some() + } else { + app.session.status_items().iter().any(|item| item.command == id) + } } pub(crate) fn persistent_button_name(app: &SolveApp, command: &solidcraft_engine::CommandSpec) -> String { @@ -1171,7 +1181,7 @@ pub(crate) fn persistent_button_name(app: &SolveApp, command: &solidcraft_engine } fn persistent_hint(app: &SolveApp, command: &solidcraft_engine::CommandSpec, enabled: bool) -> Option { - (enabled && persistent_pressed(app, command.id)).then(|| { + (enabled && command.id != COMPONENT_COLORS && persistent_pressed(app, command.id)).then(|| { let name = persistent_button_name(app, command); crate::i18n::Locale::for_language(&app.preferences.language).format("ui.viewport_status_clear_hint", &[("name", &name)]) }) @@ -2608,18 +2618,24 @@ fn dropdown_row( let pin = ui.interact(pr, ui.id().with(("dropdown_pin", c.id)), Sense::click()); let pointer_on = (resp.hovered() || pin.hovered()) && !egui::DragAndDrop::has_any_payload(ui.ctx()); let label = app.tr_label(info.label).to_string(); - resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, ui.is_enabled() && info.enabled, &label)); + let mut checked = None; + if persistent_available(app, c.id) && app.preferences.persistent_ribbon_pressed { + checked = Some(persistent_pressed(app, c.id)); + } + if c.id == "view.shots_strip" { + checked = Some(app.preferences.render_shots_strip); + } + // A checkable row announces its on/off state, since its label no longer says it. + resp.widget_info(|| match checked { + Some(on) => egui::WidgetInfo::selected(egui::WidgetType::Button, ui.is_enabled() && info.enabled, on, &label), + None => egui::WidgetInfo::labeled(egui::WidgetType::Button, ui.is_enabled() && info.enabled, &label), + }); crate::scenario::publish_handle(&format!("toolbar:{}", c.id), rect.center()); crate::scenario::publish_handle(&format!("dropdown:{}", c.id), rect.center()); let hot = info.enabled && (pointer_on || resp.has_focus()); let mut row = crate::ui_kit::MenuItem::new(c.id, &label, info.icon); row.enabled = info.enabled; - if persistent_available(app, c.id) && app.preferences.persistent_ribbon_pressed { - row.checked = Some(persistent_pressed(app, c.id)); - } - if c.id == "view.shots_strip" { - row.checked = Some(app.preferences.render_shots_strip); - } + row.checked = checked; row.highlighted = hot || revealed.is_some(); let shortcut = crate::keymap::display_for(app, c.id).unwrap_or_default(); row.shortcut = &shortcut; diff --git a/crates/ui-egui/src/viewport_appearance_tests.rs b/crates/ui-egui/src/viewport_appearance_tests.rs index 6b7ccf116..6f8e75ccd 100644 --- a/crates/ui-egui/src/viewport_appearance_tests.rs +++ b/crates/ui-egui/src/viewport_appearance_tests.rs @@ -412,6 +412,12 @@ fn cancelling_theme_preview_restores_viewport_palette_keys() { assert_ne!(keys(&h.app), first); } +/// The on/off state a screen reader hears for the widget labelled `label`. +fn announced_state(h: &crate::scenario::Harness, label: &str) -> Option { + let tree = h.output.accesskit_update.as_ref().unwrap(); + tree.nodes.iter().find(|(_, n)| n.label() == Some(label)).and_then(|(_, n)| n.toggled()) +} + #[test] fn inspect_menu_toggles_component_colors_without_a_dialog_and_refreshes_scene() { let mut h = crate::scenario::Harness::new(); @@ -419,26 +425,30 @@ fn inspect_menu_toggles_component_colors_without_a_dialog_and_refreshes_scene() h.frames(3); let command = solidcraft_engine::find_command("inspect.colored_components").unwrap(); let info = command.info(&h.app.session); - assert_eq!((info.label, info.icon), ("Enable Component Colors", "colored_components")); + assert_eq!((info.label, info.icon), ("Component Colors", "colored_components")); h.step(&json!({"click": {"handle": "tab:INSPECT"}})).unwrap(); h.frames(2); let original_key = super::scene_key(&h.app); h.step(&json!({"click": {"handle": "panel:INSPECT:CHECK"}})).unwrap(); h.frames(2); - assert!(h.widget("Enable Component Colors").is_some()); + assert!(h.widget("Component Colors").is_some()); + assert!(!crate::toolbar::persistent_pressed(&h.app, "inspect.colored_components")); + assert_eq!(announced_state(&h, "Component Colors"), Some(egui::accesskit::Toggled::False)); h.step(&json!({"click": {"handle": "dropdown:inspect.colored_components"}})).unwrap(); assert!(h.app.session.colored_components.is_some()); assert!(h.app.dialog.is_none()); assert_ne!(super::scene_key(&h.app), original_key); let info = command.info(&h.app.session); - assert_eq!((info.label, info.icon), ("Disable Component Colors", "colored_components_off")); + assert_eq!((info.label, info.icon), ("Component Colors", "colored_components")); h.step(&json!({"click": {"handle": "panel:INSPECT:CHECK"}})).unwrap(); h.frames(2); - assert!(h.widget("Disable Component Colors").is_some()); + assert!(h.widget("Component Colors").is_some()); + assert!(crate::toolbar::persistent_pressed(&h.app, "inspect.colored_components")); + assert_eq!(announced_state(&h, "Component Colors"), Some(egui::accesskit::Toggled::True)); h.step(&json!({"click": {"handle": "dropdown:inspect.colored_components"}})).unwrap(); assert!(h.app.session.colored_components.is_none()); let info = command.info(&h.app.session); - assert_eq!((info.label, info.icon), ("Enable Component Colors", "colored_components")); + assert_eq!((info.label, info.icon), ("Component Colors", "colored_components")); } /// Every shape the last frame painted in `colour`: point squares, glyph outlines, dimension