Unifying "unretraction" and "deretraction" #3862

Deretraction or unretraction? #3541
This commit is contained in:
Vojtech Bubnik 2020-10-17 21:23:24 +02:00
parent c59db4e7fe
commit f1c9d39302
2 changed files with 3 additions and 3 deletions

View File

@ -2526,7 +2526,7 @@ void GCodeViewer::render_legend() const
// items // items
add_option(EMoveType::Retract, EOptionsColors::Retractions, _u8L("Retractions")); add_option(EMoveType::Retract, EOptionsColors::Retractions, _u8L("Retractions"));
add_option(EMoveType::Unretract, EOptionsColors::Unretractions, _u8L("Unretractions")); add_option(EMoveType::Unretract, EOptionsColors::Unretractions, _u8L("Deretractions"));
add_option(EMoveType::Tool_change, EOptionsColors::ToolChanges, _u8L("Tool changes")); add_option(EMoveType::Tool_change, EOptionsColors::ToolChanges, _u8L("Tool changes"));
add_option(EMoveType::Color_change, EOptionsColors::ColorChanges, _u8L("Color changes")); add_option(EMoveType::Color_change, EOptionsColors::ColorChanges, _u8L("Color changes"));
add_option(EMoveType::Pause_Print, EOptionsColors::PausePrints, _u8L("Pause prints")); add_option(EMoveType::Pause_Print, EOptionsColors::PausePrints, _u8L("Pause prints"));

View File

@ -334,7 +334,7 @@ bool Preview::init(wxWindow* parent, Model* model)
#else #else
m_checkbox_travel = new wxCheckBox(this, wxID_ANY, _(L("Travel"))); m_checkbox_travel = new wxCheckBox(this, wxID_ANY, _(L("Travel")));
m_checkbox_retractions = new wxCheckBox(this, wxID_ANY, _(L("Retractions"))); m_checkbox_retractions = new wxCheckBox(this, wxID_ANY, _(L("Retractions")));
m_checkbox_unretractions = new wxCheckBox(this, wxID_ANY, _(L("Unretractions"))); m_checkbox_unretractions = new wxCheckBox(this, wxID_ANY, _(L("Deretractions")));
m_checkbox_shells = new wxCheckBox(this, wxID_ANY, _(L("Shells"))); m_checkbox_shells = new wxCheckBox(this, wxID_ANY, _(L("Shells")));
m_checkbox_legend = new wxCheckBox(this, wxID_ANY, _(L("Legend"))); m_checkbox_legend = new wxCheckBox(this, wxID_ANY, _(L("Legend")));
m_checkbox_legend->SetValue(true); m_checkbox_legend->SetValue(true);
@ -1470,7 +1470,7 @@ wxString Preview::get_option_type_string(OptionType type) const
{ {
case OptionType::Travel: { return _L("Travel"); } case OptionType::Travel: { return _L("Travel"); }
case OptionType::Retractions: { return _L("Retractions"); } case OptionType::Retractions: { return _L("Retractions"); }
case OptionType::Unretractions: { return _L("Unretractions"); } case OptionType::Unretractions: { return _L("Deretractions"); }
case OptionType::ToolChanges: { return _L("Tool changes"); } case OptionType::ToolChanges: { return _L("Tool changes"); }
case OptionType::ColorChanges: { return _L("Color changes"); } case OptionType::ColorChanges: { return _L("Color changes"); }
case OptionType::PausePrints: { return _L("Pause prints"); } case OptionType::PausePrints: { return _L("Pause prints"); }