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

FIX:Default option of stop printing is no 

jira: STUDIO-7405

Change-Id: I0a100746b2845bba57f57e8f6962eca1dbd562aa
(cherry picked from commit cbba4177361d8dce1ee09a1bfc39528292d72682)
This commit is contained in:
hang.xu 2024-08-14 12:13:30 +08:00 committed by Lane.Wei
parent e42aabebb1
commit 9096b2403c
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/GUI/StatusPanel.cpp
View File

@ -1907,6 +1907,15 @@ void StatusPanel::on_subtask_abort(wxCommandEvent &event)
}); });
} }
abort_dlg->update_text(_L("Are you sure you want to cancel this print?")); abort_dlg->update_text(_L("Are you sure you want to cancel this print?"));
abort_dlg->m_button_cancel->SetBackgroundColor(abort_dlg->btn_bg_green);
abort_dlg->m_button_cancel->SetBorderColor(*wxWHITE);
abort_dlg->m_button_cancel->SetTextColor(wxColor("#FFFFFE"));
abort_dlg->m_button_ok->SetBackgroundColor(abort_dlg->btn_bg_white);
abort_dlg->m_button_ok->SetBorderColor(wxColor(38, 46, 48));
abort_dlg->m_button_ok->SetTextColor(*wxBLACK);
abort_dlg->on_show(); abort_dlg->on_show();
} }
@ -2515,8 +2524,8 @@ void StatusPanel::update_extruder_status(MachineObject* obj)
tmp = m_bitmap_extruder_empty_unload; tmp = m_bitmap_extruder_empty_unload;
} }
} }
if (tmp.GetBitmapData() != m_bitmap_extruder_now) { if (!tmp.IsSameAs(m_bitmap_extruder_now)) {
m_bitmap_extruder_now = tmp.GetBitmapData(); m_bitmap_extruder_now = tmp;
m_bitmap_extruder_img->SetBitmap(tmp); m_bitmap_extruder_img->SetBitmap(tmp);
} }
} }

2
src/slic3r/GUI/StatusPanel.hpp
View File

@ -273,7 +273,7 @@ protected:
wxBitmap m_bitmap_extruder_filled_load; wxBitmap m_bitmap_extruder_filled_load;
wxBitmap m_bitmap_extruder_empty_unload; wxBitmap m_bitmap_extruder_empty_unload;
wxBitmap m_bitmap_extruder_filled_unload; wxBitmap m_bitmap_extruder_filled_unload;
wxBitmapRefData* m_bitmap_extruder_now; wxBitmap m_bitmap_extruder_now;
CameraRecordingStatus m_state_recording{CameraRecordingStatus::RECORDING_NONE}; CameraRecordingStatus m_state_recording{CameraRecordingStatus::RECORDING_NONE};
CameraTimelapseStatus m_state_timelapse{CameraTimelapseStatus::TIMELAPSE_NONE}; CameraTimelapseStatus m_state_timelapse{CameraTimelapseStatus::TIMELAPSE_NONE};