From e05493bd90c9169eca0682e867f796f21b3b43f7 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Mon, 26 Feb 2018 13:57:36 +0100 Subject: [PATCH] Fixed wrong printing of recommended_thin_wall_thickness_description_line --- xs/src/slic3r/GUI/GUI.cpp | 2 +- xs/src/slic3r/GUI/Tab.cpp | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xs/src/slic3r/GUI/GUI.cpp b/xs/src/slic3r/GUI/GUI.cpp index fe5389391..da1ec4626 100644 --- a/xs/src/slic3r/GUI/GUI.cpp +++ b/xs/src/slic3r/GUI/GUI.cpp @@ -336,7 +336,7 @@ void add_debug_menu(wxMenuBar *menu, int event_language_change) } } }); - menu->Append(local_menu, _T("&Localization")); + menu->Append(local_menu, _(L("&Localization"))); //#endif } diff --git a/xs/src/slic3r/GUI/Tab.cpp b/xs/src/slic3r/GUI/Tab.cpp index 00c749ce3..dabbbeb36 100644 --- a/xs/src/slic3r/GUI/Tab.cpp +++ b/xs/src/slic3r/GUI/Tab.cpp @@ -768,14 +768,15 @@ void TabPrint::update() get_field(el)->toggle(have_wipe_tower); m_recommended_thin_wall_thickness_description_line->SetText( - PresetHints::recommended_thin_wall_thickness(*m_preset_bundle)); + from_u8(PresetHints::recommended_thin_wall_thickness(*m_preset_bundle))); Thaw(); } void TabPrint::OnActivate() { - m_recommended_thin_wall_thickness_description_line->SetText(PresetHints::recommended_thin_wall_thickness(*m_preset_bundle)); + m_recommended_thin_wall_thickness_description_line->SetText( + from_u8(PresetHints::recommended_thin_wall_thickness(*m_preset_bundle))); } void TabFilament::build() @@ -1044,7 +1045,7 @@ void TabPrinter::build() btn->Bind(wxEVT_BUTTON, [this, parent](wxCommandEvent e){ if (m_event_button_browse > 0){ wxCommandEvent event(m_event_button_browse); - event.SetString(_(L("Button BROWSE was clicked!"))); + event.SetString("Button BROWSE was clicked!"); g_wxMainFrame->ProcessWindowEvent(event); } // // # look for devices @@ -1079,7 +1080,7 @@ void TabPrinter::build() btn->Bind(wxEVT_BUTTON, [this, parent](wxCommandEvent e) { if (m_event_button_test > 0){ wxCommandEvent event(m_event_button_test); - event.SetString(_(L("Button TEST was clicked!"))); + event.SetString("Button TEST was clicked!"); g_wxMainFrame->ProcessWindowEvent(event); } // my $ua = LWP::UserAgent->new;