GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 01:15:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for SPE-2108 : Missing update when toggling "Show incompatible print and filament presets"

Browse Source
This commit is contained in:
YuSanka 2024-01-22 15:58:14 +01:00
parent c7fa6b0f73
commit 131d8700b1
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/slic3r/GUI/Tab.cpp
View File

@ -988,7 +988,7 @@ void Tab::sys_color_changed()
if (m_detach_preset_btn) if (m_detach_preset_btn)
m_detach_preset_btn->sys_color_changed(); m_detach_preset_btn->sys_color_changed();
update_show_hide_incompatible_button(); m_btn_hide_incompatible_presets->SetBitmap(*get_bmp_bundle(m_show_incompatible_presets ? "flag_red" : "flag_green"));
// update icons for tree_ctrl // update icons for tree_ctrl
wxVector <wxBitmapBundle> img_bundles; wxVector <wxBitmapBundle> img_bundles;
@ -4483,36 +4483,40 @@ void Tab::delete_preset()
void Tab::toggle_show_hide_incompatible() void Tab::toggle_show_hide_incompatible()
{ {
m_show_incompatible_presets = !m_show_incompatible_presets; m_show_incompatible_presets = !m_show_incompatible_presets;
m_presets_choice->set_show_incompatible_presets(m_show_incompatible_presets); update_compatibility_ui();
update_show_hide_incompatible_button();
update_tab_ui();
} }
void Tab::update_show_hide_incompatible_button() void Tab::update_compatibility_ui()
{ {
m_btn_hide_incompatible_presets->SetBitmap(*get_bmp_bundle(m_show_incompatible_presets ? "flag_red" : "flag_green")); m_btn_hide_incompatible_presets->SetBitmap(*get_bmp_bundle(m_show_incompatible_presets ? "flag_red" : "flag_green"));
m_btn_hide_incompatible_presets->SetToolTip(m_show_incompatible_presets ? m_btn_hide_incompatible_presets->SetToolTip(m_show_incompatible_presets ?
"Both compatible an incompatible presets are shown. Click to hide presets not compatible with the current printer." : "Both compatible an incompatible presets are shown. Click to hide presets not compatible with the current printer." :
"Only compatible presets are shown. Click to show both the presets compatible and not compatible with the current printer."); "Only compatible presets are shown. Click to show both the presets compatible and not compatible with the current printer.");
m_presets_choice->set_show_incompatible_presets(m_show_incompatible_presets);
m_presets_choice->update();
} }
void Tab::update_ui_from_settings() void Tab::update_ui_from_settings()
{ {
// Show the 'show / hide presets' button only for the print and filament tabs, and only if enabled // Show the 'show / hide presets' button only for the print and filament tabs
// in application preferences. if (m_type == Slic3r::Preset::TYPE_PRINTER)
m_show_btn_incompatible_presets = wxGetApp().app_config->get("show_incompatible_presets")[0] == '1' ? true : false; return;
bool show = m_show_btn_incompatible_presets && m_type != Slic3r::Preset::TYPE_PRINTER;
// and only if enabled in application preferences.
bool show = wxGetApp().app_config->get_bool("show_incompatible_presets");
if (m_show_btn_incompatible_presets == show)
return;
m_show_btn_incompatible_presets = show;
m_btn_hide_incompatible_presets->Show(m_show_btn_incompatible_presets);
Layout(); Layout();
show ? m_btn_hide_incompatible_presets->Show() : m_btn_hide_incompatible_presets->Hide();
// If the 'show / hide presets' button is hidden, hide the incompatible presets. if (show)
if (show) { update_compatibility_ui();
update_show_hide_incompatible_button();
}
else { else {
if (m_show_incompatible_presets) { m_presets_choice->set_show_incompatible_presets(false);
m_show_incompatible_presets = false; m_presets_choice->update();
update_tab_ui();
}
} }
} }

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

@ -351,7 +351,7 @@ public:
void rename_preset(); void rename_preset();
void delete_preset(); void delete_preset();
void toggle_show_hide_incompatible(); void toggle_show_hide_incompatible();
void update_show_hide_incompatible_button(); void update_compatibility_ui();
void update_ui_from_settings(); void update_ui_from_settings();
void update_label_colours(); void update_label_colours();
void decorate(); void decorate();