diff --git a/internal/frontend/bridge-gui/bridge-gui/Resources.qrc b/internal/frontend/bridge-gui/bridge-gui/Resources.qrc index 499de55d..b79a8b40 100644 --- a/internal/frontend/bridge-gui/bridge-gui/Resources.qrc +++ b/internal/frontend/bridge-gui/bridge-gui/Resources.qrc @@ -110,7 +110,6 @@ qml/Proton/WebFrame.qml qml/QuestionItem.qml qml/Resources/bug_report_flow.json - qml/Resources/ComingSoon.html qml/SettingsItem.qml qml/SettingsView.qml qml/SetupWizard/ClientListItem.qml diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/MainWindow.qml b/internal/frontend/bridge-gui/bridge-gui/qml/MainWindow.qml index bd1451b4..ea0763d4 100644 --- a/internal/frontend/bridge-gui/bridge-gui/qml/MainWindow.qml +++ b/internal/frontend/bridge-gui/bridge-gui/qml/MainWindow.qml @@ -176,6 +176,9 @@ ApplicationWindow { onWizardEnded: { contentLayout.currentIndex = 0; } + onShowUnderConstruction: { + webFrameOverlay.showUnderConstruction(); + } } } WebFrame { diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/WebFrame.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/WebFrame.qml index 5ba98e53..a8f5812d 100644 --- a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/WebFrame.qml +++ b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/WebFrame.qml @@ -25,7 +25,17 @@ Item { property string url: "" function showBlankPage() { - webView.loadHtml("blank", "blank.html"); + webView.loadHtml("blank", ""); + } + + function showUnderConstruction() { + webView.loadHtml(` + + +Coming soon +

The content of this page is under construction.

+ `, "") + root.visible = true; } Rectangle { diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Resources/ComingSoon.html b/internal/frontend/bridge-gui/bridge-gui/qml/Resources/ComingSoon.html deleted file mode 100644 index 0539050e..00000000 --- a/internal/frontend/bridge-gui/bridge-gui/qml/Resources/ComingSoon.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - - Coming soon - - - - -

- The content of this page is under construction. -

- - \ No newline at end of file diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/LeftPane.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/LeftPane.qml index 38dbba1f..563c8cb4 100644 --- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/LeftPane.qml +++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/LeftPane.qml @@ -70,7 +70,7 @@ Item { root.iconWidth = 265; } function showUnderConstruction() { - Backend.showWebFrameOverlay("qrc:/qml/Resources/ComingSoon.html"); + wizard.showUnderConstruction(); } Connections { diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/SetupWizard.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/SetupWizard.qml index 3248184a..060d3b93 100644 --- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/SetupWizard.qml +++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/SetupWizard.qml @@ -43,6 +43,7 @@ Item { signal bugReportRequested signal wizardEnded + signal showUnderConstruction function _showClientConfig() { showClientConfig(root.user, root.address, false);