Merge branch 'master' into SoftFever

resources/web/guide/21/21.css

@@ -77,6 +77,7 @@
 .PName
 {
 	font-weight: 700;
+	text-align: left;
 }
 
 .pNozzel

resources/web/guide/21/21.js

@@ -59,13 +59,17 @@ function HandleModelList( pVal )
 		//Add Vendor Html Node
 		if($(".OneVendorBlock[vendor='"+strVendor+"']").length==0)
 		{
+			let sVV=strVendor;
+			if( sVV=="BBL" )
+				sVV="Bambu Lab";
+			
 			let HtmlNewVendor='<div class="OneVendorBlock" Vendor="'+strVendor+'">'+
 '<div class="BlockBanner">'+
 '	<div class="BannerBtns">'+
 '		<div class="SmallBtn_Green trans" tid="t11" onClick="SelectPrinterAll('+"\'"+strVendor+"\'"+')">all</div>'+
 '		<div class="SmallBtn trans" tid="t12" onClick="SelectPrinterNone('+"\'"+strVendor+"\'"+')">none</div>'+
 '	</div>'+
-'	<a>Bambu Lab</a>'+
+'	<a>'+sVV+'</a>'+
 '</div>'+
 '<div class="PrinterArea">	'+
 '</div>'+

resources/web/guide/22/22.css

@@ -8,10 +8,11 @@
 .CName
 {
 	width:130px;
-	min-width: 80px;
 	font-weight: 700;
 	height: 100%;
 	text-align: right;
+	white-space: nowrap;
+	flex-shrink: 0;
 }
 
 .CValues

resources/web/guide/23/23.css

@@ -8,10 +8,11 @@
 .CName
 {
 	width:130px;
-	min-width: 80px;
 	font-weight: 700;
 	height: 100%;
 	text-align: right;
+	white-space: nowrap;
+	flex-shrink: 0;
 }
 
 .CValues

resources/web/guide/24/24.css

@@ -99,6 +99,7 @@
 .PName
 {
 	font-weight: 700;
+	text-align:left;
 }
 
 .pNozzel

resources/web/guide/24/24.js

@@ -59,13 +59,17 @@ function HandleModelList( pVal )
 		//Add Vendor Html Node
 		if($(".OneVendorBlock[vendor='"+strVendor+"']").length==0)
 		{
+			let sVV=strVendor;
+			if( sVV=="BBL" )
+				sVV="Bambu Lab";			
+			
 			let HtmlNewVendor='<div class="OneVendorBlock" Vendor="'+strVendor+'">'+
 '<div class="BlockBanner">'+
 '	<div class="BannerBtns">'+
 '		<div class="SmallBtn_Green trans" tid="t11" onClick="SelectPrinterAll('+"\'"+strVendor+"\'"+')">all</div>'+
 '		<div class="SmallBtn trans" tid="t12" onClick="SelectPrinterNone('+"\'"+strVendor+"\'"+')">none</div>'+
 '	</div>'+
-'	<a>Bambu Lab</a>'+
+'	<a>'+sVV+'</a>'+
 '</div>'+
 '<div class="PrinterArea">	'+
 '</div>'+

resources/web/guide/5/5.css

@@ -1,12 +1,13 @@
 
 #Content
 {
-	padding:10%  15%;
+	padding:0%  15%;
 }
 
 #FeatureText
 {
 	line-height: 30px;
+	margin-top: 10mm;
 }
 
 

resources/web/guide/6/6.css

@@ -3,6 +3,7 @@
 	padding: 0;
 	border: 0;
 	margin: 0;		
+    font-family: "system-ui", "Segoe UI", Roboto, Oxygen, Ubuntu, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-sans;	
 }
 
 html,body

resources/web/guide/css/common.css

@@ -3,6 +3,7 @@
 	padding: 0;
 	border: 0;
 	margin: 0;		
+    font-family: "system-ui", "Segoe UI", Roboto, Oxygen, Ubuntu, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-sans;
 }
 
 html

resources/web/homepage/css/home.css

@@ -3,7 +3,7 @@
 	padding:0px;
 	border: 0px;
 	margin: 0px;
-	font-size: 16px;
+    font-family: "system-ui", "Segoe UI", Roboto, Oxygen, Ubuntu, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-sans;
 }
 
 html, body {
@@ -12,6 +12,7 @@ html, body {
     margin: 0px;
     padding: 0px;
 	line-height: 20px;
+    font-size: 16px;	
 }
 
 .RedFont
@@ -71,6 +72,12 @@ body
 	cursor:pointer;
 }
 
+#LoginBtn:hover
+{
+	font-size:17px;
+}
+
+
 #NoPluginTip
 {
 	position: absolute;
@@ -79,7 +86,7 @@ body
 	bottom: 0px;
 	right: 0px;
 	z-index: 1;
-	display: flex;
+	display: none;
 	flex-direction: column;
 	justify-content: flex-end;
 	padding: 5px;
@@ -212,7 +219,7 @@ body
 
 .MenuItem
 {
-	border: 1px solid #4CAA50;
+	border: 1px solid #EEEEEE;
 	border-radius: 12px;
 	height: 101px;
 	width: 253px;
@@ -226,6 +233,7 @@ body
 
 .MenuItem:hover
 {
+	border-color: #4CAA50;
 	background-color: #E0FCEB;
 }
 

resources/web/homepage/index.html

@@ -142,6 +142,35 @@
 </body>
 <script type="text/javascript">
 	//HandleStudio(TestData);
+    document.onkeydown = function (event) {
+		var e = event || window.event || arguments.callee.caller.arguments[0];
+
+		if (e.shiftKey && e.ctrlKey)
+			OutputKey(e.keyCode, true, true, false);
+		else if (e.ctrlKey)
+            OutputKey(e.keyCode, true, false, false);
+		else if (e.keyCode === 27) 
+            OutputKey(e.keyCode, false, false, false);
+
+		if (e.shiftKey && e.metaKey)
+			OutputKey(e.keyCode, false, true, true);
+		else if (e.metaKey)
+			OutputKey(e.keyCode, false, false, true);
+		else if (e.keyCode === 27)
+			OutputKey(e.keyCode, false, false, false);
+
+		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/homepage/js/home.js

@@ -215,4 +215,16 @@ function BeginDownloadNetworkPlugin()
 	SendWXMessage( JSON.stringify(tSend) );		
 }
 
+function OutputKey(keyCode, isCtrlDown, isShiftDown, isCmdDown) {
+	var tSend = {};
+	tSend['sequence_id'] = Math.round(new Date() / 1000);
+	tSend['command'] = "get_web_shortcut";
+	tSend['key_event'] = {};
+	tSend['key_event']['key'] = keyCode;
+	tSend['key_event']['ctrl'] = isCtrlDown;
+	tSend['key_event']['shift'] = isShiftDown;
+	tSend['key_event']['cmd'] = isCmdDown;
+
+	SendWXMessage(JSON.stringify(tSend));
+}
 window.postMessage = HandleStudio;