Merge branch 'main' of https://github.com/QIDITECH/QIDISlicer

resources/localization/zh_CN/QIDISlicer_zh_CN.po

@@ -13010,14 +13010,12 @@ msgid "Extra perimeters if needed"
 msgstr "如果需要，打印额外轮廓"
 
 #: src/libslic3r/PrintConfig.cpp:871
-#, fuzzy
 msgid ""
-"Add more perimeters when needed for avoiding gaps in sloping walls. Slic3r "
+"Add more perimeters when needed for avoiding gaps in sloping walls. Slic3r keeps adding "
-"keeps adding perimeters, until more than 70% of the loop immediately above is "
+"perimeters, until more than 70% of the loop immediately above is supported."
-"supported."
 msgstr ""
-"在需要时添加更多轮廓,以避免倾斜的墙壁出现间隙，Slic3r 不断添加轮廓,直到支撑超"
+"在需要时添加更多轮廓，以避免倾斜的墙壁出现间隙。Slic3r 不断添加轮廓，直到上方 "
-"过 70% 的正上方循环。"
+"70% 以上的环路得到支撑。"
 
 #: src/libslic3r/PrintConfig.cpp:878
 msgid "Extra perimeters on overhangs (Experimental)"

resources/web/data/text.js

@@ -1,5 +1,5 @@
 var LangText={
-    "en": {
+	"en": {
 		"t0": "Welcome to QIDISlicer",
 		"t1": "User Guide",
 		"t2": "First Print",
@@ -7,8 +7,18 @@ var LangText={
 		"t4": "Connect Device",
 		"t5": "Wifi Send",
 		"t6": "Issue Report",
-    },
+		"t7": "Demonstration",
-    "zh_CN": {
+		"t8": "Product Info",
+		"t9": "Contact with us",
+		"t10": "Filament",
+		"t11": "Add Text",
+		"t12": "Cut Model",
+		"t13": "Download Model",
+		"ls1": "You can download 3D models from the following websites.",
+		"ls2": "If you have any questions about the Printer or QIDISlicer, please contact us via the appropriate E-mail address or Skype.",
+		"ls3": "Note: please try to tell us your requirements in the form of video or pictures, and provide 3MF file, G-code file, machine number and other necessary information.",
+	},
+	"zh_CN": {
 		"t0": "欢迎使用QIDISlicer",
 		"t1": "用户指南",
 		"t2": "首次打印",
@@ -16,8 +26,18 @@ var LangText={
 		"t4": "连接设备",
 		"t5": "无线发送",
 		"t6": "问题报告",
-    },
+		"t7": "演示",
-    "ja_JP": {
+		"t8": "产品信息",
+		"t9": "与我们联系",
+		"t10": "耗材",
+		"t11": "添加文本",
+		"t12": "切割模型",
+		"t13": "下载模型",
+		"ls1": "您可以从以下网站下载 3D 模型。",
+		"ls2": "如果您对打印机或 QIDISlicer 有任何疑问，请通过相应的电子邮件地址或 Skype 与我们联系。",
+		"ls3": "注：请尽量以视频或图片的形式告诉我们您的需求，并提供3MF文件、G-Code文件、机器编号等必要信息。",
+	},
+	"ja": {
 		"t0": "QIDISlicerへようこそ",
 		"t1": "ユーザーガイド",
 		"t2": "最初の印刷物",
@@ -25,7 +45,131 @@ var LangText={
 		"t4": "デバイスを接続する",
 		"t5": "Wi-Fi送信",
 		"t6": "問題レポート",
-    }
+		"t7": "デモンストレーション",
+		"t8": "製品情報",
+		"t9": "お問い合わせください",
+		"t10": "フィラメント",
+		"t11": "テキストを追加",
+		"t12": "カットモデル",
+		"t13": "モデルをダウンロード",
+		"ls1": "3Dモデルは以下のWebサイトからダウンロードできます。",
+		"ls2": "如果您对打印机或 QIDISlicer 有任何疑问，请通过相应的电子邮件地址或 Skype 与我们联系。",
+		"ls3": "注：请尽量以视频或图片的形式告诉我们您的需求，并提供3MF文件、G-Code文件、机器编号等必要信息。",
+	},
+	"fr": {
+		"t0": "Bienvenue dans QIDISlicer",
+		"t1": "Guide de l'utilisateur",
+		"t2": "Première d'impression",
+		"t3": "Ajouter une prise en charge",
+		"t4": "Connecter l'appareil",
+		"t5": "Envoi Wi-Fi",
+		"t6": "Rapport de problème",
+		"t7": "Démonstration",
+		"t8": "Informations sur le produit",
+		"t9": "Contactez-nous",
+		"t10": "Filament",
+		"t11": "Ajouter du texte",
+		"t12": "Couper le modèle",
+		"t13": "Télécharger le modèle",
+		"ls1": "Vous pouvez télécharger des modèles 3D à partir des sites Web suivants.",
+		"ls2": "Si vous avez des questions sur l'imprimante ou le QIDISlicer, veuillez nous contacter via l'adresse e-mail appropriée ou via Skype.",
+		"ls3": "Remarque : veuillez essayer de nous indiquer vos besoins sous forme de vidéo ou d'images, et fournir un fichier 3MF, un fichier G-code, un numéro de machine et d'autres informations nécessaires.",
+	},
+	"de": {
+		"t0": "Willkommen bei QIDISlicer",
+		"t1": "Benutzerhandbuch",
+		"t2": "Erster Druck",
+		"t3": "Unterstützung hinzufügen",
+		"t4": "Gerät verbinden",
+		"t5": "Wi-Fi senden",
+		"t6": "Problembericht",
+		"t7": "Demonstration",
+		"t8": "Produktinformationen",
+		"t9": "Kontaktieren Sie uns",
+		"t10": "Filament",
+		"t11": "Text hinzufügen",
+		"t12": "Modell schneiden",
+		"t13": "Modell herunterladen",
+		"ls1": "Sie können 3D-Modelle von den folgenden Websites herunterladen.",
+		"ls2": "Wenn Sie Fragen zum Drucker oder QIDISlicer haben, kontaktieren Sie uns bitte über die entsprechende E-Mail-Adresse oder Skype.",
+		"ls3": "Hinweis: Bitte versuchen Sie, uns Ihre Anforderungen in Form von Videos oder Bildern mitzuteilen und geben Sie die 3MF-Datei, die G-Code-Datei, die Maschinennummer und andere notwendige Informationen an.",
+	},
+	"be": {
+		"t0": "Вітаем у QIDISlicer",
+		"t1": "Кіраўніцтва карыстальніка",
+		"t2": "Першы адбітак",
+		"t3": "Дадаць падтрымку",
+		"t4": "Падключыць прыладу",
+		"t5": "Адправіць па Wi-Fi",
+		"t6": "Паведамленне аб праблеме",
+		"t7": "Дэманстрацыя",
+		"t8": "Інфармацыя аб прадукце",
+		"t9": "Звязацца з намі",
+		"t10": "Філамент",
+		"t11": "Дадаць тэкст",
+		"t12": "Разрэзаная мадэль",
+		"t13": "Спампаваць мадэль",
+		"ls1": "Вы можаце загрузіць 3D-мадэлі з наступных сайтаў.",
+		"ls2": "Калі ў вас ёсць якія-небудзь пытанні аб прынтары або QIDISlicer, калі ласка, звяжыцеся з намі праз адпаведны адрас электроннай пошты або Skype.",
+		"ls3": "Заўвага: калі ласка, паспрабуйце паведаміць нам свае патрабаванні ў выглядзе відэа ці малюнкаў, а таксама прадаставіць файл 3MF, файл G-кода, нумар машыны і іншую неабходную інфармацыю.",
+	},
+	"ca": {
+		"t0": "Benvingut a QIDISlicer",
+		"t1": "Guia de l'usuari",
+		"t2": "Primera d'impressió",
+		"t3": "Afegeix suport",
+		"t4": "Connecta el dispositiu",
+		"t5": "Enviament sense fil",
+		"t6": "Informe de problemes",
+		"t7": "Demostració",
+		"t8": "Informació del producte",
+		"t9": "Contacteu amb nosaltres",
+		"t10": "Filament",
+		"t11": "Afegeix text",
+		"t12": "Tallar el model",
+		"t13": "Baixa el model",
+		"ls1": "Podeu descarregar models 3D dels següents llocs web.",
+		"ls2": "Si teniu cap pregunta sobre la impressora o QIDISlicer, poseu-vos en contacte amb nosaltres mitjançant l'adreça de correu electrònic corresponent o Skype.",
+		"ls3": "Nota: proveu d'indicar-nos els vostres requisits en forma de vídeo o imatges i proporcioneu un fitxer 3MF, un fitxer de codi G, un número de màquina i altra informació necessària.",
+	},
+	"cs": {
+		"t0": "Vítejte v QIDISlicer",
+		"t1": "Uživatelská příručka",
+		"t2": "První výtisk",
+		"t3": "Přidat podporu",
+		"t4": "Připojit zařízení",
+		"t5": "Bezdrátové odesílání",
+		"t6": "Hlášení o problému",
+		"t7": "Demonstrace",
+		"t8": "Informace o produktu",
+		"t9": "Kontaktujte nás",
+		"t10": "Filament",
+		"t11": "Přidat text",
+		"t12": "Vyříznutý model",
+		"t13": "Stáhnout model",
+		"ls1": "3D modely si můžete stáhnout z následujících webových stránek.",
+		"ls2": "Máte-li jakékoli dotazy týkající se tiskárny nebo QIDISlicer, kontaktujte nás prosím prostřednictvím příslušné e-mailové adresy nebo Skype.",
+		"ls3": "Poznámka: Zkuste nám prosím sdělit své požadavky ve formě videa nebo obrázků a poskytněte soubor 3MF, soubor G-kódu, číslo stroje a další potřebné informace.",
+	},
+	"es": {
+		"t0": "Bienvenido a QIDISlicer",
+		"t1": "Guía del usuario",
+		"t2": "Primera de impresión",
+		"t3": "Agregar soporte",
+		"t4": "Conectar dispositivo",
+		"t5": "Envío inalámbrico",
+		"t6": "Informe de problema",
+		"t7": "Demostración",
+		"t8": "Información del producto",
+		"t9": "Contacta con nosotros",
+		"t10": "Filamento",
+		"t11": "Agregar texto",
+		"t12": "Modelo cortado",
+		"t13": "Descargar Modelo",
+		"ls1": "Puede descargar modelos 3D de los siguientes sitios web.",
+		"ls2": "Si tiene alguna pregunta sobre la impresora o QIDISlicer, comuníquese con nosotros a través de la dirección de correo electrónico correspondiente o Skype.",
+		"ls3": "Nota: intente decirnos sus requisitos en forma de video o imágenes, y proporcione el archivo 3MF, el archivo de código G, el número de máquina y otra información necesaria.",
+    },
 };
 
 

resources/web/guide/css/home.css

@@ -1,85 +1,144 @@
-*
+* {
-{
+	padding: 0px;
-	padding:0px;
 	border: 0px;
 	margin: 0px;
-    font-family: "system-ui", "Segoe UI", Roboto, Oxygen, Ubuntu, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-sans;
+	font-family: "system-ui", "Segoe UI", Roboto, Oxygen, Ubuntu, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-sans;
 	border-color: #4479FB;
 }
 
 html, body {
 	height: 100%;
 	width: 100%;
-    margin: 0px;
+	margin: 0px;
-    padding: 0px;
+	padding: 0px;
 	line-height: 20px;
-    font-size: 16px;	
+	font-size: 16px;
-	background-color:#F4F7FE;
+	background-color: #F4F7FE;
 }
 
-.ZScrol::-webkit-scrollbar {/*滚动条整体样式*/
+.LinkBtn {
-    width: 12px;     /*高宽分别对应横竖滚动条的尺寸*/
+	font-size: 12px;
-    height: 1px;
-	padding: 2px;
-}
-
-.ZScrol::-webkit-scrollbar:hover {
-    color: #4479FB;
-}
-
-.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;
-	color: #F07E4A;		
-}
-
-.LinkBtn
-{
-	font-size:12px;
 	color: #1200FF;
 	cursor: pointer;
 }
 
-.LinkBtn:hover
+.LinkBtn:hover {
-{
+	text-decoration: underline;
-	text-decoration:underline;
 }
 
 /*------------------*/
-body
+* {
-{
+	/* 页面初始化 清除元素原有的内外边距 */
-	display:flex;
+	padding: 0;
+	margin: 0;
+	/* 盒子模型 */
+	box-sizing: border-box;
+}
+body {
+	display: flex;
 	justify-content: flex-start;
+	align-items: center;
+	/* 让页面占浏览器可视区域的高度 */
+	height: 100vh;
 }
 
-#LeftBoard
+#LeftBoard {
-{
 	/*border-right-width: 1px;
 	border-right-style: solid;*/
-	background:#414345;
+	background: #414345;
-	width: 248px;
+	width:360px;
+	min-width: 280px;
 	height: 100%;
 }
 
-#GuideArea
+li {
-{
+	/* 清除li元素前面的项目符号 */
-	border-bottom-width:1px;
+	list-style: none;
-	border-bottom-style:inset;
+}
+
+.accordion {
+	/* 溢出隐藏 */
+	overflow: hidden;
+	/* 圆角属性 */
+	border-radius: 0 8px 8px 0;
+	/* 盒子阴影 */
+	box-shadow: 0 0 10px rgba(0, 0, 0, 0.6);
+}
+.accordion > li {
+	width: 100%;
+}
+.accordion > li input {
+	/* 将单选按钮隐藏起来 */
+	display: none;
+}
+.accordion > li label {
+	/* 相对定位 */
+	position: relative;
+	/* label元素是行内元素 需要将其转为块级元素 才能设置宽度和高度 */
+	display: block;
+	width: 100%;
+	padding: 20px 50px;
+	color: #fff;
+	background-color: #4479FB;
+	/* 鼠标移入变小手 */
+	cursor: pointer;
+}
+.accordion > li label i {
+	/* 绝对定位 */
+	position: absolute;
+	/* calc方法自动计算数值 让字体图标垂直居中 */
+	top: calc(50% - 12px);
+	left: 20px;
+	font-size: 24px;
+	/* 加过渡 */
+	transition: all 0.5s;
+}
+.accordion > li label:hover {
+	border-left-color: #F1F1FF;
+	border-left-width: 4px;
+	border-style: solid;
+}
+/* :not()选择器选取的是除括号里的元素以外的其它元素 :first-child选择器是第一个元素 */
+.accordion > li:not(:first-child) label {
+	border-top: 1px solid #38814d;
+}
+.accordion > li ol {
+	width: 100%;
+	background-color: #333;
+}
+.accordion > li ol li {
+	position: relative;
+	width: 100%;
+	height: 0;
+	line-height: 50px;
+	padding-left: 20px;
+	cursor: pointer;
+	transition: all 0.5s;
+}
+.accordion > li ol li::before {
+	content: "";
+	position: absolute;
+	top: 3px;
+	left: 0;
+	width: 4px;
+	height: 44px;
+	background-color: #4479FB;
+	transform: scaleY(0);
+	transition: all 0.5s;
+}
+.accordion > li ol li:hover::before {
+	transform: scaleY(1);
+}
+.accordion > li input:checked ~ label i {
+	transform: rotate(90deg);
+}
+.accordion > li input:checked ~ ol li {
+	height: 50px;
+}
+
+#GuideArea {
+	/*border-bottom-width:1px;
+	border-bottom-style:inset;*/
 	height: 100px;
 	display: flex;
 	flex-direction: column;
@@ -87,24 +146,23 @@ body
 	justify-content: center;
 	flex-wrap: nowrap;
 	position: relative;
-	width:248px;
+	width: 100%;
 }
 
 
-#Guide1
+#Guide1 {
-{
+	height: 36px;
-	height:36px;
 	line-height: 36px;
 	display: flex;
 	justify-content: center;
 	user-select: none;
 }
 
-#GuideBtn
+#GuideBtn {
-{
 	cursor: pointer;
 	color: #4479FB;
 }
+
 .TbItem {
 	font-size: 24px;
 	display: flex;
@@ -114,75 +172,76 @@ body
 }
 
 .TbItem:hover {
-	font-size:25px;
+	font-size: 25px;
 }
 
 .TbItemSelected {
-
 }
 
-#Icon1
+#Icon1 {
-{
 	margin-right: 10px;
 }
 
-#QDIcon
+#QDIcon {
-{
+	height: 36px;
-	height:36px;
 }
 
 /*------------------*/
-#BtnArea
+#BtnArea {
-{
+	padding: 0;
-	
+	margin: 0;
 }
 
-
+.BtnItem {
-.BtnItem
+	padding-left: 30px;
-{
+	height: 50px;
-	border-bottom-width:1px;
-	border-bottom-style:inset;
-    padding-left:30px;	
-	height:50px;
 	line-height: 50px;
+	text-indent: 10px;
 	display: flex;
-	justify-content:flex-start;
+	justify-content: flex-start;
 	cursor: pointer;
-	color:#ffffff;
+	color: white;
+	transition: all 0.5s;
+}
+.BtnItem:hover {
+	color: #4479FB
 }
 
-.BtnItem:hover
+.BtnItemSelected {
-{
-	color:#4479FB
-}
-
-.BtnItemSelected
-{
 	background-color: #CED1D9;
-	color:#4479FB
+	color: #4479FB
 }
 
-.BtnIcon
+.BtnIcon {
-{
+	margin-left: 15px;
-	margin-right:6px;
 	display: flex;
 	flex-direction: column;
 	justify-content: center;
 }
 
-.LeftIcon
+.BookIcon {
-{
+	display: flex;
-	width:20px;
+	flex-direction: column;
+	justify-content: center;
+}
+
+.MainIcon {
+	width: 20px;
 	height: 20px;
 }
 
+.LeftIcon {
+	width: 30px;
+	height: 30px;
+	padding-left: 10px;
+}
+
 /*--------------------*/
-#RightBoard
+#RightBoard {
-{
 	width: 100%;
 	height: 100%;
 	min-width: 835px;
-	overflow-y:auto;
+	overflow-y: auto;
 }
 
 #ThumbBoard
@@ -263,6 +322,15 @@ body
 	left: 0px;
 }
 
+@media screen{
+	.halfBlock {
+		text-align: center;
+		justify-content: center;
+		width: calc(50% - 20px);
+		margin: 0px 10px;
+	}
+}
+
 @media screen and (max-width: 1100px) {
 	.PrintBlock {
 		text-align:center;
@@ -312,19 +380,78 @@ body
 	}
 }
 
-#HotspotWEB
+#FilaBigBoard {
-{
+	display: none;
-	width:100%;
-	height: 420px;
-}
-/*------Gif------*/
-#GifBigBoard
-{
-	display:none;
 }
 
-#GifBoard
+#FilaBoard {
-{
+	display: flex;
+	flex-wrap: wrap;
+	text-align: center;
+	justify-content: center;
+	height: 100vh;
+	overflow-y: auto;
+	top: 0px;
+	bottom: 0px;
+	right: 0px;
+	left: 0px;
+	box-sizing: border-box;
+}
+
+.main {
+	margin: 50px 50px;
+	width: 100%;
+	overflow: auto;
+}
+
+td, th {
+	/* 设置td,th宽度高度 */
+	border: 1px solid gray;
+	font-size: 12px;
+	width: 100px;
+	height: 50px;
+}
+
+th {
+	background-color: #4F6EBC;
+	color: #fff;
+}
+
+table {
+	table-layout: fixed;
+	width: 200px; /* 固定宽度 */
+}
+
+td:first-child, th:first-child {
+	position: sticky;
+	left: 0; /* 首行永远固定在左侧 */
+	z-index: 1;
+	background: #CDDBFB;
+}
+
+th:nth-child(odd) { /*奇表头*/
+	background-color: #6993FB;
+}
+
+thead tr th {
+	position: sticky;
+	top: 0; /* 列首永远固定在头部  */
+}
+
+tbody tr:nth-child(odd) {
+	background: #B7B9BF;
+}
+
+th:first-child {
+	z-index: 2;
+}
+
+/*------Gif------*/
+#GifBigBoard {
+	display: none;
+}
+
+#GifBoard {
 	display: flex;
 	flex-wrap: wrap;
 	align-content: flex-start;
@@ -340,38 +467,34 @@ body
 }
 
 @media screen {
-.GifBlock
+	.GifBlock {
-{
+		margin: 0px 0px 0px 0px;
-	margin: 0px 0px 0px 0px;
+		cursor: pointer;
-	cursor: pointer;
+	}
-}
 }
 
-.UG_PRINTER
+.UG_PRINTER {
-{
+	text-align: center;
-	text-align:center;
-	width:100%;
-}
-
-.UG_PRINTER img
-{
-	width:15%;
-}
-
-.UG_IMG
-{
 	width: 100%;
 }
 
-.UG_IMG img
+.UG_PRINTER img {
-{
+	width: 15%;
+}
+
+.UG_IMG {
+	justify-content:center;
+	text-align:center;
+	width: 100%;
+}
+
+.UG_IMG img {
 	width: 100%;
 	border-radius: 5px 5px 5px 5px;
 }
 
-.UG_TITLE
+.UG_TITLE {
-{
+	text-align: center;
-	text-align:center;
 	font-size: 18px;
 	font-weight: 700;
 	line-height: 25px;
@@ -381,38 +504,35 @@ body
 	color: #4479FB;
 }
 
-.UG_DESC
+.UG_DESC {
-{
 	font-size: 14px;
 	width: 100%;
 	line-height: 20px;
 }
 
-.UG_CDESC
+.UG_CDESC {
-{
+	margin-top:35px;
-	text-align:center;
+	margin-bottom:5px;
-	font-size: 14px;
+	text-align: center;
+	font-size: 24px;
 	width: 100%;
 	line-height: 20px;
 }
 
-.UG_B_TITLE
+.UG_B_TITLE {
-{
+	text-align: center;
-	text-align:center;
 	font-size: 36px;
 	font-weight: 700;
 	line-height: 25px;
 	width: 100%;
 	margin-top: 20px;
-	margin-bottom: 4px;
+	margin-bottom: 25px;
 	color: #4479FB;
 }
 
-.UG_B_DESC
+.UG_B_DESC {
-{
 	font-size: 16px;
 	width: 100%;
 	line-height: 20px;
-	margin-top: 30px;
 	margin-bottom: 50px;
 }

resources/web/guide/img/i2.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687913925905" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8764" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M264.153704 952.655092 64.311213 952.655092 64.311213 224.110197l199.843514 0L264.154727 952.655092 264.153704 952.655092zM229.954811 261.241886 98.815051 261.241886l0 67.14219 131.139759 0L229.954811 261.241886 229.954811 261.241886zM326.469981 64.541969l198.266599 0 0 888.044562L326.469981 952.58653 326.469981 64.541969 326.469981 64.541969zM495.458767 98.756211 360.142895 98.756211l0 69.234851 135.314849 0L495.457744 98.756211 495.458767 98.756211zM954.857758 892.768143l-190.012611 61.911048-225.718835-692.706665 190.010565-61.911048L954.857758 892.768143 954.857758 892.768143zM708.125331 245.963924 583.437517 286.590204l20.798698 63.833841 124.685767-40.627303L708.125331 245.963924 708.125331 245.963924zM708.125331 245.963924" fill="#4479FB" p-id="8765"></path></svg>

resources/web/guide/index.html

@@ -1,196 +1,451 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
 <head>
-<meta charset="utf-8">
+	<meta charset="utf-8">
-<meta http-equiv="Cache-Control" content="max-age=7200" />
+	<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>
+	<title>homepage</title>
-<link rel="stylesheet" type="text/css" href="css/home.css" />
+	<link rel="stylesheet" type="text/css" href="css/font-awesome.min.css" />
-<link rel="stylesheet" type="text/css" href="css/dark.css" />	
+	<link rel="stylesheet" type="text/css" href="css/home.css" />
-<script type="text/javascript" src="js/jquery-3.6.0.min.js"></script>
+	<link rel="stylesheet" type="text/css" href="css/dark.css" />
-<script type="text/javascript" src="../data/text.js"></script>	
+	<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>
-<script type="text/javascript" src="js/globalapi.js"></script>
+	<script type="text/javascript" src="js/json2.js"></script>
-<script type="text/javascript" src="js/home.js"></script>
+	<script type="text/javascript" src="js/globalapi.js"></script>
+	<script type="text/javascript" src="js/home.js"></script>
 </head>
 <body class="ZScrol" onLoad="OnInit()">
-<div id="LeftBoard">
+	<div id="LeftBoard">
-	<div id="GuideArea">
+		<div id="GuideArea">
-		<!--<div menu="userguide" class="BtnItem" onClick="GotoMenu('userguide')">
+			<div id="Guide1">
-			<div class="BtnIcon "><img class="LeftIcon" src="img/logo2.png" /></div>
+				<div id="Icon1"><img id="QDIcon" src="img/logo.png" /></div>
-			<div class="trans" tid="t2">UserGuide</div>
+				<div menu="userguide" class="TbItem" onClick="GotoMain('userguide');">
-		</div>-->
+					<div class="trans" tid="t1">UserGuide</div>
-	<div id="Guide1">
+				</div>
-		<div id="Icon1"><img id="QDIcon" src="img/logo.png" /></div>
+			</div>
-		<div menu="userguide" class="TbItem" onClick="GotoMain('userguide')">
+		</div>
-			<div class="trans" tid="t1">UserGuide</div>
+		<ul class="accordion">
+			<li>
+				<input type="radio" name="item" id="item1" />
+				<label for="item1">
+					<a class="trans" tid="t7"></a>
+					<i class="fa fa-caret-right"></i>
+				</label>
+				<ol>
+					<li menu="firstprint" class="BtnItem" onClick="GotoMenu('firstprint')">
+						<div class="BtnIcon "><img class="LeftIcon" src="img/i1.svg" /></div>
+						<div class="trans" tid="t2">UserGuide</div>
+					</li>
+					<li menu="addsupport" class="BtnItem" onClick="GotoMenu('addsupport')">
+						<div class="BtnIcon "><img class="LeftIcon" src="img/i1.svg" /></div>
+						<div class="trans" tid="t3">UserGuide</div>
+					</li>
+					<li menu="wifisend" class="BtnItem" onClick="GotoMenu('wifisend')">
+						<div class="BtnIcon "><img class="LeftIcon" src="img/i1.svg" /></div>
+						<div class="trans" tid="t5">UserGuide</div>
+					</li>
+					<li menu="connectdevice" class="BtnItem" onClick="GotoMenu('connectdevice')">
+						<div class="BtnIcon "><img class="LeftIcon" src="img/i1.svg" /></div>
+						<div class="trans" tid="t4">UserGuide</div>
+					</li>
+					<li menu="addtext" class="BtnItem" onClick="GotoMenu('addtext')">
+						<div class="BtnIcon "><img class="LeftIcon" src="img/i1.svg" /></div>
+						<div class="trans" tid="t11">UserGuide</div>
+					</li>
+					<li menu="cutmodel" class="BtnItem" onClick="GotoMenu('cutmodel')">
+						<div class="BtnIcon "><img class="LeftIcon" src="img/i1.svg" /></div>
+						<div class="trans" tid="t12">UserGuide</div>
+					</li>
+					<li menu="downloadm" class="BtnItem" onClick="GotoMenu('downloadm')">
+						<div class="BtnIcon "><img class="LeftIcon" src="img/i1.svg" /></div>
+						<div class="trans" tid="t13">UserGuide</div>
+					</li>
+				</ol>
+			</li>
+			<li>
+				<input type="radio" name="item" id="item2" />
+				<label for="item2">
+					<a class="trans" tid="t8"></a>
+					<i class="fa fa-caret-right"></i>
+				</label>
+				<ol>
+					<li menu="infomax3" class="BtnItem" onClick="GotoMenu('infomax3')">
+						<div class="BtnIcon "><img class="LeftIcon" src="img/i1.svg" /></div>
+						<div class="TextS1">X-MAX 3</div>
+					</li>
+					<li menu="infoplus3" class="BtnItem" onClick="GotoMenu('infoplus3')">
+						<div class="BtnIcon "><img class="LeftIcon" src="img/i1.svg" /></div>
+						<div class="TextS1">X-Plus 3</div>
+					</li>
+					<li menu="infosmart3" class="BtnItem" onClick="GotoMenu('infosmart3')">
+						<div class="BtnIcon "><img class="LeftIcon" src="img/i1.svg" /></div>
+						<div class="TextS1">X-Smart 3</div>
+					</li>
+					<li menu="infof1" class="BtnItem" onClick="GotoMenu('infof1')">
+						<div class="BtnIcon "><img class="LeftIcon" src="img/i1.svg" /></div>
+						<div class="trans" tid="t10">FInfo</div>
+					</li>
+				</ol>
+			</li>
+			<li>
+				<input type="radio" name="item" id="item3" />
+				<label for="item3">
+					<a class="trans" tid="t9"></a>
+					<i class="fa fa-caret-right"></i>
+				</label>
+				<ol>
+					<li menu="issuereport" class="BtnItem" onClick="GotoMenu('issuereport')">
+						<div class="BtnIcon "><img class="LeftIcon" src="img/i1.svg" /></div>
+						<div class="trans" tid="t6">UserGuide</div>
+					</li>
+				</ol>
+			</li>
+		</ul>
+	</div>
+	<div id="RightBoard">
+		<div id="ThumbBoard" class="ZScrol" board="userguide">
+			<div class="GuideBlock" onClick="GotoMenu('firstprint');">
+				<div class="UG_IMG"><img src="img/FirstPrint.gif" /></div>
+				<div class="UG_TITLE trans TextS1" tid="t2">FirstPrint</div>
+			</div>
+			<div class="GuideBlock" onClick="GotoMenu('addsupport');">
+				<div class="UG_IMG"><img src="img/AddSupport.gif" /></div>
+				<div class="UG_TITLE trans TextS1" tid="t3">AddSupport</div>
+			</div>
+			<div class="GuideBlock" onClick="GotoMenu('wifisend');">
+				<div class="UG_IMG"><img src="img/WifiSend.gif" /></div>
+				<div class="UG_TITLE trans TextS1" tid="t5">WifiSend</div>
+			</div>
+			<div class="GuideBlock" onClick="GotoMenu('connectdevice');">
+				<div class="UG_IMG"><img src="img/ConnectDevice.gif" /></div>
+				<div class="UG_TITLE trans TextS1" tid="t4">ConnectDevice</div>
+			</div>
+			<div class="GuideBlock" onClick="GotoMenu('addtext');">
+				<div class="UG_IMG"><img src="img/AddText.gif" /></div>
+				<div class="UG_TITLE trans TextS1" tid="t11">AddText</div>
+			</div>
+			<div class="GuideBlock" onClick="GotoMenu('cutmodel');">
+				<div class="UG_IMG"><img src="img/CutModel.gif" /></div>
+				<div class="UG_TITLE trans TextS1" tid="t12">CutModel</div>
+			</div>
+			<div class="GuideBlock" onClick="GotoMenu('downloadm');">
+				<div class="UG_IMG"><img src="img/DownloadModel.png" /></div>
+				<div class="UG_TITLE trans TextS1" tid="t13">AddText</div>
+			</div>
+			<div class="GuideBlock" onClick="GotoMenu('issuereport');">
+				<div class="UG_IMG"><img src="img/IssueReport.png" /></div>
+				<div class="UG_TITLE trans TextS1" tid="t6">IssueReport</div>
+			</div>
+		</div>
+
+		<div id="GifBigBoard" board="firstprint">
+			<div id="GifBoard">
+				<div class="GifBlock">
+					<div class="UG_IMG"><img src="img/FirstPrint.gif" /></div>
+				</div>
+			</div>
+		</div>
+
+		<div id="GifBigBoard" board="addsupport">
+			<div id="GifBoard">
+				<div class="GifBlock">
+					<div class="UG_IMG"><img src="img/AddSupport.gif" /></div>
+				</div>
+			</div>
+		</div>
+
+		<div id="GifBigBoard" board="connectdevice">
+			<div id="GifBoard">
+				<div class="GifBlock">
+					<div class="UG_IMG"><img src="img/ConnectDevice.gif" /></div>
+				</div>
+			</div>
+		</div>
+
+		<div id="GifBigBoard" board="wifisend">
+			<div id="GifBoard">
+				<div class="GifBlock">
+					<div class="UG_IMG"><img src="img/WifiSend.gif" /></div>
+				</div>
+			</div>
+		</div>
+
+		<div id="GifBigBoard" board="addtext">
+			<div id="GifBoard">
+				<div class="GifBlock">
+					<div class="UG_IMG"><img src="img/AddText.gif" /></div>
+				</div>
+			</div>
+		</div>
+
+		<div id="GifBigBoard" board="cutmodel">
+			<div id="GifBoard">
+				<div class="GifBlock">
+					<div class="UG_IMG"><img src="img/CutModel.gif" /></div>
+				</div>
+			</div>
+		</div>
+
+		<div id="GifBigBoard" board="downloadm">
+			<div id="GifBoard">
+				<div class="GifBlock">
+					<div class="UG_B_TITLE trans TextS1" tid="t13">download</div>
+					<div class="UG_CDESC trans" tid="ls1"></div>
+				</div>
+			</div>
+			<div id="IssueBoard">
+				<div class="halfBlock">
+					<div class="UG_DESC">URL:https://www.thingiverse.com/</div>
+					<div class="UG_IMG"><img src="img/thingiverse.png" /></div>
+				</div>
+				<div class="halfBlock">
+					<div class="UG_DESC">URL:https://www.printables.com/model</div>
+					<div class="UG_IMG"><img src="img/printables.png" /></div>
+				</div>
+			</div>
+		</div>
+		<!--<div id="GifBigBoard" board="downloadm">
+		<div id="GifBoard">
+			<div class="GifBlock">
+				<div class="UG_B_TITLE trans" tid="t13">downloadm</div>
+			</div>
+			<div id="IssueBoard">
+				<div class="halfBlock">
+					<div class="UG_CDESC">URL:https://www.thingiverse.com/</div>
+					<div class="UG_IMG"><img src="img/thingiverse.png" /></div>
+					<div class="UG_CDESC">URL:https://www.printables.com/model</div>
+					<div class="UG_IMG"><img src="img/printables.png" /></div>
+				</div>
+			</div>
+		</div>
+	</div>-->
+
+		<div id="GifBigBoard" board="infomax3">
+			<div id="GifBoard">
+				<div class="UG_IMG"><img src="img/info1.png" /></div>
+			</div>
+		</div>
+
+		<div id="GifBigBoard" board="infoplus3">
+			<div id="GifBoard">
+				<div class="UG_IMG"><img src="img/info2.png" /></div>
+			</div>
+		</div>
+
+		<div id="GifBigBoard" board="infosmart3">
+			<div id="GifBoard">
+				<div class="UG_IMG"><img src="img/info3.png" /></div>
+			</div>
+		</div>
+
+		<div id="FilaBigBoard" board="infof1">
+			<div id="FilaBoard">
+				<div class="main">
+					<table cellspacing="0">
+						<thead>
+							<tr>
+								<th>Filament</th>
+								<th>Drying box</th>
+								<th>Anneal</th>
+								<th>Water resistance</th>
+								<th>Corrosion resistance</th>
+								<th>Creep resistance</th>
+								<th>HDT 0.45</th>
+								<th>HDT 1.80</th>
+								<th>Tensile strength(MPa)</th>
+								<th>Tensile modulus(MPa)</th>
+								<th>Elongation at break(%)</th>
+								<th>Flexural strength(MPa)</th>
+								<th>Flexural modulus(MPa)</th>
+								<th>Notch impact strength(KJ/㎡)</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(item, index) in 1" :key="index">
+								<td>ToughPETG</td>
+								<td>≤20％</td>
+								<td>/</td>
+								<td>+++</td>
+								<td>++</td>
+								<td>+++</td>
+								<td>78℃</td>
+								<td>73℃</td>
+								<td>40.3±0.6</td>
+								<td>1780±80</td>
+								<td>4.0±0.2</td>
+								<td>62.8±0.4</td>
+								<td>1919±54</td>
+								<td>13.9±2.3</td>
+							</tr>
+							<tr v-for="(item, index) in 1" :key="index">
+								<td>UltraABS-GF25</td>
+								<td>≤30％</td>
+								<td>/</td>
+								<td>+++</td>
+								<td>+</td>
+								<td>+++</td>
+								<td>97℃</td>
+								<td>93℃</td>
+								<td>48.48 ± 0.61</td>
+								<td>3752.13 ± 68.39</td>
+								<td>2.10 ± 0.10</td>
+								<td>78.80 ± 1.26</td>
+								<td>3531.71 ± 75.79</td>
+								<td>8.91 ± 0.63</td>
+							</tr>
+							<tr v-for="(item, index) in 1" :key="index">
+								<td>ABS Rapido</td>
+								<td>≤30％</td>
+								<td>/</td>
+								<td>++</td>
+								<td>+</td>
+								<td>+++</td>
+								<td>85℃</td>
+								<td>/</td>
+								<td>41 ± 1</td>
+								<td>3850 ± 150</td>
+								<td>11 ± 1</td>
+								<td>77.5 ± 2.5</td>
+								<td>77.5 ± 2.5</td>
+								<td>20 ± 2</td>
+							</tr>
+							<tr v-for="(item, index) in 1" :key="index">
+								<td>PA12-CF</td>
+								<td>≤15％</td>
+								<td>80-100℃</td>
+								<td>+</td>
+								<td>++</td>
+								<td>+</td>
+								<td>149.6℃</td>
+								<td>112.4℃</td>
+								<td>87.49 ± 2.81</td>
+								<td>5438.40 ± 282.82</td>
+								<td>2.59 ± 0.19</td>
+								<td>133.17 ± 4.66</td>
+								<td>4667.43 ± 339.80</td>
+								<td>6.11 ± 1.45</td>
+							</tr>
+							<tr v-for="(item, index) in 1" :key="index">
+								<td>PATH-CF</td>
+								<td>≤15％</td>
+								<td>80-100℃</td>
+								<td>++</td>
+								<td>+++</td>
+								<td>+++</td>
+								<td>192.3℃</td>
+								<td>121.7℃</td>
+								<td>104.90 ± 1.99</td>
+								<td>8383.26 ± 419.53</td>
+								<td>1.60 ± 0.07</td>
+								<td>147.70 ± 4.09</td>
+								<td>5969.35 ± 145.28</td>
+								<td>6.17 ± 0.2</td>
+							</tr>
+							<tr v-for="(item, index) in 1" :key="index">
+								<td>PET-CF</td>
+								<td>≤15％</td>
+								<td>80-100℃</td>
+								<td>+++</td>
+								<td>+++</td>
+								<td>+++</td>
+								<td>148.8℃</td>
+								<td>112.1℃</td>
+								<td>87.41 ± 3.57</td>
+								<td>6025.53 ± 355.46</td>
+								<td>1.99 ±0.18</td>
+								<td>122.69 ± 5.19</td>
+								<td>5313.21 ± 197.89</td>
+								<td>5.57 ± 0.58</td>
+							</tr>
+							<tr v-for="(item, index) in 1" :key="index">
+								<td>PLA Rapido</td>
+								<td>≤30％</td>
+								<td>/</td>
+								<td>+</td>
+								<td>+</td>
+								<td>+</td>
+								<td>57℃</td>
+								<td>/</td>
+								<td>39 ± 3</td>
+								<td>4650 ± 150</td>
+								<td>12.5 ± 2.5</td>
+								<td>72.5 ± 2.5</td>
+								<td>2850 ± 150</td>
+								<td>6 ± 2</td>
+							</tr>
+							<tr v-for="(item, index) in 1" :key="index">
+								<td>PLA Rapido Matte</td>
+								<td>≤30％</td>
+								<td>/</td>
+								<td>+</td>
+								<td>+</td>
+								<td>+</td>
+								<td>58℃</td>
+								<td>/</td>
+								<td>39 ± 3</td>
+								<td>2400 ± 200</td>
+								<td>3 ± 1</td>
+								<td>77.5 ± 2.5</td>
+								<td>2200 ± 200</td>
+								<td>7.5 ± 1.5</td>
+							</tr>
+							<tr v-for="(item, index) in 1" :key="index">
+								<td>UltraPA</td>
+								<td>≤15％</td>
+								<td>/</td>
+								<td>++</td>
+								<td>++</td>
+								<td>++</td>
+								<td>77.8℃</td>
+								<td>73.1℃</td>
+								<td>86.15 ± 0.56</td>
+								<td>3609.22 ± 153.31</td>
+								<td>11.68 ± 3.36</td>
+								<td>121.47 ± 3.14</td>
+								<td>3314.03 ±181.88</td>
+								<td>5.78 ± 0.30</td>
+							</tr>
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+
+		<div id="GifBigBoard" board="issuereport">
+			<div id="GifBoard">
+				<div class="GifBlock">
+					<div class="UG_B_TITLE trans TextS1" tid="t6"></div>
+					<div class="trans" tid="ls2"></div>
+					<div class="UG_B_DESC trans" tid="ls3"></div>
+				</div>
+			</div>
+			<div id="IssueBoard">
+				<div class="PrintBlock">
+					<div class="UG_IMG"><img src="img/X-MAX3.png" /></div>
+					<div class="UG_TITLE">X-MAX 3</div>
+					<div class="UG_DESC">
+						E-mail:<br />MAX3support@qd3dprinter.com<br>MAX3AMS@qd3dprinter.com<br /><br>
+						Skype:<br />MAX3support@qd3dprinter.com
+					</div>
+				</div>
+				<div class="PrintBlock">
+					<div class="UG_IMG"><img src="img/X-Plus3.png" /></div>
+					<div class="UG_TITLE">X-Plus 3</div>
+					<div class="UG_DESC">
+						E-mail:<br />Plus3support01@qd3dprinter.com<br>Plus3support02@qd3dprinter.com<br /><br>
+						Skype:<br />Plus3support@qd3dprinter.com
+					</div>
+				</div>
+				<div class="PrintBlock">
+					<div class="UG_IMG"><img src="img/X-Smart3.png" /></div>
+					<div class="UG_TITLE">X-Smart 3</div>
+					<div class="UG_DESC">
+						E-mail:<br />Smart3support@qd3dprinter.com<br>Smart3AMS@qd3dprinter.com<br /><br>
+						Skype:<br />Smart3support@qd3dprinter.com
+					</div>
+				</div>
+			</div>
 		</div>
 	</div>
-	</div>
-
-	<div id="BtnArea">
-		<div menu="firstprint" class="BtnItem" onClick="GotoMenu('firstprint')">
-			<div class="BtnIcon "><img class="LeftIcon" src="img/i1.svg" /></div>
-			<div class="trans" tid="t2">UserGuide</div>
-		</div>
-		<div menu="addsupport" class="BtnItem" onClick="GotoMenu('addsupport')">
-			<div class="BtnIcon "><img class="LeftIcon" src="img/i1.svg" /></div>
-			<div class="trans" tid="t3">UserGuide</div>
-		</div>
-		<div menu="wifisend" class="BtnItem" onClick="GotoMenu('wifisend')">
-			<div class="BtnIcon "><img class="LeftIcon" src="img/i1.svg" /></div>
-			<div class="trans" tid="t5">UserGuide</div>
-		</div>
-		<div menu="connectdevice" class="BtnItem" onClick="GotoMenu('connectdevice')">
-			<div class="BtnIcon "><img class="LeftIcon" src="img/i1.svg" /></div>
-			<div class="trans" tid="t4">UserGuide</div>
-		</div>
-		<div menu="issuereport" class="BtnItem" onClick="GotoMenu('issuereport')">
-			<div class="BtnIcon "><img class="LeftIcon" src="img/i1.svg" /></div>
-			<div class="trans" tid="t6">UserGuide</div>
-		</div>
-	</div>
-</div>
-
-<div id="RightBoard">
-<div id="ThumbBoard" class="ZScrol" board="userguide">
-	<div class="GuideBlock" onClick="GotoMenu('firstprint')">
-		<div class="UG_IMG"><img src="img/FirstPrint.gif" /></div>
-		<div class="UG_TITLE trans TextS1" tid="t2">FirstPrint</div>
-	</div>
-	<div class="GuideBlock" onClick="GotoMenu('addsupport')">
-		<div class="UG_IMG"><img src="img/AddSupport.gif" /></div>
-		<div class="UG_TITLE trans TextS1" tid="t3">AddSupport</div>
-	</div>
-	<div class="GuideBlock" onClick="GotoMenu('connectdevice')">
-		<div class="UG_IMG"><img src="img/ConnectDevice.gif" /></div>
-		<div class="UG_TITLE trans TextS1" tid="t4">ConnectDevice</div>
-	</div>
-	<div class="GuideBlock" onClick="GotoMenu('wifisend')">
-		<div class="UG_IMG"><img src="img/WifiSend.gif" /></div>
-		<div class="UG_TITLE trans TextS1" tid="t5">WifiSend</div>
-	</div>
-	<div class="GuideBlock" onClick="GotoMenu('issuereport')">
-		<div class="UG_IMG"><img src="img/IssueReport.png" /></div>
-		<div class="UG_TITLE trans TextS1" tid="t6">IssueReport</div>
-	</div>
-</div>
-
-<div id="GifBigBoard" board="firstprint">
-<div id="GifBoard" >
-	<div class="GifBlock">
-		<div class="UG_IMG"><img src="img/FirstPrint.gif" /></div>
-	</div>
-</div>
-</div>
-
-<div id="GifBigBoard" board="addsupport">
-<div id="GifBoard" >
-	<div class="GifBlock">
-		<div class="UG_IMG"><img src="img/AddSupport.gif" /></div>
-	</div>
-</div>
-</div>
-
-<div id="GifBigBoard" board="connectdevice">
-<div id="GifBoard" >
-	<div class="GifBlock">
-		<div class="UG_IMG"><img src="img/ConnectDevice.gif" /></div>
-	</div>
-</div>
-</div>
-
-<div id="GifBigBoard" board="wifisend">
-<div id="GifBoard" >
-	<div class="GifBlock">
-		<div class="UG_IMG"><img src="img/WifiSend.gif" /></div>
-	</div>
-</div>
-</div>
-
-<div id="GifBigBoard" board="issuereport">
-<div id="GifBoard" >
-	<div class="GifBlock">
-		<div class="UG_B_TITLE trans TextS1" tid="wk1">Issue Report</div>
-		<div class="UG_B_DESC trans" tid="wk2">If you have any questions about the Printer or QIDISlicer, please contact us via the appropriate E-mail address or Skype.<br />
-		Note: please try to tell us your requirements in the form of video or pictures, and provide 3MF file, G-code file, machine number and other necessary information.</div>
-	</div>
-</div>
-<div id="IssueBoard">
-	<div class="PrintBlock">
-		<div class="UG_IMG"><img src="img/X-MAX3.png" /></div>
-		<div class="UG_TITLE">X-MAX 3</div>
-		<div class="UG_DESC">E-mail:<br />MAX3support@qd3dprinter.com<br>MAX3AMS@qd3dprinter.com<br /><br>
-		Skype:<br />MAX3support@qd3dprinter.com</div>
-	</div>
-	<div class="PrintBlock">
-		<div class="UG_IMG"><img src="img/X-Plus3.png" /></div>
-		<div class="UG_TITLE">X-Plus 3</div>
-		<div class="UG_DESC">E-mail:<br />Plus3support01@qd3dprinter.com<br>Plus3support02@qd3dprinter.com<br /><br>
-		Skype:<br />Plus3support@qd3dprinter.com</div>
-	</div>
-	<div class="PrintBlock">
-		<div class="UG_IMG"><img src="img/X-Smart3.png" /></div>
-		<div class="UG_TITLE">X-Smart 3</div>
-		<div class="UG_DESC">E-mail:<br />Smart3support@qd3dprinter.com<br>Smart3AMS@qd3dprinter.com<br /><br>
-		Skype:<br />Smart3support@qd3dprinter.com</div>
-	</div>
-</div>
-</div>
-<!--<div id="GifBigBoard" board="issuereport">
-<div id="GifBoard" >
-	<div class="GifBlock">
-		<div class="UG_B_TITLE trans TextS1" tid="wk1">Issue Report</div>
-		<div class="UG_B_DESC trans" tid="wk2">You can copy the email address or skype to get in touch with us by clicking Help - Requirements Report. Please try to tell us your requirements in the form of video or pictures, and provide 3MF file, G-code file, machine number and other necessary information. </div>
-		<div class="UG_PRINTER"><img src="img/X-MAX3.png" /><img /><img src="img/X-Plus3.png" /><img /><img src="img/X-Smart3.png" /></div>
-	</div>
-</div>
-</div>-->
-	
-</div>	
 </body>
-<script type="text/javascript">
-	//HandleStudio(TestData);
-    document.onkeydown = function (event) {
-		var e = event || window.event || arguments.callee.caller.arguments[0];
-
-		if (e.ctrlKey && e.metaKey)
-			OutputKey(e.keyCode, true, false, true);
-		else if (e.ctrlKey)
-			OutputKey(e.keyCode, true, false, false);
-		else if (e.metaKey)
-			OutputKey(e.keyCode, false, false, true);
-
-		if (e.shiftKey && e.ctrlKey)
-			OutputKey(e.keyCode, true, true, false);
-
-		if (e.shiftKey && e.metaKey)
-			OutputKey(e.keyCode, false, true, true);
-
-		if (window.event) {
-			try { e.keyCode = 0; } catch (e) { }
-			e.returnValue = false;
-		}
-	};
-
-	window.addEventListener('mousewheel', function (event) {
-		if (event.ctrlKey === true || event.metaKey) {
-			event.preventDefault();
-		}
-	}, { passive: false });
-
-</script>
 </html>
-
-
-
-
-
-
-
-
-
-
-
-
-

resources/web/qidi/css/home.css

@@ -1,18 +1,60 @@
-body
+body {
-{
+	display: flex;
-    background-color:#F4F7FE;
+	justify-content: center;
-    font-family: Arial, sans-serif;
+	align-items: center;
-    display: flex;
+	/* <20><>ҳ<EFBFBD><D2B3>ռ<EFBFBD><D5BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĸ߶<C4B8> */
-    justify-content: center;
+	height: 100vh;
-    align-items: center;
-    height: 100vh;
-    margin: 0;
 }
 
-.container {
+#GifBoard {
-    text-align: center;
+	display: flex;
-    padding: 30px;
+	flex-wrap: wrap;
-    border-radius: 10px;
+	align-content: flex-start;
-    background-color: #ffffff;
+	align-items: center;
-    box-shadow: 0 4px 6px rgba(39, 39, 39, 0.1);
+	justify-content: center;
+	overflow-y: auto;
+	margin: 30px 40px;
+	position: relative;
+	top: 0px;
+	bottom: 0px;
+	right: 0px;
+	left: 0px;
+}
+
+@media screen {
+	.GifBlock {
+		margin: 0px 0px 0px 0px;
+		cursor: pointer;
+	}
+}
+
+.UG_IMG {
+	justify-content:center;
+	text-align:center;
+	width: 100%;
+}
+
+.UG_IMG img {
+	width: 100%;
+	border-radius: 5px 5px 5px 5px;
+}
+
+.UG_TITLE {
+	text-align: center;
+	font-size: 36px;
+	font-weight: 700;
+	line-height: 25px;
+	width: 100%;
+	margin-top: 20px;
+	color: #4479FB;
+}
+
+.UG_DESC {
+	text-align:center;
+	font-size: 24px;
+	font-weight:lighter;
+	width: 100%;
+	line-height: 20px;
+	margin-top: 30px;
+	margin-bottom: 20px;
 }

resources/web/qidi/missing_connection.html

@@ -6,16 +6,23 @@
 <title>Printer Connection Required</title>
 <link rel="stylesheet" type="text/css" href="css/home.css" />
 <script type="text/javascript" src="../data/text.js"></script>	
-<script type="text/javascript" src="../homepage/js/jquery-3.6.0.min.js"></script>
+<script type="text/javascript" src="../guide/js/jquery-3.6.0.min.js"></script>
-<script type="text/javascript" src="../homepage/js/json2.js"></script>
+<script type="text/javascript" src="../guide/js/json2.js"></script>
-<script type="text/javascript" src="../homepage/js/globalapi.js"></script>
+<script type="text/javascript" src="../guide/js/globalapi.js"></script>
-<script type="text/javascript" src="../homepage/js/home.js"></script>
+<script type="text/javascript" src="../guide/js/home.js"></script>
 </head>
 <body onLoad="OnInit()">
-    <div class="container">
+    <div id="GifBoard">
-        <h1 class="trans" tid="t4">Printer Connection</h1>
+        <div class="GifBlock">
-        <p class="trans">Please set up your printer connection to view the device.</p>
+            <div class="UG_TITLE trans" tid="t4"></div>
-        <img src="setup_connection.gif" alt="Printer connection setup demonstration" style="max-width: 100%; height: auto; display: block;"/>
+            <div class="UG_DESC trans" tid="wk2">
+                Please set up your printer connection to view the device.
+            </div>
+            <div class="UG_IMG"><img src="setup_connection.gif" /></div>
+        </div>
     </div>
+    <!--<h1 class="trans" tid="t4">Printer Connection</h1>
+    <p class="trans">Please set up your printer connection to view the device.</p>
+    <img src="setup_connection.gif" alt="Printer connection setup demonstration" style="max-width: 100%; height: auto; display: block;"/>-->
 </body>
 </html>

src/libslic3r/AppConfig.cpp

@@ -90,6 +90,8 @@ void AppConfig::set_defaults()
             set("associate_3mf", "0");
         if (get("associate_stl").empty())
             set("associate_stl", "0");
+        if (get("associate_step").empty())
+            set("associate_step", "0");
 
         if (get("tabs_as_menu").empty())
             set("tabs_as_menu", "0");

src/libslic3r/PrintConfig.cpp

@@ -888,9 +888,8 @@ void PrintConfigDef::init_fff_params()
     def = this->add("extra_perimeters", coBool);
     def->label = L("Extra perimeters if needed");
     def->category = L("Layers and Perimeters");
-    def->tooltip = L("Add more perimeters when needed for avoiding gaps in sloping walls. "
+    def->tooltip = L("Add more perimeters when needed for avoiding gaps in sloping walls. Slic3r keeps adding "
-                   "Slic3r keeps adding perimeters, until more than 70% of the loop immediately above "
+                   "perimeters, until more than 70% of the loop immediately above is supported.");
-                   "is supported.");
     def->mode = comExpert;
     def->set_default_value(new ConfigOptionBool(true));
 

src/slic3r/GUI/ConfigWizard.cpp

@@ -1610,11 +1610,13 @@ PageFilesAssociation::PageFilesAssociation(ConfigWizard* parent)
 {
     cb_3mf = new wxCheckBox(this, wxID_ANY, _L("Associate .3mf files to QIDISlicer"));
     cb_stl = new wxCheckBox(this, wxID_ANY, _L("Associate .stl files to QIDISlicer"));
-//    cb_gcode = new wxCheckBox(this, wxID_ANY, _L("Associate .gcode files to QIDISlicer G-code Viewer"));
+    cb_step = new wxCheckBox(this, wxID_ANY, _L("Associate .step/.stp files to QIDISlicer"));
+    //    cb_gcode = new wxCheckBox(this, wxID_ANY, _L("Associate .gcode files to QIDISlicer G-code Viewer"));
 
     append(cb_3mf);
     append(cb_stl);
-//    append(cb_gcode);
+    append(cb_step);
+    //    append(cb_gcode);
 }
 #endif // _WIN32
 
@@ -3268,13 +3270,16 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *prese
 #ifdef _WIN32
     app_config->set("associate_3mf", page_files_association->associate_3mf() ? "1" : "0");
     app_config->set("associate_stl", page_files_association->associate_stl() ? "1" : "0");
-//    app_config->set("associate_gcode", page_files_association->associate_gcode() ? "1" : "0");
+    app_config->set("associate_step", page_files_association->associate_step() ? "1" : "0");
+    //    app_config->set("associate_gcode", page_files_association->associate_gcode() ? "1" : "0");
 
     if (wxGetApp().is_editor()) {
         if (page_files_association->associate_3mf())
             wxGetApp().associate_3mf_files();
         if (page_files_association->associate_stl())
             wxGetApp().associate_stl_files();
+        if (page_files_association->associate_step())
+            wxGetApp().associate_step_files();
     }
 //    else {
 //        if (page_files_association->associate_gcode())

src/slic3r/GUI/ConfigWizard_private.hpp

@@ -439,6 +439,7 @@ struct PageFilesAssociation : ConfigWizardPage
 private:
     wxCheckBox* cb_3mf{ nullptr };
     wxCheckBox* cb_stl{ nullptr };
+    wxCheckBox* cb_step{ nullptr };
 //    wxCheckBox* cb_gcode;
 
 public:
@@ -446,7 +447,8 @@ public:
 
     bool associate_3mf() const { return cb_3mf->IsChecked(); }
     bool associate_stl() const { return cb_stl->IsChecked(); }
-//    bool associate_gcode() const { return cb_gcode->IsChecked(); }
+    bool associate_step() const { return cb_step->IsChecked(); }
+    //    bool associate_gcode() const { return cb_gcode->IsChecked(); }
 };
 #endif // _WIN32
 

src/slic3r/GUI/GUI_App.cpp

@@ -1291,6 +1291,8 @@ bool GUI_App::on_init_inner()
             associate_3mf_files();
         if (app_config->get_bool("associate_stl"))
             associate_stl_files();
+        if (app_config->get_bool("associate_step"))
+            associate_step_files();
 #endif // __WXMSW__
 
         preset_updater = new PresetUpdater();
@@ -2605,6 +2607,8 @@ void GUI_App::open_preferences(const std::string& highlight_option /*= std::stri
             associate_3mf_files();
         if (app_config->get_bool("associate_stl"))
             associate_stl_files();
+        if (app_config->get_bool("associate_step"))
+            associate_step_files();
     }
     else {
         if (app_config->get_bool("associate_gcode"))
@@ -3389,6 +3393,12 @@ void GUI_App::associate_stl_files()
     associate_file_type(L".stl", L"QIDI.Slicer.1", L"QIDISlicer", true);
 }
 
+void GUI_App::associate_step_files()
+{
+    associate_file_type(L".step", L"QIDI.Slicer.1", L"QIDISlicer", true);
+    associate_file_type(L".stp", L"QIDI.Slicer.1", L"QIDISlicer", true);
+}
+
 void GUI_App::associate_gcode_files()
 {
     associate_file_type(L".gcode", L"QIDISlicer.GCodeViewer.1", L"QIDISlicerGCodeViewer", true);

src/slic3r/GUI/GUI_App.hpp

@@ -373,6 +373,7 @@ public:
 #ifdef __WXMSW__
     void            associate_3mf_files();
     void            associate_stl_files();
+    void            associate_step_files();
     void            associate_gcode_files();
 #endif // __WXMSW__
 

src/slic3r/GUI/Preferences.cpp

@@ -279,6 +279,11 @@ void PreferencesDialog::build()
 			L("Associate .stl files to QIDISlicer"),
 			L("If enabled, sets QIDISlicer as default application to open .stl files."),
 			app_config->get_bool("associate_stl"));
+
+		append_bool_option(m_optgroup_general, "associate_step",
+			L("Associate .stp files to QIDISlicer"),
+			L("If enabled, sets QIDISlicer as default application to open .stp files."),
+			app_config->get_bool("associate_step"));
 #endif // _WIN32
 
 		m_optgroup_general->append_separator();