3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

FIX: [STUDIO-3439] show/hide calibration page

Browse source 
Change-Id: I3b083b47609c40e084cf3058eda2a84c03447760
This commit is contained in:
chunmao.guo 2023-06-28 13:20:02 +08:00 • committed by Lane.Wei
parent ecfffca12d
commit 29b61a1da0
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/slic3r/GUI/MainFrame.cpp
View file

@ -872,12 +872,23 @@ void MainFrame::show_calibration_button(bool show)
{ {
#ifdef __APPLE__ #ifdef __APPLE__
bool shown = m_menubar->FindMenu(_L("Calibration")) != wxNOT_FOUND; bool shown = m_menubar->FindMenu(_L("Calibration")) != wxNOT_FOUND;
if (shown == show) return; if (shown == show)
if (show) m_menubar->Insert(3, m_calib_menu, wxString::Format("&%s", _L("Calibration"))); ;
else m_menubar->Remove(3); else if (show)
m_menubar->Insert(3, m_calib_menu, wxString::Format("&%s", _L("Calibration")));
else
m_menubar->Remove(3);
#else #else
topbar()->ShowCalibrationButton(show); topbar()->ShowCalibrationButton(show);
#endif #endif
show = !show;
auto shown2 = m_tabpanel->FindPage(m_calibration) != wxNOT_FOUND;
if (shown2 == show)
;
else if (show)
m_tabpanel->InsertPage(tpCalibration, m_calibration, _L("Calibration"), std::string("tab_monitor_active"), std::string("tab_monitor_active"));
else
m_tabpanel->RemovePage(tpCalibration);
} }
void MainFrame::update_title_colour_after_set_title() void MainFrame::update_title_colour_after_set_title()

6
src/slic3r/GUI/MainFrame.hpp
View file

@ -223,9 +223,9 @@ public:
tpPreview = 2, tpPreview = 2,
tpMonitor = 3, tpMonitor = 3,
tpProject = 4, tpProject = 4,
tpAuxiliary = 5, tpCalibration = 5,
tpCalibration = 6, toAuxiliary = 6,
toDebugTool = 7, toDebugTool = 7,
}; };
//BBS: add slice&&print status update logic //BBS: add slice&&print status update logic