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-11-01 05:01:10 -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/data/text.js
+++ b/resources/web/data/text.js
@ -30,9 +30,9 @@ var LangText={
 		"t28":"Recent",
 		"t29":"Mall",
 		"t30":"Manual",
-		"t31":"New project",
+		"t31":"New Project",
 		"t32":"Create new project",
-		"t33":"Open project",
+		"t33":"Open Project",
 		"t34":"hotspot",
 		"t35":"Recently opened",
 		"t36":"ok",
@ -81,7 +81,10 @@ var LangText={
 		"t86":"Close",
 		"t87":"User Manual",
 		"t88":"Remove",
-		"t89":"Open Containing Folder"
+		"t89":"Open Containing Folder",
+		"t90":"3D Model",
+		"t91":"Download 3D models",
+		"t92":"Bambu Christmas Cabin"
 	},
 	"zh_CN":{
 		"t1":"欢迎使用Bambu Studio",
@ -166,6 +169,9 @@ var LangText={
 		"t87":"使用引导",
 		"t88":"移除",
 		"t89":"打开所在的文件夹",
+		"t90":"3D 模型",
+		"t91":"下载3D模型",
+		"t92":"Bambu圣诞小屋",
 		"wk1":"快速入门指南",
 		"wk2":"本文介绍了Bambu Studio的最基本用法。它指导用户配置软件，创建项目，并逐步完成第一个打印任务。",
 		"wk3":"基于项目的工作流",
--- 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" );
--- a/resources/web/homepage/css/dark.css
+++ b/resources/web/homepage/css/dark.css
@ -0,0 +1,86 @@
+body
+{
+	background-color:#242428;
+}
+
+*
+{
+	border-color: #3E3E45;
+}
+
+
+.TextS1
+{
+	color:#efeff0;
+}
+
+.ZScrol::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
+    background-color: #939594;
+}
+
+.ZScrol::-webkit-scrollbar-track {/*滚动条里面轨道*/
+        background: #161817;
+}
+
+
+
+
+/*----Left Menu Button----*/
+#LogoutBtn:hover
+{
+	background: #243E30;
+	color: #efeff0;
+}
+
+.BtnItem
+{
+	color:#B3B3B5;
+}
+
+.BtnItem:hover
+{
+	color: #efeff0;
+	background-color: #243E30;
+}
+
+.BtnItem:hover .LeftIcon
+{
+	filter: brightness(300%);
+}
+
+.BtnItemSelected
+{
+	color: #efeff0;
+	background-color: #243E30;
+}
+
+.BtnItemSelected .LeftIcon
+{
+	filter: brightness(300%);
+}
+
+/*-----Right Top MenuBtn-----*/
+.MenuItem:hover
+{
+	border-color: #4CAA50;
+	background-color: #243E30;
+}
+
+#RecentClearAllBtn:hover
+{
+	color: #000;
+}
+
+#recnet_context_menu
+{
+	color: #efeff0;
+	background-color:#242428;
+	border: 0px;
+	box-shadow: 0px 0px 3px #DCDCDC;
+}
+
+/*----User Manual------*/
+.UG_DESC
+{
+	color:#818183;
+}
--- a/resources/web/homepage/css/home.css
+++ b/resources/web/homepage/css/home.css
@ -4,6 +4,7 @@
 	border: 0px;
 	margin: 0px;
    font-family: "system-ui", "Segoe UI", Roboto, Oxygen, Ubuntu, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-sans;
+	border-color: #D7D7D7;
 }

 html, body {
@ -15,6 +16,27 @@ html, body {
    font-size: 16px;	
 }

+.ZScrol::-webkit-scrollbar {/*滚动条整体样式*/
+    width: 12px;     /*高宽分别对应横竖滚动条的尺寸*/
+    height: 1px;
+	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;
+}
+
+
 .RedFont
 {
 	font-size:12px;
@ -48,7 +70,8 @@ body

 #LeftBoard
 {
-	border-right: 1px solid #EFF0F0;
+	border-right-width: 1px;
+	border-right-style: solid;
 	width:262px;
 	height: 100%;
 }
@ -212,11 +235,12 @@ body

 #ContentBoard
 {
-	overflow-y:hidden;
+	overflow-y:auto;
 	padding: 0px 40px;
 	display: flex;
 	flex-direction: column;
 	position: relative;
+	height: 100%;
 }

 #MenuArea
@ -224,11 +248,13 @@ body
 	height: 140px;
 	display: flex;
 	align-items: center;
+	flex: 0 0 140px;
 }

 .MenuItem
 {
-	border: 1px solid #EEEEEE;
+	border-width: 1px;
+	border-style: solid;
 	border-radius: 12px;
 	height: 101px;
 	width: 253px;
@ -288,19 +314,20 @@ body
 	display:flex;
 	align-items: center;
 	padding: 6px;
-    border-bottom: 1px solid #D9D9D9;	
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
 }

 #RecentClearAllBtn
 {
-	border: 1px solid #000;
+	border-width: 1px;
+	border-style: solid;
 	padding: 0px 10px;
 	border-radius: 6px;
 	line-height: 26px;
 	height: 26px;
 	margin-left: 20px;
 	cursor: pointer;
-	color: #000;
 	display: none;
 }

@ -361,6 +388,14 @@ body
 	display: inline-block;
 }

+.FileName
+{
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    word-break: break-all;	
+}
+
 .FileDate
 {
 	color: #A8A8A8;
@ -373,28 +408,28 @@ body
 	padding: 10px;
 	border: 0px;
 	min-width: 100px;
-    top: 800px;
-	border: 1px solid #C3C3C3;
+	border: 1px solid #D7D7D7;
+    top: 100px;
 	border-radius: 5px;
 	color: #323A3D;
 	background-color: #fff;
    display: none;
+	z-index: 1;
 }

 .CT_Item
 {
-	padding: 2px 10px;
+	padding: 4px 12px;
 	display: flex;
 	flex-direction: row;
 	align-items: center;
-	border: 2px solid #fff;
-	border-radius: 4px;	
 }

 .CT_Item:hover
 {
 	cursor: pointer;
 	background-color: #0078D4;
+	border-radius: 4px;
 	color: #fff;
 }

@ -591,4 +626,28 @@ body
 	font-size: 14px;
 }

