diff --git a/resources/images/cali_page_after_pa_CN.png b/resources/images/cali_page_after_pa_CN.png new file mode 100644 index 000000000..cecdbd17f Binary files /dev/null and b/resources/images/cali_page_after_pa_CN.png differ diff --git a/resources/images/cali_page_before_pa_CN.png b/resources/images/cali_page_before_pa_CN.png new file mode 100644 index 000000000..549c2eb24 Binary files /dev/null and b/resources/images/cali_page_before_pa_CN.png differ diff --git a/resources/images/cali_page_flow_introduction_CN.png b/resources/images/cali_page_flow_introduction_CN.png new file mode 100644 index 000000000..6f8a1c486 Binary files /dev/null and b/resources/images/cali_page_flow_introduction_CN.png differ diff --git a/resources/images/fd_calibration_manual_result.png b/resources/images/fd_calibration_manual_result.png index c0289b816..efdaff12d 100644 Binary files a/resources/images/fd_calibration_manual_result.png and b/resources/images/fd_calibration_manual_result.png differ diff --git a/resources/images/fd_calibration_manual_result_CN.png b/resources/images/fd_calibration_manual_result_CN.png new file mode 100644 index 000000000..43fb54678 Binary files /dev/null and b/resources/images/fd_calibration_manual_result_CN.png differ diff --git a/resources/images/flow_rate_calibration_coarse_result.png b/resources/images/flow_rate_calibration_coarse_result.png index 46dd6cc9c..274059294 100644 Binary files a/resources/images/flow_rate_calibration_coarse_result.png and b/resources/images/flow_rate_calibration_coarse_result.png differ diff --git a/resources/images/flow_rate_calibration_coarse_result_CN.png b/resources/images/flow_rate_calibration_coarse_result_CN.png new file mode 100644 index 000000000..2a5cef310 Binary files /dev/null and b/resources/images/flow_rate_calibration_coarse_result_CN.png differ diff --git a/resources/images/flow_rate_calibration_fine_result.png b/resources/images/flow_rate_calibration_fine_result.png index bf66abfa7..a8dd84e3b 100644 Binary files a/resources/images/flow_rate_calibration_fine_result.png and b/resources/images/flow_rate_calibration_fine_result.png differ diff --git a/resources/images/flow_rate_calibration_fine_result_CN.png b/resources/images/flow_rate_calibration_fine_result_CN.png new file mode 100644 index 000000000..f750e0568 Binary files /dev/null and b/resources/images/flow_rate_calibration_fine_result_CN.png differ diff --git a/src/slic3r/GUI/CalibrationWizardSavePage.cpp b/src/slic3r/GUI/CalibrationWizardSavePage.cpp index aca08a5ba..48831693f 100644 --- a/src/slic3r/GUI/CalibrationWizardSavePage.cpp +++ b/src/slic3r/GUI/CalibrationWizardSavePage.cpp @@ -516,7 +516,11 @@ void CaliPASaveManualPanel::create_panel(wxWindow* parent) } void CaliPASaveManualPanel::set_save_img() { - m_picture_panel->set_img(create_scaled_bitmap("fd_calibration_manual_result", nullptr, 330)); + if (wxGetApp().app_config->get_language_code() == "zh-cn") { + m_picture_panel->set_img(create_scaled_bitmap("fd_calibration_manual_result_CN", nullptr, 330)); + } else { + m_picture_panel->set_img(create_scaled_bitmap("fd_calibration_manual_result", nullptr, 330)); + } } void CaliPASaveManualPanel::set_default_name(const wxString& name) { @@ -651,7 +655,11 @@ void CaliPASaveP1PPanel::create_panel(wxWindow* parent) } void CaliPASaveP1PPanel::set_save_img() { - m_picture_panel->set_img(create_scaled_bitmap("fd_calibration_manual_result", nullptr, 350)); + if (wxGetApp().app_config->get_language_code() == "zh-cn") { + m_picture_panel->set_img(create_scaled_bitmap("fd_calibration_manual_result_CN", nullptr, 350)); + } else { + m_picture_panel->set_img(create_scaled_bitmap("fd_calibration_manual_result", nullptr, 350)); + } } bool CaliPASaveP1PPanel::get_result(float* out_k, float* out_n){ @@ -1222,7 +1230,11 @@ void CalibrationFlowCoarseSavePage::create_page(wxWindow* parent) } void CalibrationFlowCoarseSavePage::set_save_img() { - m_picture_panel->set_img(create_scaled_bitmap("flow_rate_calibration_coarse_result", nullptr, 350)); + if (wxGetApp().app_config->get_language_code() == "zh-cn") { + m_picture_panel->set_img(create_scaled_bitmap("flow_rate_calibration_coarse_result_CN", nullptr, 350)); + } else { + m_picture_panel->set_img(create_scaled_bitmap("flow_rate_calibration_coarse_result", nullptr, 350)); + } } void CalibrationFlowCoarseSavePage::set_default_name(const wxString& name) { @@ -1352,7 +1364,11 @@ void CalibrationFlowFineSavePage::create_page(wxWindow* parent) } void CalibrationFlowFineSavePage::set_save_img() { - m_picture_panel->set_img(create_scaled_bitmap("flow_rate_calibration_fine_result", nullptr, 350)); + if (wxGetApp().app_config->get_language_code() == "zh-cn") { + m_picture_panel->set_img(create_scaled_bitmap("flow_rate_calibration_fine_result_CN", nullptr, 350)); + } else { + m_picture_panel->set_img(create_scaled_bitmap("flow_rate_calibration_fine_result", nullptr, 350)); + } } void CalibrationFlowFineSavePage::set_default_name(const wxString& name) { diff --git a/src/slic3r/GUI/CalibrationWizardStartPage.cpp b/src/slic3r/GUI/CalibrationWizardStartPage.cpp index 802c40c19..a15d59edf 100644 --- a/src/slic3r/GUI/CalibrationWizardStartPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardStartPage.cpp @@ -89,7 +89,11 @@ void CalibrationPAStartPage::create_page(wxWindow* parent) m_top_sizer->Add(m_when_content); m_top_sizer->AddSpacer(PRESET_GAP); - create_bitmap(parent, "cali_page_before_pa", "cali_page_after_pa"); + if (wxGetApp().app_config->get_language_code() == "zh-cn") { + create_bitmap(parent, "cali_page_before_pa_CN", "cali_page_after_pa_CN"); + } else { + create_bitmap(parent, "cali_page_before_pa", "cali_page_after_pa"); + } m_top_sizer->Add(m_images_sizer, 0, wxALL, 0); m_top_sizer->AddSpacer(PRESET_GAP); @@ -199,7 +203,11 @@ void CalibrationFlowRateStartPage::create_page(wxWindow* parent) m_top_sizer->Add(m_when_content); m_top_sizer->AddSpacer(PRESET_GAP); - create_bitmap(parent, "cali_page_flow_introduction"); + if (wxGetApp().app_config->get_language_code() == "zh-cn") { + create_bitmap(parent, "cali_page_flow_introduction_CN"); + } else { + create_bitmap(parent, "cali_page_flow_introduction"); + } m_top_sizer->Add(m_images_sizer, 0, wxALL, 0); m_top_sizer->AddSpacer(PRESET_GAP); @@ -326,7 +334,11 @@ void CalibrationMaxVolumetricSpeedStartPage::create_page(wxWindow* parent) m_top_sizer->AddSpacer(PRESET_GAP); - create_bitmap(parent, "cali_page_before_pa", "cali_page_after_pa"); + if (wxGetApp().app_config->get_language_code() == "zh-cn") { + create_bitmap(parent, "cali_page_before_pa_CN", "cali_page_after_pa_CN"); + } else { + create_bitmap(parent, "cali_page_before_pa", "cali_page_after_pa"); + } m_top_sizer->Add(m_images_sizer, 0, wxALL, 0);