From a1a7b77b0b8c645d36f527b4236a59cc0714eaa6 Mon Sep 17 00:00:00 2001
From: "maosheng.wei" <maosheng.wei@bambulab.com>
Date: Mon, 4 Dec 2023 17:46:39 +0800
Subject: [PATCH] FIX: fix combobox and delete btn in filament setting enabled

Jira: XXXX

Change-Id: I8b659bd77ceb97c8cea9d3e5e931f4ea50822721
---
 src/libslic3r/Preset.cpp               | 1 +
 src/slic3r/GUI/CreatePresetsDialog.cpp | 5 +++--
 src/slic3r/GUI/ParamsDialog.cpp        | 4 +++-
 src/slic3r/GUI/ParamsDialog.hpp        | 2 +-
 src/slic3r/GUI/Plater.cpp              | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
index d701efb4e..f676e650e 100644
--- a/src/libslic3r/Preset.cpp
+++ b/src/libslic3r/Preset.cpp
@@ -1306,6 +1306,7 @@ int PresetCollection::get_differed_values_to_update(Preset& preset, std::map<std
         key_values.erase(BBL_JSON_KEY_BASE_ID);
         if (get_preset_base(preset) == &preset && !preset.filament_id.empty()) {
             key_values[BBL_JSON_KEY_FILAMENT_ID] = preset.filament_id;
+            BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " uploading user preset name is: " << preset.name << "and create filament id is: " << preset.filament_id;
         }
     }
     key_values[BBL_JSON_KEY_UPDATE_TIME] = std::to_string(preset.updated_time);
diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp
index 0d60bb7ff..b48fb8bb7 100644
--- a/src/slic3r/GUI/CreatePresetsDialog.cpp
+++ b/src/slic3r/GUI/CreatePresetsDialog.cpp
@@ -451,6 +451,7 @@ static std::string get_filament_id(std::string vendor_typr_serial)
             user_filament_id = "P" + calculate_md5(vendor_typr_serial + get_curr_time()).substr(0, 7);
         }
     }
+    BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " filament name is: " << vendor_typr_serial << "and create filament id is: " << user_filament_id;
     return user_filament_id;
 }
 
@@ -1483,8 +1484,8 @@ wxBoxSizer *CreatePrinterPresetDialog::create_step_switch_item()
     horizontal_sizer->Add(divider_line, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, FromDIP(3));
     m_step_2 = new wxStaticBitmap(step_switch_panel, wxID_ANY, create_scaled_bitmap("step_2_ready", nullptr, FromDIP(20)), wxDefaultPosition, wxDefaultSize);
     horizontal_sizer->Add(m_step_2, 0, wxEXPAND | wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, FromDIP(3));
-    wxStaticText *static_improt_presets_text = new wxStaticText(step_switch_panel, wxID_ANY, _L("Improt Preset"), wxDefaultPosition, wxDefaultSize);
-    horizontal_sizer->Add(static_improt_presets_text, 0, wxEXPAND | wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, FromDIP(3));
+    wxStaticText *static_import_presets_text = new wxStaticText(step_switch_panel, wxID_ANY, _L("Import Preset"), wxDefaultPosition, wxDefaultSize);
+    horizontal_sizer->Add(static_import_presets_text, 0, wxEXPAND | wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, FromDIP(3));
     horizontal_sizer->Add(0, 0, 1, wxEXPAND, 0);
 
     step_switch_panel->SetSizer(horizontal_sizer);
diff --git a/src/slic3r/GUI/ParamsDialog.cpp b/src/slic3r/GUI/ParamsDialog.cpp
index b4440a875..ee97f857d 100644
--- a/src/slic3r/GUI/ParamsDialog.cpp
+++ b/src/slic3r/GUI/ParamsDialog.cpp
@@ -65,7 +65,7 @@ ParamsDialog::ParamsDialog(wxWindow * parent)
     //wxGetApp().UpdateDlgDarkUI(this);
 }
 
-void ParamsDialog::Popup(bool just_edit)
+void ParamsDialog::Popup()
 {
     wxGetApp().UpdateDlgDarkUI(this);
 #ifdef __WIN32__
@@ -73,6 +73,8 @@ void ParamsDialog::Popup(bool just_edit)
 #endif
     Center();
     if (m_panel && m_panel->get_current_tab()) {
+        bool just_edit = false;
+        if (!m_editing_filament_id.empty()) just_edit = true;
         dynamic_cast<Tab *>(m_panel->get_current_tab())->set_just_edit(just_edit);
     }
     Show();
diff --git a/src/slic3r/GUI/ParamsDialog.hpp b/src/slic3r/GUI/ParamsDialog.hpp
index df5388b19..23b02d17a 100644
--- a/src/slic3r/GUI/ParamsDialog.hpp
+++ b/src/slic3r/GUI/ParamsDialog.hpp
@@ -29,7 +29,7 @@ public:
 
     ParamsPanel * panel() { return m_panel; }
 
-    void Popup(bool just_edit = false);
+    void Popup();
 
     void set_editing_filament_id(std::string id) { m_editing_filament_id = id; }
 
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index e84072e54..c3e264929 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -7643,7 +7643,7 @@ void Plater::priv::on_modify_filament(SimpleEvent &evt)
     update_ui_from_settings();
     sidebar->update_all_preset_comboboxes();
     if (wxID_EDIT == res) {
-        wxGetApp().params_dialog()->Popup(true);
+        wxGetApp().params_dialog()->Popup();
     }
 }