From a87bdf0d543e2d55e11098a6713fc9965f67a150 Mon Sep 17 00:00:00 2001
From: "zhou.xu" <zhou.xu@bambulab.com>
Date: Tue, 21 Jan 2025 14:54:42 +0800
Subject: [PATCH] FIX:fix dark mode bug of SyncAmsInfoDialog

jira: STUDIO-10012
Change-Id: I6b27b8908f04995814af97baabcee6f77643c125
---
 src/slic3r/GUI/AmsMappingPopup.cpp   |  25 ++++---
 src/slic3r/GUI/SyncAmsInfoDialog.cpp | 103 ++++-----------------------
 src/slic3r/GUI/SyncAmsInfoDialog.hpp |   4 +-
 3 files changed, 25 insertions(+), 107 deletions(-)

diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp
index dbad9686e..058960791 100644
--- a/src/slic3r/GUI/AmsMappingPopup.cpp
+++ b/src/slic3r/GUI/AmsMappingPopup.cpp
@@ -284,7 +284,7 @@ void MaterialItem::doRender(wxDC& dc)
 //#else
 
     if (m_match) {
-        dc.SetPen(wxPen(wxColour(0xAC, 0xAC, 0xAC), FromDIP(1)));
+        dc.SetPen(wxPen(wxGetApp().dark_mode() ? wxColour(107, 107, 107) : wxColour(0xAC, 0xAC, 0xAC), FromDIP(1)));
     } else {
         dc.SetPen(wxPen(wxColour(234, 31, 48), FromDIP(1)));
     }
@@ -421,6 +421,8 @@ void MaterialSyncItem::doRender(wxDC &dc)
     dc.SetBrush(wxBrush(mcolor));
     dc.DrawRectangle(0, FromDIP(10), MATERIAL_ITEM_SIZE.x, FromDIP(10));
 
+    dc.SetPen(wxColour(0xAC, 0xAC, 0xAC));
+    dc.DrawLine(FromDIP(1), FromDIP(20), FromDIP(MATERIAL_ITEM_SIZE.x), FromDIP(20));
     // bottom rectangle in wheel bitmap, size is MATERIAL_REC_WHEEL_SIZE(22)
     auto left  = (size.x / 2 - MATERIAL_REC_WHEEL_SIZE.x) / 2 + FromDIP(3);
     auto up    = (size.y * 0.4 + (size.y * 0.6 - MATERIAL_REC_WHEEL_SIZE.y) / 2);
@@ -458,14 +460,11 @@ void MaterialSyncItem::doRender(wxDC &dc)
     else {
         dc.SetPen(*wxTRANSPARENT_PEN);
         dc.SetBrush(wxBrush(mcolor));
-        dc.DrawRoundedRectangle(0, FromDIP(20), MATERIAL_ITEM_SIZE.x, MATERIAL_ITEM_SIZE.y - FromDIP(21), 5);
+        dc.DrawRoundedRectangle(0, FromDIP(21), MATERIAL_ITEM_SIZE.x, MATERIAL_ITEM_SIZE.y - FromDIP(21), 5);
 
-        dc.SetPen(*wxTRANSPARENT_PEN);
-        dc.SetBrush(wxBrush(mcolor));
-        dc.DrawRectangle(0, FromDIP(20), MATERIAL_ITEM_SIZE.x, FromDIP(10));
+        dc.DrawRectangle(0, FromDIP(21), MATERIAL_ITEM_SIZE.x, FromDIP(10));
     }
-    dc.SetPen(wxColour(0xAC, 0xAC, 0xAC));
-    dc.DrawLine(FromDIP(1), FromDIP(20), FromDIP(MATERIAL_ITEM_SIZE.x), FromDIP(20));
+
     ////border
 #if __APPLE__
     dc.SetPen(wxColour(0xAC, 0xAC, 0xAC));
@@ -479,14 +478,14 @@ void MaterialSyncItem::doRender(wxDC &dc)
     }
 #else
 
