Skip to content

Add configurable print status window #10505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sepp89117 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add configurable print status window #10505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion bbl/i18n/list.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ src/slic3r/GUI/ObjectDataViewModel.cpp
src/slic3r/GUI/OpenGLManager.cpp
src/slic3r/GUI/OptionsGroup.cpp
src/slic3r/GUI/PrintOptionsDialog.cpp
src/slic3r/GUI/PrintStatusFrame.cpp
src/slic3r/GUI/SafetyOptionsDialog.cpp
src/slic3r/GUI/ParamsPanel.cpp
src/slic3r/GUI/PartPlate.cpp
Expand Down Expand Up @@ -287,4 +288,4 @@ src/slic3r/GUI/UxProgramTermsDialog.hpp
src/slic3r/GUI/HelioHistoryDialog.hpp
src/slic3r/GUI/HelioHistoryDialog.cpp
src/slic3r/GUI/MixedFilamentDialog.cpp
src/slic3r/GUI/MixedFilamentDialog.hpp
src/slic3r/GUI/MixedFilamentDialog.hpp
43 changes: 43 additions & 0 deletions src/libslic3r/AppConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,49 @@ void AppConfig::set_defaults()
set_bool("show_print_history", true);
}

if (get("print_status_window_enabled").empty())
set_bool("print_status_window_enabled", false);
if (get("print_status_window_auto_show_on_minimize").empty())
set_bool("print_status_window_auto_show_on_minimize", false);
if (get("print_status_window_close_to_tray").empty())
set_bool("print_status_window_close_to_tray", false);
if (get("print_status_window_always_on_top").empty())
set_bool("print_status_window_always_on_top", false);
if (get("print_status_window_remember_position").empty())
set_bool("print_status_window_remember_position", true);
if (get("print_status_window_show_printer_selector").empty())
set_bool("print_status_window_show_printer_selector", true);
if (get("print_status_window_show_printer_name").empty())
set_bool("print_status_window_show_printer_name", true);
if (get("print_status_window_show_stage").empty())
set_bool("print_status_window_show_stage", true);
if (get("print_status_window_show_job_name").empty())
set_bool("print_status_window_show_job_name", true);
if (get("print_status_window_show_progress").empty())
set_bool("print_status_window_show_progress", true);
if (get("print_status_window_show_remaining_time").empty())
set_bool("print_status_window_show_remaining_time", true);
if (get("print_status_window_show_layers").empty())
set_bool("print_status_window_show_layers", true);
if (get("print_status_window_show_nozzle_temp").empty())
set_bool("print_status_window_show_nozzle_temp", true);
if (get("print_status_window_show_bed_temp").empty())
set_bool("print_status_window_show_bed_temp", true);
if (get("print_status_window_show_warnings").empty())
set_bool("print_status_window_show_warnings", true);
if (get("print_status_window_theme").empty())
set("print_status_window_theme", "follow_app");
if (get("print_status_window_opacity").empty())
set("print_status_window_opacity", "100");
if (get("print_status_window_pos_x").empty())
set("print_status_window_pos_x", "");
if (get("print_status_window_pos_y").empty())
set("print_status_window_pos_y", "");
if (get("print_status_window_width").empty())
set("print_status_window_width", "");
if (get("print_status_window_height").empty())
set("print_status_window_height", "");

if (get("show_printable_box").empty()) {
set_bool("show_printable_box", true);
}
Expand Down
2 changes: 2 additions & 0 deletions src/slic3r/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@ set(SLIC3R_GUI_SOURCES
GUI/ImageDPIFrame.hpp
GUI/Preferences.cpp
GUI/Preferences.hpp
GUI/PrintStatusFrame.cpp
GUI/PrintStatusFrame.hpp
GUI/AMSSetting.cpp
GUI/AMSSetting.hpp
GUI/AMSDryControl.cpp
Expand Down
6 changes: 4 additions & 2 deletions src/slic3r/GUI/GUI_App.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2908,10 +2908,12 @@ bool GUI_App::on_init_inner()
wxGetApp().Bind(wxEVT_QUERY_END_SESSION, [this](auto & e) {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__<< "received wxEVT_QUERY_END_SESSION";
if (mainframe) {
mainframe->set_real_shutdown_requested(true);
wxCloseEvent e2(wxEVT_CLOSE_WINDOW);
e2.SetCanVeto(true);
mainframe->GetEventHandler()->ProcessEvent(e2);
if (e2.GetVeto()) {
mainframe->set_real_shutdown_requested(false);
e.Veto();
return;
}
Expand Down Expand Up @@ -3193,10 +3195,10 @@ bool GUI_App::on_init_inner()
wxLaunchDefaultBrowser(download_url);
break;
case wxID_NO:
wxGetApp().mainframe->Close(true);
wxGetApp().mainframe->request_app_exit(true);
break;
default:
wxGetApp().mainframe->Close(true);
wxGetApp().mainframe->request_app_exit(true);
}
});

Expand Down
Loading