Merge branch 'master' into SoftFever

# Conflicts: # bbl/i18n/zh_cn/BambuStudio_zh_CN.po # resources/i18n/de/BambuStudio.mo # resources/i18n/en/BambuStudio.mo # resources/i18n/es/BambuStudio.mo # resources/i18n/fr/BambuStudio.mo # resources/i18n/hu/BambuStudio.mo # resources/i18n/nl/BambuStudio.mo # resources/i18n/sv/BambuStudio.mo # resources/i18n/zh_cn/BambuStudio.mo # resources/profiles/Creality.json # resources/profiles/Voron.json # resources/web/guide/3/index.html # src/libslic3r/AppConfig.cpp # src/libslic3r/GCode.cpp # src/libslic3r/GCode/GCodeProcessor.cpp # src/libslic3r/LayerRegion.cpp # src/libslic3r/Preset.cpp # src/libslic3r/Print.cpp # src/libslic3r/PrintConfig.cpp # src/libslic3r/PrintConfig.hpp # src/libslic3r/PrintObject.cpp # src/slic3r/GUI/AboutDialog.cpp # src/slic3r/GUI/BBLTopbar.cpp # src/slic3r/GUI/ConfigManipulation.cpp # src/slic3r/GUI/ConfigWizard.cpp # src/slic3r/GUI/GCodeViewer.cpp # src/slic3r/GUI/GUI_App.cpp # src/slic3r/GUI/GUI_Factories.cpp # src/slic3r/GUI/MainFrame.cpp # src/slic3r/GUI/Plater.cpp # src/slic3r/GUI/Tab.cpp # version.inc
2025-08-06 05:24:01 -06:00 · 2022-12-16 13:59:30 +08:00 · 2022-12-16 13:59:30 +08:00 · bf8a9fee1f
commit bf8a9fee1f
parent c06190b79c 390f68a98b
689 changed files with 46784 additions and 10006 deletions
--- a/resources/web/guide/1/index.html
+++ b/resources/web/guide/1/index.html
@ -4,7 +4,8 @@
 <meta charset="utf-8">
 <meta http-equiv="Cache-Control" content="max-age=7200" />
 <title>引导_P1</title>
-<link rel="stylesheet" type="text/css" href="../css/common.css" />		
+<link rel="stylesheet" type="text/css" href="../css/common.css" />	
+<link rel="stylesheet" type="text/css" href="../css/dark.css" />		
 <link rel="stylesheet" type="text/css" href="1.css" />
 <script type="text/javascript" src="../js/jquery-2.1.1.min.js"></script>
 <script type="text/javascript" src="../../data/text.js"></script>	
--- a/resources/web/guide/11/11.css
+++ b/resources/web/guide/11/11.css
@ -5,17 +5,20 @@
 	flex-direction: column;
 	justify-content:flex-start;
 	align-items:center;
+	align-content: center;
 }


 #EarthIcon img
 {
-	width: 160px;
+	width: 40%;
+	min-width: 100px;
 }

 #EarthIcon
 {
 	margin-bottom: 20px;
+	text-align: center;
 }

 #RegionList
@ -48,9 +51,10 @@
 .RegionSelected:hover
 {
 	background-color:#00AE42;
-	color: #fff;
+	color: #fff;	
 }

+
 #ChangeTip
 {
 	margin-top: 15px;
--- a/resources/web/guide/11/index.html
+++ b/resources/web/guide/11/index.html
@ -4,8 +4,9 @@
 <meta charset="utf-8">
 <meta http-equiv="Cache-Control" content="max-age=7200" />
 <title>引导_P21</title>
-<link rel="stylesheet" type="text/css" href="../css/common.css" />	
+<link rel="stylesheet" type="text/css" href="../css/common.css" />		
 <link rel="stylesheet" type="text/css" href="11.css" />
+<link rel="stylesheet" type="text/css" href="../css/dark.css" />	
 <script type="text/javascript" src="../js/jquery-3.6.0.min.js"></script>
 <script type="text/javascript" src="../js/json2.js"></script>	
 <script type="text/javascript" src="../../data/text.js"></script>	
@ -20,7 +21,7 @@
 <div id="Content">
 	<div id="EarthIcon"><img src="earth.png"/></div>
 	<div id="RegionList">
-		<div class="trans RegionItem RegionSelected" tid="t48" region="Asia-Pacific" onclick="ChooseRegion('Asia-Pacific')">Asia-Pacific</div>
+		<div class="trans RegionItem RegionSelected TextS1" tid="t48" region="Asia-Pacific" onclick="ChooseRegion('Asia-Pacific')">Asia-Pacific</div>
 		<div class="trans RegionItem" tid="t49" region="China" onclick="ChooseRegion('China')">China</div>
 		<div class="trans RegionItem" tid="t60" region="Europe" onclick="ChooseRegion('Europe')">Europe</div>
 		<div class="trans RegionItem" tid="t61" region="North America" onclick="ChooseRegion('North America')">North America</div>
--- a/resources/web/guide/21/21.css
+++ b/resources/web/guide/21/21.css
@ -4,26 +4,6 @@
 	overflow-y:auto;
 }

