juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: modify cali text and picture

Browse Source 
jira: STUDIO-8778 STUDIO-8824
Change-Id: Iecb0a52a100c3f0765e5eda07e0ed50226490e42
(cherry picked from commit 16791c72d62eabef96011ddc117b329385c5aa68)
This commit is contained in:
zhimin.zeng
2024-12-27 11:40:20 +08:00
committed by Noisyfox
parent 88938ad5dd
commit e0e6f77d7d
7 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/slic3r/GUI/CaliHistoryDialog.cpp
View File

@@ -311,7 +311,7 @@ void HistoryWindow::sync_history_data() {
gbSizer->Add(title_preset_name, { 0, get_colume_idx(CaliColumnType::Cali_Filament, curr_obj) }, { 1, 1 }, wxBOTTOM, FromDIP(15));
if (curr_obj && curr_obj->is_multi_extruders()) {
auto nozzle_name = new Label(m_history_data_panel, _L("Nozzle"));
auto nozzle_name = new Label(m_history_data_panel, _L("Nozzle Flow"));
nozzle_name->SetFont(Label::Head_14);
gbSizer->Add(nozzle_name, {0, get_colume_idx(CaliColumnType::Cali_Nozzle, curr_obj)}, {1, 1}, wxBOTTOM, FromDIP(15));
}
@@ -876,11 +876,14 @@ void NewCalibrationHistoryDialog::on_ok(wxCommandEvent &event)
});
if (iter != m_history_results.end()) {
MessageDialog msg_dlg(nullptr,
wxString::Format(_L("There is already a historical calibration result with the same name: %s. Only one of the results with the same name "
"is saved. Are you sure you want to override the historical result?"),
m_new_result.name),
wxEmptyString, wxICON_WARNING | wxYES_NO);
wxString duplicate_name_info = wxString::Format(_L("There is already a historical calibration result with the same name: %s. Only one of the results with the same name "
"is saved. Are you sure you want to override the historical result?"), m_new_result.name);
duplicate_name_info = wxString::Format(_L("Within the same extruder, the name(%s) must be unique when the filament type, nozzle diameter, and nozzle flow are the same.\n"
"Are you sure you want to override the historical result?"), m_new_result.name);
MessageDialog msg_dlg(nullptr, duplicate_name_info, wxEmptyString, wxICON_WARNING | wxYES_NO);
if (msg_dlg.ShowModal() != wxID_YES)
return;
}