icons update

src/libslic3r/PrintConfig.cpp

@@ -2893,9 +2893,9 @@ void PrintConfigDef::init_fff_params()
                      "will create more stable supports, while snug support towers will save material and reduce "
                      "object scarring.");
     def->set_enum<SupportMaterialStyle>({
-        { "grid", L("Grid") }, 
-        { "snug", L("Snug") },
-        { "organic", L("Organic") }
+        { "grid", L("Grid ") }, 
+        { "snug", L("Snug ") },
+        { "organic", L("Organic ") }
     });
     def->mode = comAdvanced;
     def->set_default_value(new ConfigOptionEnum<SupportMaterialStyle>(smsGrid));

src/slic3r/GUI/Widgets/TextInput.hpp

@@ -0,0 +1,77 @@
+#ifndef slic3r_GUI_TextInput_hpp_
+#define slic3r_GUI_TextInput_hpp_
+
+#include <wx/textctrl.h>
+#include "StaticBox.hpp"
+
+class TextInput : public wxNavigationEnabled<StaticBox>
+{
+
+    wxSize labelSize;
+    ScalableBitmap icon;
+    StateColor     label_color;
+    StateColor     text_color;
+    wxTextCtrl * text_ctrl;
+
+    static const int TextInputWidth = 200;
+    static const int TextInputHeight = 50;
+
+public:
+    TextInput();
+
+    TextInput(wxWindow *     parent,
+              wxString       text,
+              wxString       label = "",
+              wxString       icon  = "",
+              const wxPoint &pos   = wxDefaultPosition,
+              const wxSize & size  = wxDefaultSize,
+              long           style = 0);
+
+public:
+    void Create(wxWindow *     parent,
+              wxString       text,
+              wxString       label = "",
+              wxString       icon  = "",
+              const wxPoint &pos   = wxDefaultPosition,
+              const wxSize & size  = wxDefaultSize,
+              long           style = 0);
+
+    void SetCornerRadius(double radius);
+
+    void SetLabel(const wxString& label);
+
+    void SetIcon(const wxBitmapBundle &icon);
+
+    void SetLabelColor(StateColor const &color);
+
+    void SetTextColor(StateColor const &color);
+
+    virtual void Rescale();
+
+    virtual bool Enable(bool enable = true) override;
+
+    virtual void SetMinSize(const wxSize& size) override;
+
+    wxTextCtrl *GetTextCtrl() { return text_ctrl; }
+
+    wxTextCtrl const *GetTextCtrl() const { return text_ctrl; }
+
+protected:
+    virtual void OnEdit() {}
+
+    virtual void DoSetSize(
+        int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+
+    void DoSetToolTipText(wxString const &tip) override;
+
+private:
+    void paintEvent(wxPaintEvent& evt);
+
+    void render(wxDC& dc);
+
+    void messureSize();
+
+    DECLARE_EVENT_TABLE()
+};
+
+#endif // !slic3r_GUI_TextInput_hpp_