-    dc.SetPen(wxColour(0xAC, 0xAC, 0xAC));
+    dc.SetPen(wxPen(wxGetApp().dark_mode() ? wxColour(107, 107, 107) : wxColour(0xAC, 0xAC, 0xAC), FromDIP(1)));
     dc.SetBrush(*wxTRANSPARENT_BRUSH);
     dc.DrawRoundedRectangle(0, 0, MATERIAL_ITEM_SIZE.x, MATERIAL_ITEM_SIZE.y, 5);
 
     if (m_selected) {
-        dc.SetPen(wxColour(0x00, 0xAE, 0x42));
+        dc.SetPen(wxPen(wxColour(0x00, 0xAE, 0x42), FromDIP(2)));
         dc.SetBrush(*wxTRANSPARENT_BRUSH);
-        dc.DrawRoundedRectangle(0, 0, MATERIAL_ITEM_SIZE.x, MATERIAL_ITEM_SIZE.y, 5);
+        dc.DrawRoundedRectangle(FromDIP(1), FromDIP(1), MATERIAL_ITEM_SIZE.x - FromDIP(1), MATERIAL_ITEM_SIZE.y - FromDIP(1), 5);
     }
 #endif
     if (m_text_pos_y > 0 && m_match) {
@@ -576,8 +575,8 @@ AmsMapingPopup::AmsMapingPopup(wxWindow *parent, bool use_in_sync_dialog) :
      m_right_tip_text = _L("Select filament that installed to the right nozzle");
 
      m_left_tips = new Label(m_left_marea_panel);
-     m_left_tips->SetForegroundColour(0x262E30);
-     m_left_tips->SetBackgroundColour(*wxWHITE);
+     m_left_tips->SetForegroundColour(StateColor::darkModeColorFor("0x262E30"));
+     m_left_tips->SetBackgroundColour(StateColor::darkModeColorFor("0xFFFFFF"));
      m_left_tips->SetFont(::Label::Body_13);
      m_left_tips->SetLabel(m_left_tip_text);
 
@@ -811,7 +810,7 @@ void AmsMapingPopup::update(MachineObject* obj)
             m_right_marea_panel->Show();
             set_sizer_title(m_right_split_ams_sizer, _L("Right AMS"));
             if (m_use_in_sync_dialog) {
-                m_left_tips->SetLabel(m_left_tip_text);
+                m_left_tips->SetLabel(m_single_tip_text);
                 m_right_tips->SetLabel("");
             }
             m_right_extra_slot->Show();
diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp
index 4e0f1f4af..4fcf2f7ab 100644
--- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp
+++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp
@@ -81,7 +81,6 @@ bool SyncAmsInfoDialog::Show(bool show)
         m_panel_prepare->Hide();
         m_rename_normal_panel->Hide();
         m_rename_switch_panel->Hide();
-        m_button_ensure->Hide();
         m_sw_print_failed_info->Hide();
         m_rename_text -> Hide();
         m_rename_button->Hide();
@@ -327,14 +326,14 @@ wxBoxSizer *SyncAmsInfoDialog::create_sizer_thumbnail(wxButton *image_button, bo
     auto sizer_thumbnail = new wxBoxSizer(wxVERTICAL);
     if (left) {
         wxBoxSizer *text_sizer = new wxBoxSizer(wxHORIZONTAL);
-        auto        sync_text  = new wxStaticText(image_button->GetParent(), wxID_ANY, _CTX(L_CONTEXT("Original", "Sync_AMS"), "Sync_AMS"));
+        auto        sync_text  = new Label(image_button->GetParent(), _CTX(L_CONTEXT("Original", "Sync_AMS"), "Sync_AMS"));
         sync_text->SetForegroundColour(wxColour(107, 107, 107, 100));
         text_sizer->Add(sync_text, 0, wxALIGN_CENTER | wxALL, 0);
         sizer_thumbnail->Add(sync_text, FromDIP(0), wxALIGN_CENTER | wxALL, FromDIP(4));
     }
     else {
         wxBoxSizer *text_sizer = new wxBoxSizer(wxHORIZONTAL);
-        m_after_map_text       = new wxStaticText(image_button->GetParent(), wxID_ANY, _L("After mapping"));
+        m_after_map_text       = new Label(image_button->GetParent(), _L("After mapping"));
         m_after_map_text->SetForegroundColour(wxColour(107, 107, 107, 100));
         text_sizer->Add(m_after_map_text, 0, wxALIGN_CENTER | wxALL, 0);
         sizer_thumbnail->Add(m_after_map_text, FromDIP(0), wxALIGN_CENTER | wxALL, FromDIP(4));
@@ -477,7 +476,7 @@ void SyncAmsInfoDialog::add_two_image_control()
     m_two_thumbnail_panel_sizer = new wxBoxSizer(wxVERTICAL);
 
     auto view_two_thumbnail_sizer = new wxBoxSizer(wxHORIZONTAL);
-    view_two_thumbnail_sizer->AddSpacer(FromDIP(60));
+    view_two_thumbnail_sizer->AddSpacer(FromDIP(40));
     auto swipe_left__sizer = new wxBoxSizer(wxVERTICAL);
     swipe_left__sizer->AddStretchSpacer();
     init_bitmaps();
@@ -495,16 +494,17 @@ void SyncAmsInfoDialog::add_two_image_control()
     swipe_left__sizer->Add(m_swipe_left_button, 0, wxALIGN_CENTER | wxEXPAND | wxALIGN_CENTER_VERTICAL);
     swipe_left__sizer->AddStretchSpacer();
     view_two_thumbnail_sizer->Add(swipe_left__sizer, 0, wxEXPAND);
-    view_two_thumbnail_sizer->AddSpacer(FromDIP(20));
+    view_two_thumbnail_sizer->AddSpacer(FromDIP(24));
     {
         m_two_image_panel = new StaticBox(m_two_thumbnail_panel);
         // m_two_thumbnail_panel->SetBackgroundColour(wxColour(0xF8F8F8));
         m_two_image_panel->SetBorderWidth(0);
         //m_two_image_panel->SetForegroundColour(wxColour(248, 248, 248, 100));
-        m_two_image_panel->SetBackgroundColor(wxColour(248, 248, 248, 100));
+        m_two_image_panel->SetBackgroundColor(wxGetApp().dark_mode() ? wxColour(48, 48, 48, 100) : wxColour(246, 246, 246, 100));
         m_two_image_panel_sizer = new wxBoxSizer(wxHORIZONTAL);
         m_left_image_button     = new wxButton(m_two_image_panel, wxID_ANY, {}, wxDefaultPosition, wxSize(FromDIP(LEFT_THUMBNAIL_SIZE_WIDTH), FromDIP(LEFT_THUMBNAIL_SIZE_WIDTH)),
                                            wxBORDER_NONE | wxBU_AUTODRAW);
+        m_left_image_button->SetBackgroundColour(wxGetApp().dark_mode() ? wxColour(61, 61, 61, 0) : wxColour(238, 238, 238, 0));
         m_left_sizer_thumbnail = create_sizer_thumbnail(m_left_image_button, true);
         m_two_image_panel_sizer->Add(m_left_sizer_thumbnail, FromDIP(0), wxALIGN_LEFT | wxEXPAND | wxLEFT | wxTOP | wxBOTTOM, FromDIP(8));
         m_two_image_panel_sizer->AddSpacer(FromDIP(5));
@@ -512,6 +512,7 @@ void SyncAmsInfoDialog::add_two_image_control()
         m_right_image_button = new wxButton(m_two_image_panel, wxID_ANY, {}, wxDefaultPosition,
                                             wxSize(FromDIP(RIGHT_THUMBNAIL_SIZE_WIDTH), FromDIP(RIGHT_THUMBNAIL_SIZE_WIDTH)),
                                             wxBORDER_NONE | wxBU_AUTODRAW);
+        m_right_image_button->SetBackgroundColour(wxGetApp().dark_mode() ? wxColour(61, 61, 61, 0) : wxColour(238, 238, 238, 0));
         m_right_sizer_thumbnail = create_sizer_thumbnail(m_right_image_button, false);
         m_two_image_panel_sizer->Add(m_right_sizer_thumbnail, FromDIP(0), wxALIGN_LEFT | wxEXPAND | wxRIGHT | wxTOP | wxBOTTOM, FromDIP(8));
         m_two_image_panel->SetSizer(m_two_image_panel_sizer);
@@ -538,7 +539,7 @@ void SyncAmsInfoDialog::add_two_image_control()
     swipe_right__sizer->Add(m_swipe_right_button, 0, wxALIGN_CENTER | wxEXPAND | wxALIGN_CENTER_VERTICAL);
     swipe_right__sizer->AddStretchSpacer();
     view_two_thumbnail_sizer->Add(swipe_right__sizer, 0, wxEXPAND);
-    view_two_thumbnail_sizer->AddSpacer(FromDIP(60));
+    view_two_thumbnail_sizer->AddStretchSpacer();
     m_two_thumbnail_panel_sizer->Add(view_two_thumbnail_sizer, 0, wxEXPAND | wxTOP, FromDIP(5));
 
     m_choose_plate_sizer         = new wxBoxSizer(wxHORIZONTAL);
@@ -1081,31 +1082,6 @@ SyncAmsInfoDialog::SyncAmsInfoDialog(wxWindow *parent, SyncInfo &info) :
     m_panel_prepare = new wxPanel(m_simplebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
     m_panel_prepare->SetBackgroundColour(m_colour_def_color);
     wxBoxSizer *m_sizer_prepare = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer *m_sizer_pcont   = new wxBoxSizer(wxHORIZONTAL);
-
-    /*m_sizer_prepare->Add(0, 0, 1, wxTOP, FromDIP(12));
-
-    auto hyperlink_sizer = new wxBoxSizer(wxHORIZONTAL);
-    m_hyperlink          = new wxHyperlinkCtrl(m_panel_prepare, wxID_ANY, _L("Click here if you can't connect to the printer"),
-                                      wxT("https://wiki.bambulab.com/en/software/bambu-studio/failed-to-connect-printer"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
-
-    hyperlink_sizer->Add(m_hyperlink, 0, wxALIGN_CENTER | wxALL, 5);
-    m_sizer_prepare->Add(hyperlink_sizer, 0, wxALIGN_CENTER | wxALL, 5);*/
-
-    m_button_ensure = new Button(m_panel_prepare, _L("Send"));
-    m_button_ensure->SetBackgroundColor(m_btn_bg_enable);
-    m_button_ensure->SetBorderColor(m_btn_bg_enable);
-    m_button_ensure->SetTextColor(StateColor::darkModeColorFor("#FFFFFE"));
-    m_button_ensure->SetSize(SELECT_MACHINE_DIALOG_BUTTON_SIZE);
-    m_button_ensure->SetMinSize(SELECT_MACHINE_DIALOG_BUTTON_SIZE);
-    m_button_ensure->SetMinSize(SELECT_MACHINE_DIALOG_BUTTON_SIZE);
-    m_button_ensure->SetCornerRadius(FromDIP(5));
-    m_button_ensure->Bind(wxEVT_BUTTON, &SyncAmsInfoDialog::on_ok_btn, this);
-
-    m_sizer_pcont->Add(0, 0, 1, wxEXPAND, 0);
-    m_sizer_pcont->Add(m_button_ensure, 0, wxRIGHT, 0);
-
-    m_sizer_prepare->Add(m_sizer_pcont, 0, wxEXPAND, 0);
     m_panel_prepare->SetSizer(m_sizer_prepare);
     m_panel_prepare->SetMaxSize(wxSize(-1, FromDIP(0)));
     m_simplebook->AddPage(m_panel_prepare, wxEmptyString, true);
@@ -1461,8 +1437,6 @@ void SyncAmsInfoDialog::prepare_mode(bool refresh_button)
     if (m_print_job) { m_print_job->join(); }
     if (wxIsBusy()) wxEndBusyCursor();
 
-    if (refresh_button) { Enable_Send_Button(true); }
-
     m_status_bar->reset();
     if (m_simplebook->GetSelection() != 0) {
         m_simplebook->SetSelection(0);
@@ -2091,54 +2065,43 @@ void SyncAmsInfoDialog::show_status(PrintDialogStatus status, std::vector<wxStri
     // other
     if (status == PrintDialogStatus::PrintStatusInit) {
         update_print_status_msg(wxEmptyString, false, false);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusNoUserLogin) {
         wxString msg_text = _L("No login account, only printers in LAN mode are displayed");
         update_print_status_msg(msg_text, false, true);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusInvalidPrinter) {
         update_print_status_msg(wxEmptyString, true, true);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusConnectingServer) {
         wxString msg_text = _L("Connecting to server");
         update_print_status_msg(msg_text, true, true);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusReading) {
         wxString msg_text = _L("Synchronizing device information");
         update_print_status_msg(msg_text, false, true);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusReadingFinished) {
         update_print_status_msg(wxEmptyString, false, true);
-        Enable_Send_Button(true);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusReadingTimeout) {
         wxString msg_text = _L("Synchronizing device information time out");
         update_print_status_msg(msg_text, true, true);
-        Enable_Send_Button(true);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusInUpgrading) {
         wxString msg_text = _L("Cannot send the print job when the printer is updating firmware");
         update_print_status_msg(msg_text, true, true);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusInSystemPrinting) {
         wxString msg_text = _L("The printer is executing instructions. Please restart printing after it ends");
         update_print_status_msg(msg_text, true, true);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusInPrinting) {
         wxString msg_text = _L("The printer is busy on other print job");
         update_print_status_msg(msg_text, true, true);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusDisableAms) {
         update_print_status_msg(wxEmptyString, false, false);
-        Enable_Send_Button(true);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusNeedUpgradingAms) {
         wxString msg_text;
@@ -2147,32 +2110,26 @@ void SyncAmsInfoDialog::show_status(PrintDialogStatus status, std::vector<wxStri
         else
             msg_text = _L("Filament exceeds the number of AMS slots. Please update the printer firmware to support AMS slot assignment.");
         update_print_status_msg(msg_text, true, false);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusAmsMappingSuccess) {
         wxString msg_text = _L("Filaments to AMS slots mappings have been established. You can click a filament above to change its mapping AMS slot");
         update_print_status_msg(msg_text, false, false);
-        Enable_Send_Button(true);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusAmsMappingInvalid) {
         wxString msg_text = _L("Please click each filament above to specify its mapping AMS slot before sending the print job");
         update_print_status_msg(msg_text, true, false);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusAmsMappingMixInvalid) {
         wxString msg_text = _L("Please do not mix-use the Ext with AMS");
         update_print_status_msg(msg_text, true, false);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusNozzleDataInvalid) {
         wxString msg_text = _L("Invalid nozzle information, please refresh or manually set nozzle information.");
         update_print_status_msg(msg_text, true, false);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusNozzleMatchInvalid) {
         wxString msg_text = _L("Please check whether the nozzle type of the device is the same as the preset nozzle type.");
         update_print_status_msg(msg_text, true, false);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusAmsMappingU0Invalid) {
         wxString msg_text;
@@ -2181,43 +2138,33 @@ void SyncAmsInfoDialog::show_status(PrintDialogStatus status, std::vector<wxStri
                                         params[0], params[1]);
         else
             msg_text = _L("Filament does not match the filament in AMS slot. Please update the printer firmware to support AMS slot assignment.");
-        update_print_status_msg(msg_text, true, false);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusAmsMappingValid) {
         wxString msg_text = _L("Filaments to AMS slots mappings have been established. You can click a filament above to change its mapping AMS slot");
         update_print_status_msg(msg_text, false, false);
-        Enable_Send_Button(true);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusRefreshingMachineList) {
         update_print_status_msg(wxEmptyString, false, true);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(false);
     } else if (status == PrintDialogStatus::PrintStatusSending) {
-        Enable_Send_Button(false);
         Enable_Refresh_Button(false);
     } else if (status == PrintDialogStatus::PrintStatusSendingCanceled) {
-        Enable_Send_Button(true);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusLanModeNoSdcard) {
         wxString msg_text = _L("Storage needs to be inserted before printing via LAN.");
         update_print_status_msg(msg_text, true, true);
-        Enable_Send_Button(true);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusLanModeSDcardNotAvailable) {
         wxString msg_text = _L("Storage is not available or is in read-only mode.");
         update_print_status_msg(msg_text, true, true);
-        Enable_Send_Button(true);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusAmsMappingByOrder) {
         wxString msg_text = _L("The printer firmware only supports sequential mapping of filament => AMS slot.");
         update_print_status_msg(msg_text, false, false);
-        Enable_Send_Button(true);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusNoSdcard) {
         wxString msg_text = _L("Storage needs to be inserted before printing.");
         update_print_status_msg(msg_text, true, true);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusUnsupportedPrinter) {
         wxString msg_text;
@@ -2251,32 +2198,26 @@ void SyncAmsInfoDialog::show_status(PrintDialogStatus status, std::vector<wxStri
             return;
         } catch (...) {}
 
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusTimelapseNoSdcard) {
         wxString msg_text = _L("Storage needs to be inserted to record timelapse.");
         update_print_status_msg(msg_text, true, true);
-        Enable_Send_Button(true);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusNeedForceUpgrading) {
         wxString msg_text = _L("Cannot send the print job to a printer whose firmware is required to get updated.");
         update_print_status_msg(msg_text, true, true);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusNeedConsistencyUpgrading) {
         wxString msg_text = _L("Cannot send the print job to a printer whose firmware is required to get updated.");
         update_print_status_msg(msg_text, true, true);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusBlankPlate) {
         wxString msg_text = _L("Cannot send the print job for empty plate");
         update_print_status_msg(msg_text, true, true);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusNotSupportedPrintAll) {
         wxString msg_text = _L("This printer does not support printing all plates");
         update_print_status_msg(msg_text, true, true);
-        Enable_Send_Button(false);
         Enable_Refresh_Button(true);
     } else if (status == PrintDialogStatus::PrintStatusTimelapseWarning) {
         wxString   msg_text;
@@ -2291,12 +2232,10 @@ void SyncAmsInfoDialog::show_status(PrintDialogStatus status, std::vector<wxStri
             }
         }
         update_print_status_msg(msg_text, true, true);
-        Enable_Send_Button(true);
         Enable_Refresh_Button(true);
     } else if (status == PrintStatusMixAmsAndVtSlotWarning) {
         wxString msg_text = _L("You selected external and AMS filament at the same time in an extruder, you will need manually change external filament.");
         update_print_status_msg(msg_text, true, false);
-        Enable_Send_Button(true);
         Enable_Refresh_Button(true);
     }
 
@@ -2711,8 +2650,6 @@ void SyncAmsInfoDialog::on_send_print()
 {
     BOOST_LOG_TRIVIAL(info) << "print_job: on_ok to send";
     m_is_canceled = false;
-    Enable_Send_Button(false);
-
     if (m_mapping_popup.IsShown())
         m_mapping_popup.Dismiss();
 
@@ -3670,24 +3607,6 @@ void SyncAmsInfoDialog::Enable_Refresh_Button(bool en)
     }
 }
 
-void SyncAmsInfoDialog::Enable_Send_Button(bool en)
-{
-    if (!m_button_ensure) { return; }
-    if (!en) {
-        if (m_button_ensure->IsEnabled()) {
-            m_button_ensure->Disable();
-            m_button_ensure->SetBackgroundColor(wxColour(0x90, 0x90, 0x90));
-            m_button_ensure->SetBorderColor(wxColour(0x90, 0x90, 0x90));
-        }
-    } else {
-        if (!m_button_ensure->IsEnabled()) {
-            m_button_ensure->Enable();
-            m_button_ensure->SetBackgroundColor(m_btn_bg_enable);
-            m_button_ensure->SetBorderColor(m_btn_bg_enable);
-        }
-    }
-}
-
 void SyncAmsInfoDialog::on_dpi_changed(const wxRect &suggested_rect)
 {
     rename_editable->msw_rescale();
@@ -3696,13 +3615,15 @@ void SyncAmsInfoDialog::on_dpi_changed(const wxRect &suggested_rect)
         ams_mapping_help_icon->msw_rescale();
         if (img_amsmapping_tip) img_amsmapping_tip->SetBitmap(ams_mapping_help_icon->bmp());
     }
-    m_button_ensure->SetMinSize(SELECT_MACHINE_DIALOG_BUTTON_SIZE);
-    m_button_ensure->SetCornerRadius(FromDIP(12));
     m_status_bar->msw_rescale();
 
     for (auto material1 : m_materialList) {
         material1.second->item->msw_rescale();
     }
+    m_swipe_left_button->msw_rescale();
+    m_swipe_right_button->msw_rescale();
+    m_button_ok->Rescale();
+    m_button_cancel->Rescale();
 
     Fit();
     Refresh();
diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.hpp b/src/slic3r/GUI/SyncAmsInfoDialog.hpp
index 4133439b2..0cb528a0e 100644
--- a/src/slic3r/GUI/SyncAmsInfoDialog.hpp
+++ b/src/slic3r/GUI/SyncAmsInfoDialog.hpp
@@ -83,7 +83,6 @@ protected:
     wxBoxSizer *              rename_sizer_h{nullptr};
     wxBoxSizer *              m_sizer_autorefill{nullptr};
     ScalableButton *          m_button_refresh{nullptr};
-    Button *                  m_button_ensure{nullptr};
     wxStaticBitmap *          m_rename_button{nullptr};
     ComboBox *                m_comboBox_printer{nullptr};
     wxStaticBitmap *          m_staticbitmap{nullptr};
@@ -209,7 +208,6 @@ public:
     void     on_selection_changed(wxCommandEvent &event);
     void     update_flow_cali_check(MachineObject *obj);
     void     Enable_Refresh_Button(bool en);
-    void     Enable_Send_Button(bool en);
     void     update_user_machine_list();
     void     update_lan_machine_list();
     void     stripWhiteSpace(std::string &str);
@@ -305,7 +303,7 @@ private:
     Button *   m_button_ok     = nullptr;
     Button *   m_button_cancel = nullptr;
 
-    wxStaticText *m_after_map_text{nullptr};
+    Label *m_after_map_text{nullptr};
     wxStaticText *m_attention_text{nullptr};
     wxStaticText* m_tip_text{nullptr};
     //wxStaticText *m_specify_color_cluster_title = nullptr;