mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: gui: sync some missing codes during merge 

jira: no-jira
Change-Id: Iaeb8de95771278f9fbd30815a75dbed0ba08dad8
This commit is contained in:
lane.wei 2025-03-24 09:49:43 +08:00
parent 55155359b3
commit 8535ff2fdc
7 changed files with 11 additions and 2907 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

472
resources/web/guide/21/test.js
View File

@ -1,472 +0,0 @@
var cData={
"filament": {
"BBL PA-CF @BBL": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "BBL PA-CF @BBL",
"selected": 1,
"sub_path": "filament/BBL PA-CF @BBL.json",
"type": "PA6+CF",
"vendor": "BBL"
},
"Generic ABS": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "Generic ABS",
"selected": 1,
"sub_path": "filament/Generic ABS.json",
"type": "ABS",
"vendor": "Unknow"
},
"Generic PETG": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "Generic PETG",
"selected": 1,
"sub_path": "filament/Generic PETG.json",
"type": "PET",
"vendor": "Unknow"
},
"Generic PLA": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "Generic PLA",
"selected": 1,
"sub_path": "filament/Generic PLA.json",
"type": "PLA",
"vendor": "Unknow"
},
"Generic TPU": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "Generic TPU",
"selected": 1,
"sub_path": "filament/Generic TPU.json",
"type": "TPU",
"vendor": "Unknow"
},
"Generic TPU83": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "Generic TPU83",
"selected": 1,
"sub_path": "filament/Generic TPU83.json",
"type": "TPU",
"vendor": "Unknow"
},
"Generic TPU87": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "Generic TPU87",
"selected": 1,
"sub_path": "filament/Generic TPU87.json",
"type": "TPU",
"vendor": "Unknow"
},
"Generic TPU90": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "Generic TPU90",
"selected": 1,
"sub_path": "filament/Generic TPU90.json",
"type": "TPU",
"vendor": "Unknow"
},
"Generic TPU95": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "Generic TPU95",
"selected": 1,
"sub_path": "filament/Generic TPU95.json",
"type": "TPU",
"vendor": "Unknow"
},
"K5 ABS @Kexcelled": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "K5 ABS @Kexcelled",
"selected": 1,
"sub_path": "filament/K5 ABS @Kexcelled.json",
"type": "ABS",
"vendor": "Kexcelled"
},
"K5 ASA @Kexcelled": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "K5 ASA @Kexcelled",
"selected": 1,
"sub_path": "filament/K5 ASA @Kexcelled.json",
"type": "ABS",
"vendor": "Kexcelled"
},
"K5 PETG @Kexcelled": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "K5 PETG @Kexcelled",
"selected": 1,
"sub_path": "filament/K5 PETG @Kexcelled.json",
"type": "PET",
"vendor": "Kexcelled"
},
"K5 PLA~ @Kexcelled": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "K5 PLA~ @Kexcelled",
"selected": 1,
"sub_path": "filament/K5 PLA~ @Kexcelled.json",
"type": "PLA",
"vendor": "Kexcelled"
},
"K5 Silk PLA~ @Kexcelled": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "K5 Silk PLA~ @Kexcelled",
"selected": 1,
"sub_path": "filament/K5 Silk PLA~ @Kexcelled.json",
"type": "PLA",
"vendor": "Kexcelled"
},
"K5 Sparkle PLA @Kexcelled": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "K5 Sparkle PLA @Kexcelled",
"selected": 1,
"sub_path": "filament/K5 Sparkle PLA @Kexcelled.json",
"type": "PLA",
"vendor": "Kexcelled"
},
"K5M PLA~ @Kexcelled": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "K5M PLA~ @Kexcelled",
"selected": 1,
"sub_path": "filament/K5M PLA~ @Kexcelled.json",
"type": "PLA",
"vendor": "Kexcelled"
},
"K5P PLA~ @Kexcelled": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "K5P PLA~ @Kexcelled",
"selected": 1,
"sub_path": "filament/K5P PLA~ @Kexcelled.json",
"type": "PLA",
"vendor": "Kexcelled"
},
"K5T ABS @Kexcelled": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "K5T ABS @Kexcelled",
"selected": 1,
"sub_path": "filament/K5T ABS @Kexcelled.json",
"type": "ABS",
"vendor": "Kexcelled"
},
"K6 PETG @Kexcelled": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "K6 PETG @Kexcelled",
"selected": 1,
"sub_path": "filament/K6 PETG @Kexcelled.json",
"type": "PET",
"vendor": "Kexcelled"
},
"K6 PLA~ @Kexcelled": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "K6 PLA~ @Kexcelled",
"selected": 1,
"sub_path": "filament/K6 PLA~ @Kexcelled.json",
"type": "PLA",
"vendor": "Kexcelled"
},
"K6CF PLA~ @Kexcelled ": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "K6CF PLA~ @Kexcelled ",
"selected": 0,
"sub_path": "filament/K6CF PLA~ @Kexcelled.json",
"type": "PLA",
"vendor": "Kexcelled"
},
"K7 PC @Kexcelled ": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "K7 PC @Kexcelled ",
"selected": 0,
"sub_path": "filament/K7 PC @Kexcelled.json",
"type": "PA6+CF",
"vendor": "Kexcelled"
},
"K7CF PETG @Kexcelled": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "K7CF PETG @Kexcelled",
"selected": 1,
"sub_path": "filament/K7CF PETG @Kexcelled.json",
"type": "PET",
"vendor": "Kexcelled"
},
"K7CFLM PAHT @Kexcelled": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "K7CFLM PAHT @Kexcelled",
"selected": 1,
"sub_path": "filament/K7CFLM PAHT @Kexcelled.json",
"type": "PA6+CF",
"vendor": "Kexcelled"
},
"PLA Silk with Glue @ALL": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PLA Silk with Glue @ALL",
"selected": 1,
"sub_path": "filament/PLA Silk with Glue @ALL.json",
"type": "PLA",
"vendor": "ALL"
},
"PLA with Glue except Silk @ALL": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PLA with Glue except Silk @ALL",
"selected": 1,
"sub_path": "filament/PLA with Glue except Silk @ALL.json",
"type": "PLA",
"vendor": "ALL"
},
"PolyDissolve @Polymaker": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PolyDissolve @Polymaker",
"selected": 1,
"sub_path": "filament/PolyDissolve @Polymaker.json",
"type": "PLA",
"vendor": "Polymaker"
},
"PolyFlex TPU95HF @Polymaker": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PolyFlex TPU95HF @Polymaker",
"selected": 1,
"sub_path": "filament/PolyFlex TPU95HF @Polymaker.json",
"type": "TPU",
"vendor": "Polymaker"
},
"PolyLite ABS @Polymaker": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PolyLite ABS @Polymaker",
"selected": 1,
"sub_path": "filament/PolyLite ABS @Polymaker.json",
"type": "ABS",
"vendor": "Polymaker"
},
"PolyLite ASA @Polymaker": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PolyLite ASA @Polymaker",
"selected": 1,
"sub_path": "filament/PolyLite ASA @Polymaker.json",
"type": "ABS",
"vendor": "Polymaker"
},
"PolyLite PC @Polymaker": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PolyLite PC @Polymaker",
"selected": 1,
"sub_path": "filament/PolyLite PC @Polymaker.json",
"type": "PA6+CF",
"vendor": "Polymaker"
},
"PolyLite PETG @Polymaker": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PolyLite PETG @Polymaker",
"selected": 1,
"sub_path": "filament/PolyLite PETG @Polymaker.json",
"type": "PET",
"vendor": "Polymaker"
},
"PolyLite PLA Pro~ @Polymaker": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PolyLite PLA Pro~ @Polymaker",
"selected": 1,
"sub_path": "filament/PolyLite PLA Pro~ @Polymaker.json",
"type": "PLA",
"vendor": "Polymaker"
},
"PolyLite PLA Silk~ @Polymaker": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PolyLite PLA Silk~ @Polymaker",
"selected": 1,
"sub_path": "filament/PolyLite PLA Silk~ @Polymaker.json",
"type": "PLA",
"vendor": "Polymaker"
},
"PolyLite PLA~ @Polymaker": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PolyLite PLA~ @Polymaker",
"selected": 1,
"sub_path": "filament/PolyLite PLA~ @Polymaker.json",
"type": "PLA",
"vendor": "Polymaker"
},
"PolyMax PC @Polymaker": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PolyMax PC @Polymaker",
"selected": 1,
"sub_path": "filament/PolyMax PC @Polymaker.json",
"type": "PA6+CF",
"vendor": "Polymaker"
},
"PolyMax PETG @Polymaker": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PolyMax PETG @Polymaker",
"selected": 1,
"sub_path": "filament/PolyMax PETG @Polymaker.json",
"type": "PET",
"vendor": "Polymaker"
},
"PolyMax PLA~ @Polymaker": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PolyMax PLA~ @Polymaker",
"selected": 1,
"sub_path": "filament/PolyMax PLA~ @Polymaker.json",
"type": "PLA",
"vendor": "Polymaker"
},
"PolyMide CoPA @Polymaker": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PolyMide CoPA @Polymaker",
"selected": 1,
"sub_path": "filament/PolyMide CoPA @Polymaker.json",
"type": "PA6+CF",
"vendor": "Polymaker"
},
"PolyMide PA12-CF @Polymaker": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PolyMide PA12-CF @Polymaker",
"selected": 1,
"sub_path": "filament/PolyMide PA12-CF @Polymaker.json",
"type": "PA6+CF",
"vendor": "Polymaker"
},
"PolyMide PA6-CF @Polymaker": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PolyMide PA6-CF @Polymaker",
"selected": 1,
"sub_path": "filament/PolyMide PA6-CF @Polymaker.json",
"type": "PA6+CF",
"vendor": "Polymaker"
},
"PolyMide PA6-GF @Polymaker": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PolyMide PA6-GF @Polymaker",
"selected": 1,
"sub_path": "filament/PolyMide PA6-GF @Polymaker.json",
"type": "PA6+CF",
"vendor": "Polymaker"
},
"PolySupport @Polymaker": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PolySupport @Polymaker",
"selected": 1,
"sub_path": "filament/PolySupport @Polymaker.json",
"type": "PLA",
"vendor": "Polymaker"
},
"PolyTerra PLA~ @Polymaker": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PolyTerra PLA~ @Polymaker",
"selected": 1,
"sub_path": "filament/PolyTerra PLA~ @Polymaker.json",
"type": "PLA",
"vendor": "Polymaker"
},
"PolyWood PLA~ @Polymaker": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "PolyWood PLA~ @Polymaker",
"selected": 1,
"sub_path": "filament/PolyWood PLA~ @Polymaker.json",
"type": "PLA",
"vendor": "Polymaker"
},
"eSUN ABS @eSUN": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "eSUN ABS @eSUN",
"selected": 1,
"sub_path": "filament/eSUN ABS @eSUN.json",
"type": "ABS",
"vendor": "eSUN"
},
"eSUN ABS+ @eSUN": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "eSUN ABS+ @eSUN",
"selected": 1,
"sub_path": "filament/eSUN ABS+ @eSUN.json",
"type": "ABS",
"vendor": "eSUN"
},
"eSUN PETG @eSUN": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "eSUN PETG @eSUN",
"selected": 1,
"sub_path": "filament/eSUN PETG @eSUN.json",
"type": "PET",
"vendor": "eSUN"
},
"eSUN PLA @eSUN": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "eSUN PLA @eSUN",
"selected": 1,
"sub_path": "filament/eSUN PLA @eSUN.json",
"type": "PLA",
"vendor": "eSUN"
},
"eSUN PLA Matte~ @eSUN": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "eSUN PLA Matte~ @eSUN",
"selected": 1,
"sub_path": "filament/eSUN PLA Matte~ @eSUN.json",
"type": "PLA",
"vendor": "eSUN"
},
"eSUN PLA ST @eSUN": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "eSUN PLA ST @eSUN",
"selected": 1,
"sub_path": "filament/eSUN PLA ST @eSUN.json",
"type": "PLA",
"vendor": "eSUN"
},
"eSUN PLA Silk~ @eSUN": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "eSUN PLA Silk~ @eSUN",
"selected": 1,
"sub_path": "filament/eSUN PLA Silk~ @eSUN.json",
"type": "PLA",
"vendor": "eSUN"
},
"eSUN PLA+~ @eSUN": {
"models": "[BBL-3DP-V4NORMAL][BBL-3DP-V5NORMAL]",
"name": "eSUN PLA+~ @eSUN",
"selected": 1,
"sub_path": "filament/eSUN PLA+~ @eSUN.json",
"type": "PLA",
"vendor": "eSUN"
}
},
"machine": [{
"model": "BBL-3DP-V4NORMAL",
"name": "Bambulab BBL-3DP-001-V4-normal",
"sub_path": "machine/Bambulab BBL-3DP-001-V4-normal.json"
},
{
"model": "BBL-3DP-V5NORMAL",
"name": "Bambulab BBL-3DP-001-V5-normal",
"sub_path": "machine/Bambulab BBL-3DP-001-V5-normal.json"
}
],
"model": [{
"cover": "D:\\Document\\Bambu\\DevCode\\Slicer\\bamboo_slicer\\build\\src\\Debug\\resources\\profiles\\BBL\\BBL-3DP-V4NORMAL_cover.png",
"materials": "Generic PLA;PolyDissolve @Polymaker;PolyFlex TPU95HF @Polymaker;K5 Sparkle PLA @Kexcelled;Rock PLA @Polymaker;Generic TPU95;Generic TPU90;Generic TPU87;Generic TPU83;PolyMide CoPA @Polymaker;PolyMide PA6-GF @Polymaker;PolyMide PA12-CF @Polymaker;PolyMide PA6-CF @Polymaker;PolyLite ASA @Polymaker;K5 ASA @Kexcelled;K5T ABS @Kexcelled;PLA with Glue except Silk @ALL;PLA Silk with Glue @ALL;PolyTerra PLA~ @Polymaker; PolyLite PLA~ @Polymaker; PolyLite PLA Pro~ @Polymaker; PolyLite PLA Silk~ @Polymaker; PolyMax PLA~ @Polymaker; PolyWood PLA~ @Polymaker;K5 Silk PLA~ @Kexcelled;K5 PLA~ @Kexcelled;K6 PLA~ @Kexcelled;K6CF PLA~ @Kexcelled;K5M PLA~ @Kexcelled;K5P PLA~ @Kexcelled;eSUN PLA @eSUN; eSUN PLA+~ @eSUN; eSUN PLA Matte~ @eSUN; eSUN PLA Silk~ @eSUN; eSUN PLA ST @eSUN; PolyLite ABS @Polymaker; K5 ABS @Kexcelled; eSUN ABS @eSUN; eSUN ABS+ @eSUN; K5 PETG @Kexcelled; K6 PETG @Kexcelled; PolyMax PETG @Polymaker; PolyLite PETG @Polymaker; eSUN PETG @eSUN; PolySupport @Polymaker;K7CF PETG @Kexcelled;K7CFLM PAHT @Kexcelled; K7LM PAHT @Kexcelled; BBL PA-CF @BBL;K7 PC @Kexcelled; PolyLite PC @Polymaker; PolyMax PC @Polymaker;",
"model": "BBL-3DP-V4NORMAL",
"nozzle_diameter": "0.4;0.2",
"nozzle_selected": "0.4",
"sub_path": "machine/BBL-3DP-V4NORMAL.json",
"vendor": "BBL"
},
{
"cover": "D:\\Document\\Bambu\\DevCode\\Slicer\\bamboo_slicer\\build\\src\\Debug\\resources\\profiles\\BBL\\BBL-3DP-V5NORMAL_cover.png",
"materials": "Generic PLA;PolyDissolve @Polymaker;PolyFlex TPU95HF @Polymaker;K5 Sparkle PLA @Kexcelled;Rock PLA @Polymaker;Generic TPU95;Generic TPU90;Generic TPU87;Generic TPU83;PolyMide CoPA @Polymaker;PolyMide PA6-GF @Polymaker;PolyMide PA12-CF @Polymaker;PolyMide PA6-CF @Polymaker;PolyLite ASA @Polymaker;K5 ASA @Kexcelled;K5T ABS @Kexcelled;PLA with Glue except Silk @ALL;PLA Silk with Glue @ALL;PolyTerra PLA~ @Polymaker; PolyLite PLA~ @Polymaker; PolyLite PLA Pro~ @Polymaker; PolyLite PLA Silk~ @Polymaker; PolyMax PLA~ @Polymaker; PolyWood PLA~ @Polymaker;K5 Silk PLA~ @Kexcelled;K5 PLA~ @Kexcelled;K6 PLA~ @Kexcelled;K6CF PLA~ @Kexcelled;K5M PLA~ @Kexcelled;K5P PLA~ @Kexcelled;eSUN PLA @eSUN; eSUN PLA+~ @eSUN; eSUN PLA Matte~ @eSUN; eSUN PLA Silk~ @eSUN; eSUN PLA ST @eSUN; PolyLite ABS @Polymaker; K5 ABS @Kexcelled; eSUN ABS @eSUN; eSUN ABS+ @eSUN; K5 PETG @Kexcelled; K6 PETG @Kexcelled; PolyMax PETG @Polymaker; PolyLite PETG @Polymaker; eSUN PETG @eSUN; PolySupport @Polymaker;K7CF PETG @Kexcelled;K7CFLM PAHT @Kexcelled; K7LM PAHT @Kexcelled; BBL PA-CF @BBL;K7 PC @Kexcelled; PolyLite PC @Polymaker; PolyMax PC @Polymaker;",
"model": "BBL-3DP-V5NORMAL",
"nozzle_diameter": "0.4;0.2;0.1",
"nozzle_selected": "0.4",
"sub_path": "machine/BBL-3DP-V5NORMAL.json",
"vendor": "BBL"
}
]
};
var MData={
"BBL-3DP-V4NORMAL": {
"model": "BBL-3DP-V4NORMAL",
"nozzle_diameter": "0.4",
"vendor": "BBL"
},
"BBL-3DP-V5NORMAL": {
"model": "BBL-3DP-V5NORMAL",
"nozzle_diameter": "0.4;0.2",
"vendor": "BBL"
}
};

21
src/slic3r/GUI/MainFrame.cpp
View File

@ -3986,27 +3986,6 @@ void MainFrame::show_sync_dialog()
wxQueueEvent(this, evt);
}
bool MainFrame::check_bbl_farm_client_installed()
{
#ifdef WIN32
HKEY hKey;
LONG result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Bambulab\\Bambu Farm Manager Client"), 0, KEY_READ, &hKey);
LONG result_backup = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("HKEY_CLASSES_ROOT\\bambu-farm-client\\shell\\open\\command"), 0, KEY_READ, &hKey);
if (result == ERROR_SUCCESS || result_backup == ERROR_SUCCESS) {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "Bambu Farm Manager Client found.";
RegCloseKey(hKey);
return true;
} else {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "Bambu Farm Manager Client Not found.";
return false;
}
#else
return false;
#endif
}
void MainFrame::update_side_preset_ui()
{
// select last preset

1
src/slic3r/GUI/MainFrame.hpp
View File

@ -274,7 +274,6 @@ public:
// Called from wxEVT_ACTIVATE, as wxEVT_CREATE was not reliable (bug in wxWidgets?).
void register_win32_callbacks();
void init_menubar_as_editor();
bool check_bbl_farm_client_installed();
void init_menubar_as_gcodeviewer();
void update_menubar();
// Open item in menu by menu and item name (in actual language)

1
src/slic3r/GUI/NotificationManager.hpp
View File

@ -151,6 +151,7 @@ enum class NotificationType
BBLUserPresetExceedLimit,
BBLFilamentPrintableError,
BBLSliceLimitError,
BBLSliceMultiExtruderHeightOutside,
BBLBedFilamentIncompatible,
BBLMixUsePLAAndPETG,
NotificationTypeCount

2
src/slic3r/GUI/UnsavedChangesDialog.cpp
View File

@ -1590,7 +1590,6 @@ void UnsavedChangesDialog::update_list()
text_left->SetForegroundColour(wxGetApp().dark_mode() ? *wxLIGHT_GREY : GREY700);
#else
text_left->SetForegroundColour(GREY700);
text_left->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT));
#endif
sizer_left_v->Add(text_left, 0, wxLEFT, 37);
@ -1624,7 +1623,6 @@ void UnsavedChangesDialog::update_list()
text_left->SetForegroundColour(wxGetApp().dark_mode() ? *wxLIGHT_GREY : GREY700);
#else
text_left->SetForegroundColour(GREY700);
text_left->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT));
#endif
sizer_left_v->Add(text_left, 0, wxLEFT, 51 );

24
src/slic3r/GUI/WebViewDialog.cpp
View File

@ -279,8 +279,6 @@ WebViewPanel::WebViewPanel(wxWindow *parent)
SendDesignStaffpick(true);
}
});
SwitchWebContent("home");
}
WebViewPanel::~WebViewPanel()
@ -845,7 +843,7 @@ std::string GenerateRandomString(int length)
return randomString;
}
void WebViewPanel::OpenMakerlab3mf(std::string Base64Buf, std::string FileName)
bool WebViewPanel::SaveBase64ToLocal(std::string Base64Buf, std::string FileName, std::string FileTail, wxString &download_path, wxString &download_file)
{
int nSize = wxBase64DecodedSize(Base64Buf.length());
char *DstBuf = new char[nSize + 1];
@ -1713,7 +1711,7 @@ void WebViewPanel::SwitchWebContent(std::string modelname, int refresh)
wxString strlang = GetStudioLanguage();
if (modelname.compare("makerlab") == 0)
if (modelname.compare("makersupply") == 0)
{
std::string strRegion = wxGetApp().app_config->get_country_code();
wxString MakerSupplyUrl;
@ -1722,20 +1720,18 @@ void WebViewPanel::SwitchWebContent(std::string modelname, int refresh)
else
MakerSupplyUrl = "https://store.bambulab.com/collections/makers-supply?from=bambustudio";
wxLaunchDefaultBrowser(MakerSupplyUrl);
}
else if (modelname.compare("makerlab") == 0)
{
wxString FinalUrl;
if (!m_MakerLabFirst)
{
if (m_MakerLab_LastUrl != "")
FinalUrl = m_MakerLab_LastUrl;
else
{
SetMakerlabUrl("");
FinalUrl = m_MakerLab_LastUrl;
}
UpdateMakerlabStatus();
}
else {
if (m_MakerLab_LastUrl != "")
FinalUrl = m_MakerLab_LastUrl;
if (m_MakerLab_LastUrl != "") m_browserML->LoadURL(m_MakerLab_LastUrl);
}
m_MakerLabFirst = true;

2397
src/slic3r/GUI/Widgets/AMSControl.cpp
View File

File diff suppressed because it is too large Load Diff