mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: the bug of incorrect button without restarting 

JIRA: STUDIO-6824
The bug can cause the user to not restart when opening the multi-device option, but the button of send multi-devices appears

Change-Id: I0837fa79ecc1d8ab5ce98273ad134fa2f830421e
This commit is contained in:
Kunlong Ma 2024-04-22 09:48:29 +08:00 committed by Lane.Wei
parent a8965f7dcd
commit 1b4380a43d
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/slic3r/GUI/MainFrame.cpp
View File

@ -1552,6 +1552,7 @@ bool MainFrame::can_reslice() const
wxBoxSizer* MainFrame::create_side_tools() wxBoxSizer* MainFrame::create_side_tools()
{ {
enable_multi_machine = wxGetApp().is_enable_multi_machine();
int em = em_unit(); int em = em_unit();
wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL);
@ -1735,9 +1736,6 @@ wxBoxSizer* MainFrame::create_side_tools()
SideButton* export_all_sliced_file_btn = new SideButton(p, _L("Export all sliced file"), ""); SideButton* export_all_sliced_file_btn = new SideButton(p, _L("Export all sliced file"), "");
export_all_sliced_file_btn->SetCornerRadius(0); export_all_sliced_file_btn->SetCornerRadius(0);
SideButton* print_multi_machine_btn = new SideButton(p, _L("Send to Multi-device"), "");
print_multi_machine_btn->SetCornerRadius(0);
print_plate_btn->Bind(wxEVT_BUTTON, [this, p](wxCommandEvent&) { print_plate_btn->Bind(wxEVT_BUTTON, [this, p](wxCommandEvent&) {
m_print_btn->SetLabel(_L("Print plate")); m_print_btn->SetLabel(_L("Print plate"));
m_print_select = ePrintPlate; m_print_select = ePrintPlate;
@ -1796,6 +1794,15 @@ wxBoxSizer* MainFrame::create_side_tools()
p->Dismiss(); p->Dismiss();
}); });
p->append_button(print_plate_btn);
p->append_button(print_all_btn);
p->append_button(send_to_printer_btn);
p->append_button(send_to_printer_all_btn);
p->append_button(export_sliced_file_btn);
p->append_button(export_all_sliced_file_btn);
if (enable_multi_machine) {
SideButton* print_multi_machine_btn = new SideButton(p, _L("Send to Multi-device"), "");
print_multi_machine_btn->SetCornerRadius(0);
print_multi_machine_btn->Bind(wxEVT_BUTTON, [this, p](wxCommandEvent&) { print_multi_machine_btn->Bind(wxEVT_BUTTON, [this, p](wxCommandEvent&) {
m_print_btn->SetLabel(_L("Send to Multi-device")); m_print_btn->SetLabel(_L("Send to Multi-device"));
m_print_select = ePrintMultiMachine; m_print_select = ePrintMultiMachine;
@ -1804,16 +1811,9 @@ wxBoxSizer* MainFrame::create_side_tools()
this->Layout(); this->Layout();
p->Dismiss(); p->Dismiss();
}); });
p->append_button(print_plate_btn);
p->append_button(print_all_btn);
p->append_button(send_to_printer_btn);
p->append_button(send_to_printer_all_btn);
p->append_button(export_sliced_file_btn);
p->append_button(export_all_sliced_file_btn);
if (wxGetApp().is_enable_multi_machine())
p->append_button(print_multi_machine_btn); p->append_button(print_multi_machine_btn);
} }
}
p->Popup(m_print_btn); p->Popup(m_print_btn);
} }

1
src/slic3r/GUI/MainFrame.hpp
View File

@ -99,6 +99,7 @@ class MainFrame : public DPIFrame
wxMenuBar* m_menubar{ nullptr }; wxMenuBar* m_menubar{ nullptr };
//wxMenu* publishMenu{ nullptr }; //wxMenu* publishMenu{ nullptr };
wxMenu * m_calib_menu{nullptr}; wxMenu * m_calib_menu{nullptr};
bool enable_multi_machine{ false };
#if 0 #if 0
wxMenuItem* m_menu_item_repeat { nullptr }; // doesn't used now wxMenuItem* m_menu_item_repeat { nullptr }; // doesn't used now