3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed localization of parameter legends.

Browse Source
This commit is contained in:
bubnikv 2019-05-09 15:13:14 +02:00
parent 400ab5333e
commit b247bbab2e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/Field.cpp
View File

@ -1019,7 +1019,7 @@ void StaticText::BUILD()
if (m_opt.height >= 0) size.SetHeight(m_opt.height*m_em_unit); if (m_opt.height >= 0) size.SetHeight(m_opt.height*m_em_unit);
if (m_opt.width >= 0) size.SetWidth(m_opt.width*m_em_unit); if (m_opt.width >= 0) size.SetWidth(m_opt.width*m_em_unit);
const wxString legend(m_opt.get_default_value<ConfigOptionString>()->value); const wxString legend = wxString::FromUTF8(m_opt.get_default_value<ConfigOptionString>()->value.c_str());
auto temp = new wxStaticText(m_parent, wxID_ANY, legend, wxDefaultPosition, size, wxST_ELLIPSIZE_MIDDLE); auto temp = new wxStaticText(m_parent, wxID_ANY, legend, wxDefaultPosition, size, wxST_ELLIPSIZE_MIDDLE);
temp->SetFont(Slic3r::GUI::wxGetApp().normal_font()); temp->SetFont(Slic3r::GUI::wxGetApp().normal_font());
temp->SetBackgroundStyle(wxBG_STYLE_PAINT); temp->SetBackgroundStyle(wxBG_STYLE_PAINT);

2
src/slic3r/GUI/Field.hpp
View File

@ -465,7 +465,7 @@ public:
void set_value(const std::string& value, bool change_event = false) { void set_value(const std::string& value, bool change_event = false) {
m_disable_change_event = !change_event; m_disable_change_event = !change_event;
dynamic_cast<wxStaticText*>(window)->SetLabel(value); dynamic_cast<wxStaticText*>(window)->SetLabel(wxString::FromUTF8(value.data()));
m_disable_change_event = false; m_disable_change_event = false;
} }
void set_value(const boost::any& value, bool change_event = false) { void set_value(const boost::any& value, bool change_event = false) {

4
src/slic3r/GUI/Tab.cpp
View File

@ -2149,13 +2149,13 @@ PageShp TabPrinter::build_kinematics_page()
def.gui_type = "legend"; def.gui_type = "legend";
def.mode = comAdvanced; def.mode = comAdvanced;
def.tooltip = L("Values in this column are for Full Power mode"); def.tooltip = L("Values in this column are for Full Power mode");
def.set_default_value(new ConfigOptionString{ L("Full Power") }); def.set_default_value(new ConfigOptionString{ _(L("Full Power")).ToUTF8().data() });
auto option = Option(def, "full_power_legend"); auto option = Option(def, "full_power_legend");
line.append_option(option); line.append_option(option);
def.tooltip = L("Values in this column are for Silent mode"); def.tooltip = L("Values in this column are for Silent mode");
def.set_default_value(new ConfigOptionString{ L("Silent") }); def.set_default_value(new ConfigOptionString{ _(L("Silent")).ToUTF8().data() });
option = Option(def, "silent_legend"); option = Option(def, "silent_legend");
line.append_option(option); line.append_option(option);