diff --git a/resources/web/homepage3/img/AppStoreQR.png b/resources/web/homepage3/img/AppStoreQR.png new file mode 100644 index 0000000..cfd6c35 Binary files /dev/null and b/resources/web/homepage3/img/AppStoreQR.png differ diff --git a/resources/web/homepage3/img/GetappsQR.png b/resources/web/homepage3/img/GetappsQR.png new file mode 100644 index 0000000..c9d8656 Binary files /dev/null and b/resources/web/homepage3/img/GetappsQR.png differ diff --git a/resources/web/homepage3/img/GoogleQR.png b/resources/web/homepage3/img/GoogleQR.png new file mode 100644 index 0000000..89690c6 Binary files /dev/null and b/resources/web/homepage3/img/GoogleQR.png differ diff --git a/resources/web/homepage3/img/QIDIMakerFQR.png b/resources/web/homepage3/img/QIDIMakerFQR.png new file mode 100644 index 0000000..73ac26b Binary files /dev/null and b/resources/web/homepage3/img/QIDIMakerFQR.png differ diff --git a/resources/web/homepage3/img/QIDIMakerQR.png b/resources/web/homepage3/img/QIDIMakerQR.png new file mode 100644 index 0000000..e1535f2 Binary files /dev/null and b/resources/web/homepage3/img/QIDIMakerQR.png differ diff --git a/resources/web/homepage3/login.html b/resources/web/homepage3/login.html index 927f3e7..bd99a04 100644 --- a/resources/web/homepage3/login.html +++ b/resources/web/homepage3/login.html @@ -138,8 +138,12 @@ margin-top: 68px; font-weight: 550; } - .qrCode { + .qrCode-container { margin-top: 55px; + gap : 60px; + } + .QIDIMakerQR, .QIDIMakerFQR, .AppStoreQR, .GoogleQR, .GetappsQR { + margin-right: 35px; } .faq-section { margin-top: 40px; @@ -241,7 +245,14 @@ Download - +
+ + + + + +
+
@@ -279,10 +290,25 @@ } window.addEventListener('DOMContentLoaded', function() { TranslatePage(); - document.getElementById('qrCode').hidden = true; + document.getElementById('qrCode-container').hidden = true; document.getElementById('text-detail').hidden = true; - document.getElementById('download').hidden = true; + + let region = GetQueryString('region'); + if (region === 'Other') { + document.getElementById('GoogleQR').hidden = false; + document.getElementById('AppStoreQR').hidden = false; + document.getElementById('GetappsQR').hidden = false; + document.getElementById('QIDIMakerFQR').hidden = false; + document.getElementById('QIDIMakerQR').hidden = true; + } else { + document.getElementById('GoogleQR').hidden = true; + document.getElementById('AppStoreQR').hidden = true; + document.getElementById('GetappsQR').hidden = true; + document.getElementById('QIDIMakerFQR').hidden = true; + document.getElementById('QIDIMakerQR').hidden = false; + } + }); document.getElementById('more').addEventListener('click', function() { if (this.dataset.clicked) { @@ -303,7 +329,7 @@ window.addEventListener('DOMContentLoaded', function() { document.getElementById('text-detail').hidden = false; - document.getElementById('qrCode').hidden = true; + document.getElementById('qrCode-container').hidden = true; } }); @@ -313,7 +339,7 @@ window.addEventListener('DOMContentLoaded', function() { this.style.color = 'white'; this.style.borderColor = 'white'; - document.getElementById('qrCode').hidden = true; + document.getElementById('qrCode-container').hidden = true; delete this.dataset.clicked; } else { this.style.color = 'blue'; @@ -326,7 +352,7 @@ window.addEventListener('DOMContentLoaded', function() { document.getElementById('text-detail').hidden = true; - document.getElementById('qrCode').hidden = false; + document.getElementById('qrCode-container').hidden = false; } }); diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp index 7d49936..ebe63a7 100644 --- a/src/slic3r/GUI/WebViewDialog.cpp +++ b/src/slic3r/GUI/WebViewDialog.cpp @@ -2044,7 +2044,15 @@ void WebViewPanel::SwitchWebContent(std::string modelname, int refresh) wxString strJS = "GotoMenu(\"home\")"; WebView::RunScript(m_browserLeft, strJS); - wxString htmlUrl = wxString::Format("file:///%s/web/homepage3/login.html", from_u8(resources_dir())); + wxString regionStr = ""; + std::string region = wxGetApp().app_config->get("region"); + if (region == "China") { + regionStr = "CN"; + } + else { + regionStr = "Other"; + } + wxString htmlUrl = wxString::Format("file:///%s/web/homepage3/login.html?lang=%s®ion=%s", from_u8(resources_dir()), GetStudioLanguage(),regionStr); m_browser->LoadURL(htmlUrl);