diff --git a/src/slic3r/GUI/CaliHistoryDialog.cpp b/src/slic3r/GUI/CaliHistoryDialog.cpp index 448973583..d4433df17 100644 --- a/src/slic3r/GUI/CaliHistoryDialog.cpp +++ b/src/slic3r/GUI/CaliHistoryDialog.cpp @@ -197,7 +197,7 @@ void HistoryWindow::sync_history_data() { m_history_data_panel->SetSizer(gbSizer, true); - auto title_name = new wxStaticText(m_history_data_panel, wxID_ANY, _L("Filament Brand && Family")); + auto title_name = new wxStaticText(m_history_data_panel, wxID_ANY, _L("Name")); title_name->SetFont(Label::Head_14); gbSizer->Add(title_name, { 0, 0 }, { 1, 1 }, wxBOTTOM, FromDIP(15)); @@ -314,7 +314,7 @@ EditCalibrationHistoryDialog::EditCalibrationHistoryDialog(wxWindow* parent, con flex_sizer->SetFlexibleDirection(wxBOTH); flex_sizer->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); - wxStaticText* name_title = new wxStaticText(top_panel, wxID_ANY, _L("Filament Brand &&\n Family")); + wxStaticText* name_title = new wxStaticText(top_panel, wxID_ANY, _L("Name")); TextInput* name_value = new TextInput(top_panel, m_new_result.name, "", "", wxDefaultPosition, EDIT_HISTORY_DIALOG_INPUT_SIZE, wxTE_PROCESS_ENTER); name_value->GetTextCtrl()->Bind(wxEVT_TEXT_ENTER, [this, name_value](auto& e) { if (!name_value->GetTextCtrl()->GetValue().IsEmpty()) diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp index 3973295ba..0b3db5a3d 100644 --- a/src/slic3r/GUI/CalibrationWizard.cpp +++ b/src/slic3r/GUI/CalibrationWizard.cpp @@ -508,7 +508,7 @@ void PressureAdvanceWizard::on_cali_save() return; } if (save_page->is_all_failed()) { - MessageDialog msg_dlg(nullptr, _L("The failed test result has been droped."), wxEmptyString, wxICON_WARNING | wxOK); + MessageDialog msg_dlg(nullptr, _L("The failed test result has been droped."), wxEmptyString, wxOK); msg_dlg.ShowModal(); show_step(start_step); return; @@ -559,7 +559,7 @@ void PressureAdvanceWizard::on_cali_save() else { assert(false); } - MessageDialog msg_dlg(nullptr, _L("Dynamic Pressure Control calibration result has been saved to the printer"), wxEmptyString, wxICON_WARNING | wxOK); + MessageDialog msg_dlg(nullptr, _L("Dynamic Pressure Control calibration result has been saved to the printer"), wxEmptyString, wxOK); msg_dlg.ShowModal(); } show_step(start_step); @@ -841,7 +841,7 @@ void FlowRateWizard::on_cali_save() return; } if (save_page->is_all_failed()) { - MessageDialog msg_dlg(nullptr, _L("The failed test result has been droped."), wxEmptyString, wxICON_WARNING | wxOK); + MessageDialog msg_dlg(nullptr, _L("The failed test result has been droped."), wxEmptyString, wxOK); msg_dlg.ShowModal(); show_step(start_step); return; @@ -864,7 +864,7 @@ void FlowRateWizard::on_cali_save() } } - MessageDialog msg_dlg(nullptr, _L("Flow rate calibration result has been saved to preset"), wxEmptyString, wxICON_WARNING | wxOK); + MessageDialog msg_dlg(nullptr, _L("Flow rate calibration result has been saved to preset"), wxEmptyString, wxOK); msg_dlg.ShowModal(); } else if (m_cali_method == CalibrationMethod::CALI_METHOD_MANUAL) { @@ -903,7 +903,7 @@ void FlowRateWizard::on_cali_save() return; } - MessageDialog msg_dlg(nullptr, _L("Flow rate calibration result has been saved to preset"), wxEmptyString, wxICON_WARNING | wxOK); + MessageDialog msg_dlg(nullptr, _L("Flow rate calibration result has been saved to preset"), wxEmptyString, wxOK); msg_dlg.ShowModal(); } else { @@ -1172,7 +1172,7 @@ void MaxVolumetricSpeedWizard::on_cali_save() return; } - MessageDialog msg_dlg(nullptr, _L("Max volumetric speed calibration result has been saved to preset"), wxEmptyString, wxICON_WARNING | wxOK); + MessageDialog msg_dlg(nullptr, _L("Max volumetric speed calibration result has been saved to preset"), wxEmptyString, wxOK); msg_dlg.ShowModal(); show_step(start_step); } diff --git a/src/slic3r/GUI/CalibrationWizardPage.cpp b/src/slic3r/GUI/CalibrationWizardPage.cpp index b47f6f6ff..10a13e31e 100644 --- a/src/slic3r/GUI/CalibrationWizardPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPage.cpp @@ -364,6 +364,7 @@ CaliPageCaption::CaliPageCaption(wxWindow* parent, CalibMode cali_mode, m_help_btn = new ScalableButton(this, wxID_ANY, "cali_page_caption_help", wxEmptyString, wxDefaultSize, wxDefaultPosition, wxBU_EXACTFIT | wxNO_BORDER, true, 30); + m_help_btn->Hide(); m_help_btn->SetBackgroundColour(*wxWHITE); caption_sizer->Add(m_help_btn, 0, wxALIGN_CENTER); @@ -438,7 +439,8 @@ void CaliPageCaption::show_prev_btn(bool show) void CaliPageCaption::show_help_icon(bool show) { - m_help_btn->Show(show); + //m_help_btn->Show(show); + m_help_btn->Hide(); } CaliPageStepGuide::CaliPageStepGuide(wxWindow* parent, wxArrayString steps, diff --git a/src/slic3r/GUI/CalibrationWizardSavePage.cpp b/src/slic3r/GUI/CalibrationWizardSavePage.cpp index b2cd7ef6b..b7efac603 100644 --- a/src/slic3r/GUI/CalibrationWizardSavePage.cpp +++ b/src/slic3r/GUI/CalibrationWizardSavePage.cpp @@ -144,6 +144,15 @@ void CaliPASaveAutoPanel::create_panel(wxWindow* parent) m_grid_panel = new wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); m_top_sizer->Add(m_grid_panel, 0, wxALIGN_CENTER); + + m_top_sizer->AddSpacer(PRESET_GAP); + + wxStaticText* naming_hints = new wxStaticText(parent, wxID_ANY, _L("*We recommend you to add brand, materia, type, and even humidity level in the Name")); + naming_hints->SetFont(Label::Body_14); + naming_hints->SetForegroundColour(wxColour(157, 157, 157)); + m_top_sizer->Add(naming_hints, 0, wxALIGN_CENTER, 0); + + m_top_sizer->AddSpacer(FromDIP(20)); } void CaliPASaveAutoPanel::sync_cali_result(const std::vector& cali_result, const std::vector& history_result) @@ -168,7 +177,7 @@ void CaliPASaveAutoPanel::sync_cali_result(const std::vector& cal // hide n value n_title->Hide(); left_title_sizer->Add(n_title, 0, wxALIGN_CENTER | wxBOTTOM, ROW_GAP); - auto brand_title = new wxStaticText(m_grid_panel, wxID_ANY, _L("Brand Name"), wxDefaultPosition, wxDefaultSize, 0); + auto brand_title = new wxStaticText(m_grid_panel, wxID_ANY, _L("Name"), wxDefaultPosition, wxDefaultSize, 0); brand_title->SetFont(Label::Head_14); left_title_sizer->Add(brand_title, 0, wxALIGN_CENTER | wxBOTTOM, ROW_GAP); grid_sizer->Add(left_title_sizer); @@ -437,13 +446,20 @@ void CaliPASaveManualPanel::create_panel(wxWindow* parent) m_top_sizer->AddSpacer(FromDIP(20)); - auto save_text = new wxStaticText(parent, wxID_ANY, _L("Brand Name"), wxDefaultPosition, wxDefaultSize, 0); + auto save_text = new wxStaticText(parent, wxID_ANY, _L("Name"), wxDefaultPosition, wxDefaultSize, 0); save_text->SetFont(Label::Head_14); m_top_sizer->Add(save_text, 0, 0, 0); m_save_name_input = new TextInput(parent, "", "", "", wxDefaultPosition, { CALIBRATION_TEXT_MAX_LENGTH, FromDIP(24) }, 0); m_top_sizer->Add(m_save_name_input, 0, 0, 0); + m_top_sizer->AddSpacer(PRESET_GAP); + + wxStaticText* naming_hints = new wxStaticText(parent, wxID_ANY, _L("*We recommend you to add brand, materia, type, and even humidity level in the Name")); + naming_hints->SetFont(Label::Body_14); + naming_hints->SetForegroundColour(wxColour(157, 157, 157)); + m_top_sizer->Add(naming_hints, 0, wxALIGN_CENTER, 0); + m_top_sizer->AddSpacer(FromDIP(20)); Bind(wxEVT_LEFT_DOWN, [this](auto& e) { @@ -853,7 +869,7 @@ void CalibrationFlowX1SavePage::sync_cali_result(const std::vectorSetFont(Label::Head_14); left_title_sizer->Add(flow_ratio_title, 0, wxALIGN_CENTER | wxBOTTOM, ROW_GAP); - auto brand_title = new wxStaticText(m_grid_panel, wxID_ANY, _L("Brand Name"), wxDefaultPosition, wxDefaultSize, 0); + auto brand_title = new wxStaticText(m_grid_panel, wxID_ANY, _L("Save to Filament Preset"), wxDefaultPosition, wxDefaultSize, 0); brand_title->SetFont(Label::Head_14); left_title_sizer->Add(brand_title, 0, wxALIGN_CENTER | wxBOTTOM, ROW_GAP); grid_sizer->Add(left_title_sizer);