diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index b5ff2b8f96..cfa190384b 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -7480,16 +7480,19 @@ CLITransformConfigDef::CLITransformConfigDef() def = this->add("rotate", coFloat); def->label = L("Rotate"); def->tooltip = L("Rotation angle around the Z axis in degrees."); + def->sidetext = "°"; def->set_default_value(new ConfigOptionFloat(0)); def = this->add("rotate_x", coFloat); - def->label = "Rotate around X"; - def->tooltip = "Rotation angle around the X axis in degrees."; + def->label = L("Rotate around X"); + def->tooltip = L("Rotation angle around the X axis in degrees."); + def->sidetext = "°"; def->set_default_value(new ConfigOptionFloat(0)); def = this->add("rotate_y", coFloat); def->label = L("Rotate around Y"); def->tooltip = L("Rotation angle around the Y axis in degrees."); + def->sidetext = "°"; def->set_default_value(new ConfigOptionFloat(0)); def = this->add("scale", coFloat); diff --git a/src/slic3r/GUI/BonjourDialog.cpp b/src/slic3r/GUI/BonjourDialog.cpp index 060643c1ff..db7794a52a 100644 --- a/src/slic3r/GUI/BonjourDialog.cpp +++ b/src/slic3r/GUI/BonjourDialog.cpp @@ -82,8 +82,8 @@ BonjourDialog::BonjourDialog(wxWindow *parent, Slic3r::PrinterTechnology tech) vsizer->Add(list, 1, wxEXPAND | wxALL, em); wxBoxSizer *button_sizer = new wxBoxSizer(wxHORIZONTAL); - button_sizer->Add(new wxButton(this, wxID_OK, "OK"), 0, wxALL, em); - button_sizer->Add(new wxButton(this, wxID_CANCEL, "Cancel"), 0, wxALL, em); + button_sizer->Add(new wxButton(this, wxID_OK, _L("OK")), 0, wxALL, em); + button_sizer->Add(new wxButton(this, wxID_CANCEL, _L("Cancel")), 0, wxALL, em); // ^ Note: The Ok/Cancel labels are translated by wxWidgets vsizer->Add(button_sizer, 0, wxALIGN_CENTER); @@ -260,8 +260,8 @@ IPListDialog::IPListDialog(wxWindow* parent, const wxString& hostname, const std vsizer->Add(m_list, 1, wxEXPAND | wxALL, em); wxBoxSizer* button_sizer = new wxBoxSizer(wxHORIZONTAL); - button_sizer->Add(new wxButton(this, wxID_OK, "OK"), 0, wxALL, em); - button_sizer->Add(new wxButton(this, wxID_CANCEL, "Cancel"), 0, wxALL, em); + button_sizer->Add(new wxButton(this, wxID_OK, _L("OK")), 0, wxALL, em); + button_sizer->Add(new wxButton(this, wxID_CANCEL, _L("Cancel")), 0, wxALL, em); vsizer->Add(button_sizer, 0, wxALIGN_CENTER); SetSizerAndFit(vsizer); diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp index 7fb56a648c..bd7090837c 100644 --- a/src/slic3r/GUI/CreatePresetsDialog.cpp +++ b/src/slic3r/GUI/CreatePresetsDialog.cpp @@ -3572,8 +3572,8 @@ std::string ExportConfigsDialog::initial_file_name(const wxString &path, const s } catch(...) { MessageDialog dlg(this, - _L(wxString::Format("The file: %s \nmay have been opened by another program. \nPlease close it and try again.", - encode_path(printer_export_path.string().c_str()))), + wxString::Format(_L("The file: %s \nmay have been opened by another program. \nPlease close it and try again."), + encode_path(printer_export_path.string().c_str())), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"), wxYES | wxYES_DEFAULT | wxCENTRE); dlg.ShowModal(); return "initial_failed"; diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 81bf088670..dbbf21ad2d 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -347,7 +347,7 @@ public: // Based on Text memDc.SetFont(m_constant_text.based_on_font); - auto bs_version = wxString::Format("Based on PrusaSlicer and BambuStudio").ToStdString(); + auto bs_version = wxString::Format(_L("Based on PrusaSlicer and BambuStudio")).ToStdString(); wxSize based_on_ext = memDc.GetTextExtent(bs_version); wxRect based_on_rect( wxPoint(0, height - based_on_ext.GetHeight() * 2), @@ -2250,7 +2250,7 @@ bool GUI_App::on_init_inner() // Verify resources path const wxString resources_dir = from_u8(Slic3r::resources_dir()); wxCHECK_MSG(wxDirExists(resources_dir), false, - wxString::Format("Resources path does not exist or is not a directory: %s", resources_dir)); + wxString::Format(_L("Resources path does not exist or is not a directory: %s"), resources_dir)); #ifdef __linux__ if (! check_old_linux_datadir(GetAppName())) { diff --git a/src/slic3r/GUI/Jobs/PrintJob.cpp b/src/slic3r/GUI/Jobs/PrintJob.cpp index 5ae4a2dc84..abcca93279 100644 --- a/src/slic3r/GUI/Jobs/PrintJob.cpp +++ b/src/slic3r/GUI/Jobs/PrintJob.cpp @@ -508,7 +508,7 @@ void PrintJob::process(Ctl &ctl) else if (!wxGetApp().app_config->get("lan_mode_only").empty() && wxGetApp().app_config->get("lan_mode_only") == "1") { if (params.password.empty() || params.dev_ip.empty()) { - error_text = wxString::Format("Access code:%s Ip address:%s", params.password, params.dev_ip); + error_text = wxString::Format(_L("Access code:%s IP address:%s"), params.password, params.dev_ip); result = BAMBU_NETWORK_ERR_FTP_UPLOAD_FAILED; } else { @@ -517,7 +517,7 @@ void PrintJob::process(Ctl &ctl) is_try_lan_mode = true; result = m_agent->start_local_print_with_record(params, update_fn, cancel_fn, wait_fn); if (result < 0) { - error_text = wxString::Format("Access code:%s Ip address:%s", params.password, params.dev_ip); + error_text = wxString::Format(_L("Access code:%s IP address:%s"), params.password, params.dev_ip); // try to send with cloud BOOST_LOG_TRIVIAL(warning) << "print_job: use ftp send print failed"; } diff --git a/src/slic3r/GUI/ParamsPanel.cpp b/src/slic3r/GUI/ParamsPanel.cpp index 69048b0f95..8c465dc32c 100644 --- a/src/slic3r/GUI/ParamsPanel.cpp +++ b/src/slic3r/GUI/ParamsPanel.cpp @@ -250,8 +250,8 @@ ParamsPanel::ParamsPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, c - //m_export_to_file = new Button( this, wxT("Export To File"), ""); - //m_import_from_file = new Button( this, wxT("Import From File") ); + //m_export_to_file = new Button( this, _L("Export To File"), ""); + //m_import_from_file = new Button( this, _L("Import From File") ); // Initialize the page. #if __WXOSX__ diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index 520a4bba2c..bedf68e3e4 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -655,7 +655,7 @@ SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, cons e.Skip(); }); - m_button_resume = new Button(this, _L("resume")); + m_button_resume = new Button(this, _L("Resume")); m_button_resume->SetBackgroundColor(btn_bg_white); m_button_resume->SetBorderColor(wxColour(38, 46, 48)); m_button_resume->SetFont(Label::Body_12); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index bc34c656d8..75c15583bb 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -4353,7 +4353,7 @@ if (is_marlin_flavor) // Orca: build missed extruder pages for (auto extruder_idx = m_extruders_count_old; extruder_idx < m_extruders_count; ++extruder_idx) { // auto extruder_idx = 0; - const wxString& page_name = wxString::Format("Extruder %d", int(extruder_idx + 1)); + const wxString& page_name = wxString::Format(_L("Extruder %d"), int(extruder_idx + 1)); bool page_exist = false; for (auto page_temp : m_pages) { if (page_temp->title() == page_name) { @@ -4365,7 +4365,7 @@ if (is_marlin_flavor) if (!page_exist) { //# build page - //const wxString& page_name = wxString::Format("Extruder %d", int(extruder_idx + 1)); + //const wxString& page_name = wxString::Format(_L("Extruder %d"), int(extruder_idx + 1)); auto page = add_options_page(page_name, "custom-gcode_extruder", true); // ORCA: icon only visible on placeholders m_pages.insert(m_pages.begin() + n_before_extruders + extruder_idx, page); diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp index fab48fa679..a800919651 100644 --- a/src/slic3r/GUI/WebViewDialog.cpp +++ b/src/slic3r/GUI/WebViewDialog.cpp @@ -47,25 +47,25 @@ WebViewPanel::WebViewPanel(wxWindow *parent) // Create the button bSizer_toolbar = new wxBoxSizer(wxHORIZONTAL); - m_button_back = new wxButton(this, wxID_ANY, wxT("Back"), wxDefaultPosition, wxDefaultSize, 0); + m_button_back = new wxButton(this, wxID_ANY, _L("Back"), wxDefaultPosition, wxDefaultSize, 0); m_button_back->Enable(false); bSizer_toolbar->Add(m_button_back, 0, wxALL, 5); - m_button_forward = new wxButton(this, wxID_ANY, wxT("Forward"), wxDefaultPosition, wxDefaultSize, 0); + m_button_forward = new wxButton(this, wxID_ANY, _L("Forward"), wxDefaultPosition, wxDefaultSize, 0); m_button_forward->Enable(false); bSizer_toolbar->Add(m_button_forward, 0, wxALL, 5); - m_button_stop = new wxButton(this, wxID_ANY, wxT("Stop"), wxDefaultPosition, wxDefaultSize, 0); + m_button_stop = new wxButton(this, wxID_ANY, _L("Stop"), wxDefaultPosition, wxDefaultSize, 0); bSizer_toolbar->Add(m_button_stop, 0, wxALL, 5); - m_button_reload = new wxButton(this, wxID_ANY, wxT("Reload"), wxDefaultPosition, wxDefaultSize, 0); + m_button_reload = new wxButton(this, wxID_ANY, _L("Reload"), wxDefaultPosition, wxDefaultSize, 0); bSizer_toolbar->Add(m_button_reload, 0, wxALL, 5); m_url = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); bSizer_toolbar->Add(m_url, 1, wxALL | wxEXPAND, 5); - m_button_tools = new wxButton(this, wxID_ANY, wxT("Tools"), wxDefaultPosition, wxDefaultSize, 0); + m_button_tools = new wxButton(this, wxID_ANY, _L("Tools"), wxDefaultPosition, wxDefaultSize, 0); bSizer_toolbar->Add(m_button_tools, 0, wxALL, 5); topsizer->Add(bSizer_toolbar, 0, wxEXPAND, 0);