Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hide bambu-specific calibration tab for non-bambu printers (#2197) #2259

Merged
merged 3 commits into from
Sep 30, 2023
Merged

Hide bambu-specific calibration tab for non-bambu printers (#2197) #2259

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13032df
Hide bambu-specific calibration tab for non-bambu printers (#2197)
Noisyfox Sep 29, 2023
40044c6
Merge branch 'main' into bugfix/bbs-cali
SoftFever Sep 30, 2023
81af3c7
Hide Calibration tab only
SoftFever Sep 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Hide Calibration tab only
  • Loading branch information
@SoftFever
SoftFever committed Sep 30, 2023
commit 81af3c793d4a1fcd53f9cbefbf2e62c02db479a5
22 changes: 11 additions & 11 deletions src/slic3r/GUI/MainFrame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading