Skip to content

Commit

Permalink
Change ignore to OK in wrong filament msgbox
Browse files Browse the repository at this point in the history
This change is made because current texts does not fit the screen
BFW-3192
  • Loading branch information
MistrKernnunos authored and JohnnyDeer committed Jan 4, 2023
1 parent 923ebb7 commit c21bb1a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/gui/screen_print_preview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ static bool check_filament_type(GCodeInfo &gcode) {
gcode.filament_described && filament_known(curr_filament) && !is_same(curr_filament, gcode.filament_type);
curr_filament = Filaments::Current().name) {
string_view_utf8 txt_wrong_fil_type = _("This G-CODE was set up for another filament type.");
switch (MsgBoxWarning(txt_wrong_fil_type, Responses_ChangeIgnoreAbort, 0, GuiDefaults::RectScreenNoHeader)) {
switch (MsgBoxWarning(txt_wrong_fil_type, Responses_ChangeOkAbort, 0, GuiDefaults::RectScreenNoHeader)) {
case Response::Change:
PreheatStatus::DialogBlockingChangeLoad(RetAndCool_t::Return);
break;
case Response::Ignore:
case Response::Ok:
return true;
case Response::Abort:
return false;
Expand Down
1 change: 1 addition & 0 deletions src/guiapi/include/window_msgbox.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ static constexpr PhaseResponses Responses_YesRetry = { Response::Yes
static constexpr PhaseResponses Responses_RetryCancel = { Response::Retry, Response::Cancel, Response::_none, Response::_none };
static constexpr PhaseResponses Responses_ChangeIgnoreCancel = { Response::Change, Response::Ignore, Response::Cancel, Response::_none };
static constexpr PhaseResponses Responses_ChangeIgnoreAbort = { Response::Change, Response::Ignore, Response::Abort, Response::_none };
static constexpr PhaseResponses Responses_ChangeOkAbort = { Response::Change, Response::Ok, Response::Abort, Response::_none };
static constexpr PhaseResponses Responses_IgnoreAbort = { Response::Ignore, Response::Abort, Response::_none, Response::_none };

// clang-format on
Expand Down

0 comments on commit c21bb1a

Please sign in to comment.