+/*------Christmas cabin---*/
+#ChristmasArea
+{
+	margin-top: 10px;
+	display: flex;
+	flex-direction: column;
+}

+#ChristmasTitleBlock
+{
+	display:flex;
+	align-items: center;
+	padding: 6px;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+}
+
+#CabinList
+{
+	display: flex;
+	flex-wrap: wrap;
+	align-content: flex-start;
+	overflow-y: auto;
+
+}
--- a/resources/web/homepage/css/light.css
+++ b/resources/web/homepage/css/light.css
--- a/resources/web/homepage/img/i6.png
+++ b/resources/web/homepage/img/i6.png
--- a/resources/web/homepage/img/project_based_workflow.png
+++ b/resources/web/homepage/img/project_based_workflow.png
--- a/resources/web/homepage/index.html
+++ b/resources/web/homepage/index.html
@ -3,28 +3,29 @@
 <head>
 <meta charset="utf-8">
 <meta http-equiv="Cache-Control" content="max-age=7200" />
-<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;" name="viewport" />	
+<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />	
 <title>homepage</title>
 <link rel="stylesheet" type="text/css" href="css/home.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="../data/text.js"></script>	
 <script type="text/javascript" src="js/json2.js"></script>
 <script type="text/javascript" src="js/globalapi.js"></script>
-<script type="text/javascript" src="js/home.js"></script>	
+<script type="text/javascript" src="js/home.js"></script>
 </head>
-<body onLoad="OnInit()">
+<body class="ZScrol" onLoad="OnInit()">
 <div id="LeftBoard">
 	<div id="LoginArea">
 	<div id="Login1">
 		<div id="Icon1"><img id="BBLIcon" src="../image/logo2.png" /></div>
-		<div id="LoginBtn" style="font-weight: 700;" onClick="OnLoginOrRegister()"><span class="trans" tid="t26">login</span>/<span class="trans" tid="t27">register</span></div>
+		<div id="LoginBtn" class="TextS1" style="font-weight: 700;" onClick="OnLoginOrRegister()"><span class="trans" tid="t26">login</span>/<span class="trans" tid="t27">register</span></div>
 	</div>
 		
 	<div id="Login2">
 		<div>
 			<img id="UserAvatarIcon" src="img/c.jpg" onerror="this.onerror=null;this.src='img/c.jpg';" />
 		</div>
-		<div id="UserName"></div>
+		<div id="UserName" class="TextS1"></div>
 		<div id="LogoutBtn" class="Btn trans" tid="t50" onClick="OnLogOut()">log out</div>
 	</div>	
 		
@ -47,20 +48,27 @@
 </div>

 <div id="RightBoard">
-<div id="ContentBoard" board="recent">
+<div id="ContentBoard" class="ZScrol" board="recent">
    <div style="height: 14px;"></div>	
 	<div id="MenuArea">
+<!--		<div class="MenuItem" onClick="OnClickModelDepot()">
+			<div class="MenuIcon"><img src="img/i6.png"></div>
+			<div>
+				<div class="trans TextS1" tid="t90">3D Model</div>
+				<div class="MenuDesc trans"  tid="t91">Download 3D Models</div>
+			</div>
+		</div>	-->	
 		<div class="MenuItem" onClick="OnClickNewProject()">
 			<div class="MenuIcon"><img src="img/i4.png"></div>
 			<div>
-				<div class="trans" tid="t31">new project</div>
+				<div class="trans TextS1" tid="t31">new project</div>
 				<div class="MenuDesc trans"  tid="t32">create new project</div>
 			</div>
 		</div>
 		<div class="MenuItem" onClick="OnClickOpenProject()">
 			<div class="MenuIcon"><img src="img/i5.png"></div>
 			<div>
-				<div class="trans" tid="t33">open project</div>
+				<div class="trans TextS1" tid="t33">open project</div>
 				<div class="MenuDesc">3mf</div>
 			</div>
 		</div>		
@ -68,78 +76,120 @@
 	
 	<div id="DebugText"></div>
 	
+	<div id="ChristmasArea">
+		<div id="ChristmasTitleBlock">
+		    <div id="ChristmasTitle" class="Content-Title trans TextS1" tid="t92">Christmas Cabin</div>
+		</div>
+		<div id="CabinList">
+<!--		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
+			</div>
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
+			</div>
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
+			</div>
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
+			</div>
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
+			</div>
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
+			</div>
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
+			</div>	-->		
+		</div>
+	</div>	
+	
 	<div id="RecentFileArea">
 		<div id="RecentTitleBlock">
-		    <div id="RecentTitle" class="Content-Title trans" tid="t35">recent open</div>
-			<div id="RecentClearAllBtn" class="trans" tid="t12" onClick="OnDeleteAllRecentFiles()">Clear all</div>
+		    <div id="RecentTitle" class="Content-Title trans TextS1" tid="t35">recent open</div>
+			<div id="RecentClearAllBtn" class="trans TextS1" tid="t12" onClick="OnDeleteAllRecentFiles()">Clear all</div>
 		</div>
 		<div id="FileList">
 <!--		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
 				<a class="FileTip" title="d:\model\11.3mf"></a>
 				<div class="FileImg"><img src="img/d.png"/></div>
-				<a>abcd12334.3mf</a>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
 				<div class="FileDate">2021/12/27 09:22</div>
 			</div>
-		    <div class="FileItem" fpath='d:\model\22.3mf'>
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
 				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/b.jpg"/></div>
-				<a>abcd12334.3mf</a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
 				<div class="FileDate">2021/12/27 09:22</div>
 			</div>
-		    <div class="FileItem">
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
 				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/b.jpg"/></div>
-				<a>abcd12334.3mf</a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
 				<div class="FileDate">2021/12/27 09:22</div>
 			</div>
-		    <div class="FileItem">
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
 				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/b.jpg"/></div>
-				<a>abcd12334.3mf</a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
 				<div class="FileDate">2021/12/27 09:22</div>
 			</div>
-		    <div class="FileItem">
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
 				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/b.jpg"/></div>