-#Content::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 5px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 1px;
-}
-
-#Content::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 10px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-	box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background-color: #AAAAAA;
-}
-
-#Content::-webkit-scrollbar-track {/*滚动条里面轨道*/
-        -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-	    box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-        border-radius: 10px;
-        background: #EDEDED;
-}
-
-
 .BlockBanner
 {
 	padding: 0px;
@ -113,9 +93,10 @@
 {
 	display: none;
 	width: 400px;
-	border: 1px solid #000;
+	border-width: 1px;
+	border-style: solid;
 	border-radius: 4px;
-	background-color: #fff;	
+	background-color: inherit;	
 	position: absolute;
 	left: 50%;
 	top: 200px;
--- a/resources/web/guide/21/21.js
+++ b/resources/web/guide/21/21.js
@ -89,7 +89,7 @@ function HandleModelList( pVal )
 		for(let m=0;m<NozzleArray.length;m++)
 		{
 			let nNozzel=NozzleArray[m];
-			HtmlNozzel+='<div class="pNozzel"><input type="checkbox" model="'+OneModel['model']+'" nozzel="'+nNozzel+'" vendor="'+strVendor+'" /><span>'+nNozzel+'</span><span class="trans" tid="t13">mm nozzle</span></div>';
+			HtmlNozzel+='<div class="pNozzel TextS2"><input type="checkbox" model="'+OneModel['model']+'" nozzel="'+nNozzel+'" vendor="'+strVendor+'" /><span>'+nNozzel+'</span><span class="trans" tid="t13">mm nozzle</span></div>';
 		}
 		
 		let CoverImage="../../image/printer/"+OneModel['model']+"_cover.png";
--- a/resources/web/guide/21/index.html
+++ b/resources/web/guide/21/index.html
@ -6,6 +6,7 @@
 <title>引导_P21</title>
 <link rel="stylesheet" type="text/css" href="../css/common.css" />	
 <link rel="stylesheet" type="text/css" href="21.css" />
+<link rel="stylesheet" type="text/css" href="../css/dark.css" />	
 <script type="text/javascript" src="test.js"></script>	
 <script type="text/javascript" src="../js/jquery-3.6.0.min.js"></script>
 <script type="text/javascript" src="../js/json2.js"></script>	
@ -18,7 +19,7 @@
 <div id="Title">
 	<div class="trans" tid="t10">Printer Selection</div>
 </div>
-<div id="Content">
+<div id="Content"  class="ZScrol">

 <!--<div class="OneVendorBlock" Vendor="BBL">	
 <div class="BlockBanner">
@ -35,28 +36,28 @@
 <div class="PrinterBlock">
 	<div class="PImg"><img src="p2.jpg"  /></div>	
    <div class="PName">BBL-3DP-V4NORMAL</div>
-    <div class="pNozzel"><input id="ZZ" type="checkbox" model="BBL-3DP-V4NORMAL" nozzel="0.4" vendor="BBL" />0.4mm nozzle</div>
-	<div class="pNozzel"><input type="checkbox" model="BBL-3DP-V4NORMAL" nozzel="0.1" vendor="BBL" />0.1mm nozzle</div>
+    <div class="pNozzel TextS2"><input id="ZZ" type="checkbox" model="BBL-3DP-V4NORMAL" nozzel="0.4" vendor="BBL" />0.4mm nozzle</div>
+	<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V4NORMAL" nozzel="0.1" vendor="BBL" />0.1mm nozzle</div>
 </div>
 <div class="PrinterBlock">
 	<div class="PImg"><img src="p1.jpg"  /></div>	
    <div class="PName">BBL-3DP-V4NORMAL</div>
-    <div class="pNozzel"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.4" vendor="BBL" />0.4mm nozzle</div>
-	<div class="pNozzel"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.2" vendor="BBL" />0.22mm nozzle</div>
-	<div class="pNozzel"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.1" vendor="BBL" />0.1mm nozzle</div>
+    <div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.4" vendor="BBL" />0.4mm nozzle</div>
+	<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.2" vendor="BBL" />0.22mm nozzle</div>
+	<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.1" vendor="BBL" />0.1mm nozzle</div>
 </div>
 <div class="PrinterBlock">
 	<div class="PImg"><img src="p2.jpg"  /></div>	
    <div class="PName">BBL-3DP-V4NORMAL</div>
-    <div class="pNozzel"><input id="ZZ" type="checkbox" model="BBL-3DP-V4NORMAL" nozzel="0.4" vendor="BBL" />0.4mm nozzle</div>
-	<div class="pNozzel"><input type="checkbox" model="BBL-3DP-V4NORMAL" nozzel="0.1" vendor="BBL" />0.11mm nozzle</div>
+    <div class="pNozzel TextS2"><input id="ZZ" type="checkbox" model="BBL-3DP-V4NORMAL" nozzel="0.4" vendor="BBL" />0.4mm nozzle</div>
+	<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V4NORMAL" nozzel="0.1" vendor="BBL" />0.11mm nozzle</div>
 </div>
 <div class="PrinterBlock">
 	<div class="PImg"><img src="p1.jpg"  /></div>	
    <div class="PName">BBL-3DP-V4NORMAL</div>
-    <div class="pNozzel"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.4" vendor="BBL" />0.4mm nozzle</div>
-	<div class="pNozzel"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.2" vendor="BBL" />0.22mm nozzle</div>
-	<div class="pNozzel"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.1" vendor="BBL" />0.1mm nozzle</div>
+    <div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.4" vendor="BBL" />0.4mm nozzle</div>
+	<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.2" vendor="BBL" />0.22mm nozzle</div>
+	<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.1" vendor="BBL" />0.1mm nozzle</div>
 </div>	
 </div>		

@ -77,16 +78,16 @@
 	
 <div class="PrinterBlock">
 	<div class="PImg"><img src="p2.jpg"  /></div>	
-    <div class="PName">BBL-3DP-V4NORMAL</div>
-    <div class="pNozzel"><input type="checkbox" model="BBL-3DP-V4NORMAL" nozzel="0.4" vendor="BAMBU" />0.4mm nozzle</div>
-	<div class="pNozzel"><input type="checkbox" model="BBL-3DP-V4NORMAL" nozzel="0.1" vendor="BAMBU" />0.1mm nozzle</div>
+    <div class="PName TextS1">BBL-3DP-V4NORMAL</div>
+    <div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V4NORMAL" nozzel="0.4" vendor="BAMBU" />0.4mm nozzle</div>
+	<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V4NORMAL" nozzel="0.1" vendor="BAMBU" />0.1mm nozzle</div>
 </div>
 <div class="PrinterBlock">
 	<div class="PImg"><img src="p1.jpg"  /></div>	
-    <div class="PName">BBL-3DP-V4NORMAL</div>
-    <div class="pNozzel"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.4" vendor="BAMBU" />0.4mm nozzle</div>
-	<div class="pNozzel"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.2" vendor="BAMBU" />0.2mm nozzle</div>
-	<div class="pNozzel"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.1" vendor="BAMBU" />0.1mm nozzle</div>
+    <div class="PName TextS1">BBL-3DP-V4NORMAL</div>
+    <div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.4" vendor="BAMBU" />0.4mm nozzle</div>
+	<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.2" vendor="BAMBU" />0.2mm nozzle</div>
+	<div class="pNozzel TextS2"><input type="checkbox" model="BBL-3DP-V5NORMAL" nozzel="0.1" vendor="BAMBU" />0.1mm nozzle</div>
 </div>		
 </div>		

--- a/resources/web/guide/22/22.css
+++ b/resources/web/guide/22/22.css
@ -80,9 +80,10 @@ input
 {
 	display: none;
 	width: 500px;
-	border: 1px solid #000;
+	border-width: 1px;
+	border-style: solid;
 	border-radius: 4px;
-	background-color: #fff;	
+	background-color: inherit;	
 	position: absolute;
 	left: 50%;
 	top: 200px;
--- a/resources/web/guide/22/22.js
+++ b/resources/web/guide/22/22.js
@ -116,6 +116,8 @@ function SortUI()
 	{
 		let OneFila=m_ProfileItem['filament'][key];
 		
+		//alert(JSON.stringify(OneFila));
+		
 		let fWholeName=OneFila['name'].trim();
 		let fShortName=GetFilamentShortname( OneFila['name'] );
 		let fVendor=OneFila['vendor'];
@ -123,6 +125,8 @@ function SortUI()
 		let fSelect=OneFila['selected'];
 		let fModel=OneFila['models']
 		
+		//alert( fWholeName+' - '+fShortName+' - '+fVendor+' - '+fType+' - '+fSelect+' - '+fModel );
+		
 //		if(OneFila['name'].indexOf("Bambu PA-CF")>=0)
 //		{
 //			alert( fShortName+' - '+fVendor+' - '+fType+' - '+fSelect+' - '+fModel )
@ -188,15 +192,6 @@ function SortUI()
 			    let HtmlFila='<div class="MItem"><input type="checkbox" vendor="'+fVendor+'"  filatype="'+fType+'" filalist="'+fWholeName+';'+'"  model="'+fModel+'" name="'+fShortName+'" />'+fShortName+'</div>';
 			
 			    $("#ItemBlockArea").append(HtmlFila);
-				
-				if(fSelect==1)
-				{
-					$("#ItemBlockArea input[vendor='"+fVendor+"'][filatype='"+fType+"'][name='"+fShortName+"']").prop("checked",true);
-					
-					SelectNumber++;
-				}
-//				else
-//					$("#ItemBlockArea input[vendor='"+fVendor+"'][model='"+fModel+"'][filatype='"+fType+"'][name='"+key+"']").prop("checked",false);
 		    } 
 			else
 			{
@ -206,8 +201,18 @@ function SortUI()
 				pFila.attr("model", strModel+fModel);
 				pFila.attr("filalist", strFilalist+fWholeName+';');
 			}
+			
+		    if(fSelect*1==1)
+			{
+				//alert( fWholeName+' - '+fShortName+' - '+fVendor+' - '+fType+' - '+fSelect+' - '+fModel );
+					
+				$("#ItemBlockArea input[vendor='"+fVendor+"'][filatype='"+fType+"'][name='"+fShortName+"']").prop("checked",true);
+				SelectNumber++;
+			}
+//			else
+//				$("#ItemBlockArea input[vendor='"+fVendor+"'][model='"+fModel+"'][filatype='"+fType+"'][name='"+key+"']").prop("checked",false);			
 		}
-	}
+	} 

 	//Sort TypeArray
 	let TypeAdvNum=FilamentPriority.length;
