diff --git a/bbl/i18n/list.txt b/bbl/i18n/list.txt index ae03d3ceb..8c9ecbe34 100644 --- a/bbl/i18n/list.txt +++ b/bbl/i18n/list.txt @@ -78,6 +78,7 @@ src/slic3r/GUI/MainFrame.cpp src/slic3r/GUI/MediaPlayCtrl.cpp src/slic3r/GUI/MediaFilePanel.cpp src/slic3r/GUI/ImageGrid.cpp +src/slic3r/GUI/ImageSwitchButton.cpp src/slic3r/GUI/Printer/PrinterFileSystem.cpp src/slic3r/GUI/Mouse3DController.cpp src/slic3r/GUI/SelectMachinePop.cpp diff --git a/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp b/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp index 7faf0836b..e8a6e4214 100644 --- a/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp +++ b/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp @@ -3,6 +3,7 @@ #include "StaticBox.hpp" #include "../wxExtensions.hpp" +#include "slic3r/GUI/I18N.hpp" #include #include @@ -113,7 +114,7 @@ void ImageSwitchButton::render(wxDC& dc) wxSize szIcon; wxSize szContent = textSize; ScalableBitmap &icon = GetValue() ? m_on : m_off; - + int content_height = icon.GetBmpHeight() + textSize.y + m_padding; wxPoint pt = wxPoint((size.x - icon.GetBmpWidth()) / 2, (size.y - content_height) / 2); @@ -129,9 +130,9 @@ void ImageSwitchButton::render(wxDC& dc) dc.SetTextForeground(text_color.colorForStates(states)); auto fina_txt = GetValue() ? labels[0] : labels[1]; - if (dc.GetTextExtent(fina_txt).x > size.x) { + if (dc.GetTextExtent(fina_txt).x > size.x) { wxString forment_txt = wxEmptyString; - for (auto i = 0; i < fina_txt.length(); i++) { + for (auto i = 0; i < fina_txt.length(); i++) { forment_txt = fina_txt.SubString(0, i) + "..."; if (dc.GetTextExtent(forment_txt).x > size.x) { pt.x = (size.x - dc.GetTextExtent(forment_txt).x) / 2; @@ -141,7 +142,7 @@ void ImageSwitchButton::render(wxDC& dc) } } else { dc.DrawText(fina_txt, pt); - } + } } void ImageSwitchButton::Rescale() @@ -287,7 +288,7 @@ void FanSwitchButton::render(wxDC& dc) pt.x += icon.GetBmpWidth() + FromDIP(9); } - wxString fan_txt = "Fan"; + wxString fan_txt = _L("Fan"); dc.SetFont(::Label::Head_15); pt.y = FromDIP(9); dc.DrawText(fan_txt, pt);