Merge branch 'main' into feat/plugin-pages

src/slic3r/GUI/Widgets/Button.hpp

@@ -72,6 +72,13 @@ public:
 
     void SetTextColorNormal(wxColor const &color);
 
+    void SetSelected(bool selected = true) { m_selected = selected; }
+
+    // Only meant to be used by inspector, not public API
+    ButtonStyle GetStyle() const { return m_style; }
+    ButtonType  GetType() const  { return m_type; }
+    bool IsSelected() const      { return m_selected; }
+
     bool Enable(bool enable = true) override;
     void EnableTooltipEvenDisabled();// The tip will be shown even if the button is disabled
 

src/slic3r/GUI/Widgets/CheckBox.hpp

@@ -15,6 +15,9 @@ public:
 
 	void SetHalfChecked(bool value = true);
 
+	// Only meant to be used by inspector, not public API
+	bool IsHalfChecked() const { return m_half_checked; }
+
 	void Rescale();
 
 #ifdef __WXOSX__

src/slic3r/GUI/Widgets/FanControl.cpp

@@ -1031,13 +1031,13 @@ wxString FanControlPopupNew::get_fan_func_name(int mode, int submode, AIR_FUN fu
             L_CONTEXT("Right(Aux)", "air_duct");
             L_CONTEXT("Right(Filter)", "air_duct");
             L_CONTEXT("Left(Aux)", "air_duct");
-            return _CTX(func_text, "air_duct");
+            return _L_CONTEXT(func_text, "air_duct");
         }
     }
 
     static std::map<AIR_FUN, wxString> s_fan_func_name
     {
-        { AIR_FUN::FAN_HEAT_BREAK_0_IDX,     _L("Hotend") },
+        { AIR_FUN::FAN_HEAT_BREAK_0_IDX,     _L_CONTEXT("Hotend", "Hotend Heat Breaker Fan") },
         { AIR_FUN::FAN_COOLING_0_AIRDOOR,     _L("Parts") },
         { AIR_FUN::FAN_REMOTE_COOLING_0_IDX,  _L("Aux") },
         { AIR_FUN::FAN_CHAMBER_0_IDX,         _L("Exhaust") },

src/slic3r/GUI/Widgets/LabeledStaticBox.hpp

@@ -46,6 +46,12 @@ public:
 
     bool Enable(bool enable) override;
 
+    // Only meant to be used by inspector, not public API
+    int        GetCornerRadius() const { return m_radius; }
+    int        GetBorderWidth() const  { return m_border_width; }
+    StateColor GetBorderColor() const  { return border_color; }
+    float      GetScale() const        { return m_scale; }
+
 private:
     void PickDC(wxDC& dc);
 

src/slic3r/GUI/Widgets/TextInput.hpp

@@ -43,6 +43,9 @@ public:
 
     void SetCornerRadius(double radius);
 
+    // Only meant to be used by inspector, not public API
+    int GetCornerRadius() const { return static_cast<int>(radius); }
+
     void SetLabel(const wxString& label);
 
     void SetStaticTips(const wxString& tips, const wxBitmap& bitmap);