From 23f7b0735eafbd3056cb1671b8ced82947a5c540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C4=8Cejchan?= Date: Wed, 4 Sep 2024 12:15:41 +0200 Subject: [PATCH] Per-toolhead settings: Update terminology BFW-5985 --- src/gui/MItem_menus.cpp | 7 ++++--- src/gui/screen/toolhead/screen_toolhead_settings.cpp | 8 +++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/gui/MItem_menus.cpp b/src/gui/MItem_menus.cpp index a081965cdd..5657a7e2dc 100644 --- a/src/gui/MItem_menus.cpp +++ b/src/gui/MItem_menus.cpp @@ -151,10 +151,11 @@ void MI_SERIAL_PRINTING_SCREEN_ENABLE::OnChange(size_t old_index) { MI_TOOLHEAD_SETTINGS::MI_TOOLHEAD_SETTINGS() : IWindowMenuItem( #if HAS_TOOLCHANGER() - prusa_toolchanger.get_num_enabled_tools() > 1 ? _("Tools") : _("Tool"), -#else - _("Toolhead"), + prusa_toolchanger.is_toolchanger_enabled() + ? _("Tools") + : #endif + _("Toolhead"), nullptr, is_enabled_t::yes, is_hidden_t::no, expands_t::yes) { } diff --git a/src/gui/screen/toolhead/screen_toolhead_settings.cpp b/src/gui/screen/toolhead/screen_toolhead_settings.cpp index 7f2c445469..6dbd725d21 100644 --- a/src/gui/screen/toolhead/screen_toolhead_settings.cpp +++ b/src/gui/screen/toolhead/screen_toolhead_settings.cpp @@ -179,9 +179,15 @@ ScreenToolheadDetail::ScreenToolheadDetail(Toolhead toolhead) { if (toolhead == all_toolheads) { header.SetText(_("ALL TOOLS")); - } else { + } +#if HAS_TOOLCHANGER() + else if (prusa_toolchanger.is_toolchanger_enabled()) { header.SetText(_("TOOL %d").formatted(title_params, std::get(toolhead) + 1)); } +#endif + else { + header.SetText(_("TOOLHEAD")); + } menu_set_toolhead(container, toolhead);