mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-16 18:12:10 +00:00
FIX: Add bed type in send print page
jira: STUDIO-7824 Change-Id: I64d9ed41b862ed4e3b8c21218c289132d767105e (cherry picked from commit 7bb5060b739b3a95fe889ae64e8d7289e2c928d9)
This commit is contained in:
@@ -4070,24 +4070,9 @@ void SelectMachineDialog::sys_color_changed()
|
||||
|
||||
bool SelectMachineDialog::Show(bool show)
|
||||
{
|
||||
if (show) {
|
||||
m_refresh_timer->Start(LIST_REFRESH_INTERVAL);
|
||||
} else {
|
||||
m_refresh_timer->Stop();
|
||||
|
||||
DeviceManager *dev = Slic3r::GUI::wxGetApp().getDeviceManager();
|
||||
if (dev) {
|
||||
MachineObject *obj_ = dev->get_selected_machine();
|
||||
if (obj_ && obj_->connection_type() == "cloud" /*&& m_print_type == FROM_SDCARD_VIEW*/) {
|
||||
if (obj_->is_connected()) { obj_->disconnect(); }
|
||||
}
|
||||
}
|
||||
|
||||
return DPIDialog::Show(false);
|
||||
}
|
||||
|
||||
show_status(PrintDialogStatus::PrintStatusInit);
|
||||
|
||||
|
||||
PresetBundle& preset_bundle = *wxGetApp().preset_bundle;
|
||||
const auto& project_config = preset_bundle.project_config;
|
||||
|
||||
@@ -4109,14 +4094,31 @@ bool SelectMachineDialog::Show(bool show)
|
||||
}
|
||||
|
||||
// set default value when show this dialog
|
||||
wxGetApp().UpdateDlgDarkUI(this);
|
||||
wxGetApp().reset_to_active();
|
||||
set_default();
|
||||
update_user_machine_list();
|
||||
if (show) {
|
||||
m_refresh_timer->Start(LIST_REFRESH_INTERVAL);
|
||||
show_status(PrintDialogStatus::PrintStatusInit);
|
||||
wxGetApp().UpdateDlgDarkUI(this);
|
||||
wxGetApp().reset_to_active();
|
||||
set_default();
|
||||
update_user_machine_list();
|
||||
|
||||
Layout();
|
||||
Fit();
|
||||
CenterOnParent();
|
||||
Layout();
|
||||
Fit();
|
||||
CenterOnParent();
|
||||
}
|
||||
else {
|
||||
m_refresh_timer->Stop();
|
||||
DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
|
||||
if (dev) {
|
||||
MachineObject* obj_ = dev->get_selected_machine();
|
||||
if (obj_ && obj_->connection_type() == "cloud" /*&& m_print_type == FROM_SDCARD_VIEW*/) {
|
||||
if (obj_->is_connected()) {
|
||||
obj_->disconnect();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
return DPIDialog::Show(show);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user