-				<a>abcd12334.3mf</a>
-				<div class="FileDate">2021/12/27 09:22</div>
-			</div>	
-		    <div class="FileItem">
-				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/b.jpg"/></div>
-				<a>abcd12334.3mf</a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
 				<div class="FileDate">2021/12/27 09:22</div>
 			</div>
-		    <div class="FileItem">
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
 				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/b.jpg"/></div>
-				<a>abcd12334.3mf</a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
 				<div class="FileDate">2021/12/27 09:22</div>
 			</div>
-		    <div class="FileItem">
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
 				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/b.jpg"/></div>
-				<a>abcd12334.3mf</a>
-				<div class="FileDate">2021/12/27 09:22</div>
-			</div>	
-		    <div class="FileItem" >
-				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/xxxx.jpg" onerror="this.onerror=null;this.src='img/d.png';"  alt="No Image"  /></div>
-				<a>abcd12334.3mf</a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
 				<div class="FileDate">2021/12/27 09:22</div>
 			</div>
-		    <div class="FileItem">
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
 				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/b.jpg"/></div>
-				<a>abcd12334.3mf</a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
 				<div class="FileDate">2021/12/27 09:22</div>
 			</div>
-		    <div class="FileItem">
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
 				<a class="FileTip" title="d:\model\11.3mf"></a>
-				<div class="FileImg"><img src="img/b.jpg"/></div>
-				<a>abcd12334.3mf</a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
 				<div class="FileDate">2021/12/27 09:22</div>
-			</div>-->				
+			</div>
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
+				<a class="FileTip" title="d:\model\11.3mf"></a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
+				<div class="FileDate">2021/12/27 09:22</div>
+			</div>
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
+				<a class="FileTip" title="d:\model\11.3mf"></a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
+				<div class="FileDate">2021/12/27 09:22</div>
+			</div>
+		    <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
+				<a class="FileTip" title="d:\model\11.3mf"></a>
+				<div class="FileImg"><img src="img/d.png"/></div>
+				<div class="FileName TextS1">abcd12334abcd12334abcd12334.3mf</div>
+				<div class="FileDate">2021/12/27 09:22</div>
+			</div>	-->		
 		</div>
 	</div>
 	
@ -163,44 +213,44 @@
 <div id="WikiGuideBoard" >
 	<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/studio-quick-start')">
 		<div class="UG_IMG"><img src="img/quick_start.png" /></div>
-		<div class="UG_TITLE trans" tid="wk1">Quick Start</div>
+		<div class="UG_TITLE trans TextS1" tid="wk1">Quick Start</div>
 		<div class="UG_DESC trans" tid="wk2">This article introduces the most basic usage of Bambu Studio. It guides users to configure software, create projects, and complete the first printing task step by step. </div>
 	</div>
 	<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/project-based-workflow')">
 		<div class="UG_IMG"><img src="img/project_based_workflow.png" /></div>
-		<div class="UG_TITLE trans" tid="wk3">Project Based Workflow</div>
+		<div class="UG_TITLE trans TextS1" tid="wk3">Project Based Workflow</div>
 		<div class="UG_DESC trans" tid="wk4">Bambu Studio has put forward a leading workflow to truly achieve an “all in one” project. Based on the mainstream 3MF project format, it provides a series of revolutionary new features, such as Multi-Plate Support, a Project Resource Manager, and Assembly/Part View. It greatly improves the efficiency of both creators and regular users.</div>
 	</div>
 	<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/high-speed-print-at-quality')">
 		<div class="UG_IMG"><img src="img/high_speed_print_at_quality.png" /></div>
-		<div class="UG_TITLE trans" tid="wk5">High Speed Print at Quality</div>
+		<div class="UG_TITLE trans TextS1" tid="wk5">High Speed Print at Quality</div>
 		<div class="UG_DESC trans" tid="wk6">It is challenging to print at high speed while maintaining high quality. Bambu Studio makes this happen.
        "Arch Move" makes the toolhead move smoothly and reduces the machine's vibration. The smart cooling is based on fine-tuned cooling parameters for each filament type.
        "Auto slow down" for overhang walls works to prevent deformation at high speeds.</div>
 	</div>
 	<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/multi-color-printing')">
 		<div class="UG_IMG"><img src="img/multi_color_printing.png" /></div>
