yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

feat(GODT-2772): HTML placeholder is not loaded from resources anymore.

Browse Source
This commit is contained in:
Xavier Michelon
2023-08-28 18:21:06 +02:00
parent 86cd2437aa
commit 0c7e17701f
6 changed files with 16 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
internal/frontend/bridge-gui/bridge-gui/Resources.qrc
View File

@ -110,7 +110,6 @@
<file>qml/Proton/WebFrame.qml</file>
<file>qml/QuestionItem.qml</file>
<file>qml/Resources/bug_report_flow.json</file>
<file>qml/Resources/ComingSoon.html</file>
<file>qml/SettingsItem.qml</file>
<file>qml/SettingsView.qml</file>
<file>qml/SetupWizard/ClientListItem.qml</file>

3
internal/frontend/bridge-gui/bridge-gui/qml/MainWindow.qml
View File

@ -176,6 +176,9 @@ ApplicationWindow {
onWizardEnded: {
contentLayout.currentIndex = 0;
}
onShowUnderConstruction: {
webFrameOverlay.showUnderConstruction();
}
}
}
WebFrame {

12
internal/frontend/bridge-gui/bridge-gui/qml/Proton/WebFrame.qml
View File

@ -25,7 +25,17 @@ Item {
property string url: ""
function showBlankPage() {
webView.loadHtml("<!doctype html><meta charset=utf-8><title>blank</title>", "blank.html");
webView.loadHtml("<!doctype html><meta charset=utf-8><title>blank</title>", "");
}
function showUnderConstruction() {
webView.loadHtml(`
<!DOCTYPE html>
<html lang="en">
<head><meta charset="UTF-8"><title>Coming soon</title><style> body { background-color: #888; font-family: sans-serif; } p { font-weight: bold; margin-top: 100px; text-align: center; }</style></head>
<body><p>The content of this page is under construction.</p></body></html>
`, "")
root.visible = true;
}
Rectangle {

28
internal/frontend/bridge-gui/bridge-gui/qml/Resources/ComingSoon.html
View File

@ -1,28 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Coming soon</title>
<style>
html {
}
body {
background-color: #888;
font-family: sans-serif;
}
p {
font-weight: bold;
margin-top: 100px;
text-align: center;
}
</style>
</head>
<body>
<p>
The content of this page is under construction.
</p>
</body>
</html>

2
internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/LeftPane.qml
View File

@ -70,7 +70,7 @@ Item {
root.iconWidth = 265;
}
function showUnderConstruction() {
Backend.showWebFrameOverlay("qrc:/qml/Resources/ComingSoon.html");
wizard.showUnderConstruction();
}
Connections {

1
internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/SetupWizard.qml
View File

@ -43,6 +43,7 @@ Item {
signal bugReportRequested
signal wizardEnded
signal showUnderConstruction
function _showClientConfig() {
showClientConfig(root.user, root.address, false);