--- a/resources/web/guide/22/index.html
+++ b/resources/web/guide/22/index.html
@ -6,6 +6,7 @@
 <title>引导_P21</title>
 <link rel="stylesheet" type="text/css" href="../css/common.css" />	
 <link rel="stylesheet" type="text/css" href="22.css" />
+<link rel="stylesheet" type="text/css" href="../css/dark.css" />		
 <script type="text/javascript" src="test.js"></script>
 <script type="text/javascript" src="../js/jquery-3.6.0.min.js"></script>
 <script type="text/javascript" src="../js/json2.js"></script>	
@ -66,7 +67,7 @@
 	<div class="SmallBtn_Green trans" tid="t11" onClick="SelectAllFilament(1)">All</div>
 	<div class="SmallBtn trans" tid="t12" onClick="SelectAllFilament(0)">Clear all</div>
 </div>
-<div id="ItemBlockArea">	
+<div id="ItemBlockArea" class="ZScrol">	
 <!--	<div class="MItem"><input type="checkbox" vendor=""  filatype="" model="ALL PLA EXPSilk" name="" />ALL PLA EXPSilk</div>
 	<div class="MItem"><input type="checkbox" />ALL PLA Silk</div>
 	<div class="MItem"><input type="checkbox" />BBL PA-CF</div>	
