From d311b7f142838bd3e6d309088f6b9171f496d2f9 Mon Sep 17 00:00:00 2001
From: tao wang <tao.wang@bambulab.com>
Date: Tue, 12 Mar 2024 16:58:02 +0800
Subject: [PATCH] ENH:Hide confirmation button when unable to send print

jira:[STUDIO-6355, STUDIO-6332]

Change-Id: I8f9c0edea4d5ee70e9fef1e9d42838d598dc32c4
---
 src/slic3r/GUI/PrintOptionsDialog.cpp |  4 ++++
 src/slic3r/GUI/ReleaseNote.cpp        | 10 ++++++++++
 src/slic3r/GUI/ReleaseNote.hpp        |  2 ++
 src/slic3r/GUI/SelectMachine.cpp      |  3 ++-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/slic3r/GUI/PrintOptionsDialog.cpp b/src/slic3r/GUI/PrintOptionsDialog.cpp
index 4f6c1e9a5..323b76f52 100644
--- a/src/slic3r/GUI/PrintOptionsDialog.cpp
+++ b/src/slic3r/GUI/PrintOptionsDialog.cpp
@@ -499,6 +499,10 @@ void PrinterPartsDialog::set_nozzle_diameter(wxCommandEvent& evt)
             auto nozzle_type = nozzle_type_map[nozzle_type_checkbox->GetSelection()];
             auto nozzle_diameter = std::stof(nozzle_diameter_checkbox->GetStringSelection().ToStdString());
             nozzle_diameter = round(nozzle_diameter * 10) / 10;
+            
+            obj->nozzle_diameter = nozzle_diameter;
+            obj->nozzle_type = nozzle_type;
+
             obj->command_set_printer_nozzle(nozzle_type, nozzle_diameter);
         }
         catch (...) {}
diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp
index f8b346732..a8f043d12 100644
--- a/src/slic3r/GUI/ReleaseNote.cpp
+++ b/src/slic3r/GUI/ReleaseNote.cpp
@@ -1368,6 +1368,16 @@ void ConfirmBeforeSendDialog::show_update_nozzle_button(bool show)
     Layout();
 }
 
+void ConfirmBeforeSendDialog::hide_button_ok()
+{
+    m_button_ok->Hide();
+}
+
+void ConfirmBeforeSendDialog::edit_cancel_button_txt(wxString txt)
+{
+    m_button_cancel->SetLabel(txt);
+}
+
 void ConfirmBeforeSendDialog::disable_button_ok()
 {
     m_button_ok->Disable();
diff --git a/src/slic3r/GUI/ReleaseNote.hpp b/src/slic3r/GUI/ReleaseNote.hpp
index 93c45282e..ab26b4dab 100644
--- a/src/slic3r/GUI/ReleaseNote.hpp
+++ b/src/slic3r/GUI/ReleaseNote.hpp
@@ -243,6 +243,8 @@ public:
     void rescale();
     void on_dpi_changed(const wxRect& suggested_rect);
     void show_update_nozzle_button(bool show = false);
+    void hide_button_ok();
+    void edit_cancel_button_txt(wxString txt);
     void disable_button_ok();
     void enable_button_ok();
     wxString format_text(wxString str, int warp);
diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp
index 37149660e..347ea2dca 100644
--- a/src/slic3r/GUI/SelectMachine.cpp
+++ b/src/slic3r/GUI/SelectMachine.cpp
@@ -2581,7 +2581,8 @@ void SelectMachineDialog::on_ok_btn(wxCommandEvent &event)
         ConfirmBeforeSendDialog confirm_dlg(this, wxID_ANY, confirm_title);
 
         if(is_printing_block){
-            confirm_dlg.disable_button_ok();
+            confirm_dlg.hide_button_ok();
+            confirm_dlg.edit_cancel_button_txt(_L("Close"));
             confirm_text.push_back(ConfirmBeforeSendInfo(_L("Please fix the error above, otherwise printing cannot continue."), ConfirmBeforeSendInfo::InfoLevel::Warning));
         }
         else {