Merge main and resolved conflicts

src/slic3r/GUI/Widgets/AMSControl.cpp

@@ -278,7 +278,7 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
                 m_ams_dry_ctr_win->Move(popup_pos);
                 m_ams_dry_ctr_win->ShowModal();
             } else {
-                m_percent_humidity_dry_popup->Update(info);
+                m_percent_humidity_dry_popup->UpdateInfo(info);
 
                 wxPoint img_pos = ClientToScreen(wxPoint(0, 0));
                 wxPoint popup_pos(img_pos.x - m_percent_humidity_dry_popup->GetSize().GetWidth() + FromDIP(150), img_pos.y - FromDIP(80));
@@ -1034,7 +1034,7 @@ void AMSControl::UpdateAms(const std::string   &series_name,
                 humidity_info.humidity_percent = the_info.humidity_raw;
                 humidity_info.left_dry_time = the_info.left_dray_time;
                 humidity_info.current_temperature = the_info.current_temperature;
-                m_percent_humidity_dry_popup->Update(&humidity_info);
+                m_percent_humidity_dry_popup->UpdateInfo(&humidity_info);
                 break;
             }
         }

src/slic3r/GUI/Widgets/AMSItem.hpp

@@ -641,17 +641,11 @@ private:
     AMSRoadShowMode              m_road_mode      = {AMSRoadShowMode::AMS_ROAD_MODE_FOUR};
     AMSPassRoadSTEP              m_load_step      = {AMSPassRoadSTEP::AMS_ROAD_STEP_NONE};
 
-    bool     m_selected       = {false};
-    int      m_passroad_width = {6};
-    double   m_radius         = {4};
     wxColour m_road_def_color;
     wxColour m_road_color;
 
     std::vector<ScalableBitmap> ams_humidity_img;
 
-    int      m_humidity      = {0};
-    bool     m_show_humidity = {false};
-    bool     m_vams_loading{false};
     AMSModel m_ams_model;
 };
 
@@ -690,14 +684,10 @@ private:
 
     int             m_left_road_length     = {-1};
     int             m_right_road_length    = {-1};
-    int             m_passroad_width       = {6};
-    double          m_radius               = {4};
     AMSPassRoadSTEP m_pass_road_left_step  = {AMSPassRoadSTEP::AMS_ROAD_STEP_NONE};
     AMSPassRoadSTEP m_pass_road_right_step = {AMSPassRoadSTEP::AMS_ROAD_STEP_NONE};
 
     std::map<int, wxColour> m_road_color;
-    bool m_vams_loading{false};
-    AMSModel m_ams_model;
 };
 
 /*************************************************

src/slic3r/GUI/Widgets/AnimaController.cpp

@@ -78,7 +78,7 @@ void AnimaIcon::Stop()
     m_timer->Stop();
 }
 
-void AnimaIcon::Enable()
+void AnimaIcon::ShowEnabledIcon()
 {
     if (m_bitmap) { m_bitmap->SetBitmap(m_image_enable); }
 }

src/slic3r/GUI/Widgets/AnimaController.hpp

@@ -13,7 +13,7 @@ public:
 
     void Play();
     void Stop();
-    void Enable();
+    void ShowEnabledIcon();
     bool IsPlaying() const { return IsRunning(); };
     bool IsRunning() const;
 

src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp

@@ -17,7 +17,7 @@ public:
 
     void paintEvent(wxPaintEvent &evt);
 
-    void SetLabel(wxString msg){m_msg = msg;};
+    void SetLabel(const wxString &msg) override { m_msg = msg; }
 
 };
 #endif

src/slic3r/GUI/Widgets/FanControl.hpp

@@ -212,7 +212,6 @@ private:
     wxGridSizer* m_sizer_fanControl { nullptr };
 
     wxBoxSizer *m_mode_sizer{ nullptr };
-    wxBoxSizer *m_bottom_sizer{ nullptr };
 
     // mode switch buttons
     std::unordered_map<int, SendModeSwitchButton*> m_mode_switch_btns; //<mode_id, SendModeSwitchButton>

src/slic3r/GUI/Widgets/MultiNozzleSync.cpp

@@ -600,7 +600,7 @@ StaticBox* HotEndTable::CreateNozzleBox(const std::vector<int>& nozzle_indices)
 void HotEndTable::UpdateNozzleItems(const std::unordered_map<int, wgtDeviceNozzleRackNozzleItem*>& nozzle_items, std::shared_ptr<DevNozzleRack> nozzle_rack)
 {
     for (auto& item : nozzle_items)
-        item.second->Update(nozzle_rack);
+        item.second->UpdateInfo(nozzle_rack);
 }
 
 void HotEndTable::OnPaint(wxPaintEvent& evt)

src/slic3r/GUI/Widgets/MultiNozzleSync.hpp

@@ -89,8 +89,6 @@ private:
 
     bool m_right_on{ true };
     wxStaticBitmap* badget;
-    Label* left;
-    Label* right;
     Label* left_diameter_desp;
     Label* right_diameter_desp;
     Label* left_flow_desp;

src/slic3r/GUI/Widgets/RadioBox.cpp

@@ -36,11 +36,6 @@ void RadioBox::SetValue(bool value)
     update();
 }
 
-bool RadioBox::GetValue()
-{
-    return wxBitmapToggleButton::GetValue();
-}
-
 
 void RadioBox::Rescale()
 {

src/slic3r/GUI/Widgets/RadioBox.hpp

@@ -15,14 +15,10 @@ public:
 
 public:
     void SetValue(bool value) override;
-	bool GetValue();
     void Rescale();
     bool Disable() {
         return wxBitmapToggleButton::Disable();
     }
-    bool Enable() {
-        return wxBitmapToggleButton::Enable();
-    }
 
 private:
     void update();