-		<div class="UG_TITLE trans" tid="wk7">Multi-Color Printing</div>
+		<div class="UG_TITLE trans TextS1" tid="wk7">Multi-Color Printing</div>
 		<div class="UG_DESC trans" tid="wk8">Bambu Studio provides versatile colorizing tools to make a colorful model. You can freely add/remove filaments in a project and colorize your model with different brushes. Before printing, each filament will be auto-mapped to an AMS slot, not needing to manually change the spool placement in the AMS.</div>
 	</div>
 	<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/how-to-set-slicing-parameters')">
 		<div class="UG_IMG"><img src="img/setting_guide_of_slicing_parameters.png" /></div>
-		<div class="UG_TITLE trans" tid="wk9">Setting Guide of Slicing Parameters</div>
+		<div class="UG_TITLE trans TextS1" tid="wk9">Setting Guide of Slicing Parameters</div>
 		<div class="UG_DESC trans" tid="wk10">The parameter management features in Bambu Studio provide very flexible and powerful control over the slicing process. This article introduces the organization of parameters and provides some skills on taking full advantage of these capabilities.</div>
 	</div>
 	<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/remote-control')">
 		<div class="UG_IMG"><img src="img/remote_control_and_monitoring.png" /></div>
-		<div class="UG_TITLE trans" tid="wk11">Remote Control & Monitoring</div>
+		<div class="UG_TITLE trans TextS1" tid="wk11">Remote Control & Monitoring</div>
 		<div class="UG_DESC trans" tid="wk12">Bambu Studio support sending print job to your printer over WAN/LAN network, controlling & monitoring every aspect of your 3D printer and printing jobs. If you have more than one printer, you can easily switch between them in the device list.</div>
 	</div>
 	<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/step')">
 		<div class="UG_IMG"><img src="img/step.png" /></div>
-		<div class="UG_TITLE trans" tid="wk13">STEP Format</div>
+		<div class="UG_TITLE trans TextS1" tid="wk13">STEP Format</div>
 		<div class="UG_DESC trans" tid="wk14">Compared with STL, STEP brings more effective information. Thanks to the high accuracy of STEP, a lot of extrusion paths can be generated as arcs. STEP also includes the assembly relationship of each part of a model, which can be used to restore the assembly view after a model is split.</div>
 	</div>
 	<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/3d-text')">
 		<div class="UG_IMG"><img src="img/3d_text.png" /></div>
-		<div class="UG_TITLE trans" tid="wk15">3D Text</div>
+		<div class="UG_TITLE trans TextS1" tid="wk15">3D Text</div>
 		<div class="UG_DESC trans" tid="wk16">With 3D Text tool, users can easily create various 3D text shapes in the project, making the model more personalized. Bambu Studio provides dozens of fonts and supports bold and italic styles to give text greater flexibility.</div>
 	</div>
 </div>
--- a/resources/web/homepage/js/globalapi.js
+++ b/resources/web/homepage/js/globalapi.js
@ -278,3 +278,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");
--- a/resources/web/homepage/js/home.js
+++ b/resources/web/homepage/js/home.js
@ -12,6 +12,9 @@ function OnInit()

 	SendMsg_GetLoginInfo();
 	SendMsg_GetRecentFile();
+	
+	//-----Christmas-----
+	ShowCabin();
 }

 //------最佳打开文件的右键菜单功能----------
