diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index 6cfd203b9..8c42c2690 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -274,7 +274,7 @@ void AppConfig::set_defaults() } if (get("pop_up_filament_map_dialog").empty()){ - set_bool("pop_up_filament_map_dialog", true); + set_bool("pop_up_filament_map_dialog", false); } if (get("prefered_filament_map_mode").empty()){ diff --git a/src/slic3r/GUI/FilamentMapDialog.cpp b/src/slic3r/GUI/FilamentMapDialog.cpp index 8c6644670..f1693b68e 100644 --- a/src/slic3r/GUI/FilamentMapDialog.cpp +++ b/src/slic3r/GUI/FilamentMapDialog.cpp @@ -49,7 +49,7 @@ bool try_pop_up_before_slice(bool skip_plate_sync, Plater* plater_ref, PartPlate std::vector applied_maps = get_applied_map(full_config, plater_ref, partplate_ref, sync_plate); applied_maps.resize(filament_colors.size(), 1); - if (!force_pop_up && applied_mode != fmmManual) + if (applied_mode != fmmManual) return true; std::vector filament_lists; diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index edd7d89c0..3503eb526 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -1242,10 +1242,12 @@ wxWindow* PreferencesDialog::create_general_page() auto item_darkmode = create_item_darkmode_checkbox(_L("Enable dark mode"), page,_L("Enable dark mode"), 50, "dark_color_mode"); #endif +#if 0 auto title_filament_group = create_item_title(_L("Filament Arrange"), page, _L("Filament Arrange")); //temporarily disable it //auto item_ignore_ext_filament = create_item_checkbox(_L("Ignore ext filament when auto grouping"), page, _L("Ignore ext filament when auto grouping"), 50, "ignore_ext_filament_when_group"); auto item_pop_up_filament_map_dialog = create_item_checkbox(_L("Pop up to select filament arrangement mode"), page, _L("Pop up to select filament arrangement mode"), 50, "pop_up_filament_map_dialog"); +#endif auto title_user_experience = create_item_title(_L("User Experience"), page, _L("User Experience")); auto item_priv_policy = create_item_checkbox(_L("Join Customer Experience Improvement Program."), page, "", 50, "privacyuse"); @@ -1317,9 +1319,11 @@ wxWindow* PreferencesDialog::create_general_page() sizer_page->Add(item_darkmode, 0, wxEXPAND, FromDIP(3)); #endif +#if 0 sizer_page->Add(title_filament_group, 0, wxTOP | wxEXPAND, FromDIP(20)); //sizer_page->Add(item_ignore_ext_filament, 0, wxEXPAND, FromDIP(3)); sizer_page->Add(item_pop_up_filament_map_dialog, 0, wxEXPAND, FromDIP(3)); +#endif sizer_page->Add(title_user_experience, 0, wxTOP | wxEXPAND, FromDIP(20)); sizer_page->Add(item_priv_policy, 0, wxTOP, FromDIP(3));