From 6792b42992a3e1e9fed7bc65d4f61fbef108fd76 Mon Sep 17 00:00:00 2001 From: Stone Li Date: Fri, 2 Sep 2022 16:39:02 +0800 Subject: [PATCH] ENH: hide media file and upgrade panel Change-Id: If953e2261fbc031382f42cc47e5c8beecb626f85 --- src/slic3r/GUI/Monitor.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/Monitor.cpp b/src/slic3r/GUI/Monitor.cpp index a005cf771..cc286218c 100644 --- a/src/slic3r/GUI/Monitor.cpp +++ b/src/slic3r/GUI/Monitor.cpp @@ -198,14 +198,16 @@ MonitorPanel::~MonitorPanel() }); //m_status_add_machine_panel = new AddMachinePanel(m_tabpanel); - m_status_info_panel = new StatusPanel(m_tabpanel); + m_status_info_panel = new StatusPanel(m_tabpanel); m_tabpanel->AddPage(m_status_info_panel, _L("Status"), "", true); +#if !BBL_RELEASE_TO_PUBLIC m_media_file_panel = new MediaFilePanel(m_tabpanel); m_tabpanel->AddPage(m_media_file_panel, _L("Media"), "", false); - + m_upgrade_panel = new UpgradePanel(m_tabpanel); m_tabpanel->AddPage(m_upgrade_panel, _L("Update"), "", false); +#endif m_hms_panel = new HMSPanel(m_tabpanel); m_tabpanel->AddPage(m_hms_panel, _L("HMS"),"", false); @@ -225,8 +227,10 @@ void MonitorPanel::set_default() /* reset side tool*/ //m_bitmap_wifi_signal->SetBitmap(wxNullBitmap); +#if !BBL_RELEASE_TO_PUBLIC /* reset time lapse panel */ m_media_file_panel->SetMachineObject(nullptr); +#endif wxGetApp().sidebar().load_ams_list({}); } @@ -255,8 +259,10 @@ void MonitorPanel::msw_rescale() m_tabpanel->Rescale(); //m_status_add_machine_panel->msw_rescale(); m_status_info_panel->msw_rescale(); +#if !BBL_RELEASE_TO_PUBLIC m_media_file_panel->Rescale(); m_upgrade_panel->msw_rescale(); +#endif m_hms_panel->msw_rescale(); m_connection_info->SetCornerRadius(0); @@ -399,11 +405,16 @@ void MonitorPanel::update_all() } m_status_info_panel->obj = obj; +#if !BBL_RELEASE_TO_PUBLIC m_upgrade_panel->update(obj); +#endif m_status_info_panel->m_media_play_ctrl->SetMachineObject(obj); +#if !BBL_RELEASE_TO_PUBLIC m_media_file_panel->SetMachineObject(obj); +#endif + update_status(obj); if (!obj) { @@ -436,9 +447,11 @@ void MonitorPanel::update_all() if (m_hms_panel->IsShown()) { m_hms_panel->update(obj); } +#if !BBL_RELEASE_TO_PUBLIC if (m_upgrade_panel->IsShown()) { m_upgrade_panel->update(obj); } +#endif } bool MonitorPanel::Show(bool show)