--- a/resources/web/guide/23/23.css
+++ b/resources/web/guide/23/23.css
@ -80,9 +80,10 @@ input
 {
 	display: none;
 	width: 500px;
-	border: 1px solid #000;
+	border-width: 1px;
+	border-style: solid;
 	border-radius: 4px;
-	background-color: #fff;	
+	background-color: inherit;	
 	position: absolute;
 	left: 50%;
 	top: 200px;
--- a/resources/web/guide/23/23.js
+++ b/resources/web/guide/23/23.js
@ -113,12 +113,17 @@ function SortUI()
 	{
 		let OneFila=m_ProfileItem['filament'][key];
 		
+		//alert(JSON.stringify(OneFila));
+		
+		let fWholeName=OneFila['name'].trim();
 		let fShortName=GetFilamentShortname( OneFila['name'] );
 		let fVendor=OneFila['vendor'];
 		let fType=OneFila['type'];
 		let fSelect=OneFila['selected'];
 		let fModel=OneFila['models']
 		
+		//alert( fWholeName+' - '+fShortName+' - '+fVendor+' - '+fType+' - '+fSelect+' - '+fModel );
+		
 //		if(OneFila['name'].indexOf("Bambu PA-CF")>=0)
 //		{
 //			alert( fShortName+' - '+fVendor+' - '+fType+' - '+fSelect+' - '+fModel )
@ -149,9 +154,9 @@ function SortUI()
 				{
 					let nowModel= OneName+"++"+NozzleArray[b];
 					if(fModel.indexOf(nowModel)>=0)
-		    	{
-		    		bFind=true;
-				    break;
+					{
+						bFind=true;
+						break;
 					}
 				}
 			}
@ -173,7 +178,7 @@ function SortUI()
 			if(!VendorHtmlArray.hasOwnProperty(lowVendor))
 		    {
 			    let HtmlVendor='<div><input type="checkbox" vendor="'+fVendor+'"  onChange="VendorClick()" />'+fVendor+'</div>';
-			
+				
 				VendorHtmlArray[lowVendor]=HtmlVendor;
 		    }
 			
@ -181,27 +186,30 @@ function SortUI()
 			let pFila=$("#ItemBlockArea input[vendor='"+fVendor+"'][filatype='"+fType+"'][name='"+fShortName+"']");
 	        if(pFila.length==0)
 		    {
-			    let HtmlFila='<div class="MItem"><input type="checkbox" vendor="'+fVendor+'"  filatype="'+fType+'" model="'+fModel+'" name="'+fShortName+'" />'+fShortName+'</div>';
+			    let HtmlFila='<div class="MItem"><input type="checkbox" vendor="'+fVendor+'"  filatype="'+fType+'" filalist="'+fWholeName+';'+'"  model="'+fModel+'" name="'+fShortName+'" />'+fShortName+'</div>';
 			
 			    $("#ItemBlockArea").append(HtmlFila);
-				
-				if(fSelect==1)
-				{
-					$("#ItemBlockArea input[vendor='"+fVendor+"'][filatype='"+fType+"'][name='"+fShortName+"']").prop("checked",true);
-					
-					SelectNumber++;
-				}
-//				else
-//					$("#ItemBlockArea input[vendor='"+fVendor+"'][model='"+fModel+"'][filatype='"+fType+"'][name='"+key+"']").prop("checked",false);
 		    } 
-				else
+			else
 			{
 				let strModel=pFila.attr("model");
+				let strFilalist=pFila.attr("filalist");
 				
 				pFila.attr("model", strModel+fModel);
+				pFila.attr("filalist", strFilalist+fWholeName+';');
 			}
+			
+		    if(fSelect*1==1)
+			{
+				//alert( fWholeName+' - '+fShortName+' - '+fVendor+' - '+fType+' - '+fSelect+' - '+fModel );
+					
+				$("#ItemBlockArea input[vendor='"+fVendor+"'][filatype='"+fType+"'][name='"+fShortName+"']").prop("checked",true);
+				SelectNumber++;
+			}
+//			else
+//				$("#ItemBlockArea input[vendor='"+fVendor+"'][model='"+fModel+"'][filatype='"+fType+"'][name='"+key+"']").prop("checked",false);			
 		}
-	}
+	} 

 	//Sort TypeArray
 	let TypeAdvNum=FilamentPriority.length;
--- a/resources/web/guide/23/index.html
+++ b/resources/web/guide/23/index.html
@ -6,6 +6,7 @@
 <title>引导_P21</title>
 <link rel="stylesheet" type="text/css" href="../css/common.css" />	
 <link rel="stylesheet" type="text/css" href="23.css" />
+<link rel="stylesheet" type="text/css" href="../css/dark.css" />	
 <script type="text/javascript" src="test.js"></script>
 <script type="text/javascript" src="../js/jquery-3.6.0.min.js"></script>
 <script type="text/javascript" src="../js/json2.js"></script>	
@ -66,7 +67,7 @@
 	<div class="SmallBtn trans" tid="t12" onClick="SelectAllFilament(0)">Clear all</div>
 </div>	
 	
-<div id="ItemBlockArea">	
+<div id="ItemBlockArea" class="ZScrol">	
 <!--	<div class="MItem"><input type="checkbox" vendor=""  filatype="" model="ALL PLA EXPSilk" name="" />ALL PLA EXPSilk</div>
 	<div class="MItem"><input type="checkbox" />ALL PLA Silk</div>
 	<div class="MItem"><input type="checkbox" />BBL PA-CF</div>	
--- a/resources/web/guide/24/24.css
+++ b/resources/web/guide/24/24.css
@ -3,25 +3,6 @@
 	overflow-y:auto;
 }

-#Content::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 5px;     /*高宽分别对应横竖滚动条的尺寸*/
-    height: 1px;
-}
-
-#Content::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-    border-radius: 10px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-	box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background-color: #AAAAAA;
-}
-
-#Content::-webkit-scrollbar-track {/*滚动条里面轨道*/
-        -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-	    box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-        border-radius: 10px;
-        background: #EDEDED;
-}
-
 .BlockBanner
 {
 	padding: 0px;
@ -135,9 +116,10 @@
 {
 	display: none;
 	width: 400px;
-	border: 1px solid #000;
+	border-width: 1px;
+	border-style: solid;
 	border-radius: 4px;
-	background-color: #fff;	
+	background-color: inherit;	
 	position: absolute;
 	left: 50%;
 	top: 200px;
--- a/resources/web/guide/24/24.js
+++ b/resources/web/guide/24/24.js
@ -89,7 +89,7 @@ function HandleModelList( pVal )
 		for(let m=0;m<NozzleArray.length;m++)
 		{
 			let nNozzel=NozzleArray[m];
-			HtmlNozzel+='<div class="pNozzel"><input type="checkbox" model="'+OneModel['model']+'" nozzel="'+nNozzel+'" vendor="'+strVendor+'" /><span>'+nNozzel+'</span><span class="trans" tid="t13">mm nozzle</span></div>';
+			HtmlNozzel+='<div class="pNozzel TextS2"><input type="checkbox" model="'+OneModel['model']+'" nozzel="'+nNozzel+'" vendor="'+strVendor+'" /><span>'+nNozzel+'</span><span class="trans" tid="t13">mm nozzle</span></div>';
 		}
 		
 		let CoverImage="../../image/printer/"+OneModel['model']+"_cover.png";
--- a/resources/web/guide/24/index.html
+++ b/resources/web/guide/24/index.html
@ -6,6 +6,7 @@
 <title>引导_P21</title>
 <link rel="stylesheet" type="text/css" href="../css/common.css" />	
 <link rel="stylesheet" type="text/css" href="24.css" />
+<link rel="stylesheet" type="text/css" href="../css/dark.css" />	
 <script type="text/javascript" src="test.js"></script>	
 <script type="text/javascript" src="../js/jquery-3.6.0.min.js"></script>
 <script type="text/javascript" src="../js/json2.js"></script>	
@ -18,7 +19,7 @@
 <div id="Title">
 	<div class="trans" tid="t10">Printer Selection</div>
 </div>
-<div id="Content">
+<div id="Content"  class="ZScrol"s>

 <!--<div class="OneVendorBlock" Vendor="BBL">	
 <div class="BlockBanner">
--- a/resources/web/guide/3/3.css
+++ b/resources/web/guide/3/3.css
@ -1,12 +1,18 @@
+.PolicyArea
+{
+	background-color: #4A4A51;	
+}

 #PolicyTxt
 {
-	background-color: #EBEBEB;
 	padding: 12px;
 	word-wrap:break-word;
-	overflow-y: scroll;
+	overflow-y: auto;
 	min-height: 200px;
 	text-indent: 2em;
+	border-style: solid;
+	border-width: 1px;
+	border-color: #D7D7D7;
 }

 #PolicyTxt::-webkit-scrollbar {/*滚动条整体样式*/
--- a/resources/web/guide/3/index.html
+++ b/resources/web/guide/3/index.html
@ -6,6 +6,7 @@
 <title>引导_P1</title>
 <link rel="stylesheet" type="text/css" href="../css/common.css" />	
 <link rel="stylesheet" type="text/css" href="3.css" />
+<link rel="stylesheet" type="text/css" href="../css/dark.css" />
 <script type="text/javascript" src="../js/jquery-2.1.1.min.js"></script>
 <script type="text/javascript" src="../js/json2.js"></script>	
 <script type="text/javascript" src="../../data/text.js"></script>	
@ -18,7 +19,7 @@
 	<div class="trans" tid="t6">We kindly request your help to improve<br/> everyone's printing</div>
 </div>
 <div id="Content">
-	<div id="PolicyTxt">
+	<div id="PolicyTxt" class="TextS2 TextArea1 ZScrol">
 <a class="trans" tid="t54">In the 3D Printing community, we learn from each other’s successes and failures to adjust our own slicing parameters and settings. Bambu Studio follows the same principle and uses machine learning to improve its performance from the successes and failures of the vast number of prints by our users. We are training Bambu Studio to be smarter by feeding them the real-world data. If you are willing, this service will access information from your error logs and usage logs, which may include information described in </a><a class="HyperLink trans" tid="t55" href="https://bambulab.com/policies/privacy" target="_blank">Privacy Policy</a><a class="trans" tid="t56">
 . We will not collect any Personal Data by which an individual can be identified directly or indirectly, including without limitation names, addresses, payment information, or phone numbers. By enabling this service, you agree to these terms and the statement about Privacy Policy.
 </a>
@ -27,7 +28,7 @@

 	<div>
 	<input id="ChoosePrivacy" type="checkbox" onClick="SendPrivacySelect()"  onChange="SendPrivacySelect()" />
-	<span class="trans" tid="t7">Allow sending anonymous data</span>
+	<span class="trans TextS1" tid="t7">Allow sending anonymous data</span>
 </div>
 </div>		
 <div id="AcceptArea">
--- a/resources/web/guide/5/index.html
+++ b/resources/web/guide/5/index.html
@ -5,6 +5,7 @@
 <meta http-equiv="Cache-Control" content="max-age=7200" />
 <title>引导_P1</title>
 <link rel="stylesheet" type="text/css" href="../css/common.css" />	
+<link rel="stylesheet" type="text/css" href="../css/dark.css" />		
 <link rel="stylesheet" type="text/css" href="5.css" />
 <script type="text/javascript" src="../js/jquery-2.1.1.min.js"></script>
 <script type="text/javascript" src="../js/json2.js"></script>	
@ -20,16 +21,16 @@
 <div id="Content">

    <div id="FeatureText">
-		<div  ><a tid="t75" class="trans">Bambu Network plug-in Provides the following features:</a></div>
-		<div><span>●</span>&nbsp;&nbsp;<a tid="t65" class="trans" ></a></div>
-	    <div><span>●</span>&nbsp;&nbsp;<a tid="t66" class="trans" ></a></div>
-        <div><span>●</span>&nbsp;&nbsp;<a tid="t67" class="trans" ></a></div>
-		<div><span>●</span>&nbsp;&nbsp;<a tid="t68" class="trans" ></a></div>
+		<div  ><a tid="t75" class="trans TextS1">Bambu Network plug-in Provides the following features:</a></div>
+		<div><span class="TextPoint">●</span>&nbsp;&nbsp;<a tid="t65" class="trans" ></a></div>
+	    <div><span class="TextPoint">●</span>&nbsp;&nbsp;<a tid="t66" class="trans" ></a></div>
+        <div><span class="TextPoint">●</span>&nbsp;&nbsp;<a tid="t67" class="trans" ></a></div>
+		<div><span class="TextPoint">●</span>&nbsp;&nbsp;<a tid="t68" class="trans" ></a></div>
    </div>
 	
 	
 	
-	<div id="CheckArea"><input id="InstallCheck" onClick="SendInstallPluginCheck()" checked type="checkbox"><a tid="t69" class="trans">Install Bambu Network Plug-in. </a></div>
+	<div id="CheckArea"><input id="InstallCheck" onClick="SendInstallPluginCheck()" checked type="checkbox"><a tid="t69" class="trans TextS1">Install Bambu Network Plug-in. </a></div>
 	<div id="RestartText" tid="t70" class="trans" ></div>
 	
 </div>
--- a/resources/web/guide/css/common.css
+++ b/resources/web/guide/css/common.css
@ -26,6 +26,31 @@ body
 	line-height: 22px;
 }

+.TextPoint
+{
+	font-size:1px;
+}
+
+.ZScrol::-webkit-scrollbar {/*滚动条整体样式*/
+    width: 12px;     /*高宽分别对应横竖滚动条的尺寸*/
+    height: 12px;
+	padding: 2px;
+}
+
+.ZScrol::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
+    border-radius: 6px;
+    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+	box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+    background-color: #AAAAAA;
+}
+
+.ZScrol::-webkit-scrollbar-track {/*滚动条里面轨道*/
+        -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+	    box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+        border-radius: 10px;
+        background: #EDEDED;
+}
+
 /*----Three Part----*/
 body
 {
@ -57,7 +82,7 @@ body
 	height: 76%;
 	padding: 20px 40px;
 	overflow-x: hidden;
-	overflow-y:hidden;
+	overflow-y: auto;
 	text-align: left;
 	font-size: 14px;
 	line-height: 22px;
@ -163,3 +188,11 @@ body
 	cursor: pointer;
 }

+
+
+/*----------------Light Mode-------------------*/
+
+
+
+
+
--- a/resources/web/guide/css/dark.css
+++ b/resources/web/guide/css/dark.css
@ -0,0 +1,68 @@
+*
+{
+	color: #efeff0;
+	border-color: #B9B9BC;
+}
+
+body
+{
+	background-color:#3E3E45;
+	color: #efeff0;
+}
+
+.ZScrol::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
+    background-color: #939594;
+}
+
+.ZScrol::-webkit-scrollbar-track {/*滚动条里面轨道*/
+        background: #161817;
+}
+
+#Title div
+{
+	color: #21A452;
+}
+
+/*-----Button-----*/
+.GrayBtn
+{
+	border: 1px solid #B9B9BC;
+	color: #B9B9BC;	
+}
+
+.GrayBtn:hover
+{
+	background-color:#E8E8E8;
+	color: #565656;
+}
+
+/*-------Text------*/
+
+.TextS1
+{
+
+}
+
+.TextS2
+{
+	color:#B9B9BC;
+}
+
+/*---Policy---*/
+.TextArea1
+{
+	background-color: #4A4A51;
+	color: #BEBEC0;
+}
+
+/*----Region---*/
+.RegionItem:hover
+{
+	background-color:#4C4C55;
+}
+
+.RegionSelected:hover
+{
+	background-color:#00AE42;
+	color: #fff;	
+}
--- a/resources/web/guide/js/globalapi.js
+++ b/resources/web/guide/js/globalapi.js
@ -277,3 +277,63 @@ function SendWXMessage( strMsg )
 	}
 }

+/*------CSS Link Control----*/
+function RemoveCssLink( LinkPath )
+{
+	let pNow=$("head link[href='"+LinkPath+"']");
+	
+	let nTotal=pNow.length;
+    for( let n=0;n<nTotal;n++ )
+	{
+		pNow[n].remove();
+	}	
+}
+
+function AddCssLink( LinkPath )
+{	
+	var head = document.getElementsByTagName('head')[0];
+	var link = document.createElement('link');
+	link.href = LinkPath;
+	link.rel = 'stylesheet';
+	link.type = 'text/css';
+	head.appendChild(link);
+}
+
+function CheckCssLinkExist( LinkPath )
+{
+	let pNow=$("head link[href='"+LinkPath+"']");
+	let nTotal=pNow.length;
+	
+	return nTotal;
+}
+
+
+/*------Dark Mode------*/
+
+function SwitchDarkMode( DarkCssPath )
+{		
+	ExecuteDarkMode( DarkCssPath );
+    setInterval("ExecuteDarkMode('"+DarkCssPath+"')",1000);	
+}
+
+function ExecuteDarkMode( DarkCssPath )
+{
+    let nMode=0;
+	let bDarkMode=navigator.userAgent.match(  RegExp('dark','i') );	
+	if( bDarkMode!=null )
+		nMode=1;
+	
+	let nNow=CheckCssLinkExist(DarkCssPath);
+	if( nMode==0 )
+	{
+		if(nNow>0)
+			RemoveCssLink(DarkCssPath);
+	}
+	else
+	{
+		if(nNow==0)
+			AddCssLink(DarkCssPath);
+	}	
+}
+
+SwitchDarkMode( "../css/dark.css" );