@ -22,7 +25,7 @@ var MousePosY=0;

 function Set_RecentFile_MouseRightBtn_Event()
 {
-	$(".FileItem").mousedown(
+	$("#FileList .FileItem").mousedown(
 		function(e)
 		{			
 			//FilePath
@ -117,7 +120,7 @@ function HandleStudio( pVal )
 		{
 			$("#NoPluginTip").hide();
 		}
-	}	
+	}
 }

 function GotoMenu( strMenu )
@ -188,7 +191,7 @@ function ShowRecentFileList( pList )
 		let TmpHtml='<div class="FileItem"  fpath="'+sPath+'"  >'+
 				'<a class="FileTip" title="'+sPath+'"></a>'+
 				'<div class="FileImg" ><img src="'+sImg+'" onerror="this.onerror=null;this.src=\'img/d.png\';"  alt="No Image"  /></div>'+
-				'<a>'+sName+'</a>'+
+				'<div class="FileName TextS1">'+sName+'</div>'+
 				'<div class="FileDate">'+sTime+'</div>'+
 			    '</div>';
 		
@ -203,6 +206,7 @@ function ShowRecentFileList( pList )

 function ShowRecnetFileContextMenu()
 {
+	$("#recnet_context_menu").offset({top: 10000, left:-10000});
 	$('#recnet_context_menu').show();
 	
 	let ContextMenuWidth=$('#recnet_context_menu').width();
@ -214,10 +218,10 @@ function ShowRecnetFileContextMenu()
 	let RealX=MousePosX;
 	let RealY=MousePosY;
 	
-	if( MousePosX + ContextMenuWidth >DocumentWidth )
-		RealX=MousePosX-ContextMenuWidth;
-	if( MousePosY+ContextMenuHeight>DocumentHeight )
-		RealY=MousePosY-ContextMenuHeight;
+	if( MousePosX + ContextMenuWidth + 24 >DocumentWidth )
+		RealX=DocumentWidth-ContextMenuWidth-24;
+	if( MousePosY+ContextMenuHeight+24>DocumentHeight )
+		RealY=DocumentHeight-ContextMenuHeight-24;
 	
 	$("#recnet_context_menu").offset({top: RealY, left:RealX});
 }
@ -252,6 +256,14 @@ function OnLoginOrRegister()
 	SendWXMessage( JSON.stringify(tSend) );	
 }

+function OnClickModelDepot()
+{
+	var tSend={};
+	tSend['sequence_id']=Math.round(new Date() / 1000);
+	tSend['command']="homepage_modeldepot";
+	
+	SendWXMessage( JSON.stringify(tSend) );		
+}

 function OnClickNewProject()
 {
@ -392,3 +404,61 @@ function OpenWikiUrl( strUrl )

 //---------------Global-----------------
 window.postMessage = HandleStudio;
+
+
+//---------------Christma cabin
+var CCabin={
+	"model":[
+		{
+			"name":"Bambu Christmas Cabin",
+			"icon":"christmas_cabin.png",
+			"file":"Bambu Christmas Cabin.3mf"
+		}		
+	]	
+};
+
+function ShowCabin()
+{
+	let nCabin=CCabin.model.length;
+
+	if(nCabin==0)
+	{
+		$('#CabinList').html('');
+	
+	    $('#ChristmasArea').hide();
+		return;
+	}
+	
+	let strHtml='';
+	for(let m=0;m<nCabin;m++)
+	{
+		let OneCabin=CCabin.model[m];
+		
+		let OneHtml='<div class="FileItem" onClick="OnOpenCabin(\''+OneCabin.file+'\')" >'+
+				    '<div class="FileImg"><img src="model/'+OneCabin.icon+'"/></div>'+
+				    '<div class="FileName TextS1">'+OneCabin.name+'</div>'+
+			        '</div>';
+		
+		strHtml+=OneHtml;
+	}
+	
+	$('#CabinList').html(strHtml);
+	
+	$('#ChristmasArea').show();
+	$('#ChristmasArea').css('display','flex');
+}
+
+function OnOpenCabin( cabinfile )
+{
+	//alert(cabinfile);
+	
+	var tSend={};
+	tSend['sequence_id']=Math.round(new Date() / 1000);
+	tSend['command']="homepage_open_ccabin";
+	tSend['data']={};
+	tSend['data']['file']=cabinfile;
+	
+	SendWXMessage( JSON.stringify(tSend) );		
+}
+
+
--- a/resources/web/homepage/model/Bambu
+++ b/resources/web/homepage/model/Bambu
--- a/resources/web/homepage/model/christmas_cabin.png
+++ b/resources/web/homepage/model/christmas_cabin.png
--- a/resources/web/image/printer/Bambu
+++ b/resources/web/image/printer/Bambu