From d833ab7d48729b527748662872df1ec33567b5ab Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Mon, 13 Jan 2025 20:47:34 +0800 Subject: [PATCH] FIX: fix some translation and style issues jira: STUDIO-9777 & STUDIO-9726 & STUDIO-9717 & STUDIO-9720 Change-Id: I05e6df6bb1416988a1862fc589058241d5344a58 --- src/slic3r/GUI/CaliHistoryDialog.cpp | 6 ++-- .../GUI/CalibrationWizardPresetPage.cpp | 28 +++++++++---------- src/slic3r/GUI/CalibrationWizardSavePage.cpp | 8 +++--- src/slic3r/GUI/GUI_Factories.cpp | 16 +++++------ src/slic3r/GUI/WipeTowerDialog.cpp | 2 +- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/slic3r/GUI/CaliHistoryDialog.cpp b/src/slic3r/GUI/CaliHistoryDialog.cpp index 0d8b09327..e7fac8ba5 100644 --- a/src/slic3r/GUI/CaliHistoryDialog.cpp +++ b/src/slic3r/GUI/CaliHistoryDialog.cpp @@ -111,7 +111,7 @@ HistoryWindow::HistoryWindow(wxWindow* parent, const std::vector& m_extruder_switch_btn->SetBackgroundColour(wxColour(0, 174, 66)); m_extruder_switch_btn->SetMinSize(wxSize(FromDIP(120), FromDIP(24))); m_extruder_switch_btn->SetMaxSize(wxSize(FromDIP(120), FromDIP(24))); - m_extruder_switch_btn->SetLabels(_L("Left"), _L("Right")); + m_extruder_switch_btn->SetLabels(_L("Left Nozzle"), _L("Right Nozzle")); m_extruder_switch_btn->Bind(wxEVT_TOGGLEBUTTON, &HistoryWindow::on_switch_extruder, this); m_extruder_switch_btn->SetValue(false); scroll_sizer->Add(m_extruder_switch_btn, 0, wxCENTER | wxALL, FromDIP(10)); @@ -733,8 +733,8 @@ NewCalibrationHistoryDialog::NewCalibrationHistoryDialog(wxWindow *parent, const Label *extruder_name_title = new Label(top_panel, _L("Extruder")); m_comboBox_extruder = new ::ComboBox(top_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, NEW_HISTORY_DIALOG_INPUT_SIZE, 0, nullptr, wxCB_READONLY); wxArrayString extruder_items; - extruder_items.push_back("Left"); - extruder_items.push_back("Right"); + extruder_items.push_back(_L("Left")); + extruder_items.push_back(_L("Right")); m_comboBox_extruder->Set(extruder_items); m_comboBox_extruder->SetSelection(-1); flex_sizer->Add(extruder_name_title); diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp index b8bf3787a..c4089c3a8 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp @@ -604,10 +604,10 @@ void CalibrationPresetPage::create_selection_panel(wxWindow* parent) //nozzle_volume_sizer->AddSpacer(FromDIP(10)); wxBoxSizer * type_sizer = new wxBoxSizer(wxHORIZONTAL); - m_left_nozzle_volume_type_sizer = new wxStaticBoxSizer(wxVERTICAL, m_multi_nozzle_info_panel, "Left"); + m_left_nozzle_volume_type_sizer = new wxStaticBoxSizer(wxVERTICAL, m_multi_nozzle_info_panel, _L("Left Nozzle")); { //wxBoxSizer *nozzle_diameter_sizer = new wxBoxSizer(wxHORIZONTAL); - auto nozzle_diameter_text = new Label(m_multi_nozzle_info_panel, _L("Nozzle Diameter"), 0, CALIBRATION_LABEL_SIZE); + auto nozzle_diameter_text = new Label(m_multi_nozzle_info_panel, _L("Nozzle Diameter")); nozzle_diameter_text->SetFont(Label::Head_14); nozzle_diameter_text->Wrap(-1); @@ -621,7 +621,7 @@ void CalibrationPresetPage::create_selection_panel(wxWindow* parent) m_left_nozzle_volume_type_sizer->AddSpacer(FromDIP(5)); //wxBoxSizer *nozzle_volume_sizer = new wxBoxSizer(wxHORIZONTAL); - auto nozzle_volume_type_text = new Label(m_multi_nozzle_info_panel, _L("Nozzle Flow"), 0, CALIBRATION_LABEL_SIZE); + auto nozzle_volume_type_text = new Label(m_multi_nozzle_info_panel, _L("Nozzle Flow")); nozzle_volume_type_text->SetFont(Label::Head_14); nozzle_volume_type_text->Wrap(-1); @@ -638,10 +638,10 @@ void CalibrationPresetPage::create_selection_panel(wxWindow* parent) //m_left_nozzle_volume_type_sizer->Add(nozzle_volume_sizer); } - m_right_nozzle_volume_type_sizer = new wxStaticBoxSizer(wxVERTICAL, m_multi_nozzle_info_panel, "Right"); + m_right_nozzle_volume_type_sizer = new wxStaticBoxSizer(wxVERTICAL, m_multi_nozzle_info_panel, _L("Right Nozzle")); { //wxBoxSizer *nozzle_diameter_sizer = new wxBoxSizer(wxHORIZONTAL); - auto nozzle_diameter_text = new Label(m_multi_nozzle_info_panel, _L("Nozzle Diameter"), 0, CALIBRATION_LABEL_SIZE); + auto nozzle_diameter_text = new Label(m_multi_nozzle_info_panel, _L("Nozzle Diameter")); nozzle_diameter_text->SetFont(Label::Head_14); nozzle_diameter_text->Wrap(-1); @@ -655,7 +655,7 @@ void CalibrationPresetPage::create_selection_panel(wxWindow* parent) m_right_nozzle_volume_type_sizer->AddSpacer(FromDIP(5)); //wxBoxSizer *nozzle_volume_sizer = new wxBoxSizer(wxHORIZONTAL); - auto nozzle_volume_type_text = new Label(m_multi_nozzle_info_panel, _L("Nozzle Flow"), 0, CALIBRATION_LABEL_SIZE); + auto nozzle_volume_type_text = new Label(m_multi_nozzle_info_panel, _L("Nozzle Flow")); nozzle_volume_type_text->SetFont(Label::Head_14); nozzle_volume_type_text->Wrap(-1); @@ -1046,14 +1046,14 @@ void CalibrationPresetPage::create_multi_extruder_filament_list_panel(wxWindow * m_multi_exturder_ams_sizer = new wxBoxSizer(wxHORIZONTAL); if (m_main_extruder_on_left) { - m_main_sizer->GetStaticBox()->SetLabel("Left"); - m_deputy_sizer->GetStaticBox()->SetLabel("Right"); + m_main_sizer->GetStaticBox()->SetLabel(_L("Left Nozzle")); + m_deputy_sizer->GetStaticBox()->SetLabel(_L("Right Nozzle")); m_multi_exturder_ams_sizer->Add(m_main_sizer, 1, wxEXPAND | wxALL | wxALIGN_BOTTOM, 10); m_multi_exturder_ams_sizer->Add(m_deputy_sizer, 1, wxEXPAND | wxALL | wxALIGN_BOTTOM, 10); } else { - m_main_sizer->GetStaticBox()->SetLabel("Right"); - m_deputy_sizer->GetStaticBox()->SetLabel("Left"); + m_main_sizer->GetStaticBox()->SetLabel(_L("Right Nozzle")); + m_deputy_sizer->GetStaticBox()->SetLabel(_L("Left Nozzle")); m_multi_exturder_ams_sizer->Add(m_deputy_sizer, 1, wxEXPAND | wxALL | wxALIGN_BOTTOM, 10); m_multi_exturder_ams_sizer->Add(m_main_sizer, 1, wxEXPAND | wxALL | wxALIGN_BOTTOM, 10); } @@ -2089,8 +2089,8 @@ void CalibrationPresetPage::init_with_machine(MachineObject* obj) m_multi_exturder_ams_sizer->Detach(m_main_sizer); m_multi_exturder_ams_sizer->Detach(m_deputy_sizer); - m_main_sizer->GetStaticBox()->SetLabel("Right"); - m_deputy_sizer->GetStaticBox()->SetLabel("Left"); + m_main_sizer->GetStaticBox()->SetLabel(_L("Right Nozzle")); + m_deputy_sizer->GetStaticBox()->SetLabel(_L("Left Nozzle")); m_multi_exturder_ams_sizer->Add(m_deputy_sizer, 1, wxEXPAND | wxALL | wxALIGN_BOTTOM, 10); m_multi_exturder_ams_sizer->Add(m_main_sizer, 1, wxEXPAND | wxALL | wxALIGN_BOTTOM, 10); @@ -2100,8 +2100,8 @@ void CalibrationPresetPage::init_with_machine(MachineObject* obj) m_multi_exturder_ams_sizer->Detach(m_main_sizer); m_multi_exturder_ams_sizer->Detach(m_deputy_sizer); - m_main_sizer->GetStaticBox()->SetLabel("Left"); - m_deputy_sizer->GetStaticBox()->SetLabel("Right"); + m_main_sizer->GetStaticBox()->SetLabel(_L("Left Nozzle")); + m_deputy_sizer->GetStaticBox()->SetLabel(_L("Right Nozzle")); m_multi_exturder_ams_sizer->Add(m_main_sizer, 1, wxEXPAND | wxALL | wxALIGN_BOTTOM, 10); m_multi_exturder_ams_sizer->Add(m_deputy_sizer, 1, wxEXPAND | wxALL | wxALIGN_BOTTOM, 10); diff --git a/src/slic3r/GUI/CalibrationWizardSavePage.cpp b/src/slic3r/GUI/CalibrationWizardSavePage.cpp index da1c84b7a..9f43facf9 100644 --- a/src/slic3r/GUI/CalibrationWizardSavePage.cpp +++ b/src/slic3r/GUI/CalibrationWizardSavePage.cpp @@ -508,8 +508,8 @@ void CaliPASaveAutoPanel::sync_cali_result_for_multi_extruder(const std::vector< m_multi_extruder_grid_panel->SetSizer(grid_sizer, true); m_multi_extruder_grid_panel->Bind(wxEVT_LEFT_DOWN, [this](auto &e) { SetFocusIgnoringChildren(); }); - wxStaticBoxSizer *left_sizer = new wxStaticBoxSizer(wxVERTICAL, m_multi_extruder_grid_panel, "Left extruder"); - wxStaticBoxSizer *right_sizer = new wxStaticBoxSizer(wxVERTICAL, m_multi_extruder_grid_panel, "Right extruder"); + wxStaticBoxSizer *left_sizer = new wxStaticBoxSizer(wxVERTICAL, m_multi_extruder_grid_panel, _L("Left extruder")); + wxStaticBoxSizer *right_sizer = new wxStaticBoxSizer(wxVERTICAL, m_multi_extruder_grid_panel, _L("Right extruder")); grid_sizer->Add(left_sizer); grid_sizer->AddSpacer(COLUMN_GAP); grid_sizer->Add(right_sizer); @@ -563,9 +563,9 @@ void CaliPASaveAutoPanel::sync_cali_result_for_multi_extruder(const std::vector< } if (extruder_id == 0) { - default_name += L("Right"); + default_name += L("Right Nozzle"); } else if (extruder_id == 1){ - default_name += L("Left"); + default_name += L("Left Nozzle"); } } diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp index 60f1cb9a5..e83501998 100644 --- a/src/slic3r/GUI/GUI_Factories.cpp +++ b/src/slic3r/GUI/GUI_Factories.cpp @@ -1372,6 +1372,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); @@ -1391,14 +1398,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 diff --git a/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp index 0ace08da4..4b10b1cce 100644 --- a/src/slic3r/GUI/WipeTowerDialog.cpp +++ b/src/slic3r/GUI/WipeTowerDialog.cpp @@ -169,7 +169,7 @@ wxBoxSizer* WipingPanel::create_calc_btn_sizer(wxWindow* parent) { calc_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { calc_flushing_volumes(); }); if (m_nozzle_nums == 2) { - ComboBox *extruder_combo = new ComboBox(parent, wxID_ANY, "", wxDefaultPosition, wxSize(FromDIP(100), FromDIP(24)), 0, nullptr, wxCB_READONLY); + ComboBox *extruder_combo = new ComboBox(parent, wxID_ANY, "", wxDefaultPosition, wxSize(FromDIP(130), FromDIP(24)), 0, nullptr, wxCB_READONLY); extruder_combo->AppendString(_L("Left extruder")); extruder_combo->AppendString(_L("Right extruder")); extruder_combo->SetSelection(0);