juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-28 13:22:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

feature remove not work code.

Browse Source
This commit is contained in:
alves
2026-02-09 16:08:34 +08:00
parent af583c7789
commit 731549ca4f
2 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/slic3r/GUI/GUI_App.cpp
View File

@@ -6974,16 +6974,7 @@ bool GUI_App::config_wizard_startup()
BOOST_LOG_TRIVIAL(info) << "finished run wizard"; BOOST_LOG_TRIVIAL(info) << "finished run wizard";
return true; return true;
} /*else if (get_app_config()->legacy_datadir()) { }
// Looks like user has legacy pre-vendorbundle data directory,
// explain what this is and run the wizard
MsgDataLegacy dlg;
dlg.ShowModal();
run_wizard(ConfigWizard::RR_DATA_LEGACY);
return true;
}*/
if (isAgree.empty()) if (isAgree.empty())
{ {

14
src/slic3r/Utils/PresetUpdater.cpp
View File

@@ -1555,12 +1555,9 @@ PresetUpdater::~PresetUpdater()
//BBS: refine the preset updater logic //BBS: refine the preset updater logic
void PresetUpdater::sync(std::string http_url, std::string language, std::string plugin_version, PresetBundle *preset_bundle) void PresetUpdater::sync(std::string http_url, std::string language, std::string plugin_version, PresetBundle *preset_bundle)
{ {
//p->set_download_prefs(GUI::wxGetApp().app_config);
if (!p->enabled_version_check && !p->enabled_config_update) { return; } if (!p->enabled_version_check && !p->enabled_config_update) { return; }
// Copy the whole vendors data for use in the background thread
// Unfortunatelly as of C++11, it needs to be copied again
// into the closure (but perhaps the compiler can elide this).
VendorMap vendors = preset_bundle ? preset_bundle->vendors : VendorMap{}; VendorMap vendors = preset_bundle ? preset_bundle->vendors : VendorMap{};
p->thread = std::thread([this, vendors, http_url, language, plugin_version]() { p->thread = std::thread([this, vendors, http_url, language, plugin_version]() {
@@ -1582,10 +1579,7 @@ void PresetUpdater::sync(std::string http_url, std::string language, std::string
return; return;
this->p->sync_plugins(http_url, plugin_version); this->p->sync_plugins(http_url, plugin_version);
this->p->sync_printer_config(http_url); this->p->sync_printer_config(http_url);
//if (p->cancel)
// return;
//remove the tooltip currently
//this->p->sync_tooltip(http_url, language);
}); });
} }
@@ -1603,9 +1597,7 @@ static bool reload_configs_update_gui()
// Reload global configuration // Reload global configuration
auto* app_config = GUI::wxGetApp().app_config; auto* app_config = GUI::wxGetApp().app_config;
// System profiles should not trigger any substitutions, user profiles may trigger substitutions, but these substitutions
// were already presented to the user on application start up. Just do substitutions now and keep quiet about it.
// However throw on substitutions in system profiles, those shall never happen with system profiles installed over the air.
GUI::wxGetApp().preset_bundle->load_presets(*app_config, ForwardCompatibilitySubstitutionRule::EnableSilentDisableSystem); GUI::wxGetApp().preset_bundle->load_presets(*app_config, ForwardCompatibilitySubstitutionRule::EnableSilentDisableSystem);
GUI::wxGetApp().load_current_presets(); GUI::wxGetApp().load_current_presets();
GUI::wxGetApp().plater()->set_bed_shape(); GUI::wxGetApp().plater()->set_bed_shape();