Fixed conflicts after merge with master and ported changes into gouraud shaders to gouraud_mod shaders
This commit is contained in:
commit
2c0815f537
72 changed files with 1750 additions and 1043 deletions
src/slic3r/GUI
|
@ -4032,6 +4032,7 @@ void Plater::priv::on_export_began(wxCommandEvent& evt)
|
|||
{
|
||||
if (show_warning_dialog)
|
||||
warnings_dialog();
|
||||
notification_manager->push_delayed_notification(NotificationType::ExportOngoing, [](){return true;}, 1000, 1000);
|
||||
}
|
||||
void Plater::priv::on_slicing_began()
|
||||
{
|
||||
|
@ -4164,6 +4165,10 @@ void Plater::priv::on_process_completed(SlicingProcessCompletedEvent &evt)
|
|||
if(wxGetApp().get_mode() == comSimple) {
|
||||
show_action_buttons(false);
|
||||
}
|
||||
if (exporting_status != ExportingStatus::NOT_EXPORTING && !has_error) {
|
||||
notification_manager->stop_delayed_notifications_of_type(NotificationType::ExportOngoing);
|
||||
notification_manager->close_notification_of_type(NotificationType::ExportOngoing);
|
||||
}
|
||||
// If writing to removable drive was scheduled, show notification with eject button
|
||||
if (exporting_status == ExportingStatus::EXPORTING_TO_REMOVABLE && !has_error) {
|
||||
show_action_buttons(false);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue