diff --git a/resources/web/image/printer/Anker M5_cover.png b/resources/profiles/Anker/Anker M5_cover.png similarity index 100% rename from resources/web/image/printer/Anker M5_cover.png rename to resources/profiles/Anker/Anker M5_cover.png diff --git a/resources/web/image/printer/Anycubic 4Max Pro_cover.png b/resources/profiles/Anycubic/Anycubic 4Max Pro_cover.png similarity index 100% rename from resources/web/image/printer/Anycubic 4Max Pro_cover.png rename to resources/profiles/Anycubic/Anycubic 4Max Pro_cover.png diff --git a/resources/web/image/printer/Artillery Genius_cover.png b/resources/profiles/Artillery/Artillery Genius_cover.png similarity index 100% rename from resources/web/image/printer/Artillery Genius_cover.png rename to resources/profiles/Artillery/Artillery Genius_cover.png diff --git a/resources/web/image/printer/Artillery Hornet_cover.png b/resources/profiles/Artillery/Artillery Hornet_cover.png similarity index 100% rename from resources/web/image/printer/Artillery Hornet_cover.png rename to resources/profiles/Artillery/Artillery Hornet_cover.png diff --git a/resources/web/image/printer/Artillery Sidewinder X2_cover.png b/resources/profiles/Artillery/Artillery Sidewinder X2_cover.png similarity index 100% rename from resources/web/image/printer/Artillery Sidewinder X2_cover.png rename to resources/profiles/Artillery/Artillery Sidewinder X2_cover.png diff --git a/resources/web/image/printer/Creality CR-10 Max_cover.png b/resources/profiles/Creality/Creality CR-10 Max_cover.png similarity index 100% rename from resources/web/image/printer/Creality CR-10 Max_cover.png rename to resources/profiles/Creality/Creality CR-10 Max_cover.png diff --git a/resources/web/image/printer/Creality CR-10 V2_cover.png b/resources/profiles/Creality/Creality CR-10 V2_cover.png similarity index 100% rename from resources/web/image/printer/Creality CR-10 V2_cover.png rename to resources/profiles/Creality/Creality CR-10 V2_cover.png diff --git a/resources/web/image/printer/Creality Ender-3 S1 Pro_cover.png b/resources/profiles/Creality/Creality Ender-3 S1 Pro_cover.png similarity index 100% rename from resources/web/image/printer/Creality Ender-3 S1 Pro_cover.png rename to resources/profiles/Creality/Creality Ender-3 S1 Pro_cover.png diff --git a/resources/web/image/printer/Creality Ender-3 S1_cover.png b/resources/profiles/Creality/Creality Ender-3 S1_cover.png similarity index 100% rename from resources/web/image/printer/Creality Ender-3 S1_cover.png rename to resources/profiles/Creality/Creality Ender-3 S1_cover.png diff --git a/resources/web/image/printer/Creality Ender-3 V2_cover.png b/resources/profiles/Creality/Creality Ender-3 V2_cover.png similarity index 100% rename from resources/web/image/printer/Creality Ender-3 V2_cover.png rename to resources/profiles/Creality/Creality Ender-3 V2_cover.png diff --git a/resources/web/image/printer/Creality Ender-5 Plus_cover.png b/resources/profiles/Creality/Creality Ender-5 Plus_cover.png similarity index 100% rename from resources/web/image/printer/Creality Ender-5 Plus_cover.png rename to resources/profiles/Creality/Creality Ender-5 Plus_cover.png diff --git a/resources/web/image/printer/Creality Ender-5 Pro (2019)_cover.png b/resources/profiles/Creality/Creality Ender-5 Pro (2019)_cover.png similarity index 100% rename from resources/web/image/printer/Creality Ender-5 Pro (2019)_cover.png rename to resources/profiles/Creality/Creality Ender-5 Pro (2019)_cover.png diff --git a/resources/web/image/printer/Creality Ender-5 S1_cover.png b/resources/profiles/Creality/Creality Ender-5 S1_cover.png similarity index 100% rename from resources/web/image/printer/Creality Ender-5 S1_cover.png rename to resources/profiles/Creality/Creality Ender-5 S1_cover.png diff --git a/resources/web/image/printer/Creality Ender-5S_cover.png b/resources/profiles/Creality/Creality Ender-5S_cover.png similarity index 100% rename from resources/web/image/printer/Creality Ender-5S_cover.png rename to resources/profiles/Creality/Creality Ender-5S_cover.png diff --git a/resources/web/image/printer/Creality Ender-5_cover.png b/resources/profiles/Creality/Creality Ender-5_cover.png similarity index 100% rename from resources/web/image/printer/Creality Ender-5_cover.png rename to resources/profiles/Creality/Creality Ender-5_cover.png diff --git a/resources/web/image/printer/Creality Ender-6_cover.png b/resources/profiles/Creality/Creality Ender-6_cover.png similarity index 100% rename from resources/web/image/printer/Creality Ender-6_cover.png rename to resources/profiles/Creality/Creality Ender-6_cover.png diff --git a/resources/profiles/Custom.json b/resources/profiles/Custom.json index b131c5c7b3..7770ec0d78 100644 --- a/resources/profiles/Custom.json +++ b/resources/profiles/Custom.json @@ -1,6 +1,6 @@ { "name": "Custom Printer", - "version": "01.05.01.02", + "version": "01.06.00.00", "force_update": "0", "description": "My configurations", "machine_model_list": [ diff --git a/resources/web/image/printer/Generaic Klipper Printer_cover.png b/resources/profiles/Custom/Generic Klipper Printer_cover.png similarity index 100% rename from resources/web/image/printer/Generaic Klipper Printer_cover.png rename to resources/profiles/Custom/Generic Klipper Printer_cover.png diff --git a/resources/web/image/printer/Generic Marlin Printer_cover.png b/resources/profiles/Custom/Generic Marlin Printer_cover.png similarity index 100% rename from resources/web/image/printer/Generic Marlin Printer_cover.png rename to resources/profiles/Custom/Generic Marlin Printer_cover.png diff --git a/resources/web/image/printer/Elegoo Neptune 3 Max_cover.png b/resources/profiles/Elegoo/Elegoo Neptune 3 Max_cover.png similarity index 100% rename from resources/web/image/printer/Elegoo Neptune 3 Max_cover.png rename to resources/profiles/Elegoo/Elegoo Neptune 3 Max_cover.png diff --git a/resources/web/image/printer/Elegoo Neptune 3 Plus_cover.png b/resources/profiles/Elegoo/Elegoo Neptune 3 Plus_cover.png similarity index 100% rename from resources/web/image/printer/Elegoo Neptune 3 Plus_cover.png rename to resources/profiles/Elegoo/Elegoo Neptune 3 Plus_cover.png diff --git a/resources/web/image/printer/Elegoo Neptune 3 Pro_cover.png b/resources/profiles/Elegoo/Elegoo Neptune 3 Pro_cover.png similarity index 100% rename from resources/web/image/printer/Elegoo Neptune 3 Pro_cover.png rename to resources/profiles/Elegoo/Elegoo Neptune 3 Pro_cover.png diff --git a/resources/web/image/printer/Elegoo Neptune 3_cover.png b/resources/profiles/Elegoo/Elegoo Neptune 3_cover.png similarity index 100% rename from resources/web/image/printer/Elegoo Neptune 3_cover.png rename to resources/profiles/Elegoo/Elegoo Neptune 3_cover.png diff --git a/resources/web/image/printer/FLSun V400_cover.png b/resources/profiles/FLSun/FLSun V400_cover.png similarity index 100% rename from resources/web/image/printer/FLSun V400_cover.png rename to resources/profiles/FLSun/FLSun V400_cover.png diff --git a/resources/web/image/printer/Orca Arena X1 Carbon_cover.png b/resources/profiles/OrcaArena/Orca Arena X1 Carbon_cover.png similarity index 100% rename from resources/web/image/printer/Orca Arena X1 Carbon_cover.png rename to resources/profiles/OrcaArena/Orca Arena X1 Carbon_cover.png diff --git a/resources/web/image/printer/Prusa MINI_cover.png b/resources/profiles/Prusa/Prusa MINI_cover.png similarity index 100% rename from resources/web/image/printer/Prusa MINI_cover.png rename to resources/profiles/Prusa/Prusa MINI_cover.png diff --git a/resources/web/image/printer/Prusa MK3S_cover.png b/resources/profiles/Prusa/Prusa MK3S_cover.png similarity index 100% rename from resources/web/image/printer/Prusa MK3S_cover.png rename to resources/profiles/Prusa/Prusa MK3S_cover.png diff --git a/resources/web/image/printer/Qidi X-CF Pro_cover.png b/resources/profiles/Qidi/Qidi X-CF Pro_cover.png similarity index 100% rename from resources/web/image/printer/Qidi X-CF Pro_cover.png rename to resources/profiles/Qidi/Qidi X-CF Pro_cover.png diff --git a/resources/web/image/printer/Qidi X-Max 3_cover.png b/resources/profiles/Qidi/Qidi X-Max 3_cover.png similarity index 100% rename from resources/web/image/printer/Qidi X-Max 3_cover.png rename to resources/profiles/Qidi/Qidi X-Max 3_cover.png diff --git a/resources/web/image/printer/Qidi X-Max_cover.png b/resources/profiles/Qidi/Qidi X-Max_cover.png similarity index 100% rename from resources/web/image/printer/Qidi X-Max_cover.png rename to resources/profiles/Qidi/Qidi X-Max_cover.png diff --git a/resources/web/image/printer/Qidi X-Plus 3_cover.png b/resources/profiles/Qidi/Qidi X-Plus 3_cover.png similarity index 100% rename from resources/web/image/printer/Qidi X-Plus 3_cover.png rename to resources/profiles/Qidi/Qidi X-Plus 3_cover.png diff --git a/resources/web/image/printer/Qidi X-Plus_cover.png b/resources/profiles/Qidi/Qidi X-Plus_cover.png similarity index 100% rename from resources/web/image/printer/Qidi X-Plus_cover.png rename to resources/profiles/Qidi/Qidi X-Plus_cover.png diff --git a/resources/web/image/printer/Qidi X-Smart 3_cover.png b/resources/profiles/Qidi/Qidi X-Smart 3_cover.png similarity index 100% rename from resources/web/image/printer/Qidi X-Smart 3_cover.png rename to resources/profiles/Qidi/Qidi X-Smart 3_cover.png diff --git a/resources/web/image/printer/RatRig V-Cast_cover.png b/resources/profiles/Ratrig/RatRig V-Cast_cover.png similarity index 100% rename from resources/web/image/printer/RatRig V-Cast_cover.png rename to resources/profiles/Ratrig/RatRig V-Cast_cover.png diff --git a/resources/web/image/printer/RatRig V-Core 3 200_cover.png b/resources/profiles/Ratrig/RatRig V-Core 3 200_cover.png similarity index 100% rename from resources/web/image/printer/RatRig V-Core 3 200_cover.png rename to resources/profiles/Ratrig/RatRig V-Core 3 200_cover.png diff --git a/resources/web/image/printer/RatRig V-Core 3 300_cover.png b/resources/profiles/Ratrig/RatRig V-Core 3 300_cover.png similarity index 100% rename from resources/web/image/printer/RatRig V-Core 3 300_cover.png rename to resources/profiles/Ratrig/RatRig V-Core 3 300_cover.png diff --git a/resources/web/image/printer/RatRig V-Core 3 400_cover.png b/resources/profiles/Ratrig/RatRig V-Core 3 400_cover.png similarity index 100% rename from resources/web/image/printer/RatRig V-Core 3 400_cover.png rename to resources/profiles/Ratrig/RatRig V-Core 3 400_cover.png diff --git a/resources/web/image/printer/RatRig V-Core 3 500_cover.png b/resources/profiles/Ratrig/RatRig V-Core 3 500_cover.png similarity index 100% rename from resources/web/image/printer/RatRig V-Core 3 500_cover.png rename to resources/profiles/Ratrig/RatRig V-Core 3 500_cover.png diff --git a/resources/web/image/printer/RatRig V-Minion_cover.png b/resources/profiles/Ratrig/RatRig V-Minion_cover.png similarity index 100% rename from resources/web/image/printer/RatRig V-Minion_cover.png rename to resources/profiles/Ratrig/RatRig V-Minion_cover.png diff --git a/resources/web/image/printer/SecKit SK-Tank_cover.png b/resources/profiles/SecKit/SecKit SK-Tank_cover.png similarity index 100% rename from resources/web/image/printer/SecKit SK-Tank_cover.png rename to resources/profiles/SecKit/SecKit SK-Tank_cover.png diff --git a/resources/web/image/printer/Seckit Go3_cover.png b/resources/profiles/SecKit/Seckit Go3_cover.png similarity index 100% rename from resources/web/image/printer/Seckit Go3_cover.png rename to resources/profiles/SecKit/Seckit Go3_cover.png diff --git a/resources/web/image/printer/Snapmaker A250_cover.png b/resources/profiles/Snapmaker/Snapmaker A250_cover.png similarity index 100% rename from resources/web/image/printer/Snapmaker A250_cover.png rename to resources/profiles/Snapmaker/Snapmaker A250_cover.png diff --git a/resources/web/image/printer/Snapmaker A350_cover.png b/resources/profiles/Snapmaker/Snapmaker A350_cover.png similarity index 100% rename from resources/web/image/printer/Snapmaker A350_cover.png rename to resources/profiles/Snapmaker/Snapmaker A350_cover.png diff --git a/resources/web/image/printer/Snapmaker J1_cover.png b/resources/profiles/Snapmaker/Snapmaker J1_cover.png similarity index 100% rename from resources/web/image/printer/Snapmaker J1_cover.png rename to resources/profiles/Snapmaker/Snapmaker J1_cover.png diff --git a/resources/web/image/printer/Sovol SV01 Pro_cover.png b/resources/profiles/Sovol/Sovol SV01 Pro_cover.png similarity index 100% rename from resources/web/image/printer/Sovol SV01 Pro_cover.png rename to resources/profiles/Sovol/Sovol SV01 Pro_cover.png diff --git a/resources/web/image/printer/Sovol SV02_cover.png b/resources/profiles/Sovol/Sovol SV02_cover.png similarity index 100% rename from resources/web/image/printer/Sovol SV02_cover.png rename to resources/profiles/Sovol/Sovol SV02_cover.png diff --git a/resources/web/image/printer/Sovol SV05_cover.png b/resources/profiles/Sovol/Sovol SV05_cover.png similarity index 100% rename from resources/web/image/printer/Sovol SV05_cover.png rename to resources/profiles/Sovol/Sovol SV05_cover.png diff --git a/resources/web/image/printer/Tronxy X5SA 400 Marlin Firmware_cover.png b/resources/profiles/Tronxy/Tronxy X5SA 400 Marlin Firmware_cover.png similarity index 100% rename from resources/web/image/printer/Tronxy X5SA 400 Marlin Firmware_cover.png rename to resources/profiles/Tronxy/Tronxy X5SA 400 Marlin Firmware_cover.png diff --git a/resources/web/image/printer/TwoTrees SP-5 Klipper_cover.png b/resources/profiles/TwoTrees/TwoTrees SP-5 Klipper_cover.png similarity index 100% rename from resources/web/image/printer/TwoTrees SP-5 Klipper_cover.png rename to resources/profiles/TwoTrees/TwoTrees SP-5 Klipper_cover.png diff --git a/resources/web/image/printer/Voron 0.1_cover.png b/resources/profiles/Voron/Voron 0.1_cover.png similarity index 100% rename from resources/web/image/printer/Voron 0.1_cover.png rename to resources/profiles/Voron/Voron 0.1_cover.png diff --git a/resources/web/image/printer/Voron 2.4 250_cover.png b/resources/profiles/Voron/Voron 2.4 250_cover.png similarity index 100% rename from resources/web/image/printer/Voron 2.4 250_cover.png rename to resources/profiles/Voron/Voron 2.4 250_cover.png diff --git a/resources/web/image/printer/Voron 2.4 300_cover.png b/resources/profiles/Voron/Voron 2.4 300_cover.png similarity index 100% rename from resources/web/image/printer/Voron 2.4 300_cover.png rename to resources/profiles/Voron/Voron 2.4 300_cover.png diff --git a/resources/web/image/printer/Voron 2.4 350_cover.png b/resources/profiles/Voron/Voron 2.4 350_cover.png similarity index 100% rename from resources/web/image/printer/Voron 2.4 350_cover.png rename to resources/profiles/Voron/Voron 2.4 350_cover.png diff --git a/resources/web/image/printer/Voron Trident 250_cover.png b/resources/profiles/Voron/Voron Trident 250_cover.png similarity index 100% rename from resources/web/image/printer/Voron Trident 250_cover.png rename to resources/profiles/Voron/Voron Trident 250_cover.png diff --git a/resources/web/image/printer/Voron Trident 300_cover.png b/resources/profiles/Voron/Voron Trident 300_cover.png similarity index 100% rename from resources/web/image/printer/Voron Trident 300_cover.png rename to resources/profiles/Voron/Voron Trident 300_cover.png diff --git a/resources/web/image/printer/Voron Trident 350_cover.png b/resources/profiles/Voron/Voron Trident 350_cover.png similarity index 100% rename from resources/web/image/printer/Voron Trident 350_cover.png rename to resources/profiles/Voron/Voron Trident 350_cover.png diff --git a/resources/web/image/printer/Voxelab Aquila X2_cover.png b/resources/profiles/Voxelab/Voxelab Aquila X2_cover.png similarity index 100% rename from resources/web/image/printer/Voxelab Aquila X2_cover.png rename to resources/profiles/Voxelab/Voxelab Aquila X2_cover.png diff --git a/resources/web/image/printer/Vzbot 235 AWD_cover.PNG b/resources/profiles/Vzbot/Vzbot 235 AWD_cover.PNG similarity index 100% rename from resources/web/image/printer/Vzbot 235 AWD_cover.PNG rename to resources/profiles/Vzbot/Vzbot 235 AWD_cover.PNG diff --git a/resources/web/image/printer/Vzbot 330 AWD_cover.PNG b/resources/profiles/Vzbot/Vzbot 330 AWD_cover.PNG similarity index 100% rename from resources/web/image/printer/Vzbot 330 AWD_cover.PNG rename to resources/profiles/Vzbot/Vzbot 330 AWD_cover.PNG diff --git a/resources/web/guide/21/21.js b/resources/web/guide/21/21.js index 2b5ae8bf65..64c725688b 100644 --- a/resources/web/guide/21/21.js +++ b/resources/web/guide/21/21.js @@ -96,7 +96,7 @@ function HandleModelList( pVal ) HtmlNozzel+='
'+nNozzel+'mm nozzle
'; } - let CoverImage="../../image/printer/"+OneModel['model']+"_cover.png"; + let CoverImage=OneModel['cover']; ModelHtml[strVendor]+='
'+ '
'+ '
'+OneModel['model']+'
'+ HtmlNozzel +'
'; diff --git a/resources/web/guide/24/24.js b/resources/web/guide/24/24.js index a9b3bed847..21fcf16c0d 100644 --- a/resources/web/guide/24/24.js +++ b/resources/web/guide/24/24.js @@ -96,7 +96,7 @@ function HandleModelList( pVal ) HtmlNozzel+='
'+nNozzel+'mm nozzle
'; } - let CoverImage="../../image/printer/"+OneModel['model']+"_cover.png"; + let CoverImage=OneModel['cover']; ModelHtml[strVendor]+='
'+ '
'+ '
'+OneModel['model']+'
'+ HtmlNozzel +'
'; diff --git a/src/slic3r/GUI/WebGuideDialog.cpp b/src/slic3r/GUI/WebGuideDialog.cpp index 35a6522f9f..5de84b11fe 100644 --- a/src/slic3r/GUI/WebGuideDialog.cpp +++ b/src/slic3r/GUI/WebGuideDialog.cpp @@ -1354,7 +1354,13 @@ int GuideFrame::LoadProfileFamily(std::string strVendor, std::string strFilePath // wxString strCoverPath = wxString::Format("%s\\%s\\%s_cover.png", strFolder, strVendor, std::string(s1.mb_str())); std::string cover_file = s1 + "_cover.png"; - boost::filesystem::path cover_path = boost::filesystem::absolute(vendor_dir / cover_file).make_preferred(); + boost::filesystem::path cover_path = boost::filesystem::absolute(boost::filesystem::path(resources_dir()) / "/profiles/" / strVendor / cover_file).make_preferred(); + if (!boost::filesystem::exists(cover_path)) { + cover_path = + (boost::filesystem::absolute(boost::filesystem::path(resources_dir()) / "/web/image/printer/") / + cover_file) + .make_preferred(); + } OneModel["cover"] = cover_path.string(); OneModel["nozzle_selected"] = "";