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

FIX:Turn on the Release switch of HMS

Browse source 
Change-Id: I67fe615aec0e18cc8fd0a1e6992b6dc38a03fc88
This commit is contained in:
tao wang 2022-08-30 12:24:32 +08:00 • committed by Lane.Wei
parent db435bc704
commit a8d91531b3
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/slic3r/GUI/HMSPanel.cpp
View file

@ -83,9 +83,8 @@ HMSNotifyItem::HMSNotifyItem(wxWindow *parent, HMSItem& item)
} }
}); });
m_hms_content->Bind(wxEVT_LEFT_UP, [this](wxMouseEvent &e) { m_hms_content->Bind(wxEVT_LEFT_UP, [this](wxMouseEvent &e) {
if(!m_url.empty()) if (!m_url.empty()) wxLaunchDefaultBrowser(m_url);
wxLaunchDefaultBrowser(get_hms_wiki_url(m_hms_item.get_long_error_code())); });
});
} }
HMSNotifyItem ::~HMSNotifyItem() { HMSNotifyItem ::~HMSNotifyItem() {
; ;

25
src/slic3r/GUI/Monitor.cpp
View file

@ -198,18 +198,22 @@ MonitorPanel::~MonitorPanel()
}); });
//m_status_add_machine_panel = new AddMachinePanel(m_tabpanel); //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_media_file_panel = new MediaFilePanel(m_tabpanel);
m_tabpanel->AddPage(m_status_info_panel, _L("Status"), "", true); 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_tabpanel->AddPage(m_media_file_panel, _L("Media"), "", false);
m_upgrade_panel = new UpgradePanel(m_tabpanel); m_upgrade_panel = new UpgradePanel(m_tabpanel);
m_tabpanel->AddPage(m_upgrade_panel, _L("Update"), "", false); m_tabpanel->AddPage(m_upgrade_panel, _L("Update"), "", false);
m_hms_panel = new HMSPanel(m_tabpanel); m_hms_panel = new HMSPanel(m_tabpanel);
m_tabpanel->AddPage(m_hms_panel, _L("HMS"), "", false); m_tabpanel->AddPage(m_hms_panel, _L("HMS"),"", false);
#if !BBL_RELEASE_TO_PUBLIC
m_debug_panel = new DebugPanel(m_tabpanel);
m_tabpanel->AddPage(m_debug_panel, _L("Debug"), "", false);
#endif #endif
m_initialized = true; m_initialized = true;
@ -258,10 +262,8 @@ void MonitorPanel::msw_rescale()
//m_status_add_machine_panel->msw_rescale(); //m_status_add_machine_panel->msw_rescale();
m_status_info_panel->msw_rescale(); m_status_info_panel->msw_rescale();
m_media_file_panel->Rescale(); m_media_file_panel->Rescale();
#if !BBL_RELEASE_TO_PUBLIC
m_upgrade_panel->msw_rescale(); m_upgrade_panel->msw_rescale();
m_hms_panel->msw_rescale(); m_hms_panel->msw_rescale();
#endif
m_connection_info->SetCornerRadius(0); m_connection_info->SetCornerRadius(0);
m_connection_info->SetSize(wxSize(FromDIP(220), FromDIP(25))); m_connection_info->SetSize(wxSize(FromDIP(220), FromDIP(25)));
@ -394,16 +396,11 @@ void MonitorPanel::update_all()
} }
m_status_info_panel->obj = obj; m_status_info_panel->obj = obj;
#if !BBL_RELEASE_TO_PUBLIC
m_upgrade_panel->update(obj); m_upgrade_panel->update(obj);
#endif
m_status_info_panel->m_media_play_ctrl->SetMachineObject(IsShown() ? obj : nullptr); m_status_info_panel->m_media_play_ctrl->SetMachineObject(IsShown() ? obj : nullptr);
#if !BBL_RELEASE_TO_PUBLIC
m_media_file_panel->SetMachineObject(obj); m_media_file_panel->SetMachineObject(obj);
#endif
update_status(obj); update_status(obj);
if (!obj) { if (!obj) {
@ -433,13 +430,17 @@ void MonitorPanel::update_all()
m_status_info_panel->update(obj); m_status_info_panel->update(obj);
} }
#if !BBL_RELEASE_TO_PUBLIC
if (m_hms_panel->IsShown()) { if (m_hms_panel->IsShown()) {
m_hms_panel->update(obj); m_hms_panel->update(obj);
} }
if (m_upgrade_panel->IsShown()) { if (m_upgrade_panel->IsShown()) {
m_upgrade_panel->update(obj); m_upgrade_panel->update(obj);
} }
#if !BBL_RELEASE_TO_PUBLIC
if (m_debug_panel->IsShown()) {
m_debug_panel->update(obj);
}
#endif #endif
} }