QIDITECH/QIDIStudio
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDIStudio.git synced 2026-02-06 20:01:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix some bug

Browse Source
This commit is contained in:
wjyLearn
2026-02-06 15:56:04 +08:00
parent a1d6ec8d26
commit 8a60f89b46
7 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/web/homepage3/img/AppStoreQR.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
resources/web/homepage3/img/GetappsQR.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
resources/web/homepage3/img/GoogleQR.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
resources/web/homepage3/img/QIDIMakerFQR.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
resources/web/homepage3/img/QIDIMakerQR.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

40
resources/web/homepage3/login.html
View File

@@ -138,8 +138,12 @@
margin-top: 68px; margin-top: 68px;
font-weight: 550; font-weight: 550;
} }
.qrCode { .qrCode-container {
margin-top: 55px; margin-top: 55px;
gap : 60px;
}
.QIDIMakerQR, .QIDIMakerFQR, .AppStoreQR, .GoogleQR, .GetappsQR {
margin-right: 35px;
} }
.faq-section { .faq-section {
margin-top: 40px; margin-top: 40px;
@@ -241,7 +245,14 @@
Download Download
</button> </button>
</div> </div>
<img src="img/QR_code.png" class="qrCode" id = "qrCode" /> <div class = "qrCode-container" id="qrCode-container">
<img src="img/GoogleQR.png" class="GoogleQR" id="GoogleQR"/>
<img src="img/AppStoreQR.png" class="AppStoreQR" id="AppStoreQR" />
<img src="img/GetappsQR.png" class="GetappsQR" id="GetappsQR"/>
<img src="img/QIDIMakerFQR.png" class="QIDIMakerFQR" id="QIDIMakerFQR"/>
<img src="img/QIDIMakerQR.png" class="QIDIMakerQR" id="QIDIMakerQR" />
</div>
<div class = "detail-text" id = "text-detail"> <div class = "detail-text" id = "text-detail">
<div class="faq-section" id="faq"> <div class="faq-section" id="faq">
<div class="faq-item"> <div class="faq-item">
@@ -279,10 +290,25 @@
} }
window.addEventListener('DOMContentLoaded', function() { window.addEventListener('DOMContentLoaded', function() {
TranslatePage(); TranslatePage();
document.getElementById('qrCode').hidden = true; document.getElementById('qrCode-container').hidden = true;
document.getElementById('text-detail').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() { document.getElementById('more').addEventListener('click', function() {
if (this.dataset.clicked) { if (this.dataset.clicked) {
@@ -303,7 +329,7 @@ window.addEventListener('DOMContentLoaded', function() {
document.getElementById('text-detail').hidden = false; 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.color = 'white';
this.style.borderColor = 'white'; this.style.borderColor = 'white';
document.getElementById('qrCode').hidden = true; document.getElementById('qrCode-container').hidden = true;
delete this.dataset.clicked; delete this.dataset.clicked;
} else { } else {
this.style.color = 'blue'; this.style.color = 'blue';
@@ -326,7 +352,7 @@ window.addEventListener('DOMContentLoaded', function() {
document.getElementById('text-detail').hidden = true; document.getElementById('text-detail').hidden = true;
document.getElementById('qrCode').hidden = false; document.getElementById('qrCode-container').hidden = false;
} }
}); });

10
src/slic3r/GUI/WebViewDialog.cpp
View File

@@ -2044,7 +2044,15 @@ void WebViewPanel::SwitchWebContent(std::string modelname, int refresh)
wxString strJS = "GotoMenu(\"home\")"; wxString strJS = "GotoMenu(\"home\")";
WebView::RunScript(m_browserLeft, strJS); 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&region=%s", from_u8(resources_dir()), GetStudioLanguage(),regionStr);
m_browser->LoadURL(htmlUrl); m_browser->LoadURL(htmlUrl);