FIX: fix some translation and style issues

jira: STUDIO-9777 & STUDIO-9726 & STUDIO-9717 & STUDIO-9720
Change-Id: I05e6df6bb1416988a1862fc589058241d5344a58
(cherry picked from commit d833ab7d48729b527748662872df1ec33567b5ab)
This commit is contained in:
zhimin.zeng
2025-01-13 20:47:34 +08:00
committed by Noisyfox
parent 217084d3c3
commit 3decb8d4af
5 changed files with 30 additions and 30 deletions

View File

@@ -1478,6 +1478,13 @@ void MenuFactory::create_filament_action_menu(bool init, int active_filament_men
[]() { return true; }, m_parent);
}
if (init) {
append_menu_item(
menu, wxID_ANY, _L("Delete"), _L("Delete this filament"), [](wxCommandEvent&) {
plater()->sidebar().delete_filament(-2); }, "menu_delete", nullptr,
[]() { return plater()->sidebar().combos_filament().size() > 1; }, m_parent);
}
const int item_id = menu->FindItem(_L("Delete then replace with"));
if (item_id != wxNOT_FOUND)
menu->Destroy(item_id);
@@ -1497,14 +1504,7 @@ void MenuFactory::create_filament_action_menu(bool init, int active_filament_men
[]() { return true; }, m_parent);
}
append_submenu(menu, sub_menu, wxID_ANY, _L("Delete then replace with"), "", "",
[filaments_cnt]() { return filaments_cnt > 1; }, m_parent, 1);
if (init) {
append_menu_item(
menu, wxID_ANY, _L("Delete"), _L("Delete this filament"), [](wxCommandEvent&) {
plater()->sidebar().delete_filament(-2); }, "menu_delete", nullptr,
[]() { return plater()->sidebar().combos_filament().size() > 1; }, m_parent);
}
[filaments_cnt]() { return filaments_cnt > 1; }, m_parent);
}
//BBS: add part plate related logic