Revert "Revert "Revert "Hide bambu-specific calibration tab for non-b…

…ambu printers (SoftFever#2197) (SoftFever#2259)""" This reverts commit 2d4944b.
igiannakas · Oct 19, 2023 · 4ba14c9 · 4ba14c9
1 parent 6ac86bd
commit 4ba14c9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
@@ -882,17 +882,17 @@ void MainFrame::show_publish_button(bool show)
 
 void MainFrame::show_calibration_button(bool show)
 {
-// #ifdef __APPLE__
-//     bool shown = m_menubar->FindMenu(_L("Calibration")) != wxNOT_FOUND;
-//     if (shown == show)
-//         ;
-//     else if (show)
-//         m_menubar->Insert(3, m_calib_menu, wxString::Format("&%s", _L("Calibration")));
-//     else
-//         m_menubar->Remove(3);
-// #else
-//     topbar()->ShowCalibrationButton(show);
-// #endif
+#ifdef __APPLE__
+    bool shown = m_menubar->FindMenu(_L("Calibration")) != wxNOT_FOUND;
+    if (shown == show)
+        ;
+    else if (show)
+        m_menubar->Insert(3, m_calib_menu, wxString::Format("&%s", _L("Calibration")));
+    else
+        m_menubar->Remove(3);
+#else
+    topbar()->ShowCalibrationButton(show);
+#endif
     show = !show;
     auto shown2 = m_tabpanel->FindPage(m_calibration) != wxNOT_FOUND;
     if (shown2 == show)

diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
@@ -1160,10 +1160,6 @@ void Sidebar::update_presets(Preset::Type preset_type)
             printer_tab->update();
         }
 
-        bool isBBL = preset_bundle.is_bbl_vendor();
-        wxGetApp().mainframe->show_calibration_button(!isBBL);
-
-        break;
     }
